@visactor/vtable 0.9.1 → 0.9.2-alpha.1

package/es/scenegraph/scenegraph.js

@@ -6,10 +6,6 @@ import { isArray, isString } from "@visactor/vutils";
 
 import { Group } from "./graphic/group";
 
-import { createBodyColGroup, createColHeaderColGroup, createCornerHeaderColGroup, createRowHeaderColGroup } from "./group-creater/column";
-
-import { updateAutoRowHeight } from "./layout/auto-height";
-
 import { getCellMergeInfo } from "./utils/get-cell-merge";
 
 import { updateColWidth } from "./layout/update-width";
@@ -52,9 +48,11 @@ import { updateRow } from "./layout/update-row";
 
 import { handleTextStick } from "./stick-text";
 
+import { computeRowsHeight } from "./layout/compute-row-height";
+
 import { emptyGroup } from "./utils/empty-group";
 
-import { updateChartSize } from "./refresh-node/update-chart";
+import { updateChartSize, updateChartState } from "./refresh-node/update-chart";
 
 import { dealFrozen, resetFrozen } from "./layout/frozen";
 
@@ -150,6 +148,24 @@ export class Scenegraph {
             pickable: !1
         });
         bodyGroup.role = "body", this.bodyGroup = bodyGroup;
+        const rightFrozenGroup = new Group({
+            x: 0,
+            y: 0,
+            width: width,
+            height: 0,
+            clip: !1,
+            pickable: !1
+        });
+        rightFrozenGroup.role = "right-frozen", this.rightFrozenGroup = rightFrozenGroup;
+        const bottomFrozenGroup = new Group({
+            x: 0,
+            y: 0,
+            width: width,
+            height: 0,
+            clip: !1,
+            pickable: !1
+        });
+        bottomFrozenGroup.role = "bottom-frozen", this.bottomFrozenGroup = bottomFrozenGroup;
         const componentGroup = new Group({
             x: 0,
             y: 0,
@@ -159,8 +175,47 @@ export class Scenegraph {
             pickable: !1,
             childrenPickable: !0
         });
-        componentGroup.role = "component", this.componentGroup = componentGroup, this.tableGroup.addChild(bodyGroup), 
-        this.tableGroup.addChild(rowHeaderGroup), this.tableGroup.addChild(colHeaderGroup), 
+        componentGroup.role = "component", this.componentGroup = componentGroup;
+        const rightTopCellGroup = new Group({
+            x: 0,
+            y: 0,
+            width: 0,
+            height: 0,
+            visible: !1,
+            pickable: !0,
+            fill: this.table.theme.cornerHeaderStyle.bgColor,
+            stroke: this.table.theme.cornerHeaderStyle.borderColor,
+            lineWidth: this.table.theme.cornerHeaderStyle.borderLineWidth
+        });
+        rightTopCellGroup.role = "corner-frozen", this.rightTopCellGroup = rightTopCellGroup;
+        const leftBottomCellGroup = new Group({
+            x: 0,
+            y: 0,
+            width: 0,
+            height: 0,
+            visible: !1,
+            pickable: !0,
+            fill: this.table.theme.cornerHeaderStyle.bgColor,
+            stroke: this.table.theme.cornerHeaderStyle.borderColor,
+            lineWidth: this.table.theme.cornerHeaderStyle.borderLineWidth
+        });
+        leftBottomCellGroup.role = "corner-frozen", this.leftBottomCellGroup = leftBottomCellGroup;
+        const rightBottomCellGroup = new Group({
+            x: 0,
+            y: 0,
+            width: 0,
+            height: 0,
+            visible: !1,
+            pickable: !0,
+            fill: this.table.theme.cornerHeaderStyle.bgColor,
+            stroke: this.table.theme.cornerHeaderStyle.borderColor,
+            lineWidth: this.table.theme.cornerHeaderStyle.borderLineWidth
+        });
+        rightBottomCellGroup.role = "corner-frozen", this.rightBottomCellGroup = rightBottomCellGroup, 
+        this.tableGroup.addChild(bodyGroup), this.tableGroup.addChild(rightFrozenGroup), 
+        this.tableGroup.addChild(bottomFrozenGroup), this.tableGroup.addChild(rowHeaderGroup), 
+        this.tableGroup.addChild(colHeaderGroup), this.tableGroup.addChild(rightBottomCellGroup), 
+        this.tableGroup.addChild(rightTopCellGroup), this.tableGroup.addChild(leftBottomCellGroup), 
         this.tableGroup.addChild(cornerHeaderGroup), this.tableGroup.addChild(componentGroup);
     }
     clearCells() {
@@ -186,11 +241,39 @@ export class Scenegraph {
             y: 0,
             width: 0,
             height: 0
-        }), this.tableGroup.setAttributes({
+        }), this.rightFrozenGroup.setAttributes({
+            x: 0,
+            y: 0,
+            width: 0,
+            height: 0
+        }), this.bottomFrozenGroup.setAttributes({
             x: 0,
             y: 0,
             width: 0,
             height: 0
+        }), this.rightTopCellGroup.setAttributes({
+            x: 0,
+            y: 0,
+            width: 0,
+            height: 0,
+            visible: !1
+        }), this.leftBottomCellGroup.setAttributes({
+            x: 0,
+            y: 0,
+            width: 0,
+            height: 0,
+            visible: !1
+        }), this.rightTopCellGroup.setAttributes({
+            x: 0,
+            y: 0,
+            width: 0,
+            height: 0,
+            visible: !1
+        }), this.tableGroup.setAttributes({
+            x: this.table.tableX,
+            y: this.table.tableY,
+            width: 0,
+            height: 0
         }), this.tableGroup.border && (this.tableGroup.parent.removeChild(this.tableGroup.border), 
         delete this.tableGroup.border);
     }
@@ -199,28 +282,10 @@ export class Scenegraph {
         this.selectedRangeComponents = new Map, this.selectingRangeComponents = new Map;
     }
     createSceneGraph() {
-        this.clear = !1, computeColsWidth(this.table), this.frozenColCount = this.table.rowHeaderLevelCount, 
-        this.frozenRowCount = this.table.columnHeaderLevelCount, this.proxy = new SceneProxy(this.table), 
-        createFrameBorder(this.tableGroup, this.table.theme.frameStyle, this.tableGroup.role, void 0, !0), 
-        this.createHeaderSceneGraph(), this.transpose || this.isPivot ? this.createBodySceneGraph() : this.createBodySceneGraphForFirstScreen();
-    }
-    createHeaderSceneGraph() {
-        createCornerHeaderColGroup(this.cornerHeaderGroup, 0, 0, this.table), this.colHeaderGroup.setAttribute("x", this.cornerHeaderGroup.attribute.width), 
-        createColHeaderColGroup(this.colHeaderGroup, 0, 0, this.table);
-    }
-    createBodySceneGraph() {
-        this.rowHeaderGroup.setAttribute("y", this.colHeaderGroup.attribute.height), createRowHeaderColGroup(this.rowHeaderGroup, 0, 0, this.table), 
-        this.bodyGroup.setAttributes({
-            y: this.colHeaderGroup.attribute.height,
-            x: this.rowHeaderGroup.attribute.width
-        }), createBodyColGroup(this.bodyGroup, 0, 0, this.table), this.afterScenegraphCreated();
-    }
-    createBodySceneGraphForFirstScreen() {
-        this.rowHeaderGroup.setAttribute("y", this.colHeaderGroup.attribute.height), this.bodyGroup.setAttributes({
-            y: this.colHeaderGroup.attribute.height,
-            x: this.rowHeaderGroup.attribute.width
-        }), console.log("before-createBodyColGroupForFirstScreen"), this.proxy.createColGroupForFirstScreen(this.rowHeaderGroup, this.bodyGroup, 0, 0, this.table), 
-        console.log("after-createBodyColGroupForFirstScreen"), this.afterScenegraphCreated();
+        this.clear = !1, this.frozenColCount = this.table.rowHeaderLevelCount, this.frozenRowCount = this.table.columnHeaderLevelCount, 
+        this.proxy = new SceneProxy(this.table), createFrameBorder(this.tableGroup, this.table.theme.frameStyle, this.tableGroup.role, void 0, !0), 
+        this.proxy.createGroupForFirstScreen(this.cornerHeaderGroup, this.colHeaderGroup, this.rowHeaderGroup, this.rightFrozenGroup, this.bottomFrozenGroup, this.bodyGroup, 0, 0), 
+        this.afterScenegraphCreated();
     }
     renderSceneGraph() {
         this.stage.render();
@@ -241,20 +306,21 @@ export class Scenegraph {
         element || void 0;
     }
     getCell(col, row, getShadow) {
-        var _a;
-        let cell = null === (_a = this.getColGroup(col, row < this.frozenRowCount)) || void 0 === _a ? void 0 : _a.getRowGroup(row);
-        if (cell && "shadow-cell" === cell.role && !getShadow) {
+        var _a, _b, _c;
+        let cell;
+        if (cell = this.table.rightFrozenColCount > 0 && col > this.table.colCount - 1 - this.table.rightFrozenColCount ? null === (_a = this.rightFrozenGroup.getColGroup(col)) || void 0 === _a ? void 0 : _a.getRowGroup(row) : this.table.bottomFrozenRowCount > 0 && row > this.table.rowCount - 1 - this.table.bottomFrozenRowCount ? null === (_b = this.bottomFrozenGroup.getColGroup(col)) || void 0 === _b ? void 0 : _b.getRowGroup(row) : null === (_c = this.getColGroup(col, row < this.frozenRowCount)) || void 0 === _c ? void 0 : _c.getRowGroup(row), 
+        cell && "shadow-cell" === cell.role && !getShadow) {
             const range = this.table.getCellRange(col, row);
             cell = this.getCell(range.start.col, range.start.row);
         }
         return cell || emptyGroup;
     }
-    highPerformanceGetCell(col, row) {
-        return this.isPivot || this.transpose || this.table.isHeader(col, row) ? this.getCell(col, row) : this.proxy.highPerformanceGetCell(col, row, 0, this.table.rowCount - 1);
+    highPerformanceGetCell(col, row, getShadow) {
+        return this.table.isHeader(col, row) ? this.getCell(col, row, getShadow) : this.proxy.highPerformanceGetCell(col, row, 0, this.table.rowCount - 1, getShadow);
     }
     getColGroup(col, isCornerOrColHeader = !1) {
         let element;
-        return element = col < this.frozenColCount && isCornerOrColHeader ? this.cornerHeaderGroup.getColGroup(col) : col < this.frozenColCount ? this.rowHeaderGroup.getColGroup(col) : isCornerOrColHeader ? this.colHeaderGroup.getColGroup(col) : this.bodyGroup.getColGroup(col), 
+        return element = col < this.frozenColCount && isCornerOrColHeader ? this.cornerHeaderGroup.getColGroup(col) : col < this.frozenColCount ? this.rowHeaderGroup.getColGroup(col) : isCornerOrColHeader ? this.colHeaderGroup.getColGroup(col) : this.table.rightFrozenColCount > 0 && col > this.table.colCount - 1 - this.table.rightFrozenColCount ? this.rightFrozenGroup.getColGroup(col) : this.bodyGroup.getColGroup(col), 
         element || void 0;
     }
     getCellSize(col, row) {
@@ -379,27 +445,53 @@ export class Scenegraph {
     updateChartSize(col) {
         updateChartSize(this, col);
     }
+    updateChartState(datum) {
+        this.table.isPivotChart() && updateChartState(this, datum);
+    }
     updateAutoColWidth(col) {
         const oldWidth = this.table.getColWidth(col), newWidth = computeColWidth(col, 0, this.table.rowCount - 1, this.table, !0);
         newWidth !== oldWidth && this.updateColWidth(col, newWidth - oldWidth);
     }
     recalculateColWidths() {
-        computeColsWidth(this.table, !0);
+        computeColsWidth(this.table, 0, this.table.colCount - 1, !0);
+    }
+    recalculateRowHeights() {
+        computeRowsHeight(this.table, 0, this.table.rowCount - 1);
     }
     resize() {
-        this.recalculateColWidths(), this.table.internalProps.autoRowHeight && updateAutoRowHeight(this, !0), 
-        this.dealWidthMode(), this.dealFrozen(), this.updateTableSize(), this.updateBorderSizeAndPosition(), 
-        this.component.updateScrollBar(), this.updateNextFrame();
+        this.recalculateColWidths(), "autoHeight" === this.table.heightMode && this.recalculateRowHeights(), 
+        this.dealWidthMode(), this.dealHeightMode(), this.dealFrozen(), this.updateTableSize(), 
+        this.updateBorderSizeAndPosition(), this.component.updateScrollBar(), this.updateNextFrame();
     }
     updateTableSize() {
         var _a, _b;
         this.tableGroup.setAttributes({
-            width: Math.min(this.table.tableNoFrameWidth, Math.max(this.colHeaderGroup.attribute.width, this.bodyGroup.attribute.width, 0) + Math.max(this.cornerHeaderGroup.attribute.width, this.rowHeaderGroup.attribute.width, 0)),
-            height: Math.min(this.table.tableNoFrameHeight, (null !== (_a = this.colHeaderGroup.attribute.height) && void 0 !== _a ? _a : 0) + (null !== (_b = this.bodyGroup.attribute.height) && void 0 !== _b ? _b : 0))
+            width: Math.min(this.table.tableNoFrameWidth, Math.max(this.colHeaderGroup.attribute.width, this.bodyGroup.attribute.width, 0) + Math.max(this.cornerHeaderGroup.attribute.width, this.rowHeaderGroup.attribute.width, 0) + this.rightBottomCellGroup.attribute.width),
+            height: Math.min(this.table.tableNoFrameHeight, (null !== (_a = this.colHeaderGroup.attribute.height) && void 0 !== _a ? _a : 0) + (null !== (_b = this.bodyGroup.attribute.height) && void 0 !== _b ? _b : 0) + this.bottomFrozenGroup.attribute.height)
         }), this.tableGroup.border && this.tableGroup.border.setAttributes({
             width: this.tableGroup.attribute.width + this.tableGroup.border.attribute.lineWidth,
             height: this.tableGroup.attribute.height + this.tableGroup.border.attribute.lineWidth
-        });
+        }), this.table.bottomFrozenRowCount > 0 && (this.bottomFrozenGroup.setAttribute("y", this.tableGroup.attribute.height - this.bottomFrozenGroup.attribute.height), 
+        this.leftBottomCellGroup.setAttributes({
+            visible: !0,
+            y: this.tableGroup.attribute.height - this.bottomFrozenGroup.attribute.height,
+            height: this.bottomFrozenGroup.attribute.height,
+            width: this.table.getFrozenColsWidth()
+        }), this.rightBottomCellGroup.setAttributes({
+            visible: !0,
+            y: this.tableGroup.attribute.height - this.bottomFrozenGroup.attribute.height,
+            height: this.bottomFrozenGroup.attribute.height
+        })), this.table.rightFrozenColCount > 0 && (this.rightFrozenGroup.setAttribute("x", this.tableGroup.attribute.width - this.rightFrozenGroup.attribute.width), 
+        this.rightTopCellGroup.setAttributes({
+            visible: !0,
+            x: this.tableGroup.attribute.width - this.rightFrozenGroup.attribute.width,
+            width: this.rightFrozenGroup.attribute.width,
+            height: this.table.getFrozenRowsHeight()
+        }), this.rightBottomCellGroup.setAttributes({
+            visible: !0,
+            x: this.tableGroup.attribute.width - this.rightFrozenGroup.attribute.width,
+            width: this.rightFrozenGroup.attribute.width
+        }));
     }
     updateRowHeight(row, detaY) {
         updateRowHeight(this, row, detaY), this.updateContainerHeight(row, detaY);
@@ -425,27 +517,27 @@ export class Scenegraph {
         this.updateRowHeight(row, height - oldHeight);
     }
     setX(x) {
-        this.colHeaderGroup.attribute.width + x !== this.bodyGroup.attribute.x && (this.bodyGroup.setAttribute("x", this.rowHeaderGroup.attribute.width + x), 
-        this.colHeaderGroup.setAttribute("x", this.rowHeaderGroup.attribute.width + x), 
-        this.updateNextFrame());
+        this.table.scenegraph.proxy.setX(-x);
     }
     setY(y) {
-        if (this.transpose || this.isPivot) {
-            if (this.colHeaderGroup.attribute.height + y === this.bodyGroup.attribute.y) return;
-            this.bodyGroup.setAttribute("y", this.colHeaderGroup.attribute.height + y), this.rowHeaderGroup.setAttribute("y", this.colHeaderGroup.attribute.height + y), 
-            this.updateNextFrame();
-        } else this.table.scenegraph.proxy && this.table.scenegraph.proxy.setY(-y);
+        this.table.scenegraph.proxy.setY(-y);
     }
     setBodyAndRowHeaderY(y) {
         this.colHeaderGroup.attribute.height + y !== this.bodyGroup.attribute.y && (this.bodyGroup.setAttribute("y", this.colHeaderGroup.attribute.height + y), 
         this.rowHeaderGroup.setAttribute("y", this.colHeaderGroup.attribute.height + y), 
+        this.table.rightFrozenColCount > 0 && this.rightFrozenGroup.setAttribute("y", this.colHeaderGroup.attribute.height + y), 
+        this.updateNextFrame());
+    }
+    setBodyAndColHeaderX(x) {
+        this.rowHeaderGroup.attribute.width + x !== this.bodyGroup.attribute.x && (this.bodyGroup.setAttribute("x", this.rowHeaderGroup.attribute.width + x), 
+        this.colHeaderGroup.setAttribute("x", this.rowHeaderGroup.attribute.width + x), 
+        this.table.bottomFrozenRowCount > 0 && this.bottomFrozenGroup.setAttribute("x", this.rowHeaderGroup.attribute.width + x), 
         this.updateNextFrame());
     }
     afterScenegraphCreated() {
-        const {autoRowHeight: autoRowHeight} = this.table.internalProps;
-        autoRowHeight && updateAutoRowHeight(this), this.dealWidthMode(), this.dealFrozen(), 
-        this.createFrameBorder(), this.updateBorderSizeAndPosition(), this.component.updateScrollBar(), 
-        handleTextStick(this.table), this.updateNextFrame();
+        this.dealWidthMode(), this.dealHeightMode(), this.dealFrozen(), this.createFrameBorder(), 
+        this.updateBorderSizeAndPosition(), this.component.updateScrollBar(), handleTextStick(this.table), 
+        this.updateNextFrame();
     }
     dealWidthMode() {
         const table = this.table;
@@ -459,7 +551,7 @@ export class Scenegraph {
                 colWidth = col === table.colCount - 1 ? totalDrawWidth - table.getColsWidth(0, table.colCount - 2) : Math.round(table.getColWidth(col) * factor), 
                 this.setColWidth(col, colWidth);
             }
-        } else if ("standard-aeolus" === table.widthMode && this.transpose) {
+        } else if (table.autoFillWidth) {
             const canvasWidth = table.tableNoFrameWidth;
             let actualWidth = 0, actualHeaderWidth = 0;
             for (let col = 0; col < table.colCount; col++) {
@@ -492,6 +584,21 @@ export class Scenegraph {
             y: this.colHeaderGroup.attribute.height
         });
     }
+    dealHeightMode() {
+        const table = this.table;
+        if ("adaptive" === table.heightMode) {
+            table._clearRowRangeHeightsMap();
+            const totalDrawHeight = table.tableNoFrameHeight - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();
+            let actualHeight = 0;
+            for (let row = table.frozenRowCount; row < table.rowCount - table.bottomFrozenRowCount; row++) actualHeight += table.getRowHeight(row);
+            const factor = totalDrawHeight / actualHeight;
+            for (let row = table.frozenRowCount; row < table.rowCount - table.bottomFrozenRowCount; row++) {
+                let rowHeight;
+                rowHeight = row === table.rowCount - table.bottomFrozenRowCount - 1 ? totalDrawHeight - table.getRowsHeight(table.frozenRowCount, table.rowCount - table.bottomFrozenRowCount - 2) : Math.round(table.getRowHeight(row) * factor), 
+                this.setRowHeight(row, rowHeight);
+            }
+        }
+    }
     dealFrozen() {
         dealFrozen(this);
     }
@@ -643,7 +750,7 @@ export class Scenegraph {
         this.component.drillIcon.update(visible, x, y, drillDown, drillUp, this);
     }
     updateCellContent(col, row) {
-        this.clear || updateCell(col, row, this.table);
+        if (!this.clear) return updateCell(col, row, this.table);
     }
     setPixelRatio(pixelRatio) {
         this.stage.disableDirtyBounds(), this.stage.window.setDpr(pixelRatio), this.stage.render(), 
@@ -656,7 +763,7 @@ export class Scenegraph {
         this.findAndUpdateIcon(cellGroup, [ IconFuncTypeEnum.collapse, IconFuncTypeEnum.expand ], iconConfig);
     }
     updateRow(removeCells, addCells) {
-        updateRow(removeCells, addCells, this.table), this.recalculateColWidths(), this.table.internalProps.autoRowHeight && updateAutoRowHeight(this, !0), 
+        updateRow(removeCells, addCells, this.table), this.recalculateColWidths(), "autoHeight" === this.table.heightMode && this.recalculateRowHeights(), 
         this.table.stateManeger.checkFrozen(), this.updateNextFrame();
     }
     findAndUpdateIcon(group, funcTypeArr, iconConfig) {