@visactor/vtable 0.9.1-alpha.5 → 0.9.2-alpha.0

package/es/scenegraph/scenegraph.d.ts

@@ -49,14 +49,11 @@ export declare class Scenegraph {
     clearCells(): void;
     createComponent(): void;
     createSceneGraph(): void;
-    createHeaderSceneGraph(): void;
-    createBodySceneGraph(): void;
-    createBodySceneGraphForFirstScreen(): void;
     renderSceneGraph(): void;
     getCellOld(col: number, row: number): Group;
     getColGroupOld(col: number, isHeader?: boolean): Group;
     getCell(col: number, row: number, getShadow?: boolean): Group;
-    highPerformanceGetCell(col: number, row: number): Group;
+    highPerformanceGetCell(col: number, row: number, getShadow?: boolean): Group;
     getColGroup(col: number, isCornerOrColHeader?: boolean): Group;
     getCellSize(col: number, row: number): {
         width: number;
@@ -83,6 +80,7 @@ export declare class Scenegraph {
     updateChartSize(col: number): void;
     updateAutoColWidth(col: number): void;
     recalculateColWidths(): void;
+    recalculateRowHeights(): void;
     resize(): void;
     updateTableSize(): void;
     updateRowHeight(row: number, detaY: number): void;
@@ -93,6 +91,7 @@ export declare class Scenegraph {
     setX(x: number): void;
     setY(y: number): void;
     setBodyAndRowHeaderY(y: number): void;
+    setBodyAndColHeaderX(x: number): void;
     afterScenegraphCreated(): void;
     dealWidthMode(): void;
     dealFrozen(): void;
@@ -115,7 +114,7 @@ export declare class Scenegraph {
     sortCell(): void;
     getCellOverflowText(col: number, row: number): string | null;
     updateDrill(visible: boolean, x: number, y: number, drillDown: boolean, drillUp: boolean): void;
-    updateCellContent(col: number, row: number): void;
+    updateCellContent(col: number, row: number): Group;
     setPixelRatio(pixelRatio: number): void;
     updateHierarchyIcon(col: number, row: number): void;
     updateRow(removeCells: CellAddress[], addCells: CellAddress[]): void;

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,10 +48,14 @@ 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 { dealFrozen, resetFrozen } from "./layout/frozen";
+
 container.load(splitModule);
 
 export class Scenegraph {
@@ -197,27 +197,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), 
-        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.bodyGroup, 0, 0), 
+        this.afterScenegraphCreated();
     }
     renderSceneGraph() {
         this.stage.render();
@@ -246,8 +229,8 @@ export class Scenegraph {
         }
         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;
@@ -371,7 +354,7 @@ export class Scenegraph {
         iconBack && iconBack.setAttribute("visible", !1), icon.attribute.hoverImage && icon.attribute.image !== icon.attribute.originImage && (icon.image = icon.attribute.originImage);
     }
     updateColWidth(col, detaX) {
-        updateColWidth(this, col, detaX), this.updateContainerWidth(col, detaX);
+        updateColWidth(this, col, detaX), this.updateContainer();
     }
     updateChartSize(col) {
         updateChartSize(this, col);
@@ -381,10 +364,13 @@ export class Scenegraph {
         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.recalculateColWidths(), this.table.internalProps.autoRowHeight && this.recalculateRowHeights(), 
         this.dealWidthMode(), this.dealFrozen(), this.updateTableSize(), this.updateBorderSizeAndPosition(), 
         this.component.updateScrollBar(), this.updateNextFrame();
     }
@@ -422,27 +408,24 @@ 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.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.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.dealFrozen(), this.createFrameBorder(), this.updateBorderSizeAndPosition(), 
+        this.component.updateScrollBar(), handleTextStick(this.table), this.updateNextFrame();
     }
     dealWidthMode() {
         const table = this.table;
@@ -490,51 +473,10 @@ export class Scenegraph {
         });
     }
     dealFrozen() {
-        var _a, _b, _c, _d, _e, _f;
-        if (this.table.frozenColCount > this.table.rowHeaderLevelCount) {
-            this.rowHeaderGroup.setAttribute("height", this.bodyGroup.attribute.height), this.rowHeaderGroup.setAttribute("y", this.bodyGroup.attribute.y), 
-            this.cornerHeaderGroup.setAttribute("height", this.colHeaderGroup.attribute.height);
-            for (let i = 0; i < this.table.frozenColCount - this.table.rowHeaderLevelCount; i++) {
-                const column = this.bodyGroup.firstChild;
-                column && (this.rowHeaderGroup.appendChild(column), this.rowHeaderGroup.setAttribute("width", this.rowHeaderGroup.attribute.width + column.attribute.width), 
-                this.bodyGroup.setAttribute("width", this.bodyGroup.attribute.width - column.attribute.width));
-                const headerColumn = this.colHeaderGroup.firstChild;
-                headerColumn && (this.cornerHeaderGroup.appendChild(headerColumn), this.cornerHeaderGroup.setAttribute("width", this.cornerHeaderGroup.attribute.width + headerColumn.attribute.width), 
-                this.colHeaderGroup.setAttribute("width", this.colHeaderGroup.attribute.width - headerColumn.attribute.width));
-            }
-        }
-        this.bodyGroup.setAttribute("x", this.rowHeaderGroup.attribute.width), this.colHeaderGroup.setAttribute("x", this.cornerHeaderGroup.attribute.width);
-        const bodyDeltaX = null !== (_b = null === (_a = this.bodyGroup.firstChild) || void 0 === _a ? void 0 : _a.attribute.x) && void 0 !== _b ? _b : 0;
-        this.bodyGroup.forEachChildrenSkipChild((column => {
-            column.setAttribute("x", column.attribute.x - bodyDeltaX);
-        }));
-        const colDeltaX = null !== (_d = null === (_c = this.colHeaderGroup.firstChild) || void 0 === _c ? void 0 : _c.attribute.x) && void 0 !== _d ? _d : 0;
-        this.colHeaderGroup.forEachChildrenSkipChild((column => {
-            column.setAttribute("x", column.attribute.x - colDeltaX);
-        })), this.updateBorderSizeAndPosition(), this.isPivot || this.transpose || this.component.setFrozenColumnShadow(this.table.frozenColCount - 1), 
-        this.hasFrozen = !0, this.frozenColCount = this.table.frozenColCount, this.frozenRowCount = null !== (_f = null === (_e = this.colHeaderGroup.firstChild) || void 0 === _e ? void 0 : _e.childrenCount) && void 0 !== _f ? _f : 0;
+        dealFrozen(this);
     }
     resetFrozen() {
-        var _a, _b;
-        if (this.frozenColCount > this.table.rowHeaderLevelCount) for (let i = 0; i < this.frozenColCount - this.table.rowHeaderLevelCount; i++) {
-            const column = this.rowHeaderGroup.lastChild instanceof Group ? this.rowHeaderGroup.lastChild : this.rowHeaderGroup.lastChild._prev;
-            column && (this.bodyGroup.insertBefore(column, this.bodyGroup.firstChild), this.bodyGroup.setAttribute("width", this.bodyGroup.attribute.width + column.attribute.width), 
-            this.rowHeaderGroup.setAttribute("width", this.rowHeaderGroup.attribute.width - column.attribute.width));
-            const headerColumn = this.cornerHeaderGroup.lastChild instanceof Group ? this.cornerHeaderGroup.lastChild : this.cornerHeaderGroup.lastChild._prev;
-            headerColumn && (this.colHeaderGroup.insertBefore(headerColumn, this.colHeaderGroup.firstChild), 
-            this.colHeaderGroup.setAttribute("width", this.colHeaderGroup.attribute.width + headerColumn.attribute.width), 
-            this.cornerHeaderGroup.setAttribute("width", this.cornerHeaderGroup.attribute.width - headerColumn.attribute.width));
-        }
-        this.bodyGroup.setAttribute("x", this.rowHeaderGroup.attribute.width), this.colHeaderGroup.setAttribute("x", this.cornerHeaderGroup.attribute.width);
-        let bodyX = 0;
-        this.bodyGroup.forEachChildrenSkipChild((column => {
-            column.setAttribute("x", bodyX), bodyX += column.attribute.width;
-        }));
-        let colX = 0;
-        this.colHeaderGroup.forEachChildrenSkipChild((column => {
-            column.setAttribute("x", colX), colX += column.attribute.width;
-        })), this.updateBorderSizeAndPosition(), this.isPivot || this.transpose || this.component.setFrozenColumnShadow(this.table.frozenColCount - 1), 
-        this.hasFrozen = !0, this.frozenColCount = this.table.rowHeaderLevelCount, this.frozenRowCount = null !== (_b = null === (_a = this.colHeaderGroup.firstChild) || void 0 === _a ? void 0 : _a.childrenCount) && void 0 !== _b ? _b : 0;
+        resetFrozen(this);
     }
     updateCellLayoutWidthCertainWidth(columnGroup, detaRow, col) {
         const width = columnGroup.attribute.width;
@@ -579,7 +521,7 @@ export class Scenegraph {
         this.colHeaderGroup.setDeltaWidth(colHeaderX - this.colHeaderGroup.attribute.width), 
         this.rowHeaderGroup.setDeltaWidth(rowHeaderX - this.rowHeaderGroup.attribute.width), 
         this.bodyGroup.setDeltaWidth(bodyX - this.bodyGroup.attribute.width), this.colHeaderGroup.setAttribute("x", this.cornerHeaderGroup.attribute.width), 
-        this.bodyGroup.setAttribute("x", this.rowHeaderGroup.attribute.width);
+        this.bodyGroup.setAttribute("x", this.rowHeaderGroup.attribute.width), this.updateTableSize();
         const oldHorizontalBarPos = this.table.stateManeger.scroll.horizontalBarPos, oldVerticalBarPos = this.table.stateManeger.scroll.verticalBarPos;
         this.component.updateScrollBar(), this.table.stateManeger.setScrollLeft(oldHorizontalBarPos), 
         this.table.stateManeger.setScrollTop(oldVerticalBarPos), this.updateNextFrame();
@@ -595,7 +537,7 @@ export class Scenegraph {
         createFrameBorder(this.rowHeaderGroup, this.isPivot ? this.table.theme.rowHeaderStyle.frameStyle : this.table.theme.bodyStyle.frameStyle, this.rowHeaderGroup.role, isListTableWithFrozen ? [ !0, !1, !0, !0 ] : void 0), 
         createFrameBorder(this.colHeaderGroup, this.table.theme.headerStyle.frameStyle, this.colHeaderGroup.role, isListTableWithFrozen ? [ !0, !0, !0, !1 ] : void 0), 
         createFrameBorder(this.cornerHeaderGroup, this.isPivot ? this.table.theme.cornerHeaderStyle.frameStyle : this.table.theme.headerStyle.frameStyle, this.cornerHeaderGroup.role, isListTableWithFrozen ? [ !0, !1, !0, !0 ] : void 0), 
-        createFrameBorder(this.tableGroup, this.table.theme.frameStyle, this.tableGroup.role);
+        createFrameBorder(this.tableGroup, this.table.theme.frameStyle, this.tableGroup.role, void 0);
     }
     getResizeColAt(abstractX, abstractY, cellGroup, offset = ResizeColumnHotSpotSize / 2) {
         if (cellGroup) {
@@ -681,7 +623,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(), 
@@ -694,7 +636,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(), this.table.internalProps.autoRowHeight && this.recalculateRowHeights(), 
         this.table.stateManeger.checkFrozen(), this.updateNextFrame();
     }
     findAndUpdateIcon(group, funcTypeArr, iconConfig) {