@visactor/vtable 1.3.0 → 1.3.1-alpha.0

package/dist/vtable.js

@@ -39305,10 +39305,10 @@
         for (let col = range.start.col; col <= range.end.col; col++) {
             for (let row = range.start.row; row <= range.end.row; row++) {
                 const cellGroup = table.scenegraph.getCell(col, row, true);
-                if (cellGroup.role === 'cell' && range.start.row !== range.end.row && cellGroup.contentWidth !== cellWidth) {
+                if (cellGroup.role === 'cell' && range.start.row !== range.end.row && cellGroup.contentHeight !== cellHeight) {
                     updateCellContentHeight(cellGroup, cellHeight, cellHeight, table.isAutoRowHeight(row), padding, textAlign, textBaseline);
                 }
-                if (cellGroup.role === 'cell' && range.start.col !== range.end.col && cellGroup.contentHeight !== cellHeight) {
+                if (cellGroup.role === 'cell' && range.start.col !== range.end.col && cellGroup.contentWidth !== cellWidth) {
                     updateCellContentWidth(cellGroup, cellWidth, cellHeight, 0, table.isAutoRowHeight(row), padding, textAlign, textBaseline, table.scenegraph);
                 }
                 cellGroup.contentWidth = cellWidth;
@@ -47915,6 +47915,9 @@
             }
         }
         else if (scene.table.frozenColCount < scene.table.rowHeaderLevelCount) {
+            scene.bodyGroup.setAttribute('height', scene.rowHeaderGroup.attribute.height);
+            scene.bodyGroup.setAttribute('y', scene.rowHeaderGroup.attribute.y);
+            scene.colHeaderGroup.setAttribute('height', scene.cornerHeaderGroup.attribute.height);
             for (let i = 0; i < scene.table.rowHeaderLevelCount - scene.table.frozenColCount; i++) {
                 moveColumnFromRowHeaderToBody(scene);
                 moveColumnFromCornerHeaderToColHeader(scene);
@@ -47941,6 +47944,9 @@
     }
     function resetFrozen(scene) {
         if (scene.frozenColCount > scene.table.frozenColCount) {
+            scene.bodyGroup.setAttribute('height', scene.rowHeaderGroup.attribute.height);
+            scene.bodyGroup.setAttribute('y', scene.rowHeaderGroup.attribute.y);
+            scene.colHeaderGroup.setAttribute('height', scene.cornerHeaderGroup.attribute.height);
             for (let i = 0; i < scene.frozenColCount - scene.table.frozenColCount; i++) {
                 moveColumnFromRowHeaderToBody(scene);
                 moveColumnFromCornerHeaderToColHeader(scene);
@@ -59205,7 +59211,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.3.0";
+        version = "1.3.1-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -64078,10 +64084,12 @@
             const topHeaderHeight = !this.table.transpose || this.table.options.indicatorsAsCol
                 ? this.table.getFrozenRowsHeight()
                 : 0;
-            const width = (this.table.columnHeaderLevelCount > 0 ? this.table.getDrawRange().width : this.table.tableNoFrameWidth) -
-                leftHeaderWidth;
-            const height = (this.table.rowHeaderLevelCount > 0 ? this.table.getDrawRange().height : this.table.tableNoFrameHeight) -
-                topHeaderHeight;
+            const width = (this.table.columnHeaderLevelCount > 0 && this.table.isListTable()
+                ? this.table.getDrawRange().width
+                : this.table.tableNoFrameWidth) - leftHeaderWidth;
+            const height = (this.table.rowHeaderLevelCount > 0 && this.table.isListTable()
+                ? this.table.getDrawRange().height
+                : this.table.tableNoFrameHeight) - topHeaderHeight;
             this._emptyTipComponent.setAttributes({
                 spaceBetweenTextAndIcon: this._emptyTipOption.spaceBetweenTextAndIcon,
                 x: this.table.tableX + leftHeaderWidth,
@@ -64124,10 +64132,12 @@
             const topHeaderHeight = !this.table.transpose || this.table.options.indicatorsAsCol
                 ? this.table.getFrozenRowsHeight()
                 : 0;
-            const width = (this.table.columnHeaderLevelCount > 0 ? this.table.getDrawRange().width : this.table.tableNoFrameWidth) -
-                leftHeaderWidth;
-            const height = (this.table.rowHeaderLevelCount > 0 ? this.table.getDrawRange().height : this.table.tableNoFrameHeight) -
-                topHeaderHeight;
+            const width = (this.table.columnHeaderLevelCount > 0 && this.table.isListTable()
+                ? this.table.getDrawRange().width
+                : this.table.tableNoFrameWidth) - leftHeaderWidth;
+            const height = (this.table.rowHeaderLevelCount > 0 && this.table.isListTable()
+                ? this.table.getDrawRange().height
+                : this.table.tableNoFrameHeight) - topHeaderHeight;
             return {
                 spaceBetweenTextAndIcon: this._emptyTipOption.spaceBetweenTextAndIcon,
                 x: this.table.tableX + leftHeaderWidth,
@@ -65657,7 +65667,15 @@
             }
             this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
             if (this.cornerSetting.titleOnDimension === 'column') {
-                const colDimensionKeys = this.columnDimensionTree.dimensionKeysIncludeVirtual.valueArr();
+                let colDimensionKeys = this.columnDimensionTree.dimensionKeysIncludeVirtual.valueArr();
+                if ((this.dataset.records?.length ?? 0) === 0 && !this.dataset.customColTree && !this.dataset.customRowTree) {
+                    colDimensionKeys = this.columnsDefine.map(define => {
+                        if (typeof define === 'string') {
+                            return define;
+                        }
+                        return define.dimensionKey;
+                    });
+                }
                 this.cornerHeaderObjs = this._addCornerHeaders(this.columnHeaderTitle ? [''].concat(colDimensionKeys) : colDimensionKeys, this.columnsDefine);
             }
             else if (this.cornerSetting.titleOnDimension === 'row') {
@@ -65673,7 +65691,15 @@
                     this.cornerHeaderObjs = this._addCornerHeaders(this.rowHeaderTitle ? [''].concat(rowTreeFirstKey) : rowTreeFirstKey, this.rowsDefine.concat(extensionRowDimensions));
                 }
                 else {
-                    const rowDimensionKeys = this.rowDimensionTree.dimensionKeysIncludeVirtual.valueArr();
+                    let rowDimensionKeys = this.rowDimensionTree.dimensionKeysIncludeVirtual.valueArr();
+                    if ((this.dataset.records?.length ?? 0) === 0 && !this.dataset.customColTree && !this.dataset.customRowTree) {
+                        rowDimensionKeys = this.rowsDefine.map(define => {
+                            if (typeof define === 'string') {
+                                return define;
+                            }
+                            return define.dimensionKey;
+                        });
+                    }
                     this.cornerHeaderObjs = this._addCornerHeaders(this.rowHeaderTitle ? [''].concat(rowDimensionKeys) : rowDimensionKeys, this.rowsDefine);
                 }
             }
@@ -66331,6 +66357,19 @@
                             : this.columnDimensionTree.totalLevel
                         : this.columnDimensionTree.totalLevel
                     : this.columnDimensionTree.totalLevel;
+                if (count === 0 && !this.dataset.customColTree && !this.dataset.customRowTree) {
+                    if (this.cornerSetting.titleOnDimension === 'row') {
+                        count = 1;
+                    }
+                    else if ((this.dataset.records?.length ?? 0) === 0 && this.cornerSetting.titleOnDimension === 'column') {
+                        count = this.columnsDefine.length ?? 0;
+                    }
+                }
+                else if ((this.dataset.records?.length ?? 0) === 0 &&
+                    !this.dataset.customColTree &&
+                    !this.dataset.customRowTree) {
+                    count = this.columnsDefine.length;
+                }
                 if (this.columnHeaderTitle) {
                     count += 1;
                 }
@@ -66364,6 +66403,19 @@
                     this.rowDimensionKeys[this.rowDimensionKeys.length - 1] === this.indicatorDimensionKey) {
                     count = rowLevelCount - 1;
                 }
+                if (count === 0 && !this.dataset.customColTree && !this.dataset.customRowTree) {
+                    if (this.cornerSetting.titleOnDimension === 'column') {
+                        count = 1;
+                    }
+                    else if ((this.dataset.records?.length ?? 0) === 0 && this.cornerSetting.titleOnDimension === 'row') {
+                        count = this.rowsDefine.length ?? 0;
+                    }
+                }
+                else if ((this.dataset.records?.length ?? 0) === 0 &&
+                    !this.dataset.customColTree &&
+                    !this.dataset.customRowTree) {
+                    count = this.rowsDefine.length;
+                }
                 if (this.rowHeaderTitle) {
                     count += 1;
                 }
@@ -66478,16 +66530,16 @@
                     return '';
                 }
                 else if (this.isCornerHeader(col, row)) {
-                    return this._cornerHeaderCellIds[row][col - this.leftRowSeriesNumberColumnCount];
+                    return this._cornerHeaderCellIds[row]?.[col - this.leftRowSeriesNumberColumnCount];
                 }
                 else if (this.isColumnHeader(col, row)) {
-                    return this._columnHeaderCellIds[row][col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount];
+                    return this._columnHeaderCellIds[row]?.[col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount];
                 }
                 else if (this.isRowHeader(col, row)) {
                     return this._rowHeaderCellIds[row - this.columnHeaderLevelCount]?.[col - this.leftRowSeriesNumberColumnCount];
                 }
                 else if (this.isRightFrozenColumn(col, row)) {
-                    return this._rowHeaderCellIds[row - this.columnHeaderLevelCount][this.rowHeaderLevelCount - 1];
+                    return this._rowHeaderCellIds[row - this.columnHeaderLevelCount]?.[this.rowHeaderLevelCount - 1];
                 }
                 else if (this.isBottomFrozenRow(col, row)) {
                     return this._columnHeaderCellIds[this.columnHeaderLevelCount - 1]?.[col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount];
@@ -68321,7 +68373,9 @@
         collectedValues = {};
         cacheCollectedValues = {};
         rows;
+        rowsHasValue;
         columns;
+        columnsHasValue;
         indicatorKeys;
         customRowTree;
         customColTree;
@@ -68381,6 +68435,8 @@
             this.rowFlatKeys = {};
             this.colKeys = [];
             this.rowKeys = [];
+            this.rowsHasValue = [];
+            this.columnsHasValue = [];
             if (records) {
                 this.records = records;
                 typeof window !== 'undefined' ? window.performance.now() : 0;
@@ -68401,19 +68457,25 @@
                 }
                 else {
                     if (this.rowHierarchyType === 'tree') {
-                        this.rowHeaderTree = this.ArrToTree1(this.rowKeys, this.rows, this.indicatorsAsCol ? undefined : this.indicators, this.totals?.row?.showGrandTotals ||
+                        this.rowHeaderTree = this.ArrToTree1(this.rowKeys, this.rows.filter((key, index) => {
+                            return this.rowsHasValue[index];
+                        }), this.indicatorsAsCol ? undefined : this.indicators, this.totals?.row?.showGrandTotals ||
                             (!this.indicatorsAsCol && this.columns.length === 0) ||
                             (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel);
                     }
                     else {
-                        this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows, this.indicatorsAsCol ? undefined : this.indicators, this.rowsIsTotal, this.totals?.row?.showGrandTotals || (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel, this.rowSubTotalLabel, this.totals?.row?.showGrandTotalsOnTop ?? false, this.totals?.row?.showSubTotalsOnTop ?? false);
+                        this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows.filter((key, index) => {
+                            return this.rowsHasValue[index];
+                        }), this.indicatorsAsCol ? undefined : this.indicators, this.rowsIsTotal, this.totals?.row?.showGrandTotals || (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel, this.rowSubTotalLabel, this.totals?.row?.showGrandTotalsOnTop ?? false, this.totals?.row?.showSubTotalsOnTop ?? false);
                     }
                 }
                 if (this.customColTree) {
                     this.colHeaderTree = this.customColTree;
                 }
                 else {
-                    this.colHeaderTree = this.ArrToTree(this.colKeys, this.columns, this.indicatorsAsCol ? this.indicators : undefined, this.colsIsTotal, this.totals?.column?.showGrandTotals || (!this.indicatorsAsCol && this.columns.length === 0), this.colGrandTotalLabel, this.colSubTotalLabel, this.totals?.column?.showGrandTotalsOnLeft ?? false, this.totals?.column?.showSubTotalsOnLeft ?? false);
+                    this.colHeaderTree = this.ArrToTree(this.colKeys, this.columns.filter((key, index) => {
+                        return this.columnsHasValue[index];
+                    }), this.indicatorsAsCol ? this.indicators : undefined, this.colsIsTotal, this.totals?.column?.showGrandTotals || (!this.indicatorsAsCol && this.columns.length === 0), this.colGrandTotalLabel, this.colSubTotalLabel, this.totals?.column?.showGrandTotalsOnLeft ?? false, this.totals?.column?.showSubTotalsOnLeft ?? false);
                 }
                 typeof window !== 'undefined' ? window.performance.now() : 0;
                 if (this.dataConfig?.isPivotChart) {
@@ -68610,6 +68672,7 @@
             for (let l = 0, len1 = this.rows.length; l < len1; l++) {
                 const rowAttr = this.rows[l];
                 if (rowAttr in record) {
+                    this.rowsHasValue[l] = true;
                     rowKey.push(record[rowAttr]);
                 }
                 else if (rowAttr !== IndicatorDimensionKeyPlaceholder) {
@@ -68635,6 +68698,7 @@
             for (let n = 0, len2 = this.columns.length; n < len2; n++) {
                 const colAttr = this.columns[n];
                 if (colAttr in record) {
+                    this.columnsHasValue[n] = true;
                     colKey.push(record[colAttr]);
                 }
                 else if (colAttr !== IndicatorDimensionKeyPlaceholder) {
@@ -68760,16 +68824,22 @@
             this.sortKeys();
             if (!this.customRowTree) {
                 if (this.rowHierarchyType === 'tree') {
-                    this.rowHeaderTree = this.ArrToTree1(this.rowKeys, this.rows, this.indicatorsAsCol ? undefined : this.indicators, this.totals?.row?.showGrandTotals ||
+                    this.rowHeaderTree = this.ArrToTree1(this.rowKeys, this.rows.filter((key, index) => {
+                        return this.rowsHasValue[index];
+                    }), this.indicatorsAsCol ? undefined : this.indicators, this.totals?.row?.showGrandTotals ||
                         (!this.indicatorsAsCol && this.columns.length === 0) ||
                         (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel);
                 }
                 else {
-                    this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows, this.indicatorsAsCol ? undefined : this.indicators, this.rowsIsTotal, this.totals?.row?.showGrandTotals || (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel, this.rowSubTotalLabel, this.totals?.row?.showGrandTotalsOnTop ?? false, this.totals?.row?.showSubTotalsOnTop ?? false);
+                    this.rowHeaderTree = this.ArrToTree(this.rowKeys, this.rows.filter((key, index) => {
+                        return this.rowsHasValue[index];
+                    }), this.indicatorsAsCol ? undefined : this.indicators, this.rowsIsTotal, this.totals?.row?.showGrandTotals || (this.indicatorsAsCol && this.rows.length === 0), this.rowGrandTotalLabel, this.rowSubTotalLabel, this.totals?.row?.showGrandTotalsOnTop ?? false, this.totals?.row?.showSubTotalsOnTop ?? false);
                 }
             }
             if (!this.customColTree) {
-                this.colHeaderTree = this.ArrToTree(this.colKeys, this.columns, this.indicatorsAsCol ? this.indicators : undefined, this.colsIsTotal, this.totals?.column?.showGrandTotals || (!this.indicatorsAsCol && this.columns.length === 0), this.colGrandTotalLabel, this.colSubTotalLabel, this.totals?.column?.showGrandTotalsOnLeft ?? false, this.totals?.column?.showSubTotalsOnLeft ?? false);
+                this.colHeaderTree = this.ArrToTree(this.colKeys, this.columns.filter((key, index) => {
+                    return this.columnsHasValue[index];
+                }), this.indicatorsAsCol ? this.indicators : undefined, this.colsIsTotal, this.totals?.column?.showGrandTotals || (!this.indicatorsAsCol && this.columns.length === 0), this.colGrandTotalLabel, this.colSubTotalLabel, this.totals?.column?.showGrandTotalsOnLeft ?? false, this.totals?.column?.showSubTotalsOnLeft ?? false);
             }
         }
         updateFilterRules(filterRules, isResetTree = false) {
@@ -69483,12 +69553,18 @@
                         if (options.indicatorsAsCol !== false) {
                             this.dataset.colHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.colHeaderTree, options.indicators);
                         }
+                        if ((this.records?.length ?? 0) === 0 && !this.dataset.customColTree && !this.dataset.customRowTree) {
+                            this.dataset.colHeaderTree = [];
+                        }
                         columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
                     }
                     if (!options.rowTree) {
                         if (options.indicatorsAsCol === false) {
                             this.dataset.rowHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.rowHeaderTree, options.indicators);
                         }
+                        if ((this.records?.length ?? 0) === 0 && !this.dataset.customColTree && !this.dataset.customRowTree) {
+                            this.dataset.rowHeaderTree = [];
+                        }
                         rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId, this.options.rowHierarchyType, this.options.rowHierarchyType === 'tree' ? this.options.rowExpandLevel ?? 1 : undefined);
                     }
                     this.internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
@@ -69621,12 +69697,18 @@
                     if (options.indicatorsAsCol !== false) {
                         this.dataset.colHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.colHeaderTree, options.indicators);
                     }
+                    if ((this.records?.length ?? 0) === 0 && !this.dataset.customColTree && !this.dataset.customRowTree) {
+                        this.dataset.colHeaderTree = [];
+                    }
                     columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
                 }
                 if (!options.rowTree) {
                     if (options.indicatorsAsCol === false) {
                         this.dataset.rowHeaderTree = supplementIndicatorNodesForCustomTree(this.dataset.rowHeaderTree, options.indicators);
                     }
+                    if ((this.records?.length ?? 0) === 0 && !this.dataset.customColTree && !this.dataset.customRowTree) {
+                        this.dataset.rowHeaderTree = [];
+                    }
                     rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId, this.options.rowHierarchyType, this.options.rowHierarchyType === 'tree' ? this.options.rowExpandLevel ?? 1 : undefined);
                 }
                 internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
@@ -70403,12 +70485,18 @@
                     columnDimensionTree = internalProps.layoutMap.columnDimensionTree;
                 }
                 else {
+                    if ((this.records?.length ?? 0) === 0 && !this.dataset.customColTree && !this.dataset.customRowTree) {
+                        this.dataset.colHeaderTree = [];
+                    }
                     columnDimensionTree = new DimensionTree(this.dataset.colHeaderTree ?? [], this.layoutNodeId);
                 }
                 if (options.rowTree) {
                     rowDimensionTree = internalProps.layoutMap.rowDimensionTree;
                 }
                 else {
+                    if ((this.records?.length ?? 0) === 0 && !this.dataset.customColTree && !this.dataset.customRowTree) {
+                        this.dataset.rowHeaderTree = [];
+                    }
                     rowDimensionTree = new DimensionTree(this.dataset.rowHeaderTree ?? [], this.layoutNodeId, this.options.rowHierarchyType, this.options.rowHierarchyType === 'tree' ? this.options.rowExpandLevel ?? 1 : undefined);
                 }
                 internalProps.layoutMap = new PivotHeaderLayoutMap(this, this.dataset, columnDimensionTree, rowDimensionTree);
@@ -72330,7 +72418,7 @@
     }
 
     registerForVrender();
-    const version = "1.3.0";
+    const version = "1.3.1-alpha.0";
     function getIcons() {
         return get$2();
     }