fix(table): fix the problem that multi-level header configuration doe…

…s not take effect
vbenjs · Nov 8, 2020 · cdf2c59 · cdf2c59
1 parent 36a7e70
commit cdf2c59
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 93 deletions.
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
@@ -30,6 +30,7 @@
 - 修复`useECharts`在`resize`时不能自适应,报错
 - 修复`useWatermark`在清空后`resize`未删除
 - 修复表单校验问题
+- 修复多级表头配置不生效问题
 
 ## 2.0.0-rc.8 (2020-11-2)
 

diff --git a/src/components/Table/src/hooks/useColumns.ts b/src/components/Table/src/hooks/useColumns.ts
@@ -23,18 +23,11 @@ export function useColumns(
     }
     let pushIndexColumns = false;
     columns.forEach((item) => {
-      const { key, dataIndex } = item;
-      item.align = item.align || 'center';
-      if (ellipsis) {
-        if (!key) {
-          item.key = dataIndex;
-        }
-        if (!isBoolean(item.ellipsis)) {
-          Object.assign(item, {
-            ellipsis,
-          });
-        }
-      }
+      const { children } = item;
+      handleItem(item, !!ellipsis);
+
+      handleChildren(children, !!ellipsis);
+
       const indIndex = columns.findIndex((column) => column.flag === 'INDEX');
       if (showIndexColumn && !isTreeTable) {
         pushIndexColumns = indIndex === -1;
@@ -88,6 +81,30 @@ export function useColumns(
     cacheColumnsRef.value = columns;
   });
 
+  function handleItem(item: BasicColumn, ellipsis: boolean) {
+    const { key, dataIndex } = item;
+    item.align = item.align || 'center';
+    if (ellipsis) {
+      if (!key) {
+        item.key = dataIndex;
+      }
+      if (!isBoolean(item.ellipsis)) {
+        Object.assign(item, {
+          ellipsis,
+        });
+      }
+    }
+  }
+
+  function handleChildren(children: BasicColumn[] | undefined, ellipsis: boolean) {
+    if (!children) return;
+    children.forEach((item) => {
+      const { children } = item;
+      handleItem(item, ellipsis);
+      handleChildren(children, ellipsis);
+    });
+  }
+
   function setColumns(columns: BasicColumn[] | string[]) {
     if (!isArray(columns)) return;
 

diff --git a/src/design/ant/selection.less b/src/design/ant/selection.less