fix(table): 列拖动后，选中行列拖动后到距离被重置了

Tencent · May 12, 2022 · 5f264cb · 5f264cb
1 parent 34b04f0
commit 5f264cb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/table/hooks/useRowSelect.tsx b/src/table/hooks/useRowSelect.tsx
@@ -65,11 +65,12 @@ export default function useRowSelect(props: TdPrimaryTableProps) {
 
   // eslint-disable-next-line
   function getSelectedHeader(h: CreateElement) {
-    const isIndeterminate = intersectionKeys.value.length > 0 && intersectionKeys.value.length < canSelectedRows.value.length;
     return () => (
       <Checkbox
         checked={intersectionKeys.value.length === canSelectedRows.value.length}
-        indeterminate={isIndeterminate}
+        indeterminate={
+          intersectionKeys.value.length > 0 && intersectionKeys.value.length < canSelectedRows.value.length
+        }
         disabled={!canSelectedRows.value.length}
         {...{ on: { change: handleSelectAll } }}
       />
@@ -139,18 +140,12 @@ export default function useRowSelect(props: TdPrimaryTableProps) {
   function formatToRowSelectColumn(col: PrimaryTableCol) {
     const isSelection = ['multiple', 'single'].includes(col.type);
     if (!isSelection) return col;
-
-    !col.width
-      && Object.assign(col, {
-        width: 64,
-      });
-
-    const result = Object.assign(col, {
+    return {
+      ...col,
+      width: col.width || 64,
       cell: (h: CreateElement, p: PrimaryTableCellParams<TableRowData>) => renderSelectCell(h, p),
       title: col.type === 'multiple' ? getSelectedHeader(h) : '',
-    });
-
-    return result;
+    };
   }
 
   return {

diff --git a/src/table/primary-table.tsx b/src/table/primary-table.tsx
@@ -120,7 +120,7 @@ export default defineComponent({
     const getColumns = (columns: PrimaryTableCol<TableRowData>[]) => {
       const arr: PrimaryTableCol<TableRowData>[] = [];
       for (let i = 0, len = columns.length; i < len; i++) {
-        let item = columns[i];
+        let item = { ...columns[i] };
         // 自定义列显示控制
         const isDisplayColumn = item.children?.length || tDisplayColumns.value?.includes(item.colKey);
         if (!isDisplayColumn && props.columnController) continue;