@visactor/vtable 0.15.0-alpha.3 → 0.15.0

package/es/layout/pivot-header-layout.d.ts

@@ -2,6 +2,7 @@ import type { CellAddress, CellRange, IPivotTableCellHeaderPaths, LayoutObjectId
 import type { HeaderData, IndicatorData, LayoutMapAPI, WidthData } from '../ts-types/list-table/layout-map/api';
 import type { PivotTable } from '../PivotTable';
 import type { PivotChart } from '../PivotChart';
+import type { LayouTreeNode } from './pivot-layout-helper';
 import { DimensionTree } from './pivot-layout-helper';
 import type { Dataset } from '../dataset/dataset';
 export declare const sharedVar: {
@@ -104,9 +105,11 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     get rowHeaderLevelCount(): number;
     get colCount(): number;
     get rowCount(): number;
-    get bodyRowCount(): number;
+    get bodyRowSpanCount(): number;
     get bottomFrozenRowCount(): number;
     get rightFrozenColCount(): number;
+    get bodyRowCount(): number | undefined;
+    get bodyColCount(): number | undefined;
     get headerObjects(): HeaderData[];
     get columnObjects(): IndicatorData[];
     getCellId(col: number, row: number): LayoutObjectId;
@@ -118,6 +121,8 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     getCellRange(col: number, row: number): CellRange;
     isCellRangeEqual(col: number, row: number, targetCol: number, targetRow: number): boolean;
     getBodyIndexByRow(row: number): number;
+    get bottomHeaderRowCount(): number;
+    get rightHeaderColCount(): number;
     getBodyIndexByCol(col: number): number;
     getRecordStartRowByRecordIndex(index: number): number;
     getRecordIndexByCell(col: number, row: number): number;
@@ -190,5 +195,7 @@ export declare class PivotHeaderLayoutMap implements LayoutMapAPI {
     getColKeysPath(col: number, row: number): string;
     getRowKeysPath(col: number, row: number): string;
     getIndicatorInfo(indicatorKey: string, indicatorValue?: string): IIndicator;
+    getLayoutRowTree(): LayouTreeNode[];
+    getLayoutRowTreeCount(): number;
     updateDataset(dataset: Dataset): void;
 }

package/es/layout/pivot-header-layout.js

@@ -8,7 +8,7 @@ import { diffCellAddress } from "../tools/diff-cell";
 
 import { getChartAxes, getChartDataId, getChartSpec, getRawChartSpec } from "./chart-helper/get-chart-spec";
 
-import { DimensionTree } from "./pivot-layout-helper";
+import { DimensionTree, countLayoutTree, generateLayoutTree } from "./pivot-layout-helper";
 
 import { cloneDeep, isArray, isValid } from "@visactor/vutils";
 
@@ -420,7 +420,7 @@ export class PivotHeaderLayoutMap {
         return this.isCornerHeader(col, row) ? "cornerHeader" : this.isColumnHeader(col, row) ? "columnHeader" : this.isRowHeader(col, row) ? "rowHeader" : "body";
     }
     isHeader(col, row) {
-        return col < this.rowHeaderLevelCount || (row < this.columnHeaderLevelCount || (col >= this.colCount - this.rightFrozenColCount || row >= this.rowCount - this.bottomFrozenRowCount));
+        return col < this.rowHeaderLevelCount || (row < this.columnHeaderLevelCount || (col >= this.colCount - this.rightHeaderColCount || row >= this.rowCount - this.bottomHeaderRowCount));
     }
     isCornerHeader(col, row) {
         return col < this.rowHeaderLevelCount && row < this.columnHeaderLevelCount;
@@ -514,12 +514,10 @@ export class PivotHeaderLayoutMap {
     }
     resetCellIds() {}
     get frozenColCount() {
-        var _a;
-        return null !== (_a = this._table.internalProps.frozenColCount) && void 0 !== _a ? _a : 0;
+        return this._table.internalProps.frozenColCount ? this.colCount > this._table.internalProps.frozenColCount ? this._table.internalProps.frozenColCount : this.colCount : 0;
     }
     get frozenRowCount() {
-        var _a;
-        return null !== (_a = this._table.internalProps.frozenRowCount) && void 0 !== _a ? _a : 0;
+        return this._table.internalProps.frozenRowCount ? this.rowCount >= this._table.internalProps.frozenRowCount ? this._table.internalProps.frozenRowCount : this.rowCount : 0;
     }
     get headerLevelCount() {
         return this.columnHeaderLevelCount;
@@ -548,26 +546,32 @@ export class PivotHeaderLayoutMap {
         return this.indicatorsAsCol || this.hideIndicatorName ? 0 : 1;
     }
     get colCount() {
-        return this.columnDimensionTree.tree.size + this.rowHeaderLevelCount + this.rightFrozenColCount;
+        return this.columnDimensionTree.tree.size + this.rowHeaderLevelCount + this.rightHeaderColCount;
     }
     get rowCount() {
         var _a, _b, _c, _d;
-        return ((!Array.isArray(this._table.records) || this._table.records.length > 0) && (null === (_a = this._indicators) || void 0 === _a ? void 0 : _a.length) > 0 && !(null === (_b = this._rowHeaderCellIds) || void 0 === _b ? void 0 : _b.length) ? 1 : null !== (_d = null === (_c = this._rowHeaderCellIds) || void 0 === _c ? void 0 : _c.length) && void 0 !== _d ? _d : 0) + this.columnHeaderLevelCount + this.bottomFrozenRowCount;
+        return ((!Array.isArray(this._table.records) || this._table.records.length > 0) && (null === (_a = this._indicators) || void 0 === _a ? void 0 : _a.length) > 0 && !(null === (_b = this._rowHeaderCellIds) || void 0 === _b ? void 0 : _b.length) ? 1 : null !== (_d = null === (_c = this._rowHeaderCellIds) || void 0 === _c ? void 0 : _c.length) && void 0 !== _d ? _d : 0) + this.columnHeaderLevelCount + this.bottomHeaderRowCount;
     }
-    get bodyRowCount() {
+    get bodyRowSpanCount() {
         return this.rowDimensionTree.tree.size;
     }
     get bottomFrozenRowCount() {
-        if (!this._table.isPivotChart()) return 0;
+        if (!this._table.isPivotChart()) return this._table.internalProps.bottomFrozenRowCount ? this.rowCount - this.headerLevelCount >= this._table.internalProps.bottomFrozenRowCount ? this._table.internalProps.bottomFrozenRowCount : this.rowCount - this.headerLevelCount : 0;
         const axisOption = this._table.pivotChartAxes.find((axisOption => "bottom" === axisOption.orient));
         return !1 === (null == axisOption ? void 0 : axisOption.visible) ? 0 : (this.indicatorsAsCol, 
         1);
     }
     get rightFrozenColCount() {
-        if (!this._table.isPivotChart()) return 0;
+        if (!this._table.isPivotChart()) return this._table.internalProps.rightFrozenColCount ? this.colCount - this.rowHeaderLevelCount >= this._table.internalProps.rightFrozenColCount ? this._table.internalProps.rightFrozenColCount : this.colCount - this.rowHeaderLevelCount : 0;
         const axisOption = this._table.pivotChartAxes.find((axisOption => "right" === axisOption.orient));
         return !1 === (null == axisOption ? void 0 : axisOption.visible) || this.indicatorsAsCol ? 0 : this.hasTwoIndicatorAxes ? 1 : 0;
     }
+    get bodyRowCount() {
+        return this.rowCount - this.bottomFrozenRowCount - this.headerLevelCount;
+    }
+    get bodyColCount() {
+        return this.colCount - this.rightFrozenColCount - this.rowHeaderLevelCount;
+    }
     get headerObjects() {
         return this._headerObjects;
     }
@@ -677,10 +681,16 @@ export class PivotHeaderLayoutMap {
         return range1.start.col === range2.start.col && range1.end.col === range2.end.col && range1.start.row === range2.start.row && range1.end.row === range2.end.row;
     }
     getBodyIndexByRow(row) {
-        return row < this.columnHeaderLevelCount || row >= this.rowCount - this.bottomFrozenRowCount ? -1 : row - this.columnHeaderLevelCount;
+        return row < this.columnHeaderLevelCount || row >= this.rowCount - this.bottomHeaderRowCount ? -1 : row - this.columnHeaderLevelCount;
+    }
+    get bottomHeaderRowCount() {
+        return this._table.isPivotChart() ? this.bottomFrozenRowCount : 0;
+    }
+    get rightHeaderColCount() {
+        return this._table.isPivotChart() ? this.rightFrozenColCount : 0;
     }
     getBodyIndexByCol(col) {
-        return col < this.rowHeaderLevelCount || col >= this.colCount - this.rightFrozenColCount ? -1 : col - this.rowHeaderLevelCount;
+        return col < this.rowHeaderLevelCount || col >= this.colCount - this.rightHeaderColCount ? -1 : col - this.rowHeaderLevelCount;
     }
     getRecordStartRowByRecordIndex(index) {
         return this.columnHeaderLevelCount + index;
@@ -1195,33 +1205,33 @@ export class PivotHeaderLayoutMap {
         })) : indicatorKeys.push(chartSpec.xField), indicatorKeys) : null;
     }
     getOptimunHeightForChart(row) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const path = this.getCellHeaderPaths(this.rowHeaderLevelCount, row).rowHeaderPaths;
         let collectedValues, height;
         for (const key in this.dataset.collectValuesBy) if ("yField" === this.dataset.collectValuesBy[key].type && !this.dataset.collectValuesBy[key].range) {
-            collectedValues = this.dataset.collectedValues[key][path.map((pathObj => pathObj.value)).join(this.dataset.stringJoinChar)];
+            collectedValues = null === (_a = this.dataset.collectedValues[key]) || void 0 === _a ? void 0 : _a[path.map((pathObj => pathObj.value)).join(this.dataset.stringJoinChar)];
             break;
         }
-        if (this._chartItemBandSize) height = scaleWholeRangeSize(null !== (_a = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _a ? _a : 0, this._chartItemBandSize, this._chartPaddingInner, this._chartPaddingOuter); else {
+        if (this._chartItemBandSize) height = scaleWholeRangeSize(null !== (_b = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _b ? _b : 0, this._chartItemBandSize, this._chartPaddingInner, this._chartPaddingOuter); else {
             const barWidth = this._chartItemSpanSize || 25;
-            height = (null !== (_b = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _b ? _b : 0) * (barWidth + barWidth / 3);
+            height = (null !== (_c = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _c ? _c : 0) * (barWidth + barWidth / 3);
         }
-        const padding = getQuadProps(null !== (_d = null !== (_c = this._chartPadding) && void 0 !== _c ? _c : this._table.theme.bodyStyle.padding) && void 0 !== _d ? _d : 0);
+        const padding = getQuadProps(null !== (_e = null !== (_d = this._chartPadding) && void 0 !== _d ? _d : this._table.theme.bodyStyle.padding) && void 0 !== _e ? _e : 0);
         return height + padding[0] + padding[2];
     }
     getOptimunWidthForChart(col) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const path = this.getCellHeaderPaths(col, this.columnHeaderLevelCount).colHeaderPaths;
         let collectedValues, width;
         for (const key in this.dataset.collectValuesBy) if ("xField" === this.dataset.collectValuesBy[key].type && !this.dataset.collectValuesBy[key].range) {
-            collectedValues = this.dataset.collectedValues[key][path.map((pathObj => pathObj.value)).join(this.dataset.stringJoinChar)];
+            collectedValues = null === (_a = this.dataset.collectedValues[key]) || void 0 === _a ? void 0 : _a[path.map((pathObj => pathObj.value)).join(this.dataset.stringJoinChar)];
             break;
         }
-        if (this._chartItemBandSize) width = scaleWholeRangeSize(null !== (_a = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _a ? _a : 0, this._chartItemBandSize, this._chartPaddingInner, this._chartPaddingOuter); else {
+        if (this._chartItemBandSize) width = scaleWholeRangeSize(null !== (_b = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _b ? _b : 0, this._chartItemBandSize, this._chartPaddingInner, this._chartPaddingOuter); else {
             const barWidth = this._chartItemSpanSize || 25;
-            width = (null !== (_b = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _b ? _b : 0) * (barWidth + barWidth / 3);
+            width = (null !== (_c = null == collectedValues ? void 0 : collectedValues.length) && void 0 !== _c ? _c : 0) * (barWidth + barWidth / 3);
         }
-        const padding = getQuadProps(null !== (_d = null !== (_c = this._chartPadding) && void 0 !== _c ? _c : this._table.theme.bodyStyle.padding) && void 0 !== _d ? _d : 0);
+        const padding = getQuadProps(null !== (_e = null !== (_d = this._chartPadding) && void 0 !== _d ? _d : this._table.theme.bodyStyle.padding) && void 0 !== _e ? _e : 0);
         return width + padding[1] + padding[3];
     }
     get leftAxesCount() {
@@ -1257,6 +1267,21 @@ export class PivotHeaderLayoutMap {
         var _a;
         return null === (_a = this.indicatorsDefine) || void 0 === _a ? void 0 : _a.find((indicator => "string" != typeof indicator && (indicatorKey ? indicator.indicatorKey === indicatorKey : !!indicatorValue && indicator.title === indicatorValue)));
     }
+    getLayoutRowTree() {
+        const tree = [], children = this.rowDimensionTree.tree.children;
+        return generateLayoutTree(tree, children), tree;
+    }
+    getLayoutRowTreeCount() {
+        var _a;
+        const children = this.rowDimensionTree.tree.children;
+        let totalCount = countLayoutTree(children, "tree" === this.rowHierarchyType);
+        return null === (_a = this.extensionRows) || void 0 === _a || _a.forEach((extensionRow => {
+            if ("function" != typeof extensionRow.rowTree) {
+                const thisTreeCount = countLayoutTree(extensionRow.rowTree, !0);
+                totalCount *= thisTreeCount;
+            }
+        })), totalCount;
+    }
     updateDataset(dataset) {}
 }