Merge pull request #382 from VisActor/fix/noColumnsError

fix: no columns occur error
VisActor · Oct 10, 2023 · 2543154 · 2543154
2 parents c80ecfc + a1b7b5f
commit 2543154
Showing 1 changed file with 28 additions and 27 deletions.
diff --git a/packages/vtable/src/layout/pivot-header-layout.ts b/packages/vtable/src/layout/pivot-header-layout.ts
@@ -203,34 +203,35 @@ export class PivotHeaderLayoutMap implements LayoutMapAPI {
         this.columnDimensionTree.tree.children,
         []
       );
-      // if (typeof this.showColumnHeader !== 'boolean') {
-      if (this.columnHeaderTitle) {
-        const id = ++sharedVar.seqId;
-        const firstRowIds = Array(this.colCount - this.rowHeaderLevelCount).fill(id);
-        this._columnHeaderCellIds.unshift(firstRowIds);
-        const cell: HeaderData = {
-          id,
-          title:
-            typeof this.columnHeaderTitle.title === 'string'
-              ? this.columnHeaderTitle.title
-              : (this.columnsDefine.reduce((title: string, value) => {
-                  if (typeof value === 'string') {
-                    return title;
-                  }
-                  return title + (title ? `/${value.title}` : `${value.title}`);
-                }, '') as string),
-          field: undefined,
-          headerType: this.columnHeaderTitle.headerType ?? 'text',
-          style: this.columnHeaderTitle.headerStyle,
-          define: <any>{
-            id
-          }
-        };
-        this.columnHeaderObjs.push(cell);
-        this._headerObjects[id] = cell;
-      }
-      // }
     }
+    // if (typeof this.showColumnHeader !== 'boolean') {
+    if (this.columnHeaderTitle) {
+      const id = ++sharedVar.seqId;
+      const firstRowIds = Array(this.colCount - this.rowHeaderLevelCount).fill(id);
+      this._columnHeaderCellIds.unshift(firstRowIds);
+      const cell: HeaderData = {
+        id,
+        title:
+          typeof this.columnHeaderTitle.title === 'string'
+            ? this.columnHeaderTitle.title
+            : (this.columnsDefine.reduce((title: string, value) => {
+                if (typeof value === 'string') {
+                  return title;
+                }
+                return title + (title ? `/${value.title}` : `${value.title}`);
+              }, '') as string),
+        field: undefined,
+        headerType: this.columnHeaderTitle.headerType ?? 'text',
+        style: this.columnHeaderTitle.headerStyle,
+        define: <any>{
+          id
+        }
+      };
+      this.columnHeaderObjs.push(cell);
+      this._headerObjects[id] = cell;
+    }
+    // }
+
     colIndex = 0;
     //生成行表头单元格
     if (this.rowDimensionTree.tree.children?.length >= 1) {