fix: table reactive error, close #4756

vueComponent · Oct 14, 2021 · bd0bc08 · bd0bc08
1 parent f64d7ad
commit bd0bc08
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/components/table/Table.tsx b/components/table/Table.tsx
@@ -471,6 +471,16 @@ const InteralTable = defineComponent<
       return mergedData.value.slice((current - 1) * pageSize, current * pageSize);
     });
 
+    const expandIconColumnIndex = computed(() => {
+      // Adjust expand icon index, no overwrite expandIconColumnIndex if set.
+      if (expandType.value === 'nest' && props.expandIconColumnIndex === undefined) {
+        return props.rowSelection ? 1 : 0;
+      } else if (props.expandIconColumnIndex! > 0 && props.rowSelection) {
+        return props.expandIconColumnIndex - 1;
+      }
+      return props.expandIconColumnIndex;
+    });
+
     // ========================== Selections ==========================
     const [transformSelectionColumns, selectedKeySet] = useSelection(
       computed(() => props.rowSelection),
@@ -483,7 +493,7 @@ const InteralTable = defineComponent<
         expandType,
         childrenColumnName,
         locale: tableLocale,
-        expandIconColumnIndex: computed(() => props.expandIconColumnIndex),
+        expandIconColumnIndex,
         getPopupContainer: computed(() => props.getPopupContainer),
       },
     );
@@ -509,15 +519,6 @@ const InteralTable = defineComponent<
     expose({
       selectedKeySet,
     });
-    const expandIconColumnIndex = computed(() => {
-      // Adjust expand icon index, no overwrite expandIconColumnIndex if set.
-      if (expandType.value === 'nest' && props.expandIconColumnIndex === undefined) {
-        return props.rowSelection ? 1 : 0;
-      } else if (props.expandIconColumnIndex! > 0 && props.rowSelection) {
-        return props.expandIconColumnIndex - 1;
-      }
-      return props.expandIconColumnIndex;
-    });
 
     const indentSize = computed(() => {
       // Indent size

diff --git a/components/vc-table/Table.tsx b/components/vc-table/Table.tsx
@@ -527,17 +527,18 @@ export default defineComponent<TableProps<DefaultRecordType>>({
         summaryCollect,
       }),
     );
-
     useProvideBody(
       reactive({
-        ...reactivePick(
-          props,
-          'rowClassName',
-          'expandedRowClassName',
-          'expandRowByClick',
-          'expandedRowRender',
-          'expandIconColumnIndex',
-          'indentSize',
+        ...toRefs(
+          reactivePick(
+            props,
+            'rowClassName',
+            'expandedRowClassName',
+            'expandRowByClick',
+            'expandedRowRender',
+            'expandIconColumnIndex',
+            'indentSize',
+          ),
         ),
         columns,
         flattenColumns,