@visactor/vtable 0.11.1-alpha.5 → 0.11.1-alpha.6

package/es/scenegraph/group-creater/progress/update-position/util.js

@@ -6,7 +6,7 @@ export function checkFirstRowMerge(row, proxy) {
     for (let col = 0; col < proxy.table.colCount; col++) {
         if (col >= proxy.table.rowHeaderLevelCount && col < proxy.colStart || col > proxy.colEnd && col < proxy.table.colCount - proxy.table.rightFrozenColCount) continue;
         const range = getCellMergeInfo(proxy.table, col, row);
-        if (range && clearHadMergedRow(range.start.row, range.end.row, col, proxy), range && range.start.row !== row && "cell" !== proxy.highPerformanceGetCell(range.start.col, range.start.row, !0).role) {
+        if (range && range.start.row !== row) {
             const oldCellGroup = proxy.highPerformanceGetCell(col, row, !0), newCellGroup = updateCell(range.start.col, range.start.row, proxy.table, !0);
             newCellGroup.col = col, newCellGroup.row = row, newCellGroup.setAttribute("y", proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, range.start.row - 1)), 
             oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup), oldCellGroup.parent.removeChild(oldCellGroup), 
@@ -19,7 +19,8 @@ export function checkFirstColMerge(col, scrolling, proxy) {
     for (let row = 0; row < proxy.table.rowCount; row++) {
         if (row >= proxy.table.columnHeaderLevelCount && row < proxy.rowStart || row > proxy.rowEnd && row < proxy.table.rowCount - proxy.table.bottomFrozenRowCount) continue;
         const range = getCellMergeInfo(proxy.table, col, row);
-        if (range && clearHadMergedColumn(range.start.col, range.end.col, row, proxy), range && range.start.col !== col && "cell" !== proxy.highPerformanceGetCell(range.start.col, range.start.row, !0).role) {
+        if (range && range.start.col !== col) {
+            if (scrolling && checkHasColMerge(range.start.col, range.end.col, row, proxy)) continue;
             const oldCellGroup = proxy.highPerformanceGetCell(col, row, !0), newCellGroup = updateCell(range.start.col, range.start.row, proxy.table, !0);
             newCellGroup.col = col, newCellGroup.row = row, newCellGroup.setAttribute("x", proxy.table.getColsWidth(proxy.table.rowHeaderLevelCount, range.start.col - 1) - oldCellGroup.parent.attribute.x), 
             oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup), oldCellGroup.parent.removeChild(oldCellGroup), 
@@ -28,30 +29,6 @@ export function checkFirstColMerge(col, scrolling, proxy) {
     }
 }
 
-function clearHadMergedRow(rowStart, rowEnd, col, proxy) {
-    for (let row = rowStart; row <= rowEnd; row++) {
-        const cellGroup = proxy.highPerformanceGetCell(col, row, !0);
-        "shadow-cell" !== cellGroup.role && "empty" !== cellGroup.role && cellGroup.row !== rowStart && (cellGroup.role = "shadow-cell", 
-        cellGroup.setAttributes({
-            width: 0,
-            height: proxy.table.getRowHeight(cellGroup.row),
-            y: proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, cellGroup.row - 1)
-        }), cellGroup.clear());
-    }
-}
-
-function clearHadMergedColumn(colStart, colEnd, row, proxy) {
-    for (let col = colStart; col <= colEnd; col++) {
-        const cellGroup = proxy.highPerformanceGetCell(col, row, !0);
-        "shadow-cell" !== cellGroup.role && "empty" !== cellGroup.role && cellGroup.row !== colStart && (cellGroup.role = "shadow-cell", 
-        cellGroup.setAttributes({
-            width: 0,
-            height: proxy.table.getRowHeight(cellGroup.row),
-            y: proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, cellGroup.row - 1)
-        }), cellGroup.clear());
-    }
-}
-
 function checkHasColMerge(colStart, colEnd, row, proxy) {
     for (let col = colStart; col <= colEnd; col++) if ("shadow-cell" !== proxy.highPerformanceGetCell(col, row, !0).role && "empty" !== proxy.highPerformanceGetCell(col, row, !0).role) return !0;
     return !1;

package/es/scenegraph/group-creater/progress/update-position/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/progress/update-position/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { table } from 'console';\nimport type { Group } from '../../../graphic/group';\nimport { getCellMergeInfo } from '../../../utils/get-cell-merge';\nimport { updateCell } from '../../cell-helper';\nimport type { SceneProxy } from '../proxy';\nimport { BaseTableAPI } from '../../../../ts-types/base-table';\n\nexport function checkFirstRowMerge(row: number, proxy: SceneProxy) {\n  for (let col = 0; col < proxy.table.colCount; col++) {\n    if (\n      (col >= proxy.table.rowHeaderLevelCount && col < proxy.colStart) ||\n      (col > proxy.colEnd && col < proxy.table.colCount - proxy.table.rightFrozenColCount)\n    ) {\n      continue;\n    }\n\n    const range = getCellMergeInfo(proxy.table, col, row);\n    // 清除之前mock的Merge cell\n    range && clearHadMergedRow(range.start.row, range.end.row, col, proxy);\n\n    // 重新生成mock的Merge cell\n    if (\n      range &&\n      range.start.row !== row &&\n      proxy.highPerformanceGetCell(range.start.col, range.start.row, true).role !== 'cell'\n    ) {\n      // 在row的位置添加range.start.row单元格\n      const oldCellGroup = proxy.highPerformanceGetCell(col, row, true);\n      const newCellGroup = updateCell(range.start.col, range.start.row, proxy.table, true);\n\n      newCellGroup.col = col;\n      newCellGroup.row = row;\n      newCellGroup.setAttribute(\n        'y',\n        proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, range.start.row - 1)\n      );\n\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n\n      oldCellGroup.needUpdate = false;\n      newCellGroup.needUpdate = false;\n\n      // update cache\n      if (proxy.cellCache.get(col)) {\n        proxy.cellCache.set(col, newCellGroup);\n      }\n    }\n  }\n}\n\nexport function checkFirstColMerge(col: number, scrolling: boolean, proxy: SceneProxy) {\n  for (let row = 0; row < proxy.table.rowCount; row++) {\n    if (\n      (row >= proxy.table.columnHeaderLevelCount && row < proxy.rowStart) ||\n      (row > proxy.rowEnd && row < proxy.table.rowCount - proxy.table.bottomFrozenRowCount)\n    ) {\n      continue;\n    }\n\n    const range = getCellMergeInfo(proxy.table, col, row);\n    // 清除之前mock的Merge cell\n    range && clearHadMergedColumn(range.start.col, range.end.col, row, proxy);\n\n    if (\n      range &&\n      range.start.col !== col &&\n      proxy.highPerformanceGetCell(range.start.col, range.start.row, true).role !== 'cell'\n    ) {\n      // 在col的位置添加range.start.col单元格\n      const oldCellGroup = proxy.highPerformanceGetCell(col, row, true);\n      const newCellGroup = updateCell(range.start.col, range.start.row, proxy.table, true);\n\n      newCellGroup.col = col;\n      newCellGroup.row = row;\n      newCellGroup.setAttribute(\n        'x',\n        proxy.table.getColsWidth(proxy.table.rowHeaderLevelCount, range.start.col - 1) - oldCellGroup.parent.attribute.x\n      );\n\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n\n      oldCellGroup.needUpdate = false;\n      newCellGroup.needUpdate = false;\n\n      // update cache\n      if (proxy.cellCache.get(col)) {\n        proxy.cellCache.set(col, newCellGroup);\n      }\n    }\n  }\n}\n\nfunction clearHadMergedRow(rowStart: number, rowEnd: number, col: number, proxy: SceneProxy) {\n  for (let row = rowStart; row <= rowEnd; row++) {\n    const cellGroup = proxy.highPerformanceGetCell(col, row, true);\n    if (cellGroup.role !== 'shadow-cell' && cellGroup.role !== 'empty' && cellGroup.row !== rowStart) {\n      cellGroup.role = 'shadow-cell';\n      cellGroup.setAttributes({\n        width: 0,\n        height: proxy.table.getRowHeight(cellGroup.row),\n        y: proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, cellGroup.row - 1)\n      });\n      cellGroup.clear();\n    }\n  }\n}\n\nfunction clearHadMergedColumn(colStart: number, colEnd: number, row: number, proxy: SceneProxy) {\n  for (let col = colStart; col <= colEnd; col++) {\n    const cellGroup = proxy.highPerformanceGetCell(col, row, true);\n    if (cellGroup.role !== 'shadow-cell' && cellGroup.role !== 'empty' && cellGroup.row !== colStart) {\n      cellGroup.role = 'shadow-cell';\n      cellGroup.setAttributes({\n        width: 0,\n        height: proxy.table.getRowHeight(cellGroup.row),\n        y: proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, cellGroup.row - 1)\n      });\n      cellGroup.clear();\n    }\n  }\n}\n\nfunction checkHasColMerge(colStart: number, colEnd: number, row: number, proxy: SceneProxy) {\n  for (let col = colStart; col <= colEnd; col++) {\n    if (\n      proxy.highPerformanceGetCell(col, row, true).role !== 'shadow-cell' &&\n      proxy.highPerformanceGetCell(col, row, true).role !== 'empty'\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function getFirstChild(containerGroup: Group): Group {\n  let child = containerGroup.firstChild as Group;\n  while (child.type !== 'group') {\n    child = child._next as Group;\n  }\n  return child;\n}\n\nexport function getLastChild(containerGroup: Group): Group {\n  let child = containerGroup.lastChild as Group;\n  while (child.type !== 'group') {\n    child = child._prev as Group;\n  }\n  return child;\n}\n\nexport function getPrevGroup(group: Group): Group {\n  let child = group._prev as Group;\n  while (child && child.type !== 'group') {\n    child = child._prev as Group;\n  }\n  return child;\n}\n\nexport function getNextGroup(group: Group): Group {\n  let child = group._next as Group;\n  while (child && child.type !== 'group') {\n    child = child._next as Group;\n  }\n  return child;\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/progress/update-position/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { table } from 'console';\nimport type { Group } from '../../../graphic/group';\nimport { getCellMergeInfo } from '../../../utils/get-cell-merge';\nimport { updateCell } from '../../cell-helper';\nimport type { SceneProxy } from '../proxy';\nimport { BaseTableAPI } from '../../../../ts-types/base-table';\n\nexport function checkFirstRowMerge(row: number, proxy: SceneProxy) {\n  for (let col = 0; col < proxy.table.colCount; col++) {\n    if (\n      (col >= proxy.table.rowHeaderLevelCount && col < proxy.colStart) ||\n      (col > proxy.colEnd && col < proxy.table.colCount - proxy.table.rightFrozenColCount)\n    ) {\n      continue;\n    }\n    const range = getCellMergeInfo(proxy.table, col, row);\n    if (range && range.start.row !== row) {\n      // 在row的位置添加range.start.row单元格\n      const oldCellGroup = proxy.highPerformanceGetCell(col, row, true);\n      const newCellGroup = updateCell(range.start.col, range.start.row, proxy.table, true);\n\n      newCellGroup.col = col;\n      newCellGroup.row = row;\n      newCellGroup.setAttribute(\n        'y',\n        proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, range.start.row - 1)\n      );\n\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n\n      oldCellGroup.needUpdate = false;\n      newCellGroup.needUpdate = false;\n\n      // update cache\n      if (proxy.cellCache.get(col)) {\n        proxy.cellCache.set(col, newCellGroup);\n      }\n    }\n  }\n}\n\nexport function checkFirstColMerge(col: number, scrolling: boolean, proxy: SceneProxy) {\n  for (let row = 0; row < proxy.table.rowCount; row++) {\n    if (\n      (row >= proxy.table.columnHeaderLevelCount && row < proxy.rowStart) ||\n      (row > proxy.rowEnd && row < proxy.table.rowCount - proxy.table.bottomFrozenRowCount)\n    ) {\n      continue;\n    }\n\n    const range = getCellMergeInfo(proxy.table, col, row);\n    if (range && range.start.col !== col) {\n      if (scrolling && checkHasColMerge(range.start.col, range.end.col, row, proxy)) {\n        continue;\n      }\n      // 在col的位置添加range.start.col单元格\n      const oldCellGroup = proxy.highPerformanceGetCell(col, row, true);\n      const newCellGroup = updateCell(range.start.col, range.start.row, proxy.table, true);\n\n      newCellGroup.col = col;\n      newCellGroup.row = row;\n      newCellGroup.setAttribute(\n        'x',\n        proxy.table.getColsWidth(proxy.table.rowHeaderLevelCount, range.start.col - 1) - oldCellGroup.parent.attribute.x\n      );\n\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n\n      oldCellGroup.needUpdate = false;\n      newCellGroup.needUpdate = false;\n\n      // update cache\n      if (proxy.cellCache.get(col)) {\n        proxy.cellCache.set(col, newCellGroup);\n      }\n    }\n  }\n}\n\nfunction checkHasColMerge(colStart: number, colEnd: number, row: number, proxy: SceneProxy) {\n  for (let col = colStart; col <= colEnd; col++) {\n    if (\n      proxy.highPerformanceGetCell(col, row, true).role !== 'shadow-cell' &&\n      proxy.highPerformanceGetCell(col, row, true).role !== 'empty'\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function getFirstChild(containerGroup: Group): Group {\n  let child = containerGroup.firstChild as Group;\n  while (child.type !== 'group') {\n    child = child._next as Group;\n  }\n  return child;\n}\n\nexport function getLastChild(containerGroup: Group): Group {\n  let child = containerGroup.lastChild as Group;\n  while (child.type !== 'group') {\n    child = child._prev as Group;\n  }\n  return child;\n}\n\nexport function getPrevGroup(group: Group): Group {\n  let child = group._prev as Group;\n  while (child && child.type !== 'group') {\n    child = child._prev as Group;\n  }\n  return child;\n}\n\nexport function getNextGroup(group: Group): Group {\n  let child = group._next as Group;\n  while (child && child.type !== 'group') {\n    child = child._next as Group;\n  }\n  return child;\n}\n"]}

package/es/scenegraph/scenegraph.d.ts

@@ -133,6 +133,4 @@ export declare class Scenegraph {
     updateHierarchyIcon(col: number, row: number): void;
     updateRow(removeCells: CellAddress[], addCells: CellAddress[]): void;
     findAndUpdateIcon(group: Group, funcTypeArr: IconFuncTypeEnum[], iconConfig: ColumnIconOption): void;
-    getColumnGroupX(col: number): number;
-    getCellGroupY(row: number): number;
 }

package/es/scenegraph/scenegraph.js

@@ -101,7 +101,10 @@ export class Scenegraph {
             background: table.theme.underlayBackgroundColor,
             dpr: table.internalProps.pixelRatio,
             enableLayout: !0,
-            pluginList: table.isPivotChart() ? [ "poptipForText" ] : void 0
+            pluginList: table.isPivotChart() ? [ "poptipForText" ] : void 0,
+            afterRender: () => {
+                this.table.fireListeners("after_stage_render", null);
+            }
         }), this.stage.defaultLayer.setTheme({
             group: {
                 boundsPadding: 0,
@@ -727,12 +730,6 @@ export class Scenegraph {
             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;
-    }
-    getCellGroupY(row) {
-        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) {