@visactor/vtable 0.18.0-alpha.2 → 0.18.0

package/cjs/scenegraph/layout/move-cell.js

@@ -1,33 +1,19 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.moveHeaderPosition = void 0;
-
-const get_cell_merge_1 = require("../utils/get-cell-merge");
-
-function moveHeaderPosition(colSource, rowSource, colTarget, rowTarget, table) {
+function moveHeaderPosition(colSource, rowSource, colTarget, rowTarget, sourceMergeInfo, targetMergeInfo, table) {
     const scene = table.scenegraph, cellLocation = table.getCellLocation(colTarget, rowTarget), direction = "columnHeader" === cellLocation ? "column" : "rowHeader" === cellLocation ? "row" : void 0;
     let sourceColStart = 0, sourceRowStart = 0, sourceColEnd = 0, sourceRowEnd = 0, targetColStart = 0, targetRowStart = 0, targetColEnd = 0, targetRowEnd = 0;
-    if ("column" === direction) {
-        const sourceMergeInfo = (0, get_cell_merge_1.getCellMergeInfo)(table, colSource, rowSource), targetMergeInfo = (0, 
-        get_cell_merge_1.getCellMergeInfo)(table, colTarget, rowTarget);
-        sourceMergeInfo && targetMergeInfo ? (sourceColStart = sourceMergeInfo.start.col, 
-        sourceColEnd = sourceMergeInfo.end.col, targetColStart = targetMergeInfo.start.col, 
-        targetColEnd = targetMergeInfo.end.col, sourceRowStart = sourceMergeInfo.start.row, 
-        targetRowStart = targetMergeInfo.start.row) : (sourceColStart = colSource, sourceColEnd = colSource, 
-        targetColStart = colTarget, targetColEnd = colTarget, sourceRowStart = rowSource, 
-        targetRowStart = rowTarget), sourceRowEnd = table.rowCount - 1, targetRowEnd = table.rowCount - 1;
-    } else if ("row" === direction) {
-        const sourceMergeInfo = (0, get_cell_merge_1.getCellMergeInfo)(table, colSource, rowSource), targetMergeInfo = (0, 
-        get_cell_merge_1.getCellMergeInfo)(table, colTarget, rowTarget);
-        sourceMergeInfo && targetMergeInfo ? (sourceRowStart = sourceMergeInfo.start.row, 
-        sourceRowEnd = sourceMergeInfo.end.row, targetRowStart = targetMergeInfo.start.row, 
-        targetRowEnd = targetMergeInfo.end.row, sourceColStart = sourceMergeInfo.start.col, 
-        targetColStart = targetMergeInfo.start.col) : (sourceRowStart = rowSource, sourceRowEnd = rowSource, 
-        targetRowStart = rowTarget, targetRowEnd = rowTarget, sourceColStart = colSource, 
-        targetColStart = colTarget), sourceColEnd = table.colCount - 1, targetColEnd = table.colCount - 1;
-    }
+    "column" === direction ? (sourceMergeInfo && targetMergeInfo ? (sourceColStart = sourceMergeInfo.start.col, 
+    sourceColEnd = sourceMergeInfo.end.col, targetColStart = targetMergeInfo.start.col, 
+    targetColEnd = targetMergeInfo.end.col, sourceRowStart = sourceMergeInfo.start.row, 
+    targetRowStart = targetMergeInfo.start.row) : (sourceColStart = colSource, sourceColEnd = colSource, 
+    targetColStart = colTarget, targetColEnd = colTarget, sourceRowStart = rowSource, 
+    targetRowStart = rowTarget), sourceRowEnd = table.rowCount - 1, targetRowEnd = table.rowCount - 1) : "row" === direction && (sourceMergeInfo && targetMergeInfo ? (sourceRowStart = sourceMergeInfo.start.row, 
+    sourceRowEnd = sourceMergeInfo.end.row, targetRowStart = targetMergeInfo.start.row, 
+    targetRowEnd = targetMergeInfo.end.row, sourceColStart = sourceMergeInfo.start.col, 
+    targetColStart = targetMergeInfo.start.col) : (sourceRowStart = rowSource, sourceRowEnd = rowSource, 
+    targetRowStart = rowTarget, targetRowEnd = rowTarget, sourceColStart = colSource, 
+    targetColStart = colTarget), sourceColEnd = table.colCount - 1, targetColEnd = table.colCount - 1);
     const updateColStart = Math.min(sourceColStart, targetColStart), updateColEnd = Math.max(sourceColEnd, targetColEnd), updateRowStart = Math.min(sourceRowStart, targetRowStart), updateRowEnd = Math.max(sourceRowEnd, targetRowEnd);
     for (let col = updateColStart; col <= updateColEnd; col++) {
         const columnWidth = table.getColWidth(col), columnHeaderGroup = table.scenegraph.getColGroup(col, !0), columnGroup = table.scenegraph.getColGroup(col), columnBottomGroup = table.scenegraph.getColGroupInBottom(col);
@@ -65,5 +51,7 @@ function moveHeaderPosition(colSource, rowSource, colTarget, rowTarget, table) {
     }
 }
 
-exports.moveHeaderPosition = moveHeaderPosition;
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.moveHeaderPosition = void 0, exports.moveHeaderPosition = moveHeaderPosition;
 //# sourceMappingURL=move-cell.js.map

package/cjs/scenegraph/layout/move-cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/layout/move-cell.ts"],"names":[],"mappings":"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","file":"move-cell.js","sourcesContent":["import type { Group } from './../../vrender';\nimport { getCellMergeInfo } from '../utils/get-cell-merge';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nexport function moveHeaderPosition(\n  colSource: number,\n  rowSource: number,\n  colTarget: number,\n  rowTarget: number,\n  table: BaseTableAPI\n) {\n  const scene = table.scenegraph;\n\n  // 判断方向\n  const cellLocation = table.getCellLocation(colTarget, rowTarget);\n  const direction = cellLocation === 'columnHeader' ? 'column' : cellLocation === 'rowHeader' ? 'row' : undefined;\n\n  let sourceColStart = 0;\n  let sourceRowStart = 0;\n  let sourceColEnd = 0;\n  let sourceRowEnd = 0;\n  let targetColStart = 0;\n  let targetRowStart = 0;\n  let targetColEnd = 0;\n  let targetRowEnd = 0;\n  if (direction === 'column') {\n    const sourceMergeInfo = getCellMergeInfo(table, colSource, rowSource);\n    const targetMergeInfo = getCellMergeInfo(table, colTarget, rowTarget);\n    if (sourceMergeInfo && targetMergeInfo) {\n      sourceColStart = sourceMergeInfo.start.col;\n      sourceColEnd = sourceMergeInfo.end.col;\n      targetColStart = targetMergeInfo.start.col;\n      targetColEnd = targetMergeInfo.end.col;\n\n      sourceRowStart = sourceMergeInfo.start.row;\n      targetRowStart = targetMergeInfo.start.row;\n    } else {\n      sourceColStart = colSource;\n      sourceColEnd = colSource;\n      targetColStart = colTarget;\n      targetColEnd = colTarget;\n\n      sourceRowStart = rowSource;\n      targetRowStart = rowTarget;\n    }\n    // sourceRowStart = rowSource;\n    sourceRowEnd = table.rowCount - 1;\n    // targetRowStart = rowTarget;\n    targetRowEnd = table.rowCount - 1;\n  } else if (direction === 'row') {\n    const sourceMergeInfo = getCellMergeInfo(table, colSource, rowSource);\n    const targetMergeInfo = getCellMergeInfo(table, colTarget, rowTarget);\n    if (sourceMergeInfo && targetMergeInfo) {\n      sourceRowStart = sourceMergeInfo.start.row;\n      sourceRowEnd = sourceMergeInfo.end.row;\n      targetRowStart = targetMergeInfo.start.row;\n      targetRowEnd = targetMergeInfo.end.row;\n\n      sourceColStart = sourceMergeInfo.start.col;\n      targetColStart = targetMergeInfo.start.col;\n    } else {\n      sourceRowStart = rowSource;\n      sourceRowEnd = rowSource;\n      targetRowStart = rowTarget;\n      targetRowEnd = rowTarget;\n\n      sourceColStart = colSource;\n      targetColStart = colTarget;\n    }\n    // sourceColStart = colSource;\n    sourceColEnd = table.colCount - 1;\n    // targetColStart = colTarget;\n    targetColEnd = table.colCount - 1;\n  }\n\n  const updateColStart = Math.min(sourceColStart, targetColStart);\n  const updateColEnd = Math.max(sourceColEnd, targetColEnd);\n  const updateRowStart = Math.min(sourceRowStart, targetRowStart);\n  const updateRowEnd = Math.max(sourceRowEnd, targetRowEnd);\n\n  // 更新columnGroup列宽\n  for (let col = updateColStart; col <= updateColEnd; col++) {\n    const columnWidth = table.getColWidth(col);\n    const columnHeaderGroup = table.scenegraph.getColGroup(col, true);\n    const columnGroup = table.scenegraph.getColGroup(col);\n    const columnBottomGroup = table.scenegraph.getColGroupInBottom(col);\n    if (columnHeaderGroup) {\n      columnHeaderGroup.setAttribute('width', columnWidth);\n      columnHeaderGroup.forEachChildren((child: Group) => {\n        child.setAttribute('width', columnWidth);\n      });\n    }\n    if (columnGroup) {\n      columnGroup.setAttribute('width', columnWidth);\n      columnGroup.forEachChildren((child: Group) => {\n        child.setAttribute('width', columnWidth);\n      });\n    }\n    if (columnBottomGroup) {\n      columnBottomGroup.setAttribute('width', columnWidth);\n      columnBottomGroup.forEachChildren((child: Group) => {\n        child.setAttribute('width', columnWidth);\n      });\n    }\n  }\n\n  // 更新容器尺寸\n  // scene.updateContainerAttrWidthAndX();\n  scene.updateContainer();\n\n  if (direction === 'column') {\n    for (let col = updateColStart; col <= updateColEnd; col++) {\n      // 将该列的chartInstance清除掉\n      const columnGroup = table.scenegraph.getColGroup(col);\n      columnGroup?.setAttribute('chartInstance', undefined);\n\n      // 将上下表头 和中间body部分分别更新\n      for (let row = 0; row <= table.frozenRowCount - 1; row++) {\n        scene.updateCellContent(col, row);\n      }\n      for (let row = scene.bodyRowStart; row <= scene.bodyRowEnd; row++) {\n        scene.updateCellContent(col, row);\n      }\n      for (let row = table.rowCount - table.bottomFrozenRowCount; row <= table.rowCount - 1; row++) {\n        scene.updateCellContent(col, row);\n      }\n    }\n  } else {\n    // 将左侧冻结列or行表头的单元格更新\n    for (let col = 0; col <= table.frozenColCount - 1; col++) {\n      // 将该列的chartInstance清除掉\n      const columnGroup = table.scenegraph.getColGroup(col);\n      columnGroup?.setAttribute('chartInstance', undefined);\n      for (let row = updateRowStart; row <= updateRowEnd; row++) {\n        scene.updateCellContent(col, row);\n      }\n    }\n    // 将中间body的单元格更新\n    for (let col = scene.bodyColStart; col <= scene.bodyColEnd; col++) {\n      // 将该列的chartInstance清除掉\n      const columnGroup = table.scenegraph.getColGroup(col);\n      columnGroup?.setAttribute('chartInstance', undefined);\n      for (let row = updateRowStart; row <= updateRowEnd; row++) {\n        scene.updateCellContent(col, row);\n      }\n    }\n    // 将右侧冻结列的单元格更新\n    for (let col = table.colCount - table.rightFrozenColCount; col <= table.colCount - 1; col++) {\n      // 将该列的chartInstance清除掉\n      const columnGroup = table.scenegraph.getColGroup(col);\n      columnGroup?.setAttribute('chartInstance', undefined);\n      for (let row = updateRowStart; row <= updateRowEnd; row++) {\n        scene.updateCellContent(col, row);\n      }\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/layout/move-cell.ts"],"names":[],"mappings":"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","file":"move-cell.js","sourcesContent":["import type { Group } from './../../vrender';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { CellRange } from '../../ts-types';\nexport function moveHeaderPosition(\n  colSource: number,\n  rowSource: number,\n  colTarget: number,\n  rowTarget: number,\n  sourceMergeInfo: false | CellRange,\n  targetMergeInfo: false | CellRange,\n  table: BaseTableAPI\n) {\n  const scene = table.scenegraph;\n\n  // 判断方向\n  const cellLocation = table.getCellLocation(colTarget, rowTarget);\n  const direction = cellLocation === 'columnHeader' ? 'column' : cellLocation === 'rowHeader' ? 'row' : undefined;\n\n  let sourceColStart = 0;\n  let sourceRowStart = 0;\n  let sourceColEnd = 0;\n  let sourceRowEnd = 0;\n  let targetColStart = 0;\n  let targetRowStart = 0;\n  let targetColEnd = 0;\n  let targetRowEnd = 0;\n  if (direction === 'column') {\n    if (sourceMergeInfo && targetMergeInfo) {\n      sourceColStart = sourceMergeInfo.start.col;\n      sourceColEnd = sourceMergeInfo.end.col;\n      targetColStart = targetMergeInfo.start.col;\n      targetColEnd = targetMergeInfo.end.col;\n\n      sourceRowStart = sourceMergeInfo.start.row;\n      targetRowStart = targetMergeInfo.start.row;\n    } else {\n      sourceColStart = colSource;\n      sourceColEnd = colSource;\n      targetColStart = colTarget;\n      targetColEnd = colTarget;\n\n      sourceRowStart = rowSource;\n      targetRowStart = rowTarget;\n    }\n    // sourceRowStart = rowSource;\n    sourceRowEnd = table.rowCount - 1;\n    // targetRowStart = rowTarget;\n    targetRowEnd = table.rowCount - 1;\n  } else if (direction === 'row') {\n    if (sourceMergeInfo && targetMergeInfo) {\n      sourceRowStart = sourceMergeInfo.start.row;\n      sourceRowEnd = sourceMergeInfo.end.row;\n      targetRowStart = targetMergeInfo.start.row;\n      targetRowEnd = targetMergeInfo.end.row;\n\n      sourceColStart = sourceMergeInfo.start.col;\n      targetColStart = targetMergeInfo.start.col;\n    } else {\n      sourceRowStart = rowSource;\n      sourceRowEnd = rowSource;\n      targetRowStart = rowTarget;\n      targetRowEnd = rowTarget;\n\n      sourceColStart = colSource;\n      targetColStart = colTarget;\n    }\n    // sourceColStart = colSource;\n    sourceColEnd = table.colCount - 1;\n    // targetColStart = colTarget;\n    targetColEnd = table.colCount - 1;\n  }\n\n  const updateColStart = Math.min(sourceColStart, targetColStart);\n  const updateColEnd = Math.max(sourceColEnd, targetColEnd);\n  const updateRowStart = Math.min(sourceRowStart, targetRowStart);\n  const updateRowEnd = Math.max(sourceRowEnd, targetRowEnd);\n\n  // 更新columnGroup列宽\n  for (let col = updateColStart; col <= updateColEnd; col++) {\n    const columnWidth = table.getColWidth(col);\n    const columnHeaderGroup = table.scenegraph.getColGroup(col, true);\n    const columnGroup = table.scenegraph.getColGroup(col);\n    const columnBottomGroup = table.scenegraph.getColGroupInBottom(col);\n    if (columnHeaderGroup) {\n      columnHeaderGroup.setAttribute('width', columnWidth);\n      columnHeaderGroup.forEachChildren((child: Group) => {\n        child.setAttribute('width', columnWidth);\n      });\n    }\n    if (columnGroup) {\n      columnGroup.setAttribute('width', columnWidth);\n      columnGroup.forEachChildren((child: Group) => {\n        child.setAttribute('width', columnWidth);\n      });\n    }\n    if (columnBottomGroup) {\n      columnBottomGroup.setAttribute('width', columnWidth);\n      columnBottomGroup.forEachChildren((child: Group) => {\n        child.setAttribute('width', columnWidth);\n      });\n    }\n  }\n\n  // 更新容器尺寸\n  // scene.updateContainerAttrWidthAndX();\n  scene.updateContainer();\n\n  if (direction === 'column') {\n    for (let col = updateColStart; col <= updateColEnd; col++) {\n      // 将该列的chartInstance清除掉\n      const columnGroup = table.scenegraph.getColGroup(col);\n      columnGroup?.setAttribute('chartInstance', undefined);\n\n      // 将上下表头 和中间body部分分别更新\n      for (let row = 0; row <= table.frozenRowCount - 1; row++) {\n        scene.updateCellContent(col, row);\n      }\n      for (let row = scene.bodyRowStart; row <= scene.bodyRowEnd; row++) {\n        scene.updateCellContent(col, row);\n      }\n      for (let row = table.rowCount - table.bottomFrozenRowCount; row <= table.rowCount - 1; row++) {\n        scene.updateCellContent(col, row);\n      }\n    }\n  } else {\n    // 将左侧冻结列or行表头的单元格更新\n    for (let col = 0; col <= table.frozenColCount - 1; col++) {\n      // 将该列的chartInstance清除掉\n      const columnGroup = table.scenegraph.getColGroup(col);\n      columnGroup?.setAttribute('chartInstance', undefined);\n      for (let row = updateRowStart; row <= updateRowEnd; row++) {\n        scene.updateCellContent(col, row);\n      }\n    }\n    // 将中间body的单元格更新\n    for (let col = scene.bodyColStart; col <= scene.bodyColEnd; col++) {\n      // 将该列的chartInstance清除掉\n      const columnGroup = table.scenegraph.getColGroup(col);\n      columnGroup?.setAttribute('chartInstance', undefined);\n      for (let row = updateRowStart; row <= updateRowEnd; row++) {\n        scene.updateCellContent(col, row);\n      }\n    }\n    // 将右侧冻结列的单元格更新\n    for (let col = table.colCount - table.rightFrozenColCount; col <= table.colCount - 1; col++) {\n      // 将该列的chartInstance清除掉\n      const columnGroup = table.scenegraph.getColGroup(col);\n      columnGroup?.setAttribute('chartInstance', undefined);\n      for (let row = updateRowStart; row <= updateRowEnd; row++) {\n        scene.updateCellContent(col, row);\n      }\n    }\n  }\n}\n"]}

package/cjs/scenegraph/layout/update-height.js

@@ -9,7 +9,9 @@ const progress_bar_cell_1 = require("../group-creater/cell-type/progress-bar-cel
 function updateRowHeight(scene, row, detaY, skipTableHeightMap) {
     skipTableHeightMap || scene.table._setRowHeight(row, scene.table.getRowHeight(row) + detaY, !0);
     for (let col = 0; col < scene.table.colCount; col++) {
-        const cell = scene.getCell(col, row), mergeInfo = (0, get_cell_merge_1.getCellMergeInfo)(scene.table, col, row);
+        const cell = scene.getCell(col, row);
+        if ("empty" === cell.role) continue;
+        const mergeInfo = (0, get_cell_merge_1.getCellMergeInfo)(scene.table, col, row);
         if (mergeInfo && mergeInfo.start.col !== col) continue;
         updateCellHeightForRow(scene, cell, col, row, cell.attribute.height + detaY, detaY, scene.table.isHeader(col, row)), 
         scene.updateCellContentWhileResize(col, row);
@@ -52,23 +54,25 @@ function updateCellHeight(scene, cell, col, row, distHeight, detaY, isHeader) {
         let renderDefault = !0;
         const customContainer = cell.getChildByName("custom-container");
         if (customContainer) {
-            let customElementsGroup, customRender, customLayout;
-            customContainer.removeAllChild(), cell.removeChild(customContainer);
-            if ("body" !== scene.table.getCellLocation(col, row)) {
-                const define = scene.table.getHeaderDefine(col, row);
-                customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout;
-            } else {
-                const define = scene.table.getBodyColumnDefine(col, row);
-                customRender = (null == define ? void 0 : define.customRender) || scene.table.customRender, 
-                customLayout = null == define ? void 0 : define.customLayout;
-            }
-            if (customLayout || customRender) {
-                const style = scene.table._getCellStyle(col, row), padding = (0, padding_1.getQuadProps)((0, 
-                get_prop_1.getProp)("padding", style, col, row, scene.table)), customResult = (0, 
-                custom_1.dealWithCustom)(customLayout, customRender, col, row, cell.attribute.width, cell.attribute.height, !1, "autoHeight" === scene.table.heightMode, padding, scene.table);
-                customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
+            let customElementsGroup;
+            if (customContainer.removeAllChild(), cell.removeChild(customContainer), !(0, custom_1.getCustomCellMergeCustom)(col, row, cell, scene.table)) {
+                let customRender, customLayout;
+                if ("body" !== scene.table.getCellLocation(col, row)) {
+                    const define = scene.table.getHeaderDefine(col, row);
+                    customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout;
+                } else {
+                    const define = scene.table.getBodyColumnDefine(col, row);
+                    customRender = (null == define ? void 0 : define.customRender) || scene.table.customRender, 
+                    customLayout = null == define ? void 0 : define.customLayout;
+                }
+                if (customLayout || customRender) {
+                    const style = scene.table._getCellStyle(col, row), padding = (0, padding_1.getQuadProps)((0, 
+                    get_prop_1.getProp)("padding", style, col, row, scene.table)), customResult = (0, 
+                    custom_1.dealWithCustom)(customLayout, customRender, col, row, cell.attribute.width, cell.attribute.height, !1, "autoHeight" === scene.table.heightMode, padding, scene.table);
+                    customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
+                }
+                cell.childrenCount > 0 && customElementsGroup ? cell.insertBefore(customElementsGroup, cell.firstChild) : customElementsGroup && cell.appendChild(customElementsGroup);
             }
-            cell.childrenCount > 0 ? cell.insertBefore(customElementsGroup, cell.firstChild) : cell.appendChild(customElementsGroup);
         }
         if (renderDefault) {
             const style = scene.table._getCellStyle(col, row);

package/cjs/scenegraph/layout/update-height.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/layout/update-height.ts"],"names":[],"mappings":"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","file":"update-height.js","sourcesContent":["import type { ProgressBarStyle } from '../../body-helper/style/ProgressBarStyle';\nimport type { Group } from '../graphic/group';\nimport { createProgressBarCell } from '../group-creater/cell-type/progress-bar-cell';\nimport { createSparkLineCellGroup } from '../group-creater/cell-type/spark-line-cell';\nimport type { Scenegraph } from '../scenegraph';\nimport { getCellMergeInfo } from '../utils/get-cell-merge';\nimport { getProp } from '../utils/get-prop';\nimport { getQuadProps } from '../utils/padding';\nimport { updateCellContentHeight } from '../utils/text-icon-layout';\nimport type { IProgressbarColumnBodyDefine } from '../../ts-types/list-table/define/progressbar-define';\nimport { dealWithCustom } from '../component/custom';\nimport { updateImageCellContentWhileResize } from '../group-creater/cell-type/image-cell';\nimport { getStyleTheme } from '../../core/tableHelper';\nimport { isMergeCellGroup } from '../utils/is-merge-cell-group';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { resizeCellGroup } from '../group-creater/column-helper';\nimport type { IGraphic } from './../../vrender';\n\nexport function updateRowHeight(scene: Scenegraph, row: number, detaY: number, skipTableHeightMap?: boolean) {\n  // 更新table行高存储\n  if (!skipTableHeightMap) {\n    scene.table._setRowHeight(row, scene.table.getRowHeight(row) + detaY, true);\n  }\n\n  for (let col = 0; col < scene.table.colCount; col++) {\n    const cell = scene.getCell(col, row);\n    const mergeInfo = getCellMergeInfo(scene.table, col, row);\n    if (mergeInfo && mergeInfo.start.col !== col) {\n      continue;\n    }\n    const height = cell.attribute.height;\n    // cell.setAttribute('height', height);\n    // (cell.firstChild as Rect).setAttribute('height', cell.attribute.height);\n    updateCellHeightForRow(scene, cell, col, row, height + detaY, detaY, scene.table.isHeader(col, row));\n\n    scene.updateCellContentWhileResize(col, row);\n  }\n\n  let rowStart = 0;\n  let rowEnd = 0;\n  // 更新header 高度\n  if (row < scene.table.columnHeaderLevelCount) {\n    // scene.colHeaderGroup.setAttribute('height', scene.colHeaderGroup.attribute.height + detaY);\n    // scene.rowHeaderGroup.setAttribute('y', scene.rowHeaderGroup.attribute.y + detaY);\n    // scene.bodyGroup.setAttribute('y', scene.bodyGroup.attribute.y + detaY);\n\n    rowStart = row + 1;\n    rowEnd = scene.table.columnHeaderLevelCount - 1;\n  } else {\n    rowStart = row + 1;\n    // rowEnd = scene.table.rowCount - 1;\n    rowEnd = scene.bodyRowEnd; //- scene.table.bottomFrozenRowCount;\n  }\n\n  // 更新以下行位置\n  for (let rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {\n    for (let colIndex = 0; colIndex < scene.table.colCount; colIndex++) {\n      const cellGroup = scene.getCell(colIndex, rowIndex);\n      if (cellGroup.role === 'cell') {\n        cellGroup.setAttribute('y', cellGroup.attribute.y + detaY);\n      }\n    }\n  }\n}\n\n/**\n * @description: 更新单个单元格高度\n * @return {*}\n */\nexport function updateCellHeightForRow(\n  scene: Scenegraph,\n  cell: Group,\n  col: number,\n  row: number,\n  height: number,\n  detaY: number,\n  isHeader: boolean\n  // autoRowHeight: boolean\n) {\n  // cell.setAttribute('height', height);\n  const cellGroup = cell;\n  const distHeight = height;\n\n  if (!cellGroup) {\n    // 合并单元格非主单元格，不处理\n    return;\n  }\n\n  updateCellHeight(scene, cellGroup, col, row, distHeight, detaY, isHeader);\n}\n\nexport function updateCellHeightForColumn(\n  scene: Scenegraph,\n  cell: Group,\n  col: number,\n  row: number,\n  height: number,\n  detaY: number,\n  isHeader: boolean\n) {\n  // cell.setAttribute('height', height);\n  const cellGroup = cell;\n  updateCellHeight(scene, cellGroup, col, row, height, 0, isHeader);\n}\n\nexport function updateCellHeight(\n  scene: Scenegraph,\n  cell: Group,\n  col: number,\n  row: number,\n  distHeight: number,\n  detaY: number,\n  isHeader: boolean\n) {\n  if (cell.attribute.height === distHeight && !cell.needUpdateHeight) {\n    return;\n  }\n  cell.needUpdateHeight = false;\n\n  cell.setAttribute('height', distHeight);\n\n  // 更新单元格布局\n  const type = scene.table.isHeader(col, row)\n    ? scene.table._getHeaderLayoutMap(col, row).headerType\n    : scene.table.getBodyColumnType(col, row);\n  if (type === 'progressbar') {\n    // 目前先采用重新生成节点的方案\n    const columnDefine = scene.table.getBodyColumnDefine(col, row) as IProgressbarColumnBodyDefine;\n    const style = scene.table._getCellStyle(col, row) as ProgressBarStyle;\n    const value = scene.table.getCellValue(col, row);\n    const dataValue = scene.table.getCellOriginValue(col, row);\n    const padding = getQuadProps(getProp('padding', style, col, row, scene.table));\n\n    const newBarCell = createProgressBarCell(\n      columnDefine,\n      style,\n      cell.attribute.width,\n      // cell.attribute.height,\n      value,\n      dataValue,\n      col,\n      row,\n      padding,\n      scene.table\n    );\n\n    const oldBarCell = cell.getChildByName('progress-bar') as Group;\n    // cell.replaceChild(newBarCell, oldBarCell);\n    cell.insertBefore(newBarCell, oldBarCell);\n    cell.removeChild(oldBarCell);\n    oldBarCell.removeAllChild();\n    oldBarCell.release();\n  } else if (type === 'sparkline') {\n    // 目前先采用重新生成节点的方案\n    cell.removeAllChild();\n    const headerStyle = scene.table._getCellStyle(col, row);\n    const padding = getQuadProps(getProp('padding', headerStyle, col, row, scene.table));\n    createSparkLineCellGroup(\n      cell,\n      cell.parent,\n      cell.attribute.x,\n      cell.attribute.y,\n      col,\n      row,\n      cell.attribute.width,\n      cell.attribute.height,\n      padding,\n      scene.table,\n      getStyleTheme(headerStyle, scene.table, col, row, getProp).theme\n    );\n  } else if (type === 'image' || type === 'video') {\n    updateImageCellContentWhileResize(cell, col, row, scene.table);\n  } else if (cell.firstChild?.name === 'axis') {\n    (cell.firstChild as any)?.originAxis.resize(cell.attribute.width, cell.attribute.height);\n  } else {\n    let renderDefault = true;\n    const customContainer = cell.getChildByName('custom-container') as Group;\n    if (customContainer) {\n      let customElementsGroup;\n      customContainer.removeAllChild();\n      cell.removeChild(customContainer);\n\n      let customRender;\n      let customLayout;\n      const cellLocation = scene.table.getCellLocation(col, row);\n      if (cellLocation !== 'body') {\n        const define = scene.table.getHeaderDefine(col, row);\n        customRender = define?.headerCustomRender;\n        customLayout = define?.headerCustomLayout;\n      } else {\n        const define = scene.table.getBodyColumnDefine(col, row);\n        customRender = define?.customRender || scene.table.customRender;\n        customLayout = define?.customLayout;\n      }\n\n      if (customLayout || customRender) {\n        // const { autoRowHeight } = table.internalProps;\n        const style = scene.table._getCellStyle(col, row) as ProgressBarStyle;\n        const padding = getQuadProps(getProp('padding', style, col, row, scene.table));\n        const customResult = dealWithCustom(\n          customLayout,\n          customRender,\n          col,\n          row,\n          cell.attribute.width,\n          cell.attribute.height,\n          false,\n          scene.table.heightMode === 'autoHeight',\n          padding,\n          scene.table\n        );\n        customElementsGroup = customResult.elementsGroup;\n        renderDefault = customResult.renderDefault;\n      }\n\n      if (cell.childrenCount > 0) {\n        cell.insertBefore(customElementsGroup, cell.firstChild);\n      } else {\n        cell.appendChild(customElementsGroup);\n      }\n    }\n\n    if (renderDefault) {\n      // 处理文字\n      const style = scene.table._getCellStyle(col, row);\n      updateMergeCellContentHeight(\n        cell,\n        distHeight,\n        detaY,\n        // scene.table.internalProps.autoRowHeight,\n        scene.table.heightMode === 'autoHeight',\n        getQuadProps(style.padding as number),\n        style.textAlign,\n        style.textBaseline,\n        scene.table\n      );\n    }\n  }\n}\n\nfunction updateMergeCellContentHeight(\n  cellGroup: Group,\n  distHeight: number,\n  detaY: number,\n  autoRowHeight: boolean,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  table: BaseTableAPI\n) {\n  if (isMergeCellGroup(cellGroup)) {\n    distHeight = 0;\n    for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {\n      distHeight += table.getRowHeight(row);\n    }\n    for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {\n      for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {\n        const singleCellGroup = table.scenegraph.getCell(col, row);\n        singleCellGroup.forEachChildren((child: IGraphic) => {\n          child.setAttributes({\n            dx: 0,\n            dy: 0\n          });\n        });\n        updateCellContentHeight(singleCellGroup, distHeight, detaY, autoRowHeight, padding, textAlign, textBaseline);\n        const rangeHeight = table.getRowHeight(row);\n        const rangeWidth = table.getColWidth(col);\n\n        // const { height: contentHeight } = cellGroup.attribute;\n        singleCellGroup.contentHeight = distHeight;\n\n        const { widthChange } = resizeCellGroup(\n          singleCellGroup,\n          rangeWidth,\n          rangeHeight,\n          {\n            start: {\n              col: cellGroup.mergeStartCol,\n              row: cellGroup.mergeStartRow\n            },\n            end: {\n              col: cellGroup.mergeEndCol,\n              row: cellGroup.mergeEndRow\n            }\n          },\n          table\n        );\n\n        if (widthChange) {\n          singleCellGroup.needUpdateWidth = true;\n        }\n      }\n    }\n  } else {\n    updateCellContentHeight(cellGroup, distHeight, detaY, autoRowHeight, padding, textAlign, textBaseline);\n  }\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/layout/update-height.ts"],"names":[],"mappings":"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","file":"update-height.js","sourcesContent":["import type { ProgressBarStyle } from '../../body-helper/style/ProgressBarStyle';\nimport type { Group } from '../graphic/group';\nimport { createProgressBarCell } from '../group-creater/cell-type/progress-bar-cell';\nimport { createSparkLineCellGroup } from '../group-creater/cell-type/spark-line-cell';\nimport type { Scenegraph } from '../scenegraph';\nimport { getCellMergeInfo } from '../utils/get-cell-merge';\nimport { getProp } from '../utils/get-prop';\nimport { getQuadProps } from '../utils/padding';\nimport { updateCellContentHeight } from '../utils/text-icon-layout';\nimport type { IProgressbarColumnBodyDefine } from '../../ts-types/list-table/define/progressbar-define';\nimport { dealWithCustom, getCustomCellMergeCustom } from '../component/custom';\nimport { updateImageCellContentWhileResize } from '../group-creater/cell-type/image-cell';\nimport { getStyleTheme } from '../../core/tableHelper';\nimport { isMergeCellGroup } from '../utils/is-merge-cell-group';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { resizeCellGroup } from '../group-creater/column-helper';\nimport type { IGraphic } from './../../vrender';\n\nexport function updateRowHeight(scene: Scenegraph, row: number, detaY: number, skipTableHeightMap?: boolean) {\n  // 更新table行高存储\n  if (!skipTableHeightMap) {\n    scene.table._setRowHeight(row, scene.table.getRowHeight(row) + detaY, true);\n  }\n\n  for (let col = 0; col < scene.table.colCount; col++) {\n    const cell = scene.getCell(col, row);\n    if (cell.role === 'empty') {\n      continue;\n    }\n    const mergeInfo = getCellMergeInfo(scene.table, col, row);\n    if (mergeInfo && mergeInfo.start.col !== col) {\n      continue;\n    }\n    const height = cell.attribute.height;\n    // cell.setAttribute('height', height);\n    // (cell.firstChild as Rect).setAttribute('height', cell.attribute.height);\n    updateCellHeightForRow(scene, cell, col, row, height + detaY, detaY, scene.table.isHeader(col, row));\n\n    scene.updateCellContentWhileResize(col, row);\n  }\n\n  let rowStart = 0;\n  let rowEnd = 0;\n  // 更新header 高度\n  if (row < scene.table.columnHeaderLevelCount) {\n    // scene.colHeaderGroup.setAttribute('height', scene.colHeaderGroup.attribute.height + detaY);\n    // scene.rowHeaderGroup.setAttribute('y', scene.rowHeaderGroup.attribute.y + detaY);\n    // scene.bodyGroup.setAttribute('y', scene.bodyGroup.attribute.y + detaY);\n\n    rowStart = row + 1;\n    rowEnd = scene.table.columnHeaderLevelCount - 1;\n  } else {\n    rowStart = row + 1;\n    // rowEnd = scene.table.rowCount - 1;\n    rowEnd = scene.bodyRowEnd; //- scene.table.bottomFrozenRowCount;\n  }\n\n  // 更新以下行位置\n  for (let rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {\n    for (let colIndex = 0; colIndex < scene.table.colCount; colIndex++) {\n      const cellGroup = scene.getCell(colIndex, rowIndex);\n      if (cellGroup.role === 'cell') {\n        cellGroup.setAttribute('y', cellGroup.attribute.y + detaY);\n      }\n    }\n  }\n}\n\n/**\n * @description: 更新单个单元格高度\n * @return {*}\n */\nexport function updateCellHeightForRow(\n  scene: Scenegraph,\n  cell: Group,\n  col: number,\n  row: number,\n  height: number,\n  detaY: number,\n  isHeader: boolean\n  // autoRowHeight: boolean\n) {\n  // cell.setAttribute('height', height);\n  const cellGroup = cell;\n  const distHeight = height;\n\n  if (!cellGroup) {\n    // 合并单元格非主单元格，不处理\n    return;\n  }\n\n  updateCellHeight(scene, cellGroup, col, row, distHeight, detaY, isHeader);\n}\n\nexport function updateCellHeightForColumn(\n  scene: Scenegraph,\n  cell: Group,\n  col: number,\n  row: number,\n  height: number,\n  detaY: number,\n  isHeader: boolean\n) {\n  // cell.setAttribute('height', height);\n  const cellGroup = cell;\n  updateCellHeight(scene, cellGroup, col, row, height, 0, isHeader);\n}\n\nexport function updateCellHeight(\n  scene: Scenegraph,\n  cell: Group,\n  col: number,\n  row: number,\n  distHeight: number,\n  detaY: number,\n  isHeader: boolean\n) {\n  if (cell.attribute.height === distHeight && !cell.needUpdateHeight) {\n    return;\n  }\n  cell.needUpdateHeight = false;\n\n  cell.setAttribute('height', distHeight);\n\n  // 更新单元格布局\n  const type = scene.table.isHeader(col, row)\n    ? scene.table._getHeaderLayoutMap(col, row).headerType\n    : scene.table.getBodyColumnType(col, row);\n  if (type === 'progressbar') {\n    // 目前先采用重新生成节点的方案\n    const columnDefine = scene.table.getBodyColumnDefine(col, row) as IProgressbarColumnBodyDefine;\n    const style = scene.table._getCellStyle(col, row) as ProgressBarStyle;\n    const value = scene.table.getCellValue(col, row);\n    const dataValue = scene.table.getCellOriginValue(col, row);\n    const padding = getQuadProps(getProp('padding', style, col, row, scene.table));\n\n    const newBarCell = createProgressBarCell(\n      columnDefine,\n      style,\n      cell.attribute.width,\n      // cell.attribute.height,\n      value,\n      dataValue,\n      col,\n      row,\n      padding,\n      scene.table\n    );\n\n    const oldBarCell = cell.getChildByName('progress-bar') as Group;\n    // cell.replaceChild(newBarCell, oldBarCell);\n    cell.insertBefore(newBarCell, oldBarCell);\n    cell.removeChild(oldBarCell);\n    oldBarCell.removeAllChild();\n    oldBarCell.release();\n  } else if (type === 'sparkline') {\n    // 目前先采用重新生成节点的方案\n    cell.removeAllChild();\n    const headerStyle = scene.table._getCellStyle(col, row);\n    const padding = getQuadProps(getProp('padding', headerStyle, col, row, scene.table));\n    createSparkLineCellGroup(\n      cell,\n      cell.parent,\n      cell.attribute.x,\n      cell.attribute.y,\n      col,\n      row,\n      cell.attribute.width,\n      cell.attribute.height,\n      padding,\n      scene.table,\n      getStyleTheme(headerStyle, scene.table, col, row, getProp).theme\n    );\n  } else if (type === 'image' || type === 'video') {\n    updateImageCellContentWhileResize(cell, col, row, scene.table);\n  } else if (cell.firstChild?.name === 'axis') {\n    (cell.firstChild as any)?.originAxis.resize(cell.attribute.width, cell.attribute.height);\n  } else {\n    let renderDefault = true;\n    const customContainer = cell.getChildByName('custom-container') as Group;\n    if (customContainer) {\n      let customElementsGroup;\n      customContainer.removeAllChild();\n      cell.removeChild(customContainer);\n\n      if (!getCustomCellMergeCustom(col, row, cell, scene.table)) {\n        let customRender;\n        let customLayout;\n        const cellLocation = scene.table.getCellLocation(col, row);\n        if (cellLocation !== 'body') {\n          const define = scene.table.getHeaderDefine(col, row);\n          customRender = define?.headerCustomRender;\n          customLayout = define?.headerCustomLayout;\n        } else {\n          const define = scene.table.getBodyColumnDefine(col, row);\n          customRender = define?.customRender || scene.table.customRender;\n          customLayout = define?.customLayout;\n        }\n\n        if (customLayout || customRender) {\n          // const { autoRowHeight } = table.internalProps;\n          const style = scene.table._getCellStyle(col, row) as ProgressBarStyle;\n          const padding = getQuadProps(getProp('padding', style, col, row, scene.table));\n          const customResult = dealWithCustom(\n            customLayout,\n            customRender,\n            col,\n            row,\n            cell.attribute.width,\n            cell.attribute.height,\n            false,\n            scene.table.heightMode === 'autoHeight',\n            padding,\n            scene.table\n          );\n          customElementsGroup = customResult.elementsGroup;\n          renderDefault = customResult.renderDefault;\n        }\n\n        if (cell.childrenCount > 0 && customElementsGroup) {\n          cell.insertBefore(customElementsGroup, cell.firstChild);\n        } else if (customElementsGroup) {\n          cell.appendChild(customElementsGroup);\n        }\n      }\n    }\n    if (renderDefault) {\n      // 处理文字\n      const style = scene.table._getCellStyle(col, row);\n      updateMergeCellContentHeight(\n        cell,\n        distHeight,\n        detaY,\n        // scene.table.internalProps.autoRowHeight,\n        scene.table.heightMode === 'autoHeight',\n        getQuadProps(style.padding as number),\n        style.textAlign,\n        style.textBaseline,\n        scene.table\n      );\n    }\n  }\n}\n\nfunction updateMergeCellContentHeight(\n  cellGroup: Group,\n  distHeight: number,\n  detaY: number,\n  autoRowHeight: boolean,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  table: BaseTableAPI\n) {\n  if (isMergeCellGroup(cellGroup)) {\n    distHeight = 0;\n    for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {\n      distHeight += table.getRowHeight(row);\n    }\n    for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {\n      for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {\n        const singleCellGroup = table.scenegraph.getCell(col, row);\n        singleCellGroup.forEachChildren((child: IGraphic) => {\n          child.setAttributes({\n            dx: 0,\n            dy: 0\n          });\n        });\n        updateCellContentHeight(singleCellGroup, distHeight, detaY, autoRowHeight, padding, textAlign, textBaseline);\n        const rangeHeight = table.getRowHeight(row);\n        const rangeWidth = table.getColWidth(col);\n\n        // const { height: contentHeight } = cellGroup.attribute;\n        singleCellGroup.contentHeight = distHeight;\n\n        const { widthChange } = resizeCellGroup(\n          singleCellGroup,\n          rangeWidth,\n          rangeHeight,\n          {\n            start: {\n              col: cellGroup.mergeStartCol,\n              row: cellGroup.mergeStartRow\n            },\n            end: {\n              col: cellGroup.mergeEndCol,\n              row: cellGroup.mergeEndRow\n            }\n          },\n          table\n        );\n\n        if (widthChange) {\n          singleCellGroup.needUpdateWidth = true;\n        }\n      }\n    }\n  } else {\n    updateCellContentHeight(cellGroup, distHeight, detaY, autoRowHeight, padding, textAlign, textBaseline);\n  }\n}\n"]}

package/cjs/scenegraph/layout/update-width.js

@@ -64,6 +64,27 @@ function updateColunmWidth(columnGroup, detaX, autoRowHeight, mode, scene) {
             })), newTotalHeight = y;
         }
         scene.updateContainerHeight(row, newTotalHeight - oldContainerHeight);
+        for (let col = 0; col < scene.table.frozenColCount; col++) {
+            const leftBottomFrozenColumnGroup = scene.getColGroupInLeftBottomCorner(col);
+            let y = 0;
+            leftBottomFrozenColumnGroup.forEachChildren((cellGroup => {
+                cellGroup.setAttribute("y", y), y += scene.table.getRowHeight(cellGroup.row);
+            }));
+        }
+        for (let col = scene.table.colCount - scene.table.rightFrozenColCount; col < scene.table.colCount; col++) {
+            const rightBottomFrozenColumnGroup = scene.getColGroupInRightBottomCorner(col);
+            let y = 0;
+            rightBottomFrozenColumnGroup.forEachChildren((cellGroup => {
+                cellGroup.setAttribute("y", y), y += scene.table.getRowHeight(cellGroup.row);
+            }));
+        }
+        for (let col = scene.table.frozenColCount; col < scene.table.colCount - scene.table.rightFrozenColCount; col++) {
+            const rightBottomFrozenColumnGroup = scene.getColGroupInBottom(col);
+            let y = 0;
+            rightBottomFrozenColumnGroup.forEachChildren((cellGroup => {
+                cellGroup.setAttribute("y", y), y += scene.table.getRowHeight(cellGroup.row);
+            }));
+        }
     }
 }
 
@@ -98,24 +119,26 @@ function updateCellWidth(scene, cell, col, row, oldWidth, distWidth, detaX, isHe
         let renderDefault = !0;
         const customContainer = cell.getChildByName("custom-container");
         if (customContainer) {
-            let customElementsGroup, customRender, customLayout;
-            customContainer.removeAllChild(), cell.removeChild(customContainer);
-            if ("body" !== scene.table.getCellLocation(col, row)) {
-                const define = scene.table.getHeaderDefine(col, row);
-                customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout;
-            } else {
-                const define = scene.table.getBodyColumnDefine(col, row);
-                customRender = (null == define ? void 0 : define.customRender) || scene.table.customRender, 
-                customLayout = null == define ? void 0 : define.customLayout;
-            }
-            if (customLayout || customRender) {
-                const style = scene.table._getCellStyle(col, row), padding = (0, padding_1.getQuadProps)((0, 
-                get_prop_1.getProp)("padding", style, col, row, scene.table)), customResult = (0, 
-                custom_1.dealWithCustom)(customLayout, customRender, col, row, cellGroup.attribute.width, cellGroup.attribute.height, !1, "autoHeight" === scene.table.heightMode, padding, scene.table);
-                customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault, 
-                isHeightChange = !0;
+            let customElementsGroup;
+            if (customContainer.removeAllChild(), cell.removeChild(customContainer), !(0, custom_1.getCustomCellMergeCustom)(col, row, cell, scene.table)) {
+                let customRender, customLayout;
+                if ("body" !== scene.table.getCellLocation(col, row)) {
+                    const define = scene.table.getHeaderDefine(col, row);
+                    customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout;
+                } else {
+                    const define = scene.table.getBodyColumnDefine(col, row);
+                    customRender = (null == define ? void 0 : define.customRender) || scene.table.customRender, 
+                    customLayout = null == define ? void 0 : define.customLayout;
+                }
+                if (customLayout || customRender) {
+                    const style = scene.table._getCellStyle(col, row), padding = (0, padding_1.getQuadProps)((0, 
+                    get_prop_1.getProp)("padding", style, col, row, scene.table)), customResult = (0, 
+                    custom_1.dealWithCustom)(customLayout, customRender, col, row, cellGroup.attribute.width, cellGroup.attribute.height, !1, "autoHeight" === scene.table.heightMode, padding, scene.table);
+                    customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault, 
+                    isHeightChange = !0;
+                }
+                cell.childrenCount > 0 && customElementsGroup ? cell.insertBefore(customElementsGroup, cell.firstChild) : customElementsGroup && cell.appendChild(customElementsGroup);
             }
-            cell.childrenCount > 0 ? cell.insertBefore(customElementsGroup, cell.firstChild) : cell.appendChild(customElementsGroup);
         }
         if (renderDefault) {
             const style = scene.table._getCellStyle(col, row);

package/cjs/scenegraph/layout/update-width.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/layout/update-width.ts"],"names":[],"mappings":"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","file":"update-width.js","sourcesContent":["import type { IGraphic } from './../../vrender';\nimport type { ProgressBarStyle } from '../../body-helper/style/ProgressBarStyle';\nimport { CartesianAxis } from '../../components/axis/axis';\nimport { getStyleTheme } from '../../core/tableHelper';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { IProgressbarColumnBodyDefine } from '../../ts-types/list-table/define/progressbar-define';\nimport { dealWithCustom } from '../component/custom';\nimport type { Group } from '../graphic/group';\nimport type { Icon } from '../graphic/icon';\nimport { updateImageCellContentWhileResize } from '../group-creater/cell-type/image-cell';\nimport { createProgressBarCell } from '../group-creater/cell-type/progress-bar-cell';\nimport { createSparkLineCellGroup } from '../group-creater/cell-type/spark-line-cell';\nimport { resizeCellGroup } from '../group-creater/column-helper';\nimport type { Scenegraph } from '../scenegraph';\nimport { getCellMergeInfo } from '../utils/get-cell-merge';\nimport { getProp } from '../utils/get-prop';\nimport { isMergeCellGroup } from '../utils/is-merge-cell-group';\nimport { getQuadProps } from '../utils/padding';\nimport { updateCellContentWidth } from '../utils/text-icon-layout';\nimport { computeRowHeight, computeRowsHeight } from './compute-row-height';\nimport { updateCellHeightForRow } from './update-height';\nimport { getHierarchyOffset } from '../utils/get-hierarchy-offset';\n// import { updateAutoRowHeight } from './auto-height';\n\n/**\n * @description: 更新指定列列宽，在拖拽调整列宽中使用\n * @param {Scenegraph} scene\n * @param {number} col\n * @param {number} detaX\n * @return {*}\n */\nexport function updateColWidth(scene: Scenegraph, col: number, detaX: number, skipTableWidthMap?: boolean) {\n  if (!skipTableWidthMap) {\n    scene.table._setColWidth(col, scene.table.getColWidth(col) + detaX, true);\n  }\n\n  const autoRowHeight = scene.table.heightMode === 'autoHeight';\n  // deal with corner header or column header\n  const colOrCornerHeaderColumn = scene.getColGroup(col, true) as Group;\n  const rightTopColumn = scene.getColGroupInRightTopCorner(col);\n  if (colOrCornerHeaderColumn && !rightTopColumn) {\n    updateColunmWidth(colOrCornerHeaderColumn, detaX, autoRowHeight, 'col-corner', scene);\n  }\n  // deal with right bottom frozen cells\n  if (rightTopColumn) {\n    updateColunmWidth(rightTopColumn, detaX, autoRowHeight, 'right-top', scene);\n  }\n\n  // deal with row header or body or right frozen cells\n  const rowHeaderOrBodyColumn = scene.getColGroup(col) as Group;\n  if (rowHeaderOrBodyColumn) {\n    updateColunmWidth(rowHeaderOrBodyColumn, detaX, autoRowHeight, 'row-body', scene);\n  }\n\n  const leftBottomColumn = scene.getColGroupInLeftBottomCorner(col);\n  // deal with left bottom frozen cells\n  if (leftBottomColumn) {\n    updateColunmWidth(leftBottomColumn, detaX, autoRowHeight, 'left-bottom', scene);\n  }\n  // deal with bottom frozen cells\n  const bottomColumn = scene.getColGroupInBottom(col);\n  if (bottomColumn) {\n    updateColunmWidth(bottomColumn, detaX, autoRowHeight, 'bottom', scene);\n  }\n  // deal with right bottom frozen cells\n  const rightBottomColumn = scene.getColGroupInRightBottomCorner(col);\n  if (rightBottomColumn) {\n    updateColunmWidth(rightBottomColumn, detaX, autoRowHeight, 'right-bottom', scene);\n  }\n\n  // 更新剩余列位置\n  if (col < scene.frozenColCount) {\n    scene.cornerHeaderGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n    scene.rowHeaderGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n  } else {\n    scene.colHeaderGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n    scene.bodyGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n  }\n\n  if (leftBottomColumn) {\n    scene.leftBottomCornerGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n  }\n  if (bottomColumn) {\n    scene.bottomFrozenGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n  }\n  if (rightBottomColumn) {\n    scene.rightBottomCornerGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n  }\n\n  // scene.table.setColWidth(col, rowHeaderOrBodyColumn.attribute.width, true);\n}\n\nfunction updateColunmWidth(\n  columnGroup: Group,\n  detaX: number,\n  autoRowHeight: boolean,\n  mode: 'col-corner' | 'row-body' | 'bottom' | 'left-bottom' | 'right-top' | 'right-bottom',\n  scene: Scenegraph\n) {\n  let needRerangeRow = false;\n  // const colOrCornerHeaderColumn = scene.getColGroup(col, true) as Group;\n  const oldColumnWidth = columnGroup?.attribute.width ?? 0;\n  columnGroup?.setAttribute('width', oldColumnWidth + detaX);\n  // 更新单元格宽度\n  columnGroup?.forEachChildren((cell: Group, index: number) => {\n    const isHeightChange = updateCellWidth(\n      scene,\n      cell,\n      cell.col,\n      cell.row,\n      oldColumnWidth,\n      oldColumnWidth + detaX,\n      detaX,\n      mode === 'row-body' ? cell.col < scene.table.rowHeaderLevelCount : true,\n      autoRowHeight\n    );\n    if (isHeightChange) {\n      const mergeInfo = getCellMergeInfo(scene.table, cell.col, cell.row);\n      if (mergeInfo && mergeInfo.end.row - mergeInfo.start.row) {\n        for (let row = mergeInfo.start.row; row <= mergeInfo.end.row; row++) {\n          resetRowHeight(scene, row);\n        }\n      } else {\n        resetRowHeight(scene, cell.row);\n      }\n      needRerangeRow = true;\n    }\n  });\n\n  if (needRerangeRow) {\n    let newTotalHeight = 0;\n    let colGroup;\n    let oldContainerHeight;\n    let row;\n    for (let col = 0; col < scene.table.colCount; col++) {\n      // const colGroup = scene.getColGroup(col, true);\n      if (mode === 'col-corner') {\n        row = 0;\n        colGroup = scene.getColGroup(col, true);\n        oldContainerHeight = scene.colHeaderGroup.attribute.height ?? 0;\n      } else if (mode === 'row-body') {\n        row = scene.table.frozenRowCount;\n        colGroup = scene.getColGroup(col, false);\n        oldContainerHeight = scene.bodyGroup.attribute.height ?? 0;\n      } else if (mode === 'bottom') {\n        row = scene.table.rowCount - scene.table.bottomFrozenRowCount;\n        colGroup = scene.getColGroupInBottom(col);\n        oldContainerHeight = scene.bottomFrozenGroup.attribute.height ?? 0;\n      } else if (mode === 'left-bottom') {\n        row = scene.table.rowCount - scene.table.bottomFrozenRowCount;\n        colGroup = scene.getColGroupInLeftBottomCorner(col);\n        oldContainerHeight = scene.leftBottomCornerGroup.attribute.height ?? 0;\n      } else if (mode === 'right-top') {\n        row = 0;\n        colGroup = scene.getColGroupInRightTopCorner(col);\n        oldContainerHeight = scene.rightTopCornerGroup.attribute.height ?? 0;\n      } else if (mode === 'right-bottom') {\n        row = scene.table.rowCount - scene.table.bottomFrozenRowCount;\n        colGroup = scene.getColGroupInRightBottomCorner(col);\n        oldContainerHeight = scene.rightBottomCornerGroup.attribute.height ?? 0;\n      }\n      if (!colGroup) {\n        continue;\n      }\n      let y = 0;\n      colGroup.forEachChildren((cellGroup: Group) => {\n        // if (cellGroup.role !== 'cell') {\n        //   cellGroup.setAttribute('y', y);\n        //   y += scene.table.getRowHeight(cellGroup.row) ?? 0;\n        //   return;\n        // }\n        // y += cellGroup.attribute.height ?? 0;\n        cellGroup.setAttribute('y', y);\n        y += scene.table.getRowHeight(cellGroup.row) ?? 0;\n      });\n      newTotalHeight = y;\n    }\n    scene.updateContainerHeight(row, newTotalHeight - oldContainerHeight);\n  }\n}\n\n/**\n * @description: 更新单个单元格宽度\n * @return {*}\n */\nfunction updateCellWidth(\n  scene: Scenegraph,\n  cell: Group,\n  col: number,\n  row: number,\n  oldWidth: number, // old width, not dist\n  distWidth: number, // old width, not dist\n  detaX: number,\n  isHeader: boolean,\n  // autoColWidth: boolean,\n  autoRowHeight: boolean\n): boolean {\n  if (cell.attribute.width === distWidth && !cell.needUpdateWidth) {\n    return false;\n  }\n  cell.needUpdateWidth = false;\n\n  cell.setAttribute('width', distWidth);\n  // const mergeInfo = getCellMergeInfo(scene.table, col, row);\n  // if (mergeInfo && mergeInfo.start.row !== row) {\n  //   return false;\n  // }\n  const cellGroup = cell;\n  // const distWidth = width + detaX;\n\n  if (!cellGroup) {\n    // 合并单元格非主单元格，不处理\n    return false;\n  }\n\n  // 更新单元格布局\n  const type = scene.table.isHeader(col, row)\n    ? scene.table._getHeaderLayoutMap(col, row).headerType\n    : scene.table.getBodyColumnType(col, row);\n  let isHeightChange = false;\n  if (type === 'progressbar') {\n    // 目前先采用重新生成节点的方案\n    const columnDefine = scene.table.getBodyColumnDefine(col, row) as IProgressbarColumnBodyDefine;\n    const style = scene.table._getCellStyle(col, row) as ProgressBarStyle;\n    const value = scene.table.getCellValue(col, row);\n    const dataValue = scene.table.getCellOriginValue(col, row);\n    const padding = getQuadProps(getProp('padding', style, col, row, scene.table));\n\n    const newBarCell = createProgressBarCell(\n      columnDefine,\n      style,\n      cellGroup.attribute.width,\n      // cellGroup.attribute.height,\n      value,\n      dataValue,\n      col,\n      row,\n      padding,\n      scene.table\n    );\n\n    const oldBarCell = cellGroup.getChildByName('progress-bar') as Group;\n    // cell.replaceChild(newBarCell, oldBarCell);\n    cellGroup.insertBefore(newBarCell, oldBarCell);\n    cellGroup.removeChild(oldBarCell);\n    oldBarCell.removeAllChild();\n    oldBarCell.release();\n  } else if (type === 'sparkline') {\n    // 目前先采用重新生成节点的方案\n    cellGroup.removeAllChild();\n    const headerStyle = scene.table._getCellStyle(col, row);\n    const padding = getQuadProps(getProp('padding', headerStyle, col, row, scene.table));\n    createSparkLineCellGroup(\n      cellGroup,\n      cellGroup.parent,\n      cellGroup.attribute.x,\n      cellGroup.attribute.y,\n      col,\n      row,\n      cellGroup.attribute.width,\n      cellGroup.attribute.height,\n      padding,\n      scene.table,\n      getStyleTheme(headerStyle, scene.table, col, row, getProp).theme\n    );\n  } else if (type === 'image' || type === 'video') {\n    // // 只更新背景边框\n    // const rect = cell.firstChild as Rect;\n    // rect.setAttribute('width', cell.attribute.width);\n    updateImageCellContentWhileResize(cellGroup, col, row, scene.table);\n  } else if (cellGroup.firstChild?.name === 'axis') {\n    // recreate axis component\n    const axisConfig = scene.table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);\n    const cellStyle = scene.table._getCellStyle(col, row);\n    const padding = getQuadProps(getProp('padding', cellStyle, col, row, scene.table));\n    if (axisConfig) {\n      const axis = new CartesianAxis(\n        axisConfig,\n        cellGroup.attribute.width,\n        cellGroup.attribute.height,\n        padding,\n        scene.table\n      );\n      cellGroup.clear();\n      cellGroup.appendChild(axis.component);\n      axis.overlap();\n    }\n  } else if (cell.firstChild?.name === 'axis') {\n    (cell.firstChild as any)?.originAxis.resize(cell.attribute.width, cell.attribute.height);\n  } else {\n    let renderDefault = true;\n    const customContainer = cell.getChildByName('custom-container') as Group;\n    if (customContainer) {\n      let customElementsGroup;\n      customContainer.removeAllChild();\n      cell.removeChild(customContainer);\n\n      let customRender;\n      let customLayout;\n      const cellType = scene.table.getCellLocation(col, row);\n      if (cellType !== 'body') {\n        const define = scene.table.getHeaderDefine(col, row);\n        customRender = define?.headerCustomRender;\n        customLayout = define?.headerCustomLayout;\n      } else {\n        const define = scene.table.getBodyColumnDefine(col, row);\n        customRender = define?.customRender || scene.table.customRender;\n        customLayout = define?.customLayout;\n      }\n\n      if (customLayout || customRender) {\n        // const { autoRowHeight } = table.internalProps;\n        const style = scene.table._getCellStyle(col, row) as ProgressBarStyle;\n        const padding = getQuadProps(getProp('padding', style, col, row, scene.table));\n        const customResult = dealWithCustom(\n          customLayout,\n          customRender,\n          col,\n          row,\n          cellGroup.attribute.width,\n          cellGroup.attribute.height,\n          false,\n          scene.table.heightMode === 'autoHeight',\n          padding,\n          scene.table\n        );\n        customElementsGroup = customResult.elementsGroup;\n        renderDefault = customResult.renderDefault;\n        isHeightChange = true;\n      }\n\n      if (cell.childrenCount > 0) {\n        cell.insertBefore(customElementsGroup, cell.firstChild);\n      } else {\n        cell.appendChild(customElementsGroup);\n      }\n    }\n\n    if (renderDefault) {\n      // 处理文字\n      const style = scene.table._getCellStyle(col, row);\n      isHeightChange = updateMergeCellContentWidth(\n        cellGroup,\n        distWidth,\n        detaX,\n        autoRowHeight,\n        getQuadProps(style.padding as number),\n        style.textAlign,\n        style.textBaseline,\n        scene.table\n      );\n    }\n  }\n\n  return autoRowHeight ? isHeightChange : false;\n}\n\nfunction updateMergeCellContentWidth(\n  cellGroup: Group,\n  distWidth: number,\n  detaX: number,\n  autoRowHeight: boolean,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  table: BaseTableAPI\n) {\n  if (isMergeCellGroup(cellGroup)) {\n    distWidth = 0;\n    let isHeightChange = false;\n    for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {\n      distWidth += table.getColWidth(col);\n    }\n    let cellHeight = 0;\n    for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {\n      cellHeight += table.getRowHeight(row);\n    }\n\n    for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {\n      for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {\n        const singleCellGroup = table.scenegraph.getCell(col, row);\n        singleCellGroup.forEachChildren((child: IGraphic) => {\n          child.setAttributes({\n            dx: 0,\n            dy: 0\n          });\n        });\n        const changed = updateCellContentWidth(\n          singleCellGroup,\n          distWidth,\n          cellHeight,\n          detaX,\n          autoRowHeight,\n          padding,\n          textAlign,\n          textBaseline,\n          table.scenegraph\n        );\n\n        // reset hierarchy offset\n        const hierarchyOffset = getHierarchyOffset(singleCellGroup.col, singleCellGroup.row, table);\n        if (hierarchyOffset) {\n          const text = singleCellGroup.getChildByName('text');\n          const icon = singleCellGroup.getChildByName('expand') || singleCellGroup.getChildByName('collapse');\n          // icon-left deal with hierarchy offset, no need add to text dx\n          if (icon?.role !== 'icon-left' && text) {\n            text.setAttribute('dx', hierarchyOffset);\n          }\n        }\n\n        const rangeHeight = table.getRowHeight(row);\n        const rangeWidth = table.getColWidth(col);\n\n        // const { width: contentWidth } = cellGroup.attribute;\n        singleCellGroup.contentWidth = distWidth;\n\n        const { heightChange } = resizeCellGroup(\n          singleCellGroup,\n          rangeWidth,\n          rangeHeight,\n          {\n            start: {\n              col: cellGroup.mergeStartCol,\n              row: cellGroup.mergeStartRow\n            },\n            end: {\n              col: cellGroup.mergeEndCol,\n              row: cellGroup.mergeEndRow\n            }\n          },\n          table\n        );\n\n        if (heightChange) {\n          singleCellGroup.needUpdateHeight = true;\n        }\n\n        isHeightChange = isHeightChange || changed;\n      }\n    }\n    return isHeightChange;\n  }\n  return updateCellContentWidth(\n    cellGroup,\n    distWidth,\n    table.getRowHeight(cellGroup.row),\n    detaX,\n    autoRowHeight,\n    padding,\n    textAlign,\n    textBaseline,\n    table.scenegraph\n  );\n}\n\n/**\n * @description: 重置指定行行高\n * @param {Scenegraph} scene\n * @param {number} row\n * @return {*}\n */\nfunction resetRowHeight(scene: Scenegraph, row: number) {\n  // 获取高度\n  const maxHeight = Math.round(computeRowHeight(row, 0, scene.table.colCount - 1, scene.table));\n  // 更新table行高存储\n  scene.table._setRowHeight(row, maxHeight, true);\n\n  // 更新高度\n  for (let col = 0; col < scene.table.colCount; col++) {\n    const distHeight = maxHeight;\n    const cell = scene.highPerformanceGetCell(col, row);\n    if (cell.role === 'empty') {\n      return;\n    }\n\n    updateCellHeightForRow(\n      scene,\n      cell,\n      col,\n      row,\n      distHeight,\n      distHeight - cell.attribute.height,\n      scene.table.isHeader(col, row)\n    );\n  }\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/layout/update-width.ts"],"names":[],"mappings":"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","file":"update-width.js","sourcesContent":["import type { IGraphic } from './../../vrender';\nimport type { ProgressBarStyle } from '../../body-helper/style/ProgressBarStyle';\nimport { CartesianAxis } from '../../components/axis/axis';\nimport { getStyleTheme } from '../../core/tableHelper';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { IProgressbarColumnBodyDefine } from '../../ts-types/list-table/define/progressbar-define';\nimport { dealWithCustom, getCustomCellMergeCustom } from '../component/custom';\nimport type { Group } from '../graphic/group';\nimport type { Icon } from '../graphic/icon';\nimport { updateImageCellContentWhileResize } from '../group-creater/cell-type/image-cell';\nimport { createProgressBarCell } from '../group-creater/cell-type/progress-bar-cell';\nimport { createSparkLineCellGroup } from '../group-creater/cell-type/spark-line-cell';\nimport { resizeCellGroup } from '../group-creater/column-helper';\nimport type { Scenegraph } from '../scenegraph';\nimport { getCellMergeInfo } from '../utils/get-cell-merge';\nimport { getProp } from '../utils/get-prop';\nimport { isMergeCellGroup } from '../utils/is-merge-cell-group';\nimport { getQuadProps } from '../utils/padding';\nimport { updateCellContentWidth } from '../utils/text-icon-layout';\nimport { computeRowHeight, computeRowsHeight } from './compute-row-height';\nimport { updateCellHeightForRow } from './update-height';\nimport { getHierarchyOffset } from '../utils/get-hierarchy-offset';\n// import { updateAutoRowHeight } from './auto-height';\n\n/**\n * @description: 更新指定列列宽，在拖拽调整列宽中使用\n * @param {Scenegraph} scene\n * @param {number} col\n * @param {number} detaX\n * @return {*}\n */\nexport function updateColWidth(scene: Scenegraph, col: number, detaX: number, skipTableWidthMap?: boolean) {\n  if (!skipTableWidthMap) {\n    scene.table._setColWidth(col, scene.table.getColWidth(col) + detaX, true);\n  }\n\n  const autoRowHeight = scene.table.heightMode === 'autoHeight';\n  // deal with corner header or column header\n  const colOrCornerHeaderColumn = scene.getColGroup(col, true) as Group;\n  const rightTopColumn = scene.getColGroupInRightTopCorner(col);\n  if (colOrCornerHeaderColumn && !rightTopColumn) {\n    updateColunmWidth(colOrCornerHeaderColumn, detaX, autoRowHeight, 'col-corner', scene);\n  }\n  // deal with right bottom frozen cells\n  if (rightTopColumn) {\n    updateColunmWidth(rightTopColumn, detaX, autoRowHeight, 'right-top', scene);\n  }\n\n  // deal with row header or body or right frozen cells\n  const rowHeaderOrBodyColumn = scene.getColGroup(col) as Group;\n  if (rowHeaderOrBodyColumn) {\n    updateColunmWidth(rowHeaderOrBodyColumn, detaX, autoRowHeight, 'row-body', scene);\n  }\n\n  const leftBottomColumn = scene.getColGroupInLeftBottomCorner(col);\n  // deal with left bottom frozen cells\n  if (leftBottomColumn) {\n    updateColunmWidth(leftBottomColumn, detaX, autoRowHeight, 'left-bottom', scene);\n  }\n  // deal with bottom frozen cells\n  const bottomColumn = scene.getColGroupInBottom(col);\n  if (bottomColumn) {\n    updateColunmWidth(bottomColumn, detaX, autoRowHeight, 'bottom', scene);\n  }\n  // deal with right bottom frozen cells\n  const rightBottomColumn = scene.getColGroupInRightBottomCorner(col);\n  if (rightBottomColumn) {\n    updateColunmWidth(rightBottomColumn, detaX, autoRowHeight, 'right-bottom', scene);\n  }\n\n  // 更新剩余列位置\n  if (col < scene.frozenColCount) {\n    scene.cornerHeaderGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n    scene.rowHeaderGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n  } else {\n    scene.colHeaderGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n    scene.bodyGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n  }\n\n  if (leftBottomColumn) {\n    scene.leftBottomCornerGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n  }\n  if (bottomColumn) {\n    scene.bottomFrozenGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n  }\n  if (rightBottomColumn) {\n    scene.rightBottomCornerGroup.forEachChildrenSkipChild((column: Group, index) => {\n      if (column.col > col) {\n        column.setAttribute('x', column.attribute.x + detaX);\n      }\n    });\n  }\n\n  // scene.table.setColWidth(col, rowHeaderOrBodyColumn.attribute.width, true);\n}\n\nfunction updateColunmWidth(\n  columnGroup: Group,\n  detaX: number,\n  autoRowHeight: boolean,\n  mode: 'col-corner' | 'row-body' | 'bottom' | 'left-bottom' | 'right-top' | 'right-bottom',\n  scene: Scenegraph\n) {\n  let needRerangeRow = false;\n  // const colOrCornerHeaderColumn = scene.getColGroup(col, true) as Group;\n  const oldColumnWidth = columnGroup?.attribute.width ?? 0;\n  columnGroup?.setAttribute('width', oldColumnWidth + detaX);\n  // 更新单元格宽度\n  columnGroup?.forEachChildren((cell: Group, index: number) => {\n    const isHeightChange = updateCellWidth(\n      scene,\n      cell,\n      cell.col,\n      cell.row,\n      oldColumnWidth,\n      oldColumnWidth + detaX,\n      detaX,\n      mode === 'row-body' ? cell.col < scene.table.rowHeaderLevelCount : true,\n      autoRowHeight\n    );\n    if (isHeightChange) {\n      const mergeInfo = getCellMergeInfo(scene.table, cell.col, cell.row);\n      if (mergeInfo && mergeInfo.end.row - mergeInfo.start.row) {\n        for (let row = mergeInfo.start.row; row <= mergeInfo.end.row; row++) {\n          resetRowHeight(scene, row);\n        }\n      } else {\n        resetRowHeight(scene, cell.row);\n      }\n      needRerangeRow = true;\n    }\n  });\n\n  if (needRerangeRow) {\n    let newTotalHeight = 0;\n    let colGroup;\n    let oldContainerHeight;\n    let row;\n    for (let col = 0; col < scene.table.colCount; col++) {\n      // const colGroup = scene.getColGroup(col, true);\n      if (mode === 'col-corner') {\n        row = 0;\n        colGroup = scene.getColGroup(col, true);\n        oldContainerHeight = scene.colHeaderGroup.attribute.height ?? 0;\n      } else if (mode === 'row-body') {\n        row = scene.table.frozenRowCount;\n        colGroup = scene.getColGroup(col, false);\n        oldContainerHeight = scene.bodyGroup.attribute.height ?? 0;\n      } else if (mode === 'bottom') {\n        row = scene.table.rowCount - scene.table.bottomFrozenRowCount;\n        colGroup = scene.getColGroupInBottom(col);\n        oldContainerHeight = scene.bottomFrozenGroup.attribute.height ?? 0;\n      } else if (mode === 'left-bottom') {\n        row = scene.table.rowCount - scene.table.bottomFrozenRowCount;\n        colGroup = scene.getColGroupInLeftBottomCorner(col);\n        oldContainerHeight = scene.leftBottomCornerGroup.attribute.height ?? 0;\n      } else if (mode === 'right-top') {\n        row = 0;\n        colGroup = scene.getColGroupInRightTopCorner(col);\n        oldContainerHeight = scene.rightTopCornerGroup.attribute.height ?? 0;\n      } else if (mode === 'right-bottom') {\n        row = scene.table.rowCount - scene.table.bottomFrozenRowCount;\n        colGroup = scene.getColGroupInRightBottomCorner(col);\n        oldContainerHeight = scene.rightBottomCornerGroup.attribute.height ?? 0;\n      }\n      if (!colGroup) {\n        continue;\n      }\n      let y = 0;\n      colGroup.forEachChildren((cellGroup: Group) => {\n        cellGroup.setAttribute('y', y);\n        y += scene.table.getRowHeight(cellGroup.row) ?? 0;\n      });\n      newTotalHeight = y;\n    }\n    scene.updateContainerHeight(row, newTotalHeight - oldContainerHeight);\n    //#region 修改bug:https://github.com/VisActor/VTable/issues/954 添加底部冻结行的三块区域\n    for (let col = 0; col < scene.table.frozenColCount; col++) {\n      const leftBottomFrozenColumnGroup = scene.getColGroupInLeftBottomCorner(col);\n      // reset cell y\n      let y = 0;\n      leftBottomFrozenColumnGroup.forEachChildren((cellGroup: Group) => {\n        cellGroup.setAttribute('y', y);\n        y += scene.table.getRowHeight(cellGroup.row);\n      });\n    }\n    for (let col = scene.table.colCount - scene.table.rightFrozenColCount; col < scene.table.colCount; col++) {\n      const rightBottomFrozenColumnGroup = scene.getColGroupInRightBottomCorner(col);\n      // reset cell y\n      let y = 0;\n      rightBottomFrozenColumnGroup.forEachChildren((cellGroup: Group) => {\n        cellGroup.setAttribute('y', y);\n        y += scene.table.getRowHeight(cellGroup.row);\n      });\n    }\n\n    for (let col = scene.table.frozenColCount; col < scene.table.colCount - scene.table.rightFrozenColCount; col++) {\n      const rightBottomFrozenColumnGroup = scene.getColGroupInBottom(col);\n      // reset cell y\n      let y = 0;\n      rightBottomFrozenColumnGroup.forEachChildren((cellGroup: Group) => {\n        cellGroup.setAttribute('y', y);\n        y += scene.table.getRowHeight(cellGroup.row);\n      });\n    }\n    //#endregion\n  }\n}\n\n/**\n * @description: 更新单个单元格宽度\n * @return {*}\n */\nfunction updateCellWidth(\n  scene: Scenegraph,\n  cell: Group,\n  col: number,\n  row: number,\n  oldWidth: number, // old width, not dist\n  distWidth: number, // old width, not dist\n  detaX: number,\n  isHeader: boolean,\n  // autoColWidth: boolean,\n  autoRowHeight: boolean\n): boolean {\n  if (cell.attribute.width === distWidth && !cell.needUpdateWidth) {\n    return false;\n  }\n  cell.needUpdateWidth = false;\n\n  cell.setAttribute('width', distWidth);\n  // const mergeInfo = getCellMergeInfo(scene.table, col, row);\n  // if (mergeInfo && mergeInfo.start.row !== row) {\n  //   return false;\n  // }\n  const cellGroup = cell;\n  // const distWidth = width + detaX;\n\n  if (!cellGroup) {\n    // 合并单元格非主单元格，不处理\n    return false;\n  }\n\n  // 更新单元格布局\n  const type = scene.table.isHeader(col, row)\n    ? scene.table._getHeaderLayoutMap(col, row).headerType\n    : scene.table.getBodyColumnType(col, row);\n  let isHeightChange = false;\n  if (type === 'progressbar') {\n    // 目前先采用重新生成节点的方案\n    const columnDefine = scene.table.getBodyColumnDefine(col, row) as IProgressbarColumnBodyDefine;\n    const style = scene.table._getCellStyle(col, row) as ProgressBarStyle;\n    const value = scene.table.getCellValue(col, row);\n    const dataValue = scene.table.getCellOriginValue(col, row);\n    const padding = getQuadProps(getProp('padding', style, col, row, scene.table));\n\n    const newBarCell = createProgressBarCell(\n      columnDefine,\n      style,\n      cellGroup.attribute.width,\n      // cellGroup.attribute.height,\n      value,\n      dataValue,\n      col,\n      row,\n      padding,\n      scene.table\n    );\n\n    const oldBarCell = cellGroup.getChildByName('progress-bar') as Group;\n    // cell.replaceChild(newBarCell, oldBarCell);\n    cellGroup.insertBefore(newBarCell, oldBarCell);\n    cellGroup.removeChild(oldBarCell);\n    oldBarCell.removeAllChild();\n    oldBarCell.release();\n  } else if (type === 'sparkline') {\n    // 目前先采用重新生成节点的方案\n    cellGroup.removeAllChild();\n    const headerStyle = scene.table._getCellStyle(col, row);\n    const padding = getQuadProps(getProp('padding', headerStyle, col, row, scene.table));\n    createSparkLineCellGroup(\n      cellGroup,\n      cellGroup.parent,\n      cellGroup.attribute.x,\n      cellGroup.attribute.y,\n      col,\n      row,\n      cellGroup.attribute.width,\n      cellGroup.attribute.height,\n      padding,\n      scene.table,\n      getStyleTheme(headerStyle, scene.table, col, row, getProp).theme\n    );\n  } else if (type === 'image' || type === 'video') {\n    // // 只更新背景边框\n    // const rect = cell.firstChild as Rect;\n    // rect.setAttribute('width', cell.attribute.width);\n    updateImageCellContentWhileResize(cellGroup, col, row, scene.table);\n  } else if (cellGroup.firstChild?.name === 'axis') {\n    // recreate axis component\n    const axisConfig = scene.table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);\n    const cellStyle = scene.table._getCellStyle(col, row);\n    const padding = getQuadProps(getProp('padding', cellStyle, col, row, scene.table));\n    if (axisConfig) {\n      const axis = new CartesianAxis(\n        axisConfig,\n        cellGroup.attribute.width,\n        cellGroup.attribute.height,\n        padding,\n        scene.table\n      );\n      cellGroup.clear();\n      cellGroup.appendChild(axis.component);\n      axis.overlap();\n    }\n  } else if (cell.firstChild?.name === 'axis') {\n    (cell.firstChild as any)?.originAxis.resize(cell.attribute.width, cell.attribute.height);\n  } else {\n    let renderDefault = true;\n    const customContainer = cell.getChildByName('custom-container') as Group;\n    if (customContainer) {\n      let customElementsGroup;\n      customContainer.removeAllChild();\n      cell.removeChild(customContainer);\n\n      if (!getCustomCellMergeCustom(col, row, cell, scene.table)) {\n        let customRender;\n        let customLayout;\n        const cellType = scene.table.getCellLocation(col, row);\n        if (cellType !== 'body') {\n          const define = scene.table.getHeaderDefine(col, row);\n          customRender = define?.headerCustomRender;\n          customLayout = define?.headerCustomLayout;\n        } else {\n          const define = scene.table.getBodyColumnDefine(col, row);\n          customRender = define?.customRender || scene.table.customRender;\n          customLayout = define?.customLayout;\n        }\n\n        if (customLayout || customRender) {\n          // const { autoRowHeight } = table.internalProps;\n          const style = scene.table._getCellStyle(col, row) as ProgressBarStyle;\n          const padding = getQuadProps(getProp('padding', style, col, row, scene.table));\n          const customResult = dealWithCustom(\n            customLayout,\n            customRender,\n            col,\n            row,\n            cellGroup.attribute.width,\n            cellGroup.attribute.height,\n            false,\n            scene.table.heightMode === 'autoHeight',\n            padding,\n            scene.table\n          );\n          customElementsGroup = customResult.elementsGroup;\n          renderDefault = customResult.renderDefault;\n          isHeightChange = true;\n        }\n\n        if (cell.childrenCount > 0 && customElementsGroup) {\n          cell.insertBefore(customElementsGroup, cell.firstChild);\n        } else if (customElementsGroup) {\n          cell.appendChild(customElementsGroup);\n        }\n      }\n    }\n\n    if (renderDefault) {\n      // 处理文字\n      const style = scene.table._getCellStyle(col, row);\n      isHeightChange = updateMergeCellContentWidth(\n        cellGroup,\n        distWidth,\n        detaX,\n        autoRowHeight,\n        getQuadProps(style.padding as number),\n        style.textAlign,\n        style.textBaseline,\n        scene.table\n      );\n    }\n  }\n\n  return autoRowHeight ? isHeightChange : false;\n}\n\nfunction updateMergeCellContentWidth(\n  cellGroup: Group,\n  distWidth: number,\n  detaX: number,\n  autoRowHeight: boolean,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  table: BaseTableAPI\n) {\n  if (isMergeCellGroup(cellGroup)) {\n    distWidth = 0;\n    let isHeightChange = false;\n    for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {\n      distWidth += table.getColWidth(col);\n    }\n    let cellHeight = 0;\n    for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {\n      cellHeight += table.getRowHeight(row);\n    }\n\n    for (let col = cellGroup.mergeStartCol; col <= cellGroup.mergeEndCol; col++) {\n      for (let row = cellGroup.mergeStartRow; row <= cellGroup.mergeEndRow; row++) {\n        const singleCellGroup = table.scenegraph.getCell(col, row);\n        singleCellGroup.forEachChildren((child: IGraphic) => {\n          child.setAttributes({\n            dx: 0,\n            dy: 0\n          });\n        });\n        const changed = updateCellContentWidth(\n          singleCellGroup,\n          distWidth,\n          cellHeight,\n          detaX,\n          autoRowHeight,\n          padding,\n          textAlign,\n          textBaseline,\n          table.scenegraph\n        );\n\n        // reset hierarchy offset\n        const hierarchyOffset = getHierarchyOffset(singleCellGroup.col, singleCellGroup.row, table);\n        if (hierarchyOffset) {\n          const text = singleCellGroup.getChildByName('text');\n          const icon = singleCellGroup.getChildByName('expand') || singleCellGroup.getChildByName('collapse');\n          // icon-left deal with hierarchy offset, no need add to text dx\n          if (icon?.role !== 'icon-left' && text) {\n            text.setAttribute('dx', hierarchyOffset);\n          }\n        }\n\n        const rangeHeight = table.getRowHeight(row);\n        const rangeWidth = table.getColWidth(col);\n\n        // const { width: contentWidth } = cellGroup.attribute;\n        singleCellGroup.contentWidth = distWidth;\n\n        const { heightChange } = resizeCellGroup(\n          singleCellGroup,\n          rangeWidth,\n          rangeHeight,\n          {\n            start: {\n              col: cellGroup.mergeStartCol,\n              row: cellGroup.mergeStartRow\n            },\n            end: {\n              col: cellGroup.mergeEndCol,\n              row: cellGroup.mergeEndRow\n            }\n          },\n          table\n        );\n\n        if (heightChange) {\n          singleCellGroup.needUpdateHeight = true;\n        }\n\n        isHeightChange = isHeightChange || changed;\n      }\n    }\n    return isHeightChange;\n  }\n  return updateCellContentWidth(\n    cellGroup,\n    distWidth,\n    table.getRowHeight(cellGroup.row),\n    detaX,\n    autoRowHeight,\n    padding,\n    textAlign,\n    textBaseline,\n    table.scenegraph\n  );\n}\n\n/**\n * @description: 重置指定行行高\n * @param {Scenegraph} scene\n * @param {number} row\n * @return {*}\n */\nfunction resetRowHeight(scene: Scenegraph, row: number) {\n  // 获取高度\n  const maxHeight = Math.round(computeRowHeight(row, 0, scene.table.colCount - 1, scene.table));\n  // 更新table行高存储\n  scene.table._setRowHeight(row, maxHeight, true);\n\n  // 更新高度\n  for (let col = 0; col < scene.table.colCount; col++) {\n    const distHeight = maxHeight;\n    const cell = scene.highPerformanceGetCell(col, row);\n    if (cell.role === 'empty') {\n      return;\n    }\n\n    updateCellHeightForRow(\n      scene,\n      cell,\n      col,\n      row,\n      distHeight,\n      distHeight - cell.attribute.height,\n      scene.table.isHeader(col, row)\n    );\n  }\n}\n"]}

package/cjs/scenegraph/scenegraph.d.ts

@@ -1,5 +1,5 @@
 import type { IStage, IRect } from './../vrender';
-import type { CellSubLocation } from '../ts-types';
+import type { CellRange, CellSubLocation } from '../ts-types';
 import { type CellAddress, type SortOrder } from '../ts-types';
 import type { Group } from './graphic/group';
 import type { Icon } from './graphic/icon';
@@ -119,7 +119,7 @@ export declare class Scenegraph {
     dealFrozen(): void;
     resetFrozen(): void;
     updateCellLayoutWidthCertainWidth(columnGroup: Group, detaRow: number, col: number): boolean;
-    updateHeaderPosition(colSource: number, rowSource: number, colTarget: number, rowTarget: number): void;
+    updateHeaderPosition(colSource: number, rowSource: number, colTarget: number, rowTarget: number, sourceMergeInfo: false | CellRange, targetMergeInfo: false | CellRange): void;
     updateContainerAttrWidthAndX(): void;
     updateContainer(): void;
     updateCellContentWhileResize(col: number, row: number): void;

package/cjs/scenegraph/scenegraph.js

@@ -389,14 +389,17 @@ class Scenegraph {
         }));
     }
     updateRowHeight(row, detaY, skipTableHeightMap) {
-        detaY = Math.round(detaY), (0, update_height_1.updateRowHeight)(this, row, detaY, skipTableHeightMap), 
-        this.updateContainerHeight(row, detaY);
+        row >= this.proxy.rowStart && row <= this.proxy.rowEnd && (detaY = Math.round(detaY), 
+        (0, update_height_1.updateRowHeight)(this, row, detaY, skipTableHeightMap), this.updateContainerHeight(row, detaY));
     }
     updateRowsHeight(rows, detaYs, skipTableHeightMap) {
         for (let i = 0; i < rows.length; i++) {
-            const row = rows[i], detaY = detaYs[i];
-            (0, update_height_1.updateRowHeight)(this, row, Math.round(detaY), skipTableHeightMap), 
-            this._updateContainerHeight(row, detaY);
+            const row = rows[i];
+            if (row >= this.proxy.rowStart && row <= this.proxy.rowEnd) {
+                const detaY = detaYs[i];
+                (0, update_height_1.updateRowHeight)(this, row, Math.round(detaY), skipTableHeightMap), 
+                this._updateContainerHeight(row, detaY);
+            }
         }
         this.updateTableSize(), this.component.updateScrollBar(), this.updateNextFrame();
     }
@@ -553,8 +556,8 @@ class Scenegraph {
             (rowHeight === oldCellHeight || newCellHeight > rowHeight) && (isUpdate = !0));
         })), isUpdate;
     }
-    updateHeaderPosition(colSource, rowSource, colTarget, rowTarget) {
-        (0, move_cell_1.moveHeaderPosition)(colSource, rowSource, colTarget, rowTarget, this.table);
+    updateHeaderPosition(colSource, rowSource, colTarget, rowTarget, sourceMergeInfo, targetMergeInfo) {
+        (0, move_cell_1.moveHeaderPosition)(colSource, rowSource, colTarget, rowTarget, sourceMergeInfo, targetMergeInfo, this.table);
     }
     updateContainerAttrWidthAndX() {
         var _a, _b, _c;