@visactor/vtable 0.13.4 → 0.13.5

package/es/scenegraph/scenegraph.d.ts

@@ -1,14 +1,12 @@
 import type { IStage, IRect } from '@visactor/vrender';
 import type { CellSubLocation } from '../ts-types';
-import { type CellAddress, type ColumnIconOption, type SortOrder, IconFuncTypeEnum } from '../ts-types';
+import { type CellAddress, type SortOrder } from '../ts-types';
 import type { Group } from './graphic/group';
 import type { Icon } from './graphic/icon';
 import { TableComponent } from './component/table-component';
 import { SceneProxy } from './group-creater/progress/proxy';
 import type { BaseTableAPI } from '../ts-types/base-table';
 export type MergeMap = Map<string, {
-    x: number;
-    y: number;
     cellWidth: number;
     cellHeight: number;
 }>;
@@ -56,8 +54,6 @@ export declare class Scenegraph {
     createComponent(): void;
     createSceneGraph(): 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, getShadow?: boolean): Group;
     getColGroup(col: number, isCornerOrColHeader?: boolean): Group;
@@ -75,6 +71,12 @@ export declare class Scenegraph {
     showHoverIcon(col: number, row: number): void;
     hideClickIcon(col: number, row: number): void;
     showClickIcon(col: number, row: number): void;
+    getIcon(col: number, row: number, x: number, y: number): Icon | undefined;
+    setIconHoverStyle(icon: Icon, col: number, row: number, cellGroup: Group): void;
+    updateSortIcon(col: number, row: number, iconMark: Icon, order: SortOrder, oldSortCol: number, oldSortRow: number, oldIconMark: Icon | undefined): void;
+    updateFrozenIcon(col: number, oldFrozenCol: number): void;
+    updateHierarchyIcon(col: number, row: number): void;
+    setIconNormalStyle(icon: Icon, col: number, row: number): void;
     deactivateChart(col: number, row: number): void;
     activateChart(col: number, row: number): void;
     removeInteractionBorder(col: number, row: number): void;
@@ -83,9 +85,6 @@ export declare class Scenegraph {
     deleteLastSelectedRangeComponents(): void;
     deleteAllSelectBorder(): void;
     updateCellSelectBorder(newStartCol: number, newStartRow: number, newEndCol: number, newEndRow: number): void;
-    getIcon(col: number, row: number, x: number, y: number): Icon | undefined;
-    setIconHoverStyle(icon: Icon, col: number, row: number, cellGroup: Group): void;
-    setIconNormalStyle(icon: Icon, col: number, row: number): void;
     updateColWidth(col: number, detaX: number, skipUpdateContainer?: boolean): void;
     updateChartSize(col: number): void;
     updateChartState(datum: any): void;
@@ -122,21 +121,16 @@ export declare class Scenegraph {
         x?: number;
         rightFrozen?: boolean;
     };
-    updateIcon(icon: Icon, iconConfig: ColumnIconOption): void;
     updateFrozen(): void;
     dealWidthRightFrozen(rightFrozenColCount: number): void;
     dealWidthBottomFrozen(bottomFrozenRowCount: number): void;
     updateBorderSizeAndPosition(): void;
-    updateSortIcon(col: number, row: number, iconMark: Icon, order: SortOrder, oldSortCol: number, oldSortRow: number, oldIconMark: Icon | undefined): void;
-    updateFrozenIcon(col: number, oldFrozenCol: number): void;
     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): Group;
     setPixelRatio(pixelRatio: number): void;
-    updateHierarchyIcon(col: number, row: number): void;
     updateRow(removeCells: CellAddress[], addCells: CellAddress[], updateCells?: CellAddress[]): void;
-    findAndUpdateIcon(group: Group, funcTypeArr: IconFuncTypeEnum[], iconConfig: ColumnIconOption): void;
     getColumnGroupX(col: number): number;
     getCellGroupY(row: number): number;
 }

package/es/scenegraph/scenegraph.js

@@ -1,6 +1,4 @@
-import { createStage, createRect, IContainPointMode, container, vglobal } from "@visactor/vrender";
-
-import { IconFuncTypeEnum } from "../ts-types";
+import { createStage, container, vglobal } from "@visactor/vrender";
 
 import { isArray, isString } from "@visactor/vutils";
 
@@ -24,8 +22,6 @@ import splitModule from "./graphic/contributions";
 
 import { getProp } from "./utils/get-prop";
 
-import { dealWithIcon } from "./utils/text-icon-layout";
-
 import { SceneProxy } from "./group-creater/progress/proxy";
 
 import { computeColWidth, computeColsWidth } from "./layout/compute-col-width";
@@ -62,6 +58,8 @@ import { loadPoptip, setPoptipTheme } from "@visactor/vrender-components";
 
 import textMeasureModule from "./utils/text-measure";
 
+import { getIconByXY, hideClickIcon, hideHoverIcon, setIconHoverStyle, setIconNormalStyle, showClickIcon, showHoverIcon, updateFrozenIcon, updateHierarchyIcon, updateSortIcon } from "./icon/icon-update";
+
 import { Env } from "../tools/env";
 
 loadPoptip(), container.load(splitModule), container.load(textMeasureModule);
@@ -226,21 +224,6 @@ export class Scenegraph {
     renderSceneGraph() {
         this.stage.render();
     }
-    getCellOld(col, row) {
-        var _a, _b, _c, _d;
-        let element;
-        if (element = this.hasFrozen && col < this.table.frozenColCount && row < this.table.frozenRowCount ? null === (_a = this.cornerHeaderGroup.getChildAt(col)) || void 0 === _a ? void 0 : _a.getChildAt(row) : row < this.table.frozenRowCount ? null === (_b = this.colHeaderGroup.getChildAt(this.hasFrozen ? col - this.table.frozenColCount : col)) || void 0 === _b ? void 0 : _b.getChildAt(row) : col < this.table.frozenColCount ? null === (_c = this.rowHeaderGroup.getChildAt(col)) || void 0 === _c ? void 0 : _c.getChildAt(row - this.table.frozenRowCount) : null === (_d = this.bodyGroup.getChildAt(col - this.table.frozenColCount)) || void 0 === _d ? void 0 : _d.getChildAt(row - this.table.frozenRowCount), 
-        element && "shadow-cell" === element.role) {
-            const range = this.table.getCellRange(col, row);
-            element = this.getCell(range.start.col, range.start.row);
-        }
-        return element || void 0;
-    }
-    getColGroupOld(col, isHeader = !1) {
-        let element;
-        return element = col < this.frozenColCount && isHeader ? this.cornerHeaderGroup.getChildAt(col) : col < this.frozenColCount ? this.rowHeaderGroup.getChildAt(col) : isHeader ? this.rowHeaderGroup.getChildAt(col - this.frozenColCount) : this.bodyGroup.getChildAt(col - this.frozenColCount), 
-        element || void 0;
-    }
     getCell(col, row, getShadow) {
         var _a, _b, _c, _d, _e, _f;
         let cell;
@@ -288,20 +271,34 @@ export class Scenegraph {
         (null === (_b = null === (_a = this.table.stateManeger.select) || void 0 === _a ? void 0 : _a.ranges) || void 0 === _b ? void 0 : _b.length) > 0 && updateAllSelectComponent(this);
     }
     hideHoverIcon(col, row) {
-        if (-1 === col || -1 === row) return;
-        hideIcon(this, this.getCell(col, row), "mouseenter_cell");
+        hideHoverIcon(col, row, this);
     }
     showHoverIcon(col, row) {
-        if (-1 === col || -1 === row) return;
-        showIcon(this, this.getCell(col, row), "mouseenter_cell");
+        showHoverIcon(col, row, this);
     }
     hideClickIcon(col, row) {
-        if (-1 === col || -1 === row) return;
-        hideIcon(this, this.getCell(col, row), "click_cell");
+        hideClickIcon(col, row, this);
     }
     showClickIcon(col, row) {
-        if (-1 === col || -1 === row) return;
-        showIcon(this, this.getCell(col, row), "click_cell");
+        showClickIcon(col, row, this);
+    }
+    getIcon(col, row, x, y) {
+        return getIconByXY(col, row, x, y, this);
+    }
+    setIconHoverStyle(icon, col, row, cellGroup) {
+        setIconHoverStyle(icon, col, row, cellGroup, this);
+    }
+    updateSortIcon(col, row, iconMark, order, oldSortCol, oldSortRow, oldIconMark) {
+        updateSortIcon(col, row, iconMark, order, oldSortCol, oldSortRow, oldIconMark, this);
+    }
+    updateFrozenIcon(col, oldFrozenCol) {
+        updateFrozenIcon(this);
+    }
+    updateHierarchyIcon(col, row) {
+        updateHierarchyIcon(col, row, this);
+    }
+    setIconNormalStyle(icon, col, row) {
+        setIconNormalStyle(icon, col, row, this);
     }
     deactivateChart(col, row) {
         var _a, _b;
@@ -335,59 +332,6 @@ export class Scenegraph {
     updateCellSelectBorder(newStartCol, newStartRow, newEndCol, newEndRow) {
         updateCellSelectBorder(this, newStartCol, newStartRow, newEndCol, newEndRow);
     }
-    getIcon(col, row, x, y) {
-        let pickMark;
-        return this.getCell(col, row).forEachChildren((mark => {
-            "icon" === mark.role && mark.containsPoint(x, y, IContainPointMode.GLOBAL) && (pickMark = mark);
-        })), pickMark;
-    }
-    setIconHoverStyle(icon, col, row, cellGroup) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        if (icon.attribute.backgroundColor) {
-            let iconBack = icon.parent.getChildByName("icon-back");
-            iconBack ? iconBack.setAttributes({
-                x: (null !== (_a = icon.attribute.x) && void 0 !== _a ? _a : 0) + (null !== (_b = icon.attribute.dx) && void 0 !== _b ? _b : 0) + (icon.AABBBounds.width() - icon.backgroundWidth) / 2,
-                y: (null !== (_c = icon.attribute.y) && void 0 !== _c ? _c : 0) + (icon.AABBBounds.height() - icon.backgroundHeight) / 2,
-                width: icon.backgroundWidth,
-                height: icon.backgroundHeight,
-                fill: icon.attribute.backgroundColor,
-                cornerRadius: 5,
-                visible: !0
-            }) : (iconBack = createRect({
-                x: (null !== (_d = icon.attribute.x) && void 0 !== _d ? _d : 0) + (null !== (_e = icon.attribute.dx) && void 0 !== _e ? _e : 0) + (icon.AABBBounds.width() - icon.backgroundWidth) / 2,
-                y: (null !== (_f = icon.attribute.y) && void 0 !== _f ? _f : 0) + (icon.AABBBounds.height() - icon.backgroundHeight) / 2,
-                width: icon.backgroundWidth,
-                height: icon.backgroundHeight,
-                fill: icon.attribute.backgroundColor,
-                cornerRadius: 5,
-                pickable: !1,
-                visible: !0
-            }), iconBack.name = "icon-back"), icon.parent.insertBefore(iconBack, icon);
-        }
-        if (icon.attribute.hoverImage && icon.attribute.image !== icon.attribute.hoverImage && (icon.image = icon.attribute.hoverImage), 
-        icon.tooltip) {
-            const {x1: left, x2: right, y1: top, y2: bottom} = icon.globalAABBBounds, tooltipOptions = {
-                content: icon.tooltip.title,
-                referencePosition: {
-                    rect: {
-                        left: left,
-                        right: right,
-                        top: top,
-                        bottom: bottom,
-                        width: icon.globalAABBBounds.width(),
-                        height: icon.globalAABBBounds.height()
-                    },
-                    placement: icon.tooltip.placement
-                },
-                style: Object.assign({}, null === (_g = this.table.internalProps.theme) || void 0 === _g ? void 0 : _g.tooltipStyle, null === (_h = icon.tooltip) || void 0 === _h ? void 0 : _h.style)
-            };
-            this.table.internalProps.tooltipHandler.isBinded(tooltipOptions) || this.table.showTooltip(col, row, tooltipOptions);
-        }
-    }
-    setIconNormalStyle(icon, col, row) {
-        const iconBack = icon.parent.getChildByName("icon-back");
-        iconBack && iconBack.setAttribute("visible", !1), icon.attribute.hoverImage && icon.attribute.image !== icon.attribute.originImage && (icon.image = icon.attribute.originImage);
-    }
     updateColWidth(col, detaX, skipUpdateContainer) {
         updateColWidth(this, col, Math.round(detaX)), skipUpdateContainer || this.updateContainer();
     }
@@ -686,9 +630,6 @@ export class Scenegraph {
             row: -1
         };
     }
-    updateIcon(icon, iconConfig) {
-        dealWithIcon(iconConfig, icon), icon.name = iconConfig.name, this.updateNextFrame();
-    }
     updateFrozen() {
         this.clear || (this.resetFrozen(), this.component.updateScrollBar());
     }
@@ -707,37 +648,6 @@ export class Scenegraph {
         updateFrameBorderSize(this.rowHeaderGroup)), this.cornerHeaderGroup.border && (this.cornerHeaderGroup.appendChild(this.cornerHeaderGroup.border), 
         updateFrameBorderSize(this.cornerHeaderGroup));
     }
-    updateSortIcon(col, row, iconMark, order, oldSortCol, oldSortRow, oldIconMark) {
-        const icon = this.table.internalProps.headerHelper.getSortIcon(order, this.table, col, row);
-        if (iconMark && this.updateIcon(iconMark, icon), oldIconMark !== iconMark) {
-            const oldIcon = this.table.internalProps.headerHelper.getSortIcon("normal", this.table, oldSortCol, oldSortRow);
-            if (oldIconMark) this.updateIcon(oldIconMark, oldIcon); else {
-                let oldIconMark;
-                this.getCell(oldSortCol, oldSortRow).forEachChildren((mark => "sort" === mark.attribute.funcType && (oldIconMark = mark, 
-                !0))), oldIconMark && this.updateIcon(oldIconMark, oldIcon);
-            }
-        }
-    }
-    updateFrozenIcon(col, oldFrozenCol) {
-        const updateCol = Math.max(col, oldFrozenCol);
-        this.colHeaderGroup.forEachChildrenSkipChild((colGroup => !(colGroup.col <= updateCol) || (colGroup.forEachChildren((cellGroup => {
-            cellGroup.forEachChildren((icon => {
-                if ("frozen" === icon.attribute.funcType) {
-                    const iconConfig = this.table.internalProps.headerHelper.getFrozenIcon(cellGroup.col, cellGroup.row);
-                    return this.updateIcon(icon, iconConfig), !0;
-                }
-                return !1;
-            }));
-        })), !1))), this.cornerHeaderGroup.forEachChildrenSkipChild((colGroup => !(colGroup.col <= updateCol) || (colGroup.forEachChildren((cellGroup => {
-            cellGroup.forEachChildren((icon => {
-                if ("frozen" === icon.attribute.funcType) {
-                    const iconConfig = this.table.internalProps.headerHelper.getFrozenIcon(cellGroup.col, cellGroup.row);
-                    return this.updateIcon(icon, iconConfig), !0;
-                }
-                return !1;
-            }));
-        })), !1)));
-    }
     sortCell() {
         this.isPivot || (this.transpose ? this.proxy.sortCellHorizontal() : this.proxy.sortCellVertical());
     }
@@ -762,24 +672,11 @@ export class Scenegraph {
         this.stage.disableDirtyBounds(), this.stage.window.setDpr(pixelRatio), this.stage.render(), 
         this.stage.enableDirtyBounds();
     }
-    updateHierarchyIcon(col, row) {
-        const cellGroup = this.getCell(col, row);
-        let iconConfig;
-        iconConfig = this.table.isHeader(col, row) ? this.table.internalProps.headerHelper.getHierarchyIcon(cellGroup.col, cellGroup.row) : this.table.internalProps.bodyHelper.getHierarchyIcon(cellGroup.col, cellGroup.row), 
-        this.findAndUpdateIcon(cellGroup, [ IconFuncTypeEnum.collapse, IconFuncTypeEnum.expand ], iconConfig);
-    }
     updateRow(removeCells, addCells, updateCells = []) {
         updateRow(removeCells, addCells, updateCells, this.table), this.recalculateColWidths(), 
         this.recalculateRowHeights(), this.table.stateManeger.checkFrozen(), this.isPivot || this.transpose || this.component.setFrozenColumnShadow(this.table.frozenColCount - 1), 
         this.updateNextFrame();
     }
-    findAndUpdateIcon(group, funcTypeArr, iconConfig) {
-        group.forEachChildren((icon => {
-            if ("group" === icon.type) this.findAndUpdateIcon(icon, funcTypeArr, iconConfig); else if (-1 !== funcTypeArr.indexOf(icon.attribute.funcType)) return this.updateIcon(icon, iconConfig), 
-            !0;
-            return !1;
-        }));
-    }
     getColumnGroupX(col) {
         return col < this.table.rowHeaderLevelCount ? this.table.getColsWidth(0, col - 1) : col < this.table.colCount - this.table.rightFrozenColCount ? this.table.getColsWidth(this.table.rowHeaderLevelCount, col - 1) : col < this.table.colCount ? this.table.getColsWidth(this.table.colCount - this.table.bottomFrozenRowCount, col - 1) : 0;
     }
@@ -787,18 +684,4 @@ export class Scenegraph {
         return row < this.table.columnHeaderLevelCount ? this.table.getRowsHeight(0, row - 1) : row < this.table.rowCount - this.table.bottomFrozenRowCount ? this.table.getRowsHeight(this.table.columnHeaderLevelCount, row - 1) : row < this.table.rowCount ? this.table.getRowsHeight(this.table.rowCount - this.table.bottomFrozenRowCount, row - 1) : 0;
     }
 }
-
-function showIcon(scene, cellGroup, visibleTime) {
-    cellGroup.forEachChildren((child => {
-        "group" === child.type ? showIcon(scene, child, visibleTime) : child.attribute.visibleTime === visibleTime && (child.attribute.visible = !0, 
-        scene.updateNextFrame());
-    }));
-}
-
-function hideIcon(scene, cellGroup, visibleTime) {
-    cellGroup.forEachChildren((child => {
-        "group" === child.type ? hideIcon(scene, child, visibleTime) : child.attribute.visibleTime === visibleTime && (child.attribute.visible = !1, 
-        scene.updateNextFrame());
-    }));
-}
 //# sourceMappingURL=scenegraph.js.map