@visactor/vtable 0.9.1-alpha.4 → 0.9.1

package/cjs/scenegraph/layout/frozen.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.resetFrozen = exports.dealFrozen = void 0;
+
+const group_1 = require("../graphic/group");
+
+function dealFrozen(scene) {
+    var _a, _b;
+    if (scene.table.frozenColCount > scene.table.rowHeaderLevelCount) {
+        scene.rowHeaderGroup.setAttribute("height", scene.bodyGroup.attribute.height), scene.rowHeaderGroup.setAttribute("y", scene.bodyGroup.attribute.y), 
+        scene.cornerHeaderGroup.setAttribute("height", scene.colHeaderGroup.attribute.height);
+        for (let i = 0; i < scene.table.frozenColCount - scene.table.rowHeaderLevelCount; i++) moveColumnFromBodyToRowHeader(scene), 
+        moveColumnFromColHeaderToCornerHeader(scene);
+    } else if (scene.table.frozenColCount < scene.table.rowHeaderLevelCount) for (let i = 0; i < scene.table.rowHeaderLevelCount - scene.table.frozenColCount; i++) moveColumnFromRowHeaderToBody(scene), 
+    moveColumnFromCornerHeaderToColHeader(scene);
+    scene.bodyGroup.setAttribute("x", scene.rowHeaderGroup.attribute.width), scene.colHeaderGroup.setAttribute("x", scene.cornerHeaderGroup.attribute.width), 
+    scene.updateContainer(), scene.updateBorderSizeAndPosition(), scene.isPivot || scene.transpose || scene.component.setFrozenColumnShadow(scene.table.frozenColCount - 1), 
+    scene.hasFrozen = !0, scene.frozenColCount = scene.table.frozenColCount, scene.frozenRowCount = null !== (_b = null === (_a = scene.colHeaderGroup.firstChild) || void 0 === _a ? void 0 : _a.childrenCount) && void 0 !== _b ? _b : 0;
+}
+
+function resetFrozen(scene) {
+    var _a, _b;
+    if (scene.frozenColCount > scene.table.rowHeaderLevelCount) for (let i = 0; i < scene.frozenColCount - scene.table.rowHeaderLevelCount; i++) moveColumnFromRowHeaderToBody(scene), 
+    moveColumnFromCornerHeaderToColHeader(scene); else if (scene.frozenColCount < scene.table.rowHeaderLevelCount) {
+        scene.rowHeaderGroup.setAttribute("height", scene.bodyGroup.attribute.height), scene.rowHeaderGroup.setAttribute("y", scene.bodyGroup.attribute.y), 
+        scene.cornerHeaderGroup.setAttribute("height", scene.colHeaderGroup.attribute.height);
+        for (let i = 0; i < scene.table.rowHeaderLevelCount - scene.frozenColCount; i++) moveColumnFromBodyToRowHeader(scene), 
+        moveColumnFromColHeaderToCornerHeader(scene);
+    }
+    scene.bodyGroup.setAttribute("x", scene.rowHeaderGroup.attribute.width), scene.colHeaderGroup.setAttribute("x", scene.cornerHeaderGroup.attribute.width), 
+    scene.updateContainer(), scene.updateBorderSizeAndPosition(), scene.isPivot || scene.transpose || scene.component.setFrozenColumnShadow(scene.table.frozenColCount - 1), 
+    scene.hasFrozen = !0, scene.frozenColCount = scene.table.rowHeaderLevelCount, scene.frozenRowCount = null !== (_b = null === (_a = scene.colHeaderGroup.firstChild) || void 0 === _a ? void 0 : _a.childrenCount) && void 0 !== _b ? _b : 0;
+}
+
+function moveColumnFromBodyToRowHeader(scene) {
+    const column = scene.bodyGroup.firstChild instanceof group_1.Group ? scene.bodyGroup.firstChild : null;
+    column && (scene.rowHeaderGroup.appendChild(column), scene.rowHeaderGroup.setAttribute("width", scene.rowHeaderGroup.attribute.width + column.attribute.width), 
+    scene.bodyGroup.setAttribute("width", scene.bodyGroup.attribute.width - column.attribute.width));
+}
+
+function moveColumnFromColHeaderToCornerHeader(scene) {
+    const headerColumn = scene.colHeaderGroup.firstChild instanceof group_1.Group ? scene.colHeaderGroup.firstChild : null;
+    headerColumn && (scene.cornerHeaderGroup.appendChild(headerColumn), scene.cornerHeaderGroup.setAttribute("width", scene.cornerHeaderGroup.attribute.width + headerColumn.attribute.width), 
+    scene.colHeaderGroup.setAttribute("width", scene.colHeaderGroup.attribute.width - headerColumn.attribute.width));
+}
+
+function moveColumnFromRowHeaderToBody(scene) {
+    var _a;
+    const column = scene.rowHeaderGroup.lastChild instanceof group_1.Group ? scene.rowHeaderGroup.lastChild : null === (_a = scene.rowHeaderGroup.lastChild) || void 0 === _a ? void 0 : _a._prev;
+    column && (scene.bodyGroup.firstChild ? scene.bodyGroup.insertBefore(column, scene.bodyGroup.firstChild) : scene.bodyGroup.appendChild(column), 
+    scene.bodyGroup.setAttribute("width", scene.bodyGroup.attribute.width + column.attribute.width), 
+    scene.rowHeaderGroup.setAttribute("width", scene.rowHeaderGroup.attribute.width - column.attribute.width));
+}
+
+function moveColumnFromCornerHeaderToColHeader(scene) {
+    var _a;
+    const headerColumn = scene.cornerHeaderGroup.lastChild instanceof group_1.Group ? scene.cornerHeaderGroup.lastChild : null === (_a = scene.cornerHeaderGroup.lastChild) || void 0 === _a ? void 0 : _a._prev;
+    headerColumn && (scene.colHeaderGroup.firstChild ? scene.colHeaderGroup.insertBefore(headerColumn, scene.colHeaderGroup.firstChild) : scene.bodyGroup.appendChild(headerColumn), 
+    scene.colHeaderGroup.setAttribute("width", scene.colHeaderGroup.attribute.width + headerColumn.attribute.width), 
+    scene.cornerHeaderGroup.setAttribute("width", scene.cornerHeaderGroup.attribute.width - headerColumn.attribute.width));
+}
+
+exports.dealFrozen = dealFrozen, exports.resetFrozen = resetFrozen;
+//# sourceMappingURL=frozen.js.map

package/cjs/scenegraph/layout/frozen.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["scenegraph/layout/frozen.ts"],"names":[],"mappings":"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","file":"frozen.js","sourcesContent":["import { Group } from '../graphic/group';\nimport type { Scenegraph } from '../scenegraph';\n\nexport function dealFrozen(scene: Scenegraph) {\n  if (scene.table.frozenColCount > scene.table.rowHeaderLevelCount) {\n    // 将对应列移入rowHeaderGroup\n    scene.rowHeaderGroup.setAttribute('height', scene.bodyGroup.attribute.height);\n    scene.rowHeaderGroup.setAttribute('y', scene.bodyGroup.attribute.y);\n    scene.cornerHeaderGroup.setAttribute('height', scene.colHeaderGroup.attribute.height);\n    for (let i = 0; i < scene.table.frozenColCount - scene.table.rowHeaderLevelCount; i++) {\n      moveColumnFromBodyToRowHeader(scene);\n      moveColumnFromColHeaderToCornerHeader(scene);\n    }\n  } else if (scene.table.frozenColCount < scene.table.rowHeaderLevelCount) {\n    // move columnGroup from rowHeaderGroup into bodyGroup(from cornerHeaderGroup into colHeaderGroup)\n    for (let i = 0; i < scene.table.rowHeaderLevelCount - scene.table.frozenColCount; i++) {\n      moveColumnFromRowHeaderToBody(scene);\n      moveColumnFromCornerHeaderToColHeader(scene);\n    }\n  }\n  scene.bodyGroup.setAttribute('x', scene.rowHeaderGroup.attribute.width);\n  scene.colHeaderGroup.setAttribute('x', scene.cornerHeaderGroup.attribute.width);\n\n  scene.updateContainer();\n  scene.updateBorderSizeAndPosition();\n\n  if (!scene.isPivot && !scene.transpose) {\n    scene.component.setFrozenColumnShadow(scene.table.frozenColCount - 1);\n  }\n  scene.hasFrozen = true;\n\n  // scene.frozenColCount = scene.rowHeaderGroup.childrenCount;\n  scene.frozenColCount = scene.table.frozenColCount;\n  scene.frozenRowCount = scene.colHeaderGroup.firstChild?.childrenCount ?? 0;\n}\n\nexport function resetFrozen(scene: Scenegraph) {\n  if (scene.frozenColCount > scene.table.rowHeaderLevelCount) {\n    // move columnGroup from rowHeaderGroup into bodyGroup(from cornerHeaderGroup into colHeaderGroup)\n    for (let i = 0; i < scene.frozenColCount - scene.table.rowHeaderLevelCount; i++) {\n      moveColumnFromRowHeaderToBody(scene);\n      moveColumnFromCornerHeaderToColHeader(scene);\n    }\n  } else if (scene.frozenColCount < scene.table.rowHeaderLevelCount) {\n    // move columnGroup from bodyGroup into rowHeaderGroup(from colHeaderGroup into cornerHeaderGroup)\n    scene.rowHeaderGroup.setAttribute('height', scene.bodyGroup.attribute.height);\n    scene.rowHeaderGroup.setAttribute('y', scene.bodyGroup.attribute.y);\n    scene.cornerHeaderGroup.setAttribute('height', scene.colHeaderGroup.attribute.height);\n    for (let i = 0; i < scene.table.rowHeaderLevelCount - scene.frozenColCount; i++) {\n      moveColumnFromBodyToRowHeader(scene);\n      moveColumnFromColHeaderToCornerHeader(scene);\n    }\n  }\n  scene.bodyGroup.setAttribute('x', scene.rowHeaderGroup.attribute.width);\n  scene.colHeaderGroup.setAttribute('x', scene.cornerHeaderGroup.attribute.width);\n\n  scene.updateContainer();\n  scene.updateBorderSizeAndPosition();\n\n  if (!scene.isPivot && !scene.transpose) {\n    scene.component.setFrozenColumnShadow(scene.table.frozenColCount - 1);\n  }\n  scene.hasFrozen = true;\n\n  // scene.frozenColCount = scene.rowHeaderGroup.childrenCount;\n  scene.frozenColCount = scene.table.rowHeaderLevelCount;\n  scene.frozenRowCount = scene.colHeaderGroup.firstChild?.childrenCount ?? 0;\n}\n\nfunction moveColumnFromBodyToRowHeader(scene: Scenegraph) {\n  // deal with bodyGroup\n  const column = scene.bodyGroup.firstChild instanceof Group ? scene.bodyGroup.firstChild : null;\n  if (column) {\n    scene.rowHeaderGroup.appendChild(column);\n    // update container width\n    scene.rowHeaderGroup.setAttribute('width', scene.rowHeaderGroup.attribute.width + column.attribute.width);\n    scene.bodyGroup.setAttribute('width', scene.bodyGroup.attribute.width - column.attribute.width);\n  }\n}\n\nfunction moveColumnFromColHeaderToCornerHeader(scene: Scenegraph) {\n  // deal width colHeaderGroup\n  const headerColumn = scene.colHeaderGroup.firstChild instanceof Group ? scene.colHeaderGroup.firstChild : null;\n  if (headerColumn) {\n    scene.cornerHeaderGroup.appendChild(headerColumn);\n    scene.cornerHeaderGroup.setAttribute(\n      'width',\n      scene.cornerHeaderGroup.attribute.width + headerColumn.attribute.width\n    );\n    scene.colHeaderGroup.setAttribute('width', scene.colHeaderGroup.attribute.width - headerColumn.attribute.width);\n  }\n}\n\nfunction moveColumnFromRowHeaderToBody(scene: Scenegraph) {\n  const column =\n    scene.rowHeaderGroup.lastChild instanceof Group\n      ? scene.rowHeaderGroup.lastChild\n      : (scene.rowHeaderGroup.lastChild?._prev as Group);\n  if (column) {\n    if (scene.bodyGroup.firstChild) {\n      scene.bodyGroup.insertBefore(column, scene.bodyGroup.firstChild);\n    } else {\n      scene.bodyGroup.appendChild(column);\n    }\n    // 更新容器宽度\n    scene.bodyGroup.setAttribute('width', scene.bodyGroup.attribute.width + column.attribute.width);\n    scene.rowHeaderGroup.setAttribute('width', scene.rowHeaderGroup.attribute.width - column.attribute.width);\n  }\n}\n\nfunction moveColumnFromCornerHeaderToColHeader(scene: Scenegraph) {\n  // 处理列表头\n  const headerColumn =\n    scene.cornerHeaderGroup.lastChild instanceof Group\n      ? scene.cornerHeaderGroup.lastChild\n      : (scene.cornerHeaderGroup.lastChild?._prev as Group);\n  if (headerColumn) {\n    if (scene.colHeaderGroup.firstChild) {\n      scene.colHeaderGroup.insertBefore(headerColumn, scene.colHeaderGroup.firstChild);\n    } else {\n      scene.bodyGroup.appendChild(headerColumn);\n    }\n    scene.colHeaderGroup.setAttribute('width', scene.colHeaderGroup.attribute.width + headerColumn.attribute.width);\n    scene.cornerHeaderGroup.setAttribute(\n      'width',\n      scene.cornerHeaderGroup.attribute.width - headerColumn.attribute.width\n    );\n  }\n}\n"]}

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

@@ -27,13 +27,17 @@ function moveHeaderPosition(colSource, rowSource, colTarget, rowTarget, table) {
         sourceColEnd = table.colCount - 1, targetColStart = colTarget, 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++) for (let row = updateRowStart; row <= updateRowEnd; row++) scene.updateCellContent(col, row);
     for (let col = updateColStart; col <= updateColEnd; col++) {
         const columnHeaderGroup = table.scenegraph.getColGroup(col, !0), columnGroup = table.scenegraph.getColGroup(col);
         columnHeaderGroup && columnHeaderGroup.setAttribute("width", table.getColWidth(col)), 
         columnGroup && columnGroup.setAttribute("width", table.getColWidth(col));
     }
     scene.updateContainer();
+    for (let col = updateColStart; col <= updateColEnd; col++) {
+        const columnGroup = table.scenegraph.getColGroup(col);
+        null == columnGroup || columnGroup.setAttribute("chartInstance", void 0);
+        for (let row = updateRowStart; row <= updateRowEnd; row++) scene.updateCellContent(col, row);
+    }
 }
 
 function changeCell(colSource, rowSource, colTarget, rowTarget, table) {

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

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/layout/move-cell.ts"],"names":[],"mappings":"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","file":"move-cell.js","sourcesContent":["import { Group } from '@visactor/vrender';\nimport { getCellMergeInfo } from '../utils/get-cell-merge';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\nconst groupForPosition = new Group({});\n\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 cellType = table.getCellType(colTarget, rowTarget);\n  const direction = cellType === 'columnHeader' ? 'column' : cellType === '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    } else {\n      sourceColStart = colSource;\n      sourceColEnd = colSource;\n      targetColStart = colTarget;\n      targetColEnd = colTarget;\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, colSource, rowSource);\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    } else {\n      sourceRowStart = rowSource;\n      sourceRowEnd = rowSource;\n      targetRowStart = rowTarget;\n      targetRowEnd = rowTarget;\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  for (let col = updateColStart; col <= updateColEnd; col++) {\n    // 更新单元格记录全量属性，不更新column theme\n    for (let row = updateRowStart; row <= updateRowEnd; row++) {\n      scene.updateCellContent(col, row);\n    }\n  }\n\n  // 更新columnGroup列宽\n  for (let col = updateColStart; col <= updateColEnd; col++) {\n    const columnHeaderGroup = table.scenegraph.getColGroup(col, true);\n    const columnGroup = table.scenegraph.getColGroup(col);\n    if (columnHeaderGroup) {\n      columnHeaderGroup.setAttribute('width', table.getColWidth(col));\n    }\n    if (columnGroup) {\n      columnGroup.setAttribute('width', table.getColWidth(col));\n    }\n  }\n\n  // 更新容器尺寸\n  scene.updateContainer();\n}\n\nfunction changeCell(colSource: number, rowSource: number, colTarget: number, rowTarget: number, table: BaseTableAPI) {\n  // 记录基础属性\n  const scene = table.scenegraph;\n  const sourceCellGroup = scene.getCell(colSource, rowSource, true);\n  const targetCellGroup = scene.getCell(colTarget, rowTarget, true);\n  if (sourceCellGroup.role === 'empty' || targetCellGroup.role === 'empty') {\n    return;\n  }\n  const sourceParent = sourceCellGroup.parent as Group;\n  const targetParent = targetCellGroup.parent as Group;\n  const { x: sourceX, y: sourceY } = sourceCellGroup.attribute;\n  const { x: targetX, y: targetY } = targetCellGroup.attribute;\n\n  // 判断merge属性\n  let sourceDeltaCol;\n  let sourceDeltaRow;\n  let targetDeltaCol;\n  let targetDeltaRow;\n  const sourceMergeCol = sourceCellGroup.mergeCol;\n  const sourceMergeRow = sourceCellGroup.mergeRow;\n  const targetMergeCol = targetCellGroup.mergeCol;\n  const targetMergeRow = targetCellGroup.mergeRow;\n  if (typeof sourceMergeCol === 'number' && typeof sourceMergeRow === 'number') {\n    sourceDeltaCol = sourceMergeCol - colSource;\n    sourceDeltaRow = sourceMergeRow - rowSource;\n  }\n  if (typeof targetMergeCol === 'number' && typeof targetMergeRow === 'number') {\n    targetDeltaCol = targetMergeCol - colTarget;\n    targetDeltaRow = targetMergeRow - rowTarget;\n  }\n\n  // 更新位置\n  targetParent.insertAfter(groupForPosition, targetCellGroup);\n  sourceParent.insertAfter(targetCellGroup, sourceCellGroup);\n  targetParent.insertAfter(sourceCellGroup, groupForPosition);\n  targetParent.removeChild(groupForPosition);\n\n  // 更新属性\n  sourceCellGroup.setAttributes({\n    x: targetX,\n    y: targetY\n  });\n  sourceCellGroup.col = colTarget;\n  sourceCellGroup.row = rowTarget;\n\n  targetCellGroup.setAttributes({\n    x: sourceX,\n    y: sourceY\n  });\n  targetCellGroup.col = colSource;\n  targetCellGroup.row = rowSource;\n  if (typeof sourceDeltaCol === 'number' && typeof sourceDeltaRow === 'number') {\n    sourceCellGroup.mergeCol = sourceCellGroup.col + sourceDeltaCol;\n    sourceCellGroup.mergeRow = sourceCellGroup.row + sourceDeltaRow;\n  }\n  if (typeof targetDeltaCol === 'number' && typeof targetDeltaRow === 'number') {\n    targetCellGroup.mergeCol = targetCellGroup.col + targetDeltaCol;\n    targetCellGroup.mergeRow = targetCellGroup.row + targetDeltaRow;\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/layout/move-cell.ts"],"names":[],"mappings":"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","file":"move-cell.js","sourcesContent":["import { Group } from '@visactor/vrender';\nimport { getCellMergeInfo } from '../utils/get-cell-merge';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\nconst groupForPosition = new Group({});\n\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 cellType = table.getCellType(colTarget, rowTarget);\n  const direction = cellType === 'columnHeader' ? 'column' : cellType === '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    } else {\n      sourceColStart = colSource;\n      sourceColEnd = colSource;\n      targetColStart = colTarget;\n      targetColEnd = colTarget;\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, colSource, rowSource);\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    } else {\n      sourceRowStart = rowSource;\n      sourceRowEnd = rowSource;\n      targetRowStart = rowTarget;\n      targetRowEnd = rowTarget;\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 columnHeaderGroup = table.scenegraph.getColGroup(col, true);\n    const columnGroup = table.scenegraph.getColGroup(col);\n    if (columnHeaderGroup) {\n      columnHeaderGroup.setAttribute('width', table.getColWidth(col));\n    }\n    if (columnGroup) {\n      columnGroup.setAttribute('width', table.getColWidth(col));\n    }\n  }\n\n  // 更新容器尺寸\n  scene.updateContainer();\n\n  for (let col = updateColStart; col <= updateColEnd; col++) {\n    // 将该列的chartInstance清除掉\n    const columnGroup = table.scenegraph.getColGroup(col);\n    columnGroup?.setAttribute('chartInstance', undefined);\n    // 更新单元格记录全量属性，不更新column theme\n    for (let row = updateRowStart; row <= updateRowEnd; row++) {\n      scene.updateCellContent(col, row);\n    }\n  }\n}\n\nfunction changeCell(colSource: number, rowSource: number, colTarget: number, rowTarget: number, table: BaseTableAPI) {\n  // 记录基础属性\n  const scene = table.scenegraph;\n  const sourceCellGroup = scene.getCell(colSource, rowSource, true);\n  const targetCellGroup = scene.getCell(colTarget, rowTarget, true);\n  if (sourceCellGroup.role === 'empty' || targetCellGroup.role === 'empty') {\n    return;\n  }\n  const sourceParent = sourceCellGroup.parent as Group;\n  const targetParent = targetCellGroup.parent as Group;\n  const { x: sourceX, y: sourceY } = sourceCellGroup.attribute;\n  const { x: targetX, y: targetY } = targetCellGroup.attribute;\n\n  // 判断merge属性\n  let sourceDeltaCol;\n  let sourceDeltaRow;\n  let targetDeltaCol;\n  let targetDeltaRow;\n  const sourceMergeCol = sourceCellGroup.mergeCol;\n  const sourceMergeRow = sourceCellGroup.mergeRow;\n  const targetMergeCol = targetCellGroup.mergeCol;\n  const targetMergeRow = targetCellGroup.mergeRow;\n  if (typeof sourceMergeCol === 'number' && typeof sourceMergeRow === 'number') {\n    sourceDeltaCol = sourceMergeCol - colSource;\n    sourceDeltaRow = sourceMergeRow - rowSource;\n  }\n  if (typeof targetMergeCol === 'number' && typeof targetMergeRow === 'number') {\n    targetDeltaCol = targetMergeCol - colTarget;\n    targetDeltaRow = targetMergeRow - rowTarget;\n  }\n\n  // 更新位置\n  targetParent.insertAfter(groupForPosition, targetCellGroup);\n  sourceParent.insertAfter(targetCellGroup, sourceCellGroup);\n  targetParent.insertAfter(sourceCellGroup, groupForPosition);\n  targetParent.removeChild(groupForPosition);\n\n  // 更新属性\n  sourceCellGroup.setAttributes({\n    x: targetX,\n    y: targetY\n  });\n  sourceCellGroup.col = colTarget;\n  sourceCellGroup.row = rowTarget;\n\n  targetCellGroup.setAttributes({\n    x: sourceX,\n    y: sourceY\n  });\n  targetCellGroup.col = colSource;\n  targetCellGroup.row = rowSource;\n  if (typeof sourceDeltaCol === 'number' && typeof sourceDeltaRow === 'number') {\n    sourceCellGroup.mergeCol = sourceCellGroup.col + sourceDeltaCol;\n    sourceCellGroup.mergeRow = sourceCellGroup.row + sourceDeltaRow;\n  }\n  if (typeof targetDeltaCol === 'number' && typeof targetDeltaRow === 'number') {\n    targetCellGroup.mergeCol = targetCellGroup.col + targetDeltaCol;\n    targetCellGroup.mergeRow = targetCellGroup.row + targetDeltaRow;\n  }\n}\n"]}

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

@@ -20,19 +20,19 @@ function updateCellLayout(scene, cell, col, row, width, height, detaX, detaY, is
     const type = scene.table.isHeader(col, row) ? scene.table._getHeaderLayoutMap(col, row).headerType : scene.table.getBodyColumnType(col, row);
     if ("progressbar" === type) {
         const columnDefine = scene.table.getBodyColumnDefine(col, row), style = scene.table._getCellStyle(col, row), value = scene.table.getCellValue(col, row), dataValue = scene.table.getCellOriginValue(col, row), padding = (0, 
-        padding_1.getPadding)((0, get_prop_1.getProp)("padding", style, col, row, scene.table)), newBarCell = (0, 
+        padding_1.getQuadProps)((0, get_prop_1.getProp)("padding", style, col, row, scene.table)), newBarCell = (0, 
         progress_bar_cell_1.createProgressBarCell)(columnDefine, style, cell.attribute.width, value, dataValue, col, row, padding, scene.table), oldBarCell = cell.getChildByName("progress-bar");
         cell.insertBefore(newBarCell, oldBarCell), cell.removeChild(oldBarCell), oldBarCell.removeAllChild(), 
         oldBarCell.release();
     } else if ("sparkline" === type) {
         cell.removeAllChild();
-        const headerStyle = scene.table._getCellStyle(col, row), padding = (0, padding_1.getPadding)((0, 
+        const headerStyle = scene.table._getCellStyle(col, row), padding = (0, padding_1.getQuadProps)((0, 
         get_prop_1.getProp)("padding", headerStyle, col, row, scene.table));
         (0, spark_line_cell_1.createSparkLineCellGroup)(cell, cell.parent, cell.attribute.x, cell.attribute.y, col, row, cell.attribute.width, cell.attribute.height, padding, scene.table);
     } else if ("image" === type || "video" === type) ; else {
         const style = scene.table._getCellStyle(col, row);
         (0, text_icon_layout_1.updateCellContentWidth)(cell, distWidth, detaX, autoRowHeight, (0, 
-        padding_1.getPadding)(style.padding), style.textAlign, style.textBaseline, scene);
+        padding_1.getQuadProps)(style.padding), style.textAlign, style.textBaseline, scene);
         const customContainer = cellGroup.getChildByName("custom-container");
         if (customContainer) {
             let customRender, customLayout;

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

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/layout/update-cell.ts"],"names":[],"mappings":"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","file":"update-cell.js","sourcesContent":["import type { ProgressBarStyle } from '../../body-helper/style/ProgressBarStyle';\nimport type { IProgressbarColumnBodyDefine } from '../../ts-types/list-table/define/progressbar-define';\nimport { dealWithCustom } from '../component/custom';\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 { getPadding } from '../utils/padding';\nimport { updateCellContentWidth } from '../utils/text-icon-layout';\n\n/**\n * @description: 更新单个单元格宽度/高度\n * @return {*}\n */\nexport function updateCellLayout(\n  scene: Scenegraph,\n  cell: Group,\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  detaX: number,\n  detaY: number,\n  isHeader: boolean,\n  autoColWidth: boolean,\n  autoRowHeight: boolean\n) {\n  let cellGroup;\n  let distWidth;\n  const mergeInfo = getCellMergeInfo(scene.table, col, row);\n  // TO BE FIXED 这里使用横向和纵向来判断单元格merge情况，目前没有横纵都merge的情况，\n  // 如果有这里的逻辑要修改\n  if (mergeInfo && mergeInfo.end.col - mergeInfo.start.col) {\n    // 更新横向merge cell width\n    const mergeCell = scene.getCell(mergeInfo.start.col, mergeInfo.start.row);\n    const mergeCellWidth = mergeCell.attribute.width;\n    mergeCell.setAttribute('width', mergeCellWidth + detaX);\n\n    cellGroup = mergeCell;\n    distWidth = mergeCell.attribute.width;\n  } else if (mergeInfo && mergeInfo.start.row === row) {\n    // 更新纵向merge cell width，只更新一次\n    cell.setAttribute('width', width + detaX);\n\n    cellGroup = cell;\n    distWidth = width + detaX;\n  } else if (!mergeInfo) {\n    cell.setAttribute('width', width + detaX);\n    cellGroup = cell;\n    distWidth = width + detaX;\n  }\n\n  if (!cellGroup) {\n    // 合并单元格非主单元格，不处理\n    return;\n  }\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  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 = getPadding(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 = getPadding(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    );\n  } else if (type === 'image' || type === 'video') {\n    // // 只更新背景边框\n    // const rect = cell.firstChild as Rect;\n    // rect.setAttribute('width', cell.attribute.width);\n  } else {\n    // 处理文字\n    const style = scene.table._getCellStyle(col, row);\n    updateCellContentWidth(\n      cell,\n      distWidth,\n      detaX,\n      autoRowHeight,\n      getPadding(style.padding as number),\n      style.textAlign,\n      style.textBaseline,\n      scene\n    );\n\n    // 处理自定义渲染\n    const customContainer = cellGroup.getChildByName('custom-container') as Group;\n    if (customContainer) {\n      customContainer.clear();\n      cellGroup.removeChild(customContainer);\n\n      let customRender;\n      let customLayout;\n      const cellType = scene.table.getCellType(cellGroup.col, cellGroup.row);\n      if (cellType !== 'body') {\n        const define = scene.table.getHeaderDefine(cellGroup.col, cellGroup.row);\n        customRender = define?.headerCustomRender;\n        customLayout = define?.headerCustomLayout;\n      } else {\n        const define = scene.table.getBodyColumnDefine(cellGroup.col, cellGroup.row);\n        customRender = define?.customRender || scene.table.customRender;\n        customLayout = define?.customLayout;\n      }\n      const customResult = dealWithCustom(\n        customLayout,\n        customRender,\n        cellGroup.col,\n        cellGroup.row,\n        cellGroup.attribute.width,\n        cellGroup.attribute.height,\n        false,\n        false,\n        scene.table\n      );\n      cellGroup.appendChild(customResult.elementsGroup);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/layout/update-cell.ts"],"names":[],"mappings":"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","file":"update-cell.js","sourcesContent":["import type { ProgressBarStyle } from '../../body-helper/style/ProgressBarStyle';\nimport type { IProgressbarColumnBodyDefine } from '../../ts-types/list-table/define/progressbar-define';\nimport { dealWithCustom } from '../component/custom';\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 { updateCellContentWidth } from '../utils/text-icon-layout';\n\n/**\n * @description: 更新单个单元格宽度/高度\n * @return {*}\n */\nexport function updateCellLayout(\n  scene: Scenegraph,\n  cell: Group,\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  detaX: number,\n  detaY: number,\n  isHeader: boolean,\n  autoColWidth: boolean,\n  autoRowHeight: boolean\n) {\n  let cellGroup;\n  let distWidth;\n  const mergeInfo = getCellMergeInfo(scene.table, col, row);\n  // TO BE FIXED 这里使用横向和纵向来判断单元格merge情况，目前没有横纵都merge的情况，\n  // 如果有这里的逻辑要修改\n  if (mergeInfo && mergeInfo.end.col - mergeInfo.start.col) {\n    // 更新横向merge cell width\n    const mergeCell = scene.getCell(mergeInfo.start.col, mergeInfo.start.row);\n    const mergeCellWidth = mergeCell.attribute.width;\n    mergeCell.setAttribute('width', mergeCellWidth + detaX);\n\n    cellGroup = mergeCell;\n    distWidth = mergeCell.attribute.width;\n  } else if (mergeInfo && mergeInfo.start.row === row) {\n    // 更新纵向merge cell width，只更新一次\n    cell.setAttribute('width', width + detaX);\n\n    cellGroup = cell;\n    distWidth = width + detaX;\n  } else if (!mergeInfo) {\n    cell.setAttribute('width', width + detaX);\n    cellGroup = cell;\n    distWidth = width + detaX;\n  }\n\n  if (!cellGroup) {\n    // 合并单元格非主单元格，不处理\n    return;\n  }\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  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    );\n  } else if (type === 'image' || type === 'video') {\n    // // 只更新背景边框\n    // const rect = cell.firstChild as Rect;\n    // rect.setAttribute('width', cell.attribute.width);\n  } else {\n    // 处理文字\n    const style = scene.table._getCellStyle(col, row);\n    updateCellContentWidth(\n      cell,\n      distWidth,\n      detaX,\n      autoRowHeight,\n      getQuadProps(style.padding as number),\n      style.textAlign,\n      style.textBaseline,\n      scene\n    );\n\n    // 处理自定义渲染\n    const customContainer = cellGroup.getChildByName('custom-container') as Group;\n    if (customContainer) {\n      customContainer.clear();\n      cellGroup.removeChild(customContainer);\n\n      let customRender;\n      let customLayout;\n      const cellType = scene.table.getCellType(cellGroup.col, cellGroup.row);\n      if (cellType !== 'body') {\n        const define = scene.table.getHeaderDefine(cellGroup.col, cellGroup.row);\n        customRender = define?.headerCustomRender;\n        customLayout = define?.headerCustomLayout;\n      } else {\n        const define = scene.table.getBodyColumnDefine(cellGroup.col, cellGroup.row);\n        customRender = define?.customRender || scene.table.customRender;\n        customLayout = define?.customLayout;\n      }\n      const customResult = dealWithCustom(\n        customLayout,\n        customRender,\n        cellGroup.col,\n        cellGroup.row,\n        cellGroup.attribute.width,\n        cellGroup.attribute.height,\n        false,\n        false,\n        scene.table\n      );\n      cellGroup.appendChild(customResult.elementsGroup);\n    }\n  }\n}\n"]}

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

@@ -54,19 +54,19 @@ function updateCellHeight(scene, cell, col, row, distHeight, detaY, isHeader) {
     const type = scene.table.isHeader(col, row) ? scene.table._getHeaderLayoutMap(col, row).headerType : scene.table.getBodyColumnType(col, row);
     if ("progressbar" === type) {
         const columnDefine = scene.table.getBodyColumnDefine(col, row), style = scene.table._getCellStyle(col, row), value = scene.table.getCellValue(col, row), dataValue = scene.table.getCellOriginValue(col, row), padding = (0, 
-        padding_1.getPadding)((0, get_prop_1.getProp)("padding", style, col, row, scene.table)), newBarCell = (0, 
+        padding_1.getQuadProps)((0, get_prop_1.getProp)("padding", style, col, row, scene.table)), newBarCell = (0, 
         progress_bar_cell_1.createProgressBarCell)(columnDefine, style, cell.attribute.width, value, dataValue, col, row, padding, scene.table), oldBarCell = cell.getChildByName("progress-bar");
         cell.insertBefore(newBarCell, oldBarCell), cell.removeChild(oldBarCell), oldBarCell.removeAllChild(), 
         oldBarCell.release();
     } else if ("sparkline" === type) {
         cell.removeAllChild();
-        const headerStyle = scene.table._getCellStyle(col, row), padding = (0, padding_1.getPadding)((0, 
+        const headerStyle = scene.table._getCellStyle(col, row), padding = (0, padding_1.getQuadProps)((0, 
         get_prop_1.getProp)("padding", headerStyle, col, row, scene.table));
         (0, spark_line_cell_1.createSparkLineCellGroup)(cell, cell.parent, cell.attribute.x, cell.attribute.y, col, row, cell.attribute.width, cell.attribute.height, padding, scene.table);
     } else if ("image" === type || "video" === type) (0, image_cell_1.updateImageCellContentWhileResize)(cell, col, row, scene.table); else {
         const style = scene.table._getCellStyle(col, row);
         (0, text_icon_layout_1.updateCellContentHeight)(cell, distHeight, detaY, scene.table.internalProps.autoRowHeight, (0, 
-        padding_1.getPadding)(style.padding), style.textAlign, style.textBaseline);
+        padding_1.getQuadProps)(style.padding), style.textAlign, style.textBaseline);
         const customContainer = cell.getChildByName("custom-container");
         if (customContainer) {
             let customRender, customLayout;
@@ -80,7 +80,7 @@ function updateCellHeight(scene, cell, col, row, distHeight, detaY, isHeader) {
                 customLayout = null == define ? void 0 : define.customLayout;
             }
             const customResult = (0, custom_1.dealWithCustom)(customLayout, customRender, col, row, cell.attribute.width, cell.attribute.height, !1, !1, scene.table);
-            cell.appendChild(customResult.elementsGroup);
+            cell.childrenCount > 0 ? cell.insertBefore(customResult.elementsGroup, cell.firstChild) : cell.appendChild(customResult.elementsGroup);
         }
     }
 }

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

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/layout/update-height.ts"],"names":[],"mappings":";;;AAEA,oFAAqF;AACrF,gFAAsF;AAEtF,4DAA2D;AAC3D,gDAA4C;AAC5C,8CAA8C;AAC9C,gEAAoE;AAEpE,gDAAqD;AACrD,sEAA0F;AAE1F,SAAgB,eAAe,CAAC,KAAiB,EAAE,GAAW,EAAE,KAAa;IAC3E,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE;QACnD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,IAAA,iCAAgB,EAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC1D,IAAI,SAAS,IAAI,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,EAAE;YAC5C,SAAS;SACV;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QAGrC,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAE7F,KAAK,CAAC,4BAA4B,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;KAC9C;IAED,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,MAAM,GAAG,CAAC,CAAC;IAEf,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,sBAAsB,EAAE;QAC5C,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC;QAC3F,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;QACjF,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;QAEvE,QAAQ,GAAG,GAAG,GAAG,CAAC,CAAC;QACnB,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,sBAAsB,GAAG,CAAC,CAAC;KACjD;SAAM;QACL,QAAQ,GAAG,GAAG,GAAG,CAAC,CAAC;QAEnB,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC;KAC3B;IAGD,KAAK,IAAI,QAAQ,GAAG,QAAQ,EAAE,QAAQ,IAAI,MAAM,EAAE,QAAQ,EAAE,EAAE;QAE5D,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;YAClE,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACpD,MAAM,SAAS,GAAG,IAAA,iCAAgB,EAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACpE,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,QAAQ,IAAI,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,QAAQ,CAAC,EAAE;gBACvF,SAAS;aACV;YAED,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;SAC5D;KACF;IAGD,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC;AAC7E,CAAC;AA/CD,0CA+CC;AAMD,SAAgB,sBAAsB,CACpC,KAAiB,EACjB,IAAW,EACX,GAAW,EACX,GAAW,EACX,MAAc,EACd,KAAa,EACb,QAAiB;IAGjB,IAAI,SAAS,CAAC;IACd,IAAI,UAAU,CAAC;IACf,MAAM,SAAS,GAAG,IAAA,iCAAgB,EAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAG1D,IAAI,SAAS,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,EAAE;QAEvF,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1E,MAAM,eAAe,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;QACnD,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,eAAe,GAAG,KAAK,CAAC,CAAC;QAE1D,SAAS,GAAG,SAAS,CAAC;QACtB,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;KACzC;SAAM,IAAI,SAAS,EAAE;QAEpB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;QAE5C,SAAS,GAAG,IAAI,CAAC;QACjB,UAAU,GAAG,MAAM,GAAG,KAAK,CAAC;KAC7B;SAAM,IAAI,CAAC,SAAS,EAAE;QACrB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;QAC5C,SAAS,GAAG,IAAI,CAAC;QACjB,UAAU,GAAG,MAAM,GAAG,KAAK,CAAC;KAM7B;IAED,IAAI,CAAC,SAAS,EAAE;QAEd,OAAO;KACR;IAED,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC5E,CAAC;AA9CD,wDA8CC;AAED,SAAgB,yBAAyB,CACvC,KAAiB,EACjB,IAAW,EACX,GAAW,EACX,GAAW,EACX,MAAc,EACd,KAAa,EACb,QAAiB;IAEjB,IAAI,SAAS,CAAC;IAEd,MAAM,SAAS,GAAG,IAAA,iCAAgB,EAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1D,IAAI,SAAS,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;QACxD,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/D,IAAI,GAAG,KAAK,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;YAE9B,IAAY,CAAC,WAAW,GAAG,MAAM,CAAC;YACnC,OAAO;SACR;aAAM,IAAI,GAAG,KAAK,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE;YACpC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAG,IAAY,CAAC,WAAW,GAAG,MAAM,CAAC,CAAC;YAChE,SAAS,GAAG,IAAI,CAAC;YACjB,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;SAEhC;aAAM;YAEJ,IAAY,CAAC,WAAW,IAAI,MAAM,CAAC;YACpC,OAAO;SACR;KACF;SAAM,IAAI,SAAS,EAAE;QACpB,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACpC,SAAS,GAAG,IAAI,CAAC;KAIlB;SAAM;QACL,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACpC,SAAS,GAAG,IAAI,CAAC;KAClB;IACD,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;AACpE,CAAC;AAxCD,8DAwCC;AAED,SAAgB,gBAAgB,CAC9B,KAAiB,EACjB,IAAW,EACX,GAAW,EACX,GAAW,EACX,UAAkB,EAClB,KAAa,EACb,QAAiB;IAGjB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;QACzC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,UAAU;QACtD,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5C,IAAI,IAAI,KAAK,aAAa,EAAE;QAE1B,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAiC,CAAC;QAC/F,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAqB,CAAC;QACtE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,IAAA,oBAAU,EAAC,IAAA,kBAAO,EAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAE7E,MAAM,UAAU,GAAG,IAAA,yCAAqB,EACtC,YAAY,EACZ,KAAK,EACL,IAAI,CAAC,SAAS,CAAC,KAAK,EAEpB,KAAK,EACL,SAAS,EACT,GAAG,EACH,GAAG,EACH,OAAO,EACP,KAAK,CAAC,KAAK,CACZ,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAU,CAAC;QAEhE,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC7B,UAAU,CAAC,cAAc,EAAE,CAAC;QAC5B,UAAU,CAAC,OAAO,EAAE,CAAC;KACtB;SAAM,IAAI,IAAI,KAAK,WAAW,EAAE;QAE/B,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,IAAA,oBAAU,EAAC,IAAA,kBAAO,EAAC,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACnF,IAAA,0CAAwB,EACtB,IAAI,EACJ,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,CAAC,CAAC,EAChB,IAAI,CAAC,SAAS,CAAC,CAAC,EAChB,GAAG,EACH,GAAG,EACH,IAAI,CAAC,SAAS,CAAC,KAAK,EACpB,IAAI,CAAC,SAAS,CAAC,MAAM,EACrB,OAAO,EACP,KAAK,CAAC,KAAK,CACZ,CAAC;KACH;SAAM,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,OAAO,EAAE;QAC/C,IAAA,8CAAiC,EAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;KAChE;SAAM;QAEL,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAClD,IAAA,0CAAuB,EACrB,IAAI,EACJ,UAAU,EACV,KAAK,EACL,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,aAAa,EACvC,IAAA,oBAAU,EAAC,KAAK,CAAC,OAAiB,CAAC,EACnC,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,YAAY,CACnB,CAAC;QAGF,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAU,CAAC;QACzE,IAAI,eAAe,EAAE;YACnB,eAAe,CAAC,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YAElC,IAAI,YAAY,CAAC;YACjB,IAAI,YAAY,CAAC;YACjB,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACnD,IAAI,QAAQ,KAAK,MAAM,EAAE;gBACvB,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACrD,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC;gBAC1C,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC;aAC3C;iBAAM;gBACL,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACzD,YAAY,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,KAAI,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC;gBAChE,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC;aACrC;YACD,MAAM,YAAY,GAAG,IAAA,uBAAc,EACjC,YAAY,EACZ,YAAY,EACZ,GAAG,EACH,GAAG,EACH,IAAI,CAAC,SAAS,CAAC,KAAK,EACpB,IAAI,CAAC,SAAS,CAAC,MAAM,EACrB,KAAK,EACL,KAAK,EACL,KAAK,CAAC,KAAK,CACZ,CAAC;YACF,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;SAC9C;KACF;AACH,CAAC;AAxGD,4CAwGC","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 { getPadding } 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';\n\nexport function updateRowHeight(scene: Scenegraph, row: number, detaY: number) {\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, 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.colHeaderGroup.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;\n  }\n\n  // 更新以下行位置\n  for (let rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {\n    // if (rowIndex === 2) debugger;\n    for (let colIndex = 0; colIndex < scene.table.colCount; colIndex++) {\n      const cellGroup = scene.getCell(colIndex, rowIndex);\n      const mergeInfo = getCellMergeInfo(scene.table, colIndex, rowIndex);\n      if (mergeInfo && (mergeInfo.start.col !== colIndex || mergeInfo.start.row !== rowIndex)) {\n        continue;\n      }\n\n      cellGroup.setAttribute('y', cellGroup.attribute.y + detaY);\n    }\n  }\n\n  // 更新table行高存储\n  scene.table.setRowHeight(row, scene.table.getRowHeight(row) + detaY, true);\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  let cellGroup;\n  let distHeight;\n  const mergeInfo = getCellMergeInfo(scene.table, col, row);\n  // TO BE FIXED 这里使用横向和纵向来判断单元格merge情况，目前没有横纵都merge的情况，\n  // 如果有这里的逻辑要修改\n  if (mergeInfo && mergeInfo.end.col - mergeInfo.start.col && mergeInfo.start.col === col) {\n    // 更新横向merge cell height，只更新一次\n    const mergeCell = scene.getCell(mergeInfo.start.col, mergeInfo.start.row);\n    const mergeCellheight = mergeCell.attribute.height;\n    mergeCell.setAttribute('height', mergeCellheight + detaY);\n\n    cellGroup = mergeCell;\n    distHeight = mergeCell.attribute.height;\n  } else if (mergeInfo) {\n    // 更新纵向merge cell width\n    cell.setAttribute('height', height + detaY);\n\n    cellGroup = cell;\n    distHeight = height + detaY;\n  } else if (!mergeInfo) {\n    cell.setAttribute('height', height + detaY);\n    cellGroup = cell;\n    distHeight = height + detaY;\n    // cell.setTheme({\n    //   rect: {\n    //     height: cell.attribute.height,\n    //   },\n    // });\n  }\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  let cellGroup;\n  // let distHeight;\n  const mergeInfo = getCellMergeInfo(scene.table, col, row);\n  if (mergeInfo && mergeInfo.end.row - mergeInfo.start.row) {\n    cell = scene.getCell(mergeInfo.start.col, mergeInfo.start.row);\n    if (row === mergeInfo.start.row) {\n      // 初始化高度\n      (cell as any)._tempHeight = height;\n      return;\n    } else if (row === mergeInfo.end.row) {\n      cell.setAttribute('height', (cell as any)._tempHeight + height);\n      cellGroup = cell;\n      height = cell.attribute.height;\n      // updateCellHeight(scene, cellGroup, col, row, cell.attribute.height, 0, isHeader);\n    } else {\n      // 累加高度\n      (cell as any)._tempHeight += height;\n      return;\n    }\n  } else if (mergeInfo) {\n    cell = scene.getCell(mergeInfo.start.col, mergeInfo.start.row);\n    cell.setAttribute('height', height);\n    cellGroup = cell;\n\n    // const rect = cell.firstChild as Rect;\n    // rect.setAttribute('height', cell.attribute.height);\n  } else {\n    cell.setAttribute('height', height);\n    cellGroup = cell;\n  }\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  // 更新单元格布局\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 = getPadding(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 = getPadding(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    );\n  } else if (type === 'image' || type === 'video') {\n    updateImageCellContentWhileResize(cell, col, row, scene.table);\n  } else {\n    // 处理文字\n    const style = scene.table._getCellStyle(col, row);\n    updateCellContentHeight(\n      cell,\n      distHeight,\n      detaY,\n      scene.table.internalProps.autoRowHeight,\n      getPadding(style.padding as number),\n      style.textAlign,\n      style.textBaseline\n    );\n\n    // 处理自定义渲染\n    const customContainer = cell.getChildByName('custom-container') as Group;\n    if (customContainer) {\n      customContainer.clear();\n      cell.removeChild(customContainer);\n\n      let customRender;\n      let customLayout;\n      const cellType = scene.table.getCellType(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      const customResult = dealWithCustom(\n        customLayout,\n        customRender,\n        col,\n        row,\n        cell.attribute.width,\n        cell.attribute.height,\n        false,\n        false,\n        scene.table\n      );\n      cell.appendChild(customResult.elementsGroup);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/layout/update-height.ts"],"names":[],"mappings":";;;AAEA,oFAAqF;AACrF,gFAAsF;AAEtF,4DAA2D;AAC3D,gDAA4C;AAC5C,8CAAgD;AAChD,gEAAoE;AAEpE,gDAAqD;AACrD,sEAA0F;AAE1F,SAAgB,eAAe,CAAC,KAAiB,EAAE,GAAW,EAAE,KAAa;IAC3E,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE;QACnD,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,IAAA,iCAAgB,EAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC1D,IAAI,SAAS,IAAI,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,EAAE;YAC5C,SAAS;SACV;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QAGrC,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAE7F,KAAK,CAAC,4BAA4B,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;KAC9C;IAED,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,MAAM,GAAG,CAAC,CAAC;IAEf,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,sBAAsB,EAAE;QAC5C,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC;QAC3F,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;QACjF,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;QAEvE,QAAQ,GAAG,GAAG,GAAG,CAAC,CAAC;QACnB,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,sBAAsB,GAAG,CAAC,CAAC;KACjD;SAAM;QACL,QAAQ,GAAG,GAAG,GAAG,CAAC,CAAC;QAEnB,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC;KAC3B;IAGD,KAAK,IAAI,QAAQ,GAAG,QAAQ,EAAE,QAAQ,IAAI,MAAM,EAAE,QAAQ,EAAE,EAAE;QAE5D,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;YAClE,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACpD,MAAM,SAAS,GAAG,IAAA,iCAAgB,EAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACpE,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,QAAQ,IAAI,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,QAAQ,CAAC,EAAE;gBACvF,SAAS;aACV;YAED,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;SAC5D;KACF;IAGD,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC;AAC7E,CAAC;AA/CD,0CA+CC;AAMD,SAAgB,sBAAsB,CACpC,KAAiB,EACjB,IAAW,EACX,GAAW,EACX,GAAW,EACX,MAAc,EACd,KAAa,EACb,QAAiB;IAGjB,IAAI,SAAS,CAAC;IACd,IAAI,UAAU,CAAC;IACf,MAAM,SAAS,GAAG,IAAA,iCAAgB,EAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAG1D,IAAI,SAAS,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,EAAE;QAEvF,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1E,MAAM,eAAe,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;QACnD,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,eAAe,GAAG,KAAK,CAAC,CAAC;QAE1D,SAAS,GAAG,SAAS,CAAC;QACtB,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;KACzC;SAAM,IAAI,SAAS,EAAE;QAEpB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;QAE5C,SAAS,GAAG,IAAI,CAAC;QACjB,UAAU,GAAG,MAAM,GAAG,KAAK,CAAC;KAC7B;SAAM,IAAI,CAAC,SAAS,EAAE;QACrB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;QAC5C,SAAS,GAAG,IAAI,CAAC;QACjB,UAAU,GAAG,MAAM,GAAG,KAAK,CAAC;KAM7B;IAED,IAAI,CAAC,SAAS,EAAE;QAEd,OAAO;KACR;IAED,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAC5E,CAAC;AA9CD,wDA8CC;AAED,SAAgB,yBAAyB,CACvC,KAAiB,EACjB,IAAW,EACX,GAAW,EACX,GAAW,EACX,MAAc,EACd,KAAa,EACb,QAAiB;IAEjB,IAAI,SAAS,CAAC;IAEd,MAAM,SAAS,GAAG,IAAA,iCAAgB,EAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1D,IAAI,SAAS,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;QACxD,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/D,IAAI,GAAG,KAAK,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;YAE9B,IAAY,CAAC,WAAW,GAAG,MAAM,CAAC;YACnC,OAAO;SACR;aAAM,IAAI,GAAG,KAAK,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE;YACpC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAG,IAAY,CAAC,WAAW,GAAG,MAAM,CAAC,CAAC;YAChE,SAAS,GAAG,IAAI,CAAC;YACjB,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;SAEhC;aAAM;YAEJ,IAAY,CAAC,WAAW,IAAI,MAAM,CAAC;YACpC,OAAO;SACR;KACF;SAAM,IAAI,SAAS,EAAE;QACpB,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACpC,SAAS,GAAG,IAAI,CAAC;KAIlB;SAAM;QACL,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACpC,SAAS,GAAG,IAAI,CAAC;KAClB;IACD,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;AACpE,CAAC;AAxCD,8DAwCC;AAED,SAAgB,gBAAgB,CAC9B,KAAiB,EACjB,IAAW,EACX,GAAW,EACX,GAAW,EACX,UAAkB,EAClB,KAAa,EACb,QAAiB;IAGjB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;QACzC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,UAAU;QACtD,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5C,IAAI,IAAI,KAAK,aAAa,EAAE;QAE1B,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAiC,CAAC;QAC/F,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAqB,CAAC;QACtE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,IAAA,kBAAO,EAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAE/E,MAAM,UAAU,GAAG,IAAA,yCAAqB,EACtC,YAAY,EACZ,KAAK,EACL,IAAI,CAAC,SAAS,CAAC,KAAK,EAEpB,KAAK,EACL,SAAS,EACT,GAAG,EACH,GAAG,EACH,OAAO,EACP,KAAK,CAAC,KAAK,CACZ,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAU,CAAC;QAEhE,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC7B,UAAU,CAAC,cAAc,EAAE,CAAC;QAC5B,UAAU,CAAC,OAAO,EAAE,CAAC;KACtB;SAAM,IAAI,IAAI,KAAK,WAAW,EAAE;QAE/B,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,IAAA,kBAAO,EAAC,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACrF,IAAA,0CAAwB,EACtB,IAAI,EACJ,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,CAAC,CAAC,EAChB,IAAI,CAAC,SAAS,CAAC,CAAC,EAChB,GAAG,EACH,GAAG,EACH,IAAI,CAAC,SAAS,CAAC,KAAK,EACpB,IAAI,CAAC,SAAS,CAAC,MAAM,EACrB,OAAO,EACP,KAAK,CAAC,KAAK,CACZ,CAAC;KACH;SAAM,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,OAAO,EAAE;QAC/C,IAAA,8CAAiC,EAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;KAChE;SAAM;QAEL,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAClD,IAAA,0CAAuB,EACrB,IAAI,EACJ,UAAU,EACV,KAAK,EACL,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,aAAa,EACvC,IAAA,sBAAY,EAAC,KAAK,CAAC,OAAiB,CAAC,EACrC,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,YAAY,CACnB,CAAC;QAGF,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAU,CAAC;QACzE,IAAI,eAAe,EAAE;YACnB,eAAe,CAAC,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YAElC,IAAI,YAAY,CAAC;YACjB,IAAI,YAAY,CAAC;YACjB,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACnD,IAAI,QAAQ,KAAK,MAAM,EAAE;gBACvB,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACrD,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC;gBAC1C,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC;aAC3C;iBAAM;gBACL,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACzD,YAAY,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,KAAI,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC;gBAChE,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC;aACrC;YACD,MAAM,YAAY,GAAG,IAAA,uBAAc,EACjC,YAAY,EACZ,YAAY,EACZ,GAAG,EACH,GAAG,EACH,IAAI,CAAC,SAAS,CAAC,KAAK,EACpB,IAAI,CAAC,SAAS,CAAC,MAAM,EACrB,KAAK,EACL,KAAK,EACL,KAAK,CAAC,KAAK,CACZ,CAAC;YACF,IAAI,IAAI,CAAC,aAAa,GAAG,CAAC,EAAE;gBAC1B,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;aAChE;iBAAM;gBACL,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;aAC9C;SACF;KACF;AACH,CAAC;AA5GD,4CA4GC","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';\n\nexport function updateRowHeight(scene: Scenegraph, row: number, detaY: number) {\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, 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.colHeaderGroup.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;\n  }\n\n  // 更新以下行位置\n  for (let rowIndex = rowStart; rowIndex <= rowEnd; rowIndex++) {\n    // if (rowIndex === 2) debugger;\n    for (let colIndex = 0; colIndex < scene.table.colCount; colIndex++) {\n      const cellGroup = scene.getCell(colIndex, rowIndex);\n      const mergeInfo = getCellMergeInfo(scene.table, colIndex, rowIndex);\n      if (mergeInfo && (mergeInfo.start.col !== colIndex || mergeInfo.start.row !== rowIndex)) {\n        continue;\n      }\n\n      cellGroup.setAttribute('y', cellGroup.attribute.y + detaY);\n    }\n  }\n\n  // 更新table行高存储\n  scene.table.setRowHeight(row, scene.table.getRowHeight(row) + detaY, true);\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  let cellGroup;\n  let distHeight;\n  const mergeInfo = getCellMergeInfo(scene.table, col, row);\n  // TO BE FIXED 这里使用横向和纵向来判断单元格merge情况，目前没有横纵都merge的情况，\n  // 如果有这里的逻辑要修改\n  if (mergeInfo && mergeInfo.end.col - mergeInfo.start.col && mergeInfo.start.col === col) {\n    // 更新横向merge cell height，只更新一次\n    const mergeCell = scene.getCell(mergeInfo.start.col, mergeInfo.start.row);\n    const mergeCellheight = mergeCell.attribute.height;\n    mergeCell.setAttribute('height', mergeCellheight + detaY);\n\n    cellGroup = mergeCell;\n    distHeight = mergeCell.attribute.height;\n  } else if (mergeInfo) {\n    // 更新纵向merge cell width\n    cell.setAttribute('height', height + detaY);\n\n    cellGroup = cell;\n    distHeight = height + detaY;\n  } else if (!mergeInfo) {\n    cell.setAttribute('height', height + detaY);\n    cellGroup = cell;\n    distHeight = height + detaY;\n    // cell.setTheme({\n    //   rect: {\n    //     height: cell.attribute.height,\n    //   },\n    // });\n  }\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  let cellGroup;\n  // let distHeight;\n  const mergeInfo = getCellMergeInfo(scene.table, col, row);\n  if (mergeInfo && mergeInfo.end.row - mergeInfo.start.row) {\n    cell = scene.getCell(mergeInfo.start.col, mergeInfo.start.row);\n    if (row === mergeInfo.start.row) {\n      // 初始化高度\n      (cell as any)._tempHeight = height;\n      return;\n    } else if (row === mergeInfo.end.row) {\n      cell.setAttribute('height', (cell as any)._tempHeight + height);\n      cellGroup = cell;\n      height = cell.attribute.height;\n      // updateCellHeight(scene, cellGroup, col, row, cell.attribute.height, 0, isHeader);\n    } else {\n      // 累加高度\n      (cell as any)._tempHeight += height;\n      return;\n    }\n  } else if (mergeInfo) {\n    cell = scene.getCell(mergeInfo.start.col, mergeInfo.start.row);\n    cell.setAttribute('height', height);\n    cellGroup = cell;\n\n    // const rect = cell.firstChild as Rect;\n    // rect.setAttribute('height', cell.attribute.height);\n  } else {\n    cell.setAttribute('height', height);\n    cellGroup = cell;\n  }\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  // 更新单元格布局\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    );\n  } else if (type === 'image' || type === 'video') {\n    updateImageCellContentWhileResize(cell, col, row, scene.table);\n  } else {\n    // 处理文字\n    const style = scene.table._getCellStyle(col, row);\n    updateCellContentHeight(\n      cell,\n      distHeight,\n      detaY,\n      scene.table.internalProps.autoRowHeight,\n      getQuadProps(style.padding as number),\n      style.textAlign,\n      style.textBaseline\n    );\n\n    // 处理自定义渲染\n    const customContainer = cell.getChildByName('custom-container') as Group;\n    if (customContainer) {\n      customContainer.clear();\n      cell.removeChild(customContainer);\n\n      let customRender;\n      let customLayout;\n      const cellType = scene.table.getCellType(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      const customResult = dealWithCustom(\n        customLayout,\n        customRender,\n        col,\n        row,\n        cell.attribute.width,\n        cell.attribute.height,\n        false,\n        false,\n        scene.table\n      );\n      if (cell.childrenCount > 0) {\n        cell.insertBefore(customResult.elementsGroup, cell.firstChild);\n      } else {\n        cell.appendChild(customResult.elementsGroup);\n      }\n    }\n  }\n}\n"]}

package/cjs/scenegraph/layout/update-row.d.ts

@@ -0,0 +1,3 @@
+import type { CellAddress } from '../../ts-types';
+import type { BaseTableAPI } from '../../ts-types/base-table';
+export declare function updateRow(removeCells: CellAddress[], addCells: CellAddress[], table: BaseTableAPI): void;

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

@@ -0,0 +1,81 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.updateRow = void 0;
+
+const cell_helper_1 = require("../group-creater/cell-helper");
+
+function updateRow(removeCells, addCells, table) {
+    const scene = table.scenegraph, removeRows = deduplication(removeCells.map((cell => cell.row))).sort(((a, b) => a - b)), addRows = deduplication(addCells.map((cell => cell.row))).sort(((a, b) => a - b));
+    removeRows.forEach((row => {
+        removeRow(row, scene);
+    })), removeRows.length && resetRowNumber(scene), addRows.forEach((row => {
+        addRow(row, scene);
+    })), resetRowNumberAndY(scene);
+}
+
+function removeRow(row, scene) {
+    for (let col = 0; col < scene.table.colCount; col++) {
+        const colGroup = scene.getColGroup(col, !1);
+        let cellGroup;
+        colGroup.forEachChildren((cell => cell.row === row && (cellGroup = cell, !0))), 
+        cellGroup && colGroup.removeChild(cellGroup);
+    }
+}
+
+function addRow(row, scene) {
+    var _a;
+    for (let col = 0; col < scene.table.colCount; col++) {
+        const cellGroup = (0, cell_helper_1.updateCell)(col, row, scene.table, !0);
+        if (!cellGroup) continue;
+        const colGroup = scene.getColGroup(col);
+        if (colGroup.firstChild && row < colGroup.firstChild.row) colGroup.insertBefore(cellGroup, colGroup.firstChild); else if (colGroup.lastChild && row > colGroup.lastChild.row) colGroup.appendChild(cellGroup); else {
+            let cellBefore;
+            colGroup.forEachChildren((cellGroup => cellGroup.row === row && (cellBefore = cellGroup, 
+            !0))), cellBefore !== cellGroup && colGroup.insertBefore(cellGroup, cellBefore);
+        }
+        let rowIndex = null === (_a = colGroup.firstChild) || void 0 === _a ? void 0 : _a.row;
+        colGroup.forEachChildren((cellGroup => {
+            cellGroup.row = rowIndex, rowIndex++;
+        }));
+    }
+}
+
+function deduplication(array) {
+    const result = [];
+    for (let i = 0; i < array.length; i++) -1 === result.indexOf(array[i]) && result.push(array[i]);
+    return result;
+}
+
+function resetRowNumber(scene) {
+    var _a, _b;
+    for (let col = 0; col < scene.table.colCount; col++) {
+        const headerColGroup = scene.getColGroup(col, !0), colGroup = scene.getColGroup(col, !1);
+        let rowIndex = null === (_a = headerColGroup.firstChild) || void 0 === _a ? void 0 : _a.row;
+        headerColGroup.forEachChildren((cellGroup => {
+            cellGroup.row = rowIndex, rowIndex++;
+        })), rowIndex = null === (_b = colGroup.firstChild) || void 0 === _b ? void 0 : _b.row, 
+        colGroup.forEachChildren((cellGroup => {
+            cellGroup.row = rowIndex, rowIndex++;
+        }));
+    }
+}
+
+function resetRowNumberAndY(scene) {
+    var _a, _b;
+    let newTotalHeight = 0;
+    for (let col = 0; col < scene.table.colCount; col++) {
+        const headerColGroup = scene.getColGroup(col, !0), colGroup = scene.getColGroup(col, !1);
+        let rowIndex = null === (_a = headerColGroup.firstChild) || void 0 === _a ? void 0 : _a.row, y = 0;
+        rowIndex = null === (_b = colGroup.firstChild) || void 0 === _b ? void 0 : _b.row, 
+        y = 0, colGroup.forEachChildren((cellGroup => {
+            cellGroup.row = rowIndex, rowIndex++, "cell" === cellGroup.role && (cellGroup.setAttribute("y", y), 
+            y += cellGroup.attribute.height);
+        })), newTotalHeight = y;
+    }
+    scene.updateContainerHeight(scene.table.frozenRowCount, newTotalHeight - scene.bodyGroup.attribute.height);
+}
+
+exports.updateRow = updateRow;
+//# sourceMappingURL=update-row.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["scenegraph/layout/update-row.ts"],"names":[],"mappings":"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","file":"update-row.js","sourcesContent":["import type { CellAddress } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { Group } from '../graphic/group';\nimport { updateCell } from '../group-creater/cell-helper';\nimport type { Scenegraph } from '../scenegraph';\n\n/**\n * add and remove rows in scenegraph\n */\nexport function updateRow(removeCells: CellAddress[], addCells: CellAddress[], table: BaseTableAPI) {\n  const scene = table.scenegraph;\n  // deduplication\n  const removeRows = deduplication(removeCells.map(cell => cell.row)).sort((a, b) => a - b);\n  const addRows = deduplication(addCells.map(cell => cell.row)).sort((a, b) => a - b);\n\n  // remove cells\n  removeRows.forEach(row => {\n    removeRow(row, scene);\n  });\n\n  if (removeRows.length) {\n    resetRowNumber(scene);\n  }\n\n  // add cells\n  addRows.forEach(row => {\n    addRow(row, scene);\n  });\n\n  // reset attribute y and row number in CellGroup\n  resetRowNumberAndY(scene);\n}\n\nfunction removeRow(row: number, scene: Scenegraph) {\n  for (let col = 0; col < scene.table.colCount; col++) {\n    // const headerColGroup = scene.getColGroup(col, true);\n    const colGroup = scene.getColGroup(col, false);\n\n    // // remove cellGroup in headerColGroup\n    // let headerCellGroup;\n    // headerColGroup.forEachChildren((cellGroup: Group) => {\n    //   if (cellGroup.row === row) {\n    //     headerCellGroup = cellGroup;\n    //     return true;\n    //   }\n    //   return false;\n    // });\n    // if (headerCellGroup) {\n    //   headerColGroup.removeChild(headerCellGroup);\n    // }\n\n    // remove cellGroup in colGroup\n    let cellGroup;\n    colGroup.forEachChildren((cell: Group) => {\n      if (cell.row === row) {\n        cellGroup = cell;\n        return true;\n      }\n      return false;\n    });\n    if (cellGroup) {\n      colGroup.removeChild(cellGroup);\n    }\n  }\n}\n\nfunction addRow(row: number, scene: Scenegraph) {\n  for (let col = 0; col < scene.table.colCount; col++) {\n    // create cellGroup\n    const cellGroup = updateCell(col, row, scene.table, true);\n\n    if (!cellGroup) {\n      // TODO: deal with data promise situation\n      continue;\n    }\n\n    // insert cellGroup in colGroup\n    const colGroup = scene.getColGroup(col);\n    if (colGroup.firstChild && row < (colGroup.firstChild as Group).row) {\n      colGroup.insertBefore(cellGroup, colGroup.firstChild);\n    } else if (colGroup.lastChild && row > (colGroup.lastChild as Group).row) {\n      colGroup.appendChild(cellGroup);\n    } else {\n      let cellBefore;\n      colGroup.forEachChildren((cellGroup: Group) => {\n        if (cellGroup.row === row) {\n          cellBefore = cellGroup;\n          return true;\n        }\n        return false;\n      });\n      if (cellBefore !== cellGroup) {\n        colGroup.insertBefore(cellGroup, cellBefore);\n      }\n    }\n\n    // reset row number\n    let rowIndex = (colGroup.firstChild as Group)?.row;\n    colGroup.forEachChildren((cellGroup: Group) => {\n      cellGroup.row = rowIndex;\n      rowIndex++;\n    });\n  }\n}\n\n// array deduplication\nfunction deduplication(array: number[]) {\n  const result = [];\n  for (let i = 0; i < array.length; i++) {\n    if (result.indexOf(array[i]) === -1) {\n      result.push(array[i]);\n    }\n  }\n  return result;\n}\n\nfunction resetRowNumber(scene: Scenegraph) {\n  for (let col = 0; col < scene.table.colCount; col++) {\n    const headerColGroup = scene.getColGroup(col, true);\n    const colGroup = scene.getColGroup(col, false);\n    // reset row number\n    let rowIndex = (headerColGroup.firstChild as Group)?.row;\n    headerColGroup.forEachChildren((cellGroup: Group) => {\n      cellGroup.row = rowIndex;\n      rowIndex++;\n    });\n    rowIndex = (colGroup.firstChild as Group)?.row;\n    colGroup.forEachChildren((cellGroup: Group) => {\n      cellGroup.row = rowIndex;\n      rowIndex++;\n    });\n  }\n}\n\nfunction resetRowNumberAndY(scene: Scenegraph) {\n  let newTotalHeight = 0;\n  for (let col = 0; col < scene.table.colCount; col++) {\n    const headerColGroup = scene.getColGroup(col, true);\n    const colGroup = scene.getColGroup(col, false);\n    // reset row number\n    let rowIndex = (headerColGroup.firstChild as Group)?.row;\n    let y = 0;\n    // headerColGroup.forEachChildren((cellGroup: Group) => {\n    //   cellGroup.row = rowIndex;\n    //   rowIndex++;\n    //   if (cellGroup.role !== 'cell') {\n    //     return;\n    //   }\n    //   cellGroup.setAttribute('y', y);\n    //   y+= cellGroup.attribute.height;\n    // });\n    rowIndex = (colGroup.firstChild as Group)?.row;\n    y = 0;\n    colGroup.forEachChildren((cellGroup: Group) => {\n      cellGroup.row = rowIndex;\n      rowIndex++;\n      if (cellGroup.role !== 'cell') {\n        return;\n      }\n      cellGroup.setAttribute('y', y);\n      y += cellGroup.attribute.height;\n    });\n    newTotalHeight = y;\n  }\n\n  // update table size\n  scene.updateContainerHeight(scene.table.frozenRowCount, newTotalHeight - scene.bodyGroup.attribute.height);\n}\n"]}

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

@@ -9,7 +9,7 @@ const image_cell_1 = require("../group-creater/cell-type/image-cell"), progress_
 function updateColWidth(scene, col, detaX) {
     const {autoRowHeight: autoRowHeight} = scene.table.internalProps;
     let needRerangeRow = !1;
-    const colOrCornerHeaderColumn = scene.getColGroup(col, !0), oldColOrCornerHeaderColumnWidth = colOrCornerHeaderColumn.attribute.width;
+    const colOrCornerHeaderColumn = scene.getColGroup(col, !0), oldColOrCornerHeaderColumnWidth = null == colOrCornerHeaderColumn ? void 0 : colOrCornerHeaderColumn.attribute.width;
     if (null == colOrCornerHeaderColumn || colOrCornerHeaderColumn.setAttribute("width", oldColOrCornerHeaderColumnWidth + detaX), 
     null == colOrCornerHeaderColumn || colOrCornerHeaderColumn.forEachChildren(((cell, index) => {
         if (updateCellWidth(scene, cell, col, cell.row, oldColOrCornerHeaderColumnWidth, detaX, index < scene.table.columnHeaderLevelCount, autoRowHeight)) {
@@ -74,19 +74,19 @@ function updateCellWidth(scene, cell, col, row, width, detaX, isHeader, autoRowH
     let isHeightChange = !1;
     if ("progressbar" === type) {
         const columnDefine = scene.table.getBodyColumnDefine(col, row), style = scene.table._getCellStyle(col, row), value = scene.table.getCellValue(col, row), dataValue = scene.table.getCellOriginValue(col, row), padding = (0, 
-        padding_1.getPadding)((0, get_prop_1.getProp)("padding", style, col, row, scene.table)), newBarCell = (0, 
+        padding_1.getQuadProps)((0, get_prop_1.getProp)("padding", style, col, row, scene.table)), newBarCell = (0, 
         progress_bar_cell_1.createProgressBarCell)(columnDefine, style, cellGroup.attribute.width, value, dataValue, col, row, padding, scene.table), oldBarCell = cellGroup.getChildByName("progress-bar");
         cellGroup.insertBefore(newBarCell, oldBarCell), cellGroup.removeChild(oldBarCell), 
         oldBarCell.removeAllChild(), oldBarCell.release();
     } else if ("sparkline" === type) {
         cellGroup.removeAllChild();
-        const headerStyle = scene.table._getCellStyle(col, row), padding = (0, padding_1.getPadding)((0, 
+        const headerStyle = scene.table._getCellStyle(col, row), padding = (0, padding_1.getQuadProps)((0, 
         get_prop_1.getProp)("padding", headerStyle, col, row, scene.table));
         (0, spark_line_cell_1.createSparkLineCellGroup)(cellGroup, cellGroup.parent, cellGroup.attribute.x, cellGroup.attribute.y, col, row, cellGroup.attribute.width, cellGroup.attribute.height, padding, scene.table);
     } else if ("image" === type || "video" === type) (0, image_cell_1.updateImageCellContentWhileResize)(cellGroup, col, row, scene.table); else {
         const style = scene.table._getCellStyle(col, row);
         isHeightChange = (0, text_icon_layout_1.updateCellContentWidth)(cellGroup, distWidth, detaX, autoRowHeight, (0, 
-        padding_1.getPadding)(style.padding), style.textAlign, style.textBaseline, scene);
+        padding_1.getQuadProps)(style.padding), style.textAlign, style.textBaseline, scene);
     }
     return isHeightChange;
 }
@@ -113,7 +113,7 @@ function getCleanCellHeight(cell, scene) {
     cell.forEachChildren((child => {
         "icon-left" !== child.role && "icon-right" !== child.role && "text" !== child.name && "content" !== child.name || (maxHeight = Math.max(maxHeight, child.AABBBounds.height()));
     }));
-    const padding = (0, padding_1.getPadding)(scene.table._getCellStyle(cell.col, cell.row).padding);
+    const padding = (0, padding_1.getQuadProps)(scene.table._getCellStyle(cell.col, cell.row).padding);
     return maxHeight + padding[0] + padding[2];
 }