@visactor/vtable 0.9.2 → 0.9.3-alpha.0

package/cjs/scenegraph/layout/compute-row-height.js

@@ -13,15 +13,15 @@ const vrender_1 = require("@visactor/vrender"), util_1 = require("../../tools/ut
 });
 
 function computeRowsHeight(table, rowStart, rowEnd) {
-    if (!table.internalProps.autoRowHeight) return;
-    rowStart = null != rowStart ? rowStart : 0, rowEnd = null != rowEnd ? rowEnd : table.rowCount - 1;
     const time = "undefined" != typeof window ? window.performance.now() : 0;
-    if (0 === rowStart && rowEnd === table.rowCount - 1) table._clearRowRangeHeightsMap(); else for (let row = rowStart; row <= rowEnd; row++) table._clearRowRangeHeightsMap(row);
-    for (let row = rowStart; row < table.columnHeaderLevelCount; row++) {
-        const height = computeRowHeight(row, 0, table.colCount - 1, table);
-        table.setRowHeight(row, height);
-    }
-    if (!(rowEnd < table.columnHeaderLevelCount)) {
+    if ("autoHeight" === table.heightMode) {
+        if (rowStart = null != rowStart ? rowStart : 0, rowEnd = null != rowEnd ? rowEnd : table.rowCount - 1, 
+        0 === rowStart && rowEnd === table.rowCount - 1) table._clearRowRangeHeightsMap(); else for (let row = rowStart; row <= rowEnd; row++) table._clearRowRangeHeightsMap(row);
+        for (let row = rowStart; row < table.columnHeaderLevelCount; row++) {
+            const height = computeRowHeight(row, 0, table.colCount - 1, table);
+            table.setRowHeight(row, height);
+        }
+        if (rowEnd < table.columnHeaderLevelCount) return;
         if (table.internalProps.transpose || table.isPivotTable() && table.internalProps.layoutMap.indicatorsAsCol || !checkFixedStyleAndNoWrap(table)) if ((table.internalProps.transpose || table.isPivotTable() && !table.internalProps.layoutMap.indicatorsAsCol) && checkFixedStyleAndNoWrap(table)) for (let row = Math.max(rowStart, table.columnHeaderLevelCount); row <= rowEnd; row++) {
             table._clearRowRangeHeightsMap(row);
             const height = computeRowHeight(row, 0, table.rowHeaderLevelCount, table);
@@ -33,8 +33,19 @@ function computeRowsHeight(table, rowStart, rowEnd) {
         } else {
             fillRowsHeight(computeRowHeight(table.columnHeaderLevelCount, 0, table.colCount - 1, table), table.columnHeaderLevelCount, table.rowCount - 1, table);
         }
-        console.log("computeRowsHeight  time:", ("undefined" != typeof window ? window.performance.now() : 0) - time);
+    } else if ("adaptive" === table.heightMode) {
+        table._clearRowRangeHeightsMap();
+        const totalDrawHeight = table.tableNoFrameHeight - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();
+        let actualHeight = 0;
+        for (let row = table.frozenRowCount; row < table.rowCount - table.bottomFrozenRowCount; row++) actualHeight += table.getRowHeight(row);
+        const factor = totalDrawHeight / actualHeight;
+        for (let row = table.frozenRowCount; row < table.rowCount - table.bottomFrozenRowCount; row++) {
+            let rowHeight;
+            rowHeight = row === table.rowCount - table.bottomFrozenRowCount - 1 ? totalDrawHeight - table.getRowsHeight(table.frozenRowCount, table.rowCount - table.bottomFrozenRowCount - 2) : Math.round(table.getRowHeight(row) * factor), 
+            table.setRowHeight(row, rowHeight, !1);
+        }
     }
+    console.log("computeRowsHeight  time:", ("undefined" != typeof window ? window.performance.now() : 0) - time);
 }
 
 function computeRowHeight(row, startCol, endCol, table) {

package/cjs/scenegraph/layout/compute-row-height.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/layout/compute-row-height.ts"],"names":[],"mappings":"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","file":"compute-row-height.js","sourcesContent":["import { RichText } from '@visactor/vrender';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { validToString } from '../../tools/util';\nimport type { ColumnIconOption } from '../../ts-types';\nimport { IconPosition } from '../../ts-types';\nimport type { BaseTableAPI, HeaderData } from '../../ts-types/base-table';\nimport type { ColumnData, TextColumnDefine } from '../../ts-types/list-table/layout-map/api';\nimport { WrapText } from '../graphic/text';\nimport { getProp } from '../utils/get-prop';\nimport { getQuadProps } from '../utils/padding';\nimport { getCellRect } from './compute-col-width';\nimport { dealWithRichTextIcon } from '../utils/text-icon-layout';\n\nconst utilTextMark = new WrapText({\n  autoWrapText: true\n});\nconst utilRichTextMark = new RichText({\n  width: 0,\n  height: 0,\n  textConfig: []\n});\n\nexport function computeRowsHeight(table: BaseTableAPI, rowStart?: number, rowEnd?: number): void {\n  if (!table.internalProps.autoRowHeight) {\n    // autoRowHeight false use default height\n    return;\n  }\n  rowStart = rowStart ?? 0;\n  rowEnd = rowEnd ?? table.rowCount - 1;\n  const time = typeof window !== 'undefined' ? window.performance.now() : 0;\n\n  // clear rowRangeHeightsMap\n  if (rowStart === 0 && rowEnd === table.rowCount - 1) {\n    table._clearRowRangeHeightsMap();\n  } else {\n    for (let row = rowStart; row <= rowEnd; row++) {\n      table._clearRowRangeHeightsMap(row);\n    }\n  }\n\n  // compute header row in column header row\n  for (let row = rowStart; row < table.columnHeaderLevelCount; row++) {\n    const height = computeRowHeight(row, 0, table.colCount - 1, table);\n    table.setRowHeight(row, height);\n  }\n\n  if (rowEnd < table.columnHeaderLevelCount) {\n    return;\n  }\n\n  // compute body row\n  if (\n    !table.internalProps.transpose &&\n    !(table.isPivotTable() && (table.internalProps.layoutMap as PivotHeaderLayoutMap).indicatorsAsCol) &&\n    checkFixedStyleAndNoWrap(table)\n  ) {\n    // check fixed style and no wrap situation, fill all row width single compute\n    // traspose table and row indicator pivot table cannot use single row height\n    const height = computeRowHeight(table.columnHeaderLevelCount, 0, table.colCount - 1, table);\n    fillRowsHeight(height, table.columnHeaderLevelCount, table.rowCount - 1, table);\n  } else if (\n    (table.internalProps.transpose ||\n      (table.isPivotTable() && !(table.internalProps.layoutMap as PivotHeaderLayoutMap).indicatorsAsCol)) &&\n    checkFixedStyleAndNoWrap(table)\n  ) {\n    // check fixed style and no wrap situation, just compute 0-table.rowHeaderLevelCount column(the column after row header) in ervey row\n    // in traspose table and row indicator pivot table\n    for (let row = Math.max(rowStart, table.columnHeaderLevelCount); row <= rowEnd; row++) {\n      table._clearRowRangeHeightsMap(row);\n      const height = computeRowHeight(row, 0, table.rowHeaderLevelCount, table);\n      table.setRowHeight(row, height);\n    }\n  } else {\n    for (let row = Math.max(rowStart, table.columnHeaderLevelCount); row <= rowEnd; row++) {\n      table._clearRowRangeHeightsMap(row);\n      const height = computeRowHeight(row, 0, table.colCount - 1, table);\n      table.setRowHeight(row, height);\n    }\n  }\n\n  console.log('computeRowsHeight  time:', (typeof window !== 'undefined' ? window.performance.now() : 0) - time);\n}\n\nexport function computeRowHeight(row: number, startCol: number, endCol: number, table: BaseTableAPI): number {\n  let maxHeight = 0;\n  for (let col = startCol; col <= endCol; col++) {\n    // CustomRender height calculation\n    const customHeight = computeCustomRenderHeight(col, row, table);\n    if (typeof customHeight === 'number') {\n      maxHeight = Math.max(customHeight, maxHeight);\n      continue;\n    }\n\n    // text height calculation\n    const textHeight = computeTextHeight(col, row, table);\n    maxHeight = Math.max(textHeight, maxHeight);\n  }\n  return maxHeight;\n}\n\nfunction checkFixedStyleAndNoWrap(table: BaseTableAPI): boolean {\n  const { layoutMap } = table.internalProps;\n  const row = table.columnHeaderLevelCount;\n  for (let col = 0; col < table.colCount; col++) {\n    const isHeader = layoutMap.isHeader(col, row);\n    const cellDefine = isHeader ? layoutMap.getHeader(col, row) : layoutMap.getBody(col, row);\n    if (\n      typeof cellDefine.style === 'function' ||\n      typeof (cellDefine as ColumnData).icon === 'function' ||\n      typeof (cellDefine as HeaderData).headerIcon === 'function' ||\n      (isHeader ? cellDefine.define?.headerCustomRender : cellDefine.define?.customRender) ||\n      (isHeader ? typeof cellDefine.define?.headerIcon === 'function' : typeof cellDefine.define?.icon === 'function')\n    ) {\n      return false;\n    }\n    const cellStyle = table._getCellStyle(col, row);\n    if (\n      typeof cellStyle.padding === 'function' ||\n      typeof cellStyle.fontSize === 'function' ||\n      typeof cellStyle.lineHeight === 'function' ||\n      cellStyle.autoWrapText === true\n    ) {\n      return false;\n    }\n  }\n\n  return true;\n}\n\nfunction fillRowsHeight(height: number, startRow: number, endRow: number, table: BaseTableAPI) {\n  for (let row = startRow; row <= endRow; row++) {\n    table.setRowHeight(row, height);\n  }\n}\n\n/**\n * @description: compute customRender height\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeCustomRenderHeight(col: number, row: number, table: BaseTableAPI): number | undefined {\n  const customRender = table.getCustomRender(col, row);\n  const customLayout = table.getCustomLayout(col, row);\n  if (customRender || customLayout) {\n    let spanCol = 1;\n    let height = 0;\n    if (table.isHeader(col, row) || (table.getBodyColumnDefine(col, row) as TextColumnDefine).mergeCell) {\n      const cellRange = table.getCellRange(col, row);\n      spanCol = cellRange.end.col - cellRange.start.col + 1;\n    }\n    const arg = {\n      col,\n      row,\n      dataValue: table.getCellOriginValue(col, row),\n      value: table.getCellValue(col, row) || '',\n      rect: getCellRect(col, row, table),\n      table\n    };\n    if (customLayout) {\n      // 处理customLayout\n      const customLayoutObj = customLayout(arg);\n      customLayoutObj.rootContainer.isRoot = true;\n      const size = customLayoutObj.rootContainer.getContentSize();\n      height = size.height ?? 0;\n    } else if (typeof customRender === 'function') {\n      // 处理customRender\n      const customRenderObj = customRender(arg);\n      height = customRenderObj?.expectedHeight ?? 0;\n    } else {\n      height = customRender?.expectedHeight ?? 0;\n    }\n    return height / spanCol;\n  }\n  return undefined;\n}\n\n/**\n * @description: compute text height\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeTextHeight(col: number, row: number, table: BaseTableAPI): number {\n  let maxHeight = 0;\n  const cellValue = table.getCellValue(col, row);\n  // const dataValue = table.getCellOriginValue(col, row);\n  const actStyle = table._getCellStyle(col, row);\n  let iconHeight = 0;\n  let iconWidth = 0;\n  const iconInlineFront: ColumnIconOption[] = [];\n  let iconInlineFrontHeight = 0;\n  const iconInlineEnd: ColumnIconOption[] = [];\n  let iconInlineEndHeight = 0;\n  const define = table.getBodyColumnDefine(col, row);\n  const mayHaveIcon = table.getCellType(col, row) !== 'body' ? true : !!define?.icon || !!define?.tree;\n  if (mayHaveIcon) {\n    const icons = table.getCellIcons(col, row);\n    icons?.forEach(icon => {\n      if (\n        icon.positionType !== IconPosition.absoluteRight &&\n        icon.positionType !== IconPosition.inlineFront &&\n        icon.positionType !== IconPosition.inlineEnd\n      ) {\n        iconWidth += (icon.width ?? 0) + (icon.marginLeft ?? 0) + (icon.marginRight ?? 0);\n        iconHeight = Math.max(iconHeight, icon.height ?? 0);\n      } else if (icon.positionType === IconPosition.inlineFront) {\n        iconInlineFront.push(icon);\n        iconInlineFrontHeight = Math.max(\n          iconInlineFrontHeight,\n          (icon.height ?? 0) + (icon.marginLeft ?? 0) + (icon.marginRight ?? 0)\n        );\n      } else if (icon.positionType === IconPosition.inlineEnd) {\n        iconInlineEnd.push(icon);\n        iconInlineEndHeight = Math.max(\n          iconInlineEndHeight,\n          (icon.height ?? 0) + (icon.marginLeft ?? 0) + (icon.marginRight ?? 0)\n        );\n      }\n    });\n  }\n  let spanRow = 1;\n  if (table.isHeader(col, row) || (table.getBodyColumnDefine(col, row) as TextColumnDefine).mergeCell) {\n    const cellRange = table.getCellRange(col, row);\n    spanRow = cellRange.end.row - cellRange.start.row + 1;\n  }\n\n  const padding = getQuadProps(getProp('padding', actStyle, col, row, table));\n  const fontSize = getProp('fontSize', actStyle, col, row, table);\n  const fontStyle = getProp('fontStyle', actStyle, col, row, table);\n  const fontWeight = getProp('fontWeight', actStyle, col, row, table);\n  const lineHeight = getProp('lineHeight', actStyle, col, row, table) ?? fontSize;\n  const fontFamily = getProp('fontFamily', actStyle, col, row, table);\n  const autoWrapText = getProp('autoWrapText', actStyle, col, row, table);\n  const lines = validToString(cellValue).split('\\n') || [];\n\n  if (iconInlineFront.length || iconInlineEnd.length) {\n    // if (autoWrapText) {\n    const textOption = Object.assign({\n      text: cellValue?.toString(),\n      fontFamily,\n      fontSize,\n      fontStyle,\n      fontWeight,\n      lineHeight\n    });\n    textOption.textBaseline = 'middle';\n    const textConfig = [\n      ...iconInlineFront.map(icon => dealWithRichTextIcon(icon)),\n      textOption,\n      ...iconInlineEnd.map(icon => dealWithRichTextIcon(icon))\n    ];\n    utilRichTextMark.setAttributes({\n      width: table.getColWidth(col) - (padding[1] + padding[3]) - iconWidth,\n      height: 0,\n      textConfig\n    });\n    maxHeight = utilRichTextMark.AABBBounds.height();\n    // } else {\n    //   maxHeight = 0;\n    //   lines.forEach((line: string, index: number) => {\n    //     if (index === 0 && iconInlineFront.length) {\n    //       maxHeight += Math.max(lineHeight, iconInlineFrontHeight);\n    //     } else if (index === lines.length - 1 && iconInlineEnd.length) {\n    //       maxHeight += Math.max(lineHeight, iconInlineEndHeight);\n    //     } else {\n    //       maxHeight += lineHeight;\n    //     }\n    //   });\n    // }\n  } else if (autoWrapText) {\n    const maxLineWidth = table.getColWidth(col) - (padding[1] + padding[3]) - iconWidth;\n    utilTextMark.setAttributes({\n      maxLineWidth,\n      text: lines,\n      fontSize,\n      fontStyle,\n      fontWeight,\n      fontFamily\n    });\n    maxHeight = utilTextMark.AABBBounds.height();\n  } else {\n    // autoWrapText = false\n    maxHeight = lines.length * lineHeight;\n  }\n\n  return (Math.max(maxHeight, iconHeight) + padding[0] + padding[2]) / spanRow;\n}\n"]}
+{"version":3,"sources":["scenegraph/layout/compute-row-height.ts"],"names":[],"mappings":"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","file":"compute-row-height.js","sourcesContent":["import { RichText } from '@visactor/vrender';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { validToString } from '../../tools/util';\nimport type { ColumnIconOption } from '../../ts-types';\nimport { IconPosition } from '../../ts-types';\nimport type { BaseTableAPI, HeaderData } from '../../ts-types/base-table';\nimport type { ColumnData, TextColumnDefine } from '../../ts-types/list-table/layout-map/api';\nimport { WrapText } from '../graphic/text';\nimport { getProp } from '../utils/get-prop';\nimport { getQuadProps } from '../utils/padding';\nimport { getCellRect } from './compute-col-width';\nimport { dealWithRichTextIcon } from '../utils/text-icon-layout';\n\nconst utilTextMark = new WrapText({\n  autoWrapText: true\n});\nconst utilRichTextMark = new RichText({\n  width: 0,\n  height: 0,\n  textConfig: []\n});\n\nexport function computeRowsHeight(table: BaseTableAPI, rowStart?: number, rowEnd?: number): void {\n  const time = typeof window !== 'undefined' ? window.performance.now() : 0;\n  if (table.heightMode === 'autoHeight') {\n    rowStart = rowStart ?? 0;\n    rowEnd = rowEnd ?? table.rowCount - 1;\n\n    // clear rowRangeHeightsMap\n    if (rowStart === 0 && rowEnd === table.rowCount - 1) {\n      table._clearRowRangeHeightsMap();\n    } else {\n      for (let row = rowStart; row <= rowEnd; row++) {\n        table._clearRowRangeHeightsMap(row);\n      }\n    }\n\n    // compute header row in column header row\n    for (let row = rowStart; row < table.columnHeaderLevelCount; row++) {\n      const height = computeRowHeight(row, 0, table.colCount - 1, table);\n      table.setRowHeight(row, height);\n    }\n\n    if (rowEnd < table.columnHeaderLevelCount) {\n      return;\n    }\n\n    // compute body row\n    if (\n      !table.internalProps.transpose &&\n      !(table.isPivotTable() && (table.internalProps.layoutMap as PivotHeaderLayoutMap).indicatorsAsCol) &&\n      checkFixedStyleAndNoWrap(table)\n    ) {\n      // check fixed style and no wrap situation, fill all row width single compute\n      // traspose table and row indicator pivot table cannot use single row height\n      const height = computeRowHeight(table.columnHeaderLevelCount, 0, table.colCount - 1, table);\n      fillRowsHeight(height, table.columnHeaderLevelCount, table.rowCount - 1, table);\n    } else if (\n      (table.internalProps.transpose ||\n        (table.isPivotTable() && !(table.internalProps.layoutMap as PivotHeaderLayoutMap).indicatorsAsCol)) &&\n      checkFixedStyleAndNoWrap(table)\n    ) {\n      // check fixed style and no wrap situation, just compute 0-table.rowHeaderLevelCount column(the column after row header) in ervey row\n      // in traspose table and row indicator pivot table\n      for (let row = Math.max(rowStart, table.columnHeaderLevelCount); row <= rowEnd; row++) {\n        table._clearRowRangeHeightsMap(row);\n        const height = computeRowHeight(row, 0, table.rowHeaderLevelCount, table);\n        table.setRowHeight(row, height);\n      }\n    } else {\n      for (let row = Math.max(rowStart, table.columnHeaderLevelCount); row <= rowEnd; row++) {\n        table._clearRowRangeHeightsMap(row);\n        const height = computeRowHeight(row, 0, table.colCount - 1, table);\n        table.setRowHeight(row, height);\n      }\n    }\n  }\n  // 处理adaptive宽度\n  else if (table.heightMode === 'adaptive') {\n    table._clearRowRangeHeightsMap();\n    // const canvasWidth = table.internalProps.canvas.width;\n    const totalDrawHeight = table.tableNoFrameHeight - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();\n    let actualHeight = 0;\n    for (let row = table.frozenRowCount; row < table.rowCount - table.bottomFrozenRowCount; row++) {\n      actualHeight += table.getRowHeight(row);\n    }\n    const factor = totalDrawHeight / actualHeight;\n    for (let row = table.frozenRowCount; row < table.rowCount - table.bottomFrozenRowCount; row++) {\n      let rowHeight;\n      if (row === table.rowCount - table.bottomFrozenRowCount - 1) {\n        rowHeight =\n          totalDrawHeight - table.getRowsHeight(table.frozenRowCount, table.rowCount - table.bottomFrozenRowCount - 2);\n      } else {\n        rowHeight = Math.round(table.getRowHeight(row) * factor);\n      }\n      table.setRowHeight(row, rowHeight, false);\n    }\n  }\n\n  console.log('computeRowsHeight  time:', (typeof window !== 'undefined' ? window.performance.now() : 0) - time);\n}\n\nexport function computeRowHeight(row: number, startCol: number, endCol: number, table: BaseTableAPI): number {\n  let maxHeight = 0;\n  for (let col = startCol; col <= endCol; col++) {\n    // CustomRender height calculation\n    const customHeight = computeCustomRenderHeight(col, row, table);\n    if (typeof customHeight === 'number') {\n      maxHeight = Math.max(customHeight, maxHeight);\n      continue;\n    }\n\n    // text height calculation\n    const textHeight = computeTextHeight(col, row, table);\n    maxHeight = Math.max(textHeight, maxHeight);\n  }\n  return maxHeight;\n}\n\nfunction checkFixedStyleAndNoWrap(table: BaseTableAPI): boolean {\n  const { layoutMap } = table.internalProps;\n  const row = table.columnHeaderLevelCount;\n  for (let col = 0; col < table.colCount; col++) {\n    const isHeader = layoutMap.isHeader(col, row);\n    const cellDefine = isHeader ? layoutMap.getHeader(col, row) : layoutMap.getBody(col, row);\n    if (\n      typeof cellDefine.style === 'function' ||\n      typeof (cellDefine as ColumnData).icon === 'function' ||\n      typeof (cellDefine as HeaderData).headerIcon === 'function' ||\n      (isHeader ? cellDefine.define?.headerCustomRender : cellDefine.define?.customRender) ||\n      (isHeader ? typeof cellDefine.define?.headerIcon === 'function' : typeof cellDefine.define?.icon === 'function')\n    ) {\n      return false;\n    }\n    const cellStyle = table._getCellStyle(col, row);\n    if (\n      typeof cellStyle.padding === 'function' ||\n      typeof cellStyle.fontSize === 'function' ||\n      typeof cellStyle.lineHeight === 'function' ||\n      cellStyle.autoWrapText === true\n    ) {\n      return false;\n    }\n  }\n\n  return true;\n}\n\nfunction fillRowsHeight(height: number, startRow: number, endRow: number, table: BaseTableAPI) {\n  for (let row = startRow; row <= endRow; row++) {\n    table.setRowHeight(row, height);\n  }\n}\n\n/**\n * @description: compute customRender height\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeCustomRenderHeight(col: number, row: number, table: BaseTableAPI): number | undefined {\n  const customRender = table.getCustomRender(col, row);\n  const customLayout = table.getCustomLayout(col, row);\n  if (customRender || customLayout) {\n    let spanCol = 1;\n    let height = 0;\n    if (table.isHeader(col, row) || (table.getBodyColumnDefine(col, row) as TextColumnDefine).mergeCell) {\n      const cellRange = table.getCellRange(col, row);\n      spanCol = cellRange.end.col - cellRange.start.col + 1;\n    }\n    const arg = {\n      col,\n      row,\n      dataValue: table.getCellOriginValue(col, row),\n      value: table.getCellValue(col, row) || '',\n      rect: getCellRect(col, row, table),\n      table\n    };\n    if (customLayout) {\n      // 处理customLayout\n      const customLayoutObj = customLayout(arg);\n      customLayoutObj.rootContainer.isRoot = true;\n      const size = customLayoutObj.rootContainer.getContentSize();\n      height = size.height ?? 0;\n    } else if (typeof customRender === 'function') {\n      // 处理customRender\n      const customRenderObj = customRender(arg);\n      height = customRenderObj?.expectedHeight ?? 0;\n    } else {\n      height = customRender?.expectedHeight ?? 0;\n    }\n    return height / spanCol;\n  }\n  return undefined;\n}\n\n/**\n * @description: compute text height\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction computeTextHeight(col: number, row: number, table: BaseTableAPI): number {\n  let maxHeight = 0;\n  const cellValue = table.getCellValue(col, row);\n  // const dataValue = table.getCellOriginValue(col, row);\n  const actStyle = table._getCellStyle(col, row);\n  let iconHeight = 0;\n  let iconWidth = 0;\n  const iconInlineFront: ColumnIconOption[] = [];\n  let iconInlineFrontHeight = 0;\n  const iconInlineEnd: ColumnIconOption[] = [];\n  let iconInlineEndHeight = 0;\n  const define = table.getBodyColumnDefine(col, row);\n  const mayHaveIcon = table.getCellType(col, row) !== 'body' ? true : !!define?.icon || !!define?.tree;\n  if (mayHaveIcon) {\n    const icons = table.getCellIcons(col, row);\n    icons?.forEach(icon => {\n      if (\n        icon.positionType !== IconPosition.absoluteRight &&\n        icon.positionType !== IconPosition.inlineFront &&\n        icon.positionType !== IconPosition.inlineEnd\n      ) {\n        iconWidth += (icon.width ?? 0) + (icon.marginLeft ?? 0) + (icon.marginRight ?? 0);\n        iconHeight = Math.max(iconHeight, icon.height ?? 0);\n      } else if (icon.positionType === IconPosition.inlineFront) {\n        iconInlineFront.push(icon);\n        iconInlineFrontHeight = Math.max(\n          iconInlineFrontHeight,\n          (icon.height ?? 0) + (icon.marginLeft ?? 0) + (icon.marginRight ?? 0)\n        );\n      } else if (icon.positionType === IconPosition.inlineEnd) {\n        iconInlineEnd.push(icon);\n        iconInlineEndHeight = Math.max(\n          iconInlineEndHeight,\n          (icon.height ?? 0) + (icon.marginLeft ?? 0) + (icon.marginRight ?? 0)\n        );\n      }\n    });\n  }\n  let spanRow = 1;\n  if (table.isHeader(col, row) || (table.getBodyColumnDefine(col, row) as TextColumnDefine).mergeCell) {\n    const cellRange = table.getCellRange(col, row);\n    spanRow = cellRange.end.row - cellRange.start.row + 1;\n  }\n\n  const padding = getQuadProps(getProp('padding', actStyle, col, row, table));\n  const fontSize = getProp('fontSize', actStyle, col, row, table);\n  const fontStyle = getProp('fontStyle', actStyle, col, row, table);\n  const fontWeight = getProp('fontWeight', actStyle, col, row, table);\n  const lineHeight = getProp('lineHeight', actStyle, col, row, table) ?? fontSize;\n  const fontFamily = getProp('fontFamily', actStyle, col, row, table);\n  const autoWrapText = getProp('autoWrapText', actStyle, col, row, table);\n  const lines = validToString(cellValue).split('\\n') || [];\n\n  if (iconInlineFront.length || iconInlineEnd.length) {\n    // if (autoWrapText) {\n    const textOption = Object.assign({\n      text: cellValue?.toString(),\n      fontFamily,\n      fontSize,\n      fontStyle,\n      fontWeight,\n      lineHeight\n    });\n    textOption.textBaseline = 'middle';\n    const textConfig = [\n      ...iconInlineFront.map(icon => dealWithRichTextIcon(icon)),\n      textOption,\n      ...iconInlineEnd.map(icon => dealWithRichTextIcon(icon))\n    ];\n    utilRichTextMark.setAttributes({\n      width: table.getColWidth(col) - (padding[1] + padding[3]) - iconWidth,\n      height: 0,\n      textConfig\n    });\n    maxHeight = utilRichTextMark.AABBBounds.height();\n    // } else {\n    //   maxHeight = 0;\n    //   lines.forEach((line: string, index: number) => {\n    //     if (index === 0 && iconInlineFront.length) {\n    //       maxHeight += Math.max(lineHeight, iconInlineFrontHeight);\n    //     } else if (index === lines.length - 1 && iconInlineEnd.length) {\n    //       maxHeight += Math.max(lineHeight, iconInlineEndHeight);\n    //     } else {\n    //       maxHeight += lineHeight;\n    //     }\n    //   });\n    // }\n  } else if (autoWrapText) {\n    const maxLineWidth = table.getColWidth(col) - (padding[1] + padding[3]) - iconWidth;\n    utilTextMark.setAttributes({\n      maxLineWidth,\n      text: lines,\n      fontSize,\n      fontStyle,\n      fontWeight,\n      fontFamily\n    });\n    maxHeight = utilTextMark.AABBBounds.height();\n  } else {\n    // autoWrapText = false\n    maxHeight = lines.length * lineHeight;\n  }\n\n  return (Math.max(maxHeight, iconHeight) + padding[0] + padding[2]) / spanRow;\n}\n"]}

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

@@ -19,7 +19,7 @@ function moveHeaderPosition(colSource, rowSource, colTarget, rowTarget, table) {
         sourceRowEnd = table.rowCount - 1, targetRowStart = rowTarget, 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, colSource, rowSource);
+        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) : (sourceRowStart = rowSource, sourceRowEnd = rowSource, 

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  // 更新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"]}
+{"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, 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    } 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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.updateCellLayout = void 0;
 
-const custom_1 = require("../component/custom"), progress_bar_cell_1 = require("../group-creater/cell-type/progress-bar-cell"), spark_line_cell_1 = require("../group-creater/cell-type/spark-line-cell"), get_cell_merge_1 = require("../utils/get-cell-merge"), get_prop_1 = require("../utils/get-prop"), padding_1 = require("../utils/padding"), text_icon_layout_1 = require("../utils/text-icon-layout");
+const tableHelper_1 = require("../../core/tableHelper"), custom_1 = require("../component/custom"), progress_bar_cell_1 = require("../group-creater/cell-type/progress-bar-cell"), spark_line_cell_1 = require("../group-creater/cell-type/spark-line-cell"), get_cell_merge_1 = require("../utils/get-cell-merge"), get_prop_1 = require("../utils/get-prop"), padding_1 = require("../utils/padding"), text_icon_layout_1 = require("../utils/text-icon-layout");
 
 function updateCellLayout(scene, cell, col, row, width, height, detaX, detaY, isHeader, autoColWidth, autoRowHeight) {
     let cellGroup, distWidth;
@@ -28,7 +28,8 @@ function updateCellLayout(scene, cell, col, row, width, height, detaX, detaY, is
         cell.removeAllChild();
         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);
+        (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, (0, 
+        tableHelper_1.getStyleTheme)(headerStyle, scene.table, col, row, get_prop_1.getProp).theme);
     } 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, 

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 { 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"]}
+{"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 { getStyleTheme } from '../../core/tableHelper';\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      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  } 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

@@ -66,7 +66,7 @@ function updateCellHeight(scene, cell, col, row, distHeight, detaY, isHeader) {
         tableHelper_1.getStyleTheme)(headerStyle, scene.table, col, row, get_prop_1.getProp).theme);
     } 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, 
+        (0, text_icon_layout_1.updateCellContentHeight)(cell, distHeight, detaY, "autoHeight" === scene.table.heightMode, (0, 
         padding_1.getQuadProps)(style.padding), style.textAlign, style.textBaseline);
         const customContainer = cell.getChildByName("custom-container");
         if (customContainer) {

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

@@ -1 +1 @@
-{"version":3,"sources":["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';\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      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 {\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"]}
+{"version":3,"sources":["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';\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      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 {\n    // 处理文字\n    const style = scene.table._getCellStyle(col, row);\n    updateCellContentHeight(\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    );\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.js

@@ -68,7 +68,7 @@ function resetRowNumberAndY(scene) {
     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, 
+        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);

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

@@ -1 +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"]}
+{"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    const rowStart = rowIndex;\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    // const rowCount = rowIndex - rowStart;\n    // if (col === 0 && scene.proxy.rowEnd - scene.proxy.rowStart + 1 !== rowCount) {\n    //   scene.proxy.rowEnd = scene.proxy.rowStart + rowCount - 1;\n    //   scene.proxy.referenceRow = scene.proxy.rowStart + Math.floor((scene.proxy.rowEnd - scene.proxy.rowStart) / 2);\n    // }\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

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.updateColWidth = void 0;
 
-const tableHelper_1 = require("../../core/tableHelper"), image_cell_1 = require("../group-creater/cell-type/image-cell"), progress_bar_cell_1 = require("../group-creater/cell-type/progress-bar-cell"), spark_line_cell_1 = require("../group-creater/cell-type/spark-line-cell"), get_cell_merge_1 = require("../utils/get-cell-merge"), get_prop_1 = require("../utils/get-prop"), padding_1 = require("../utils/padding"), text_icon_layout_1 = require("../utils/text-icon-layout"), update_height_1 = require("./update-height");
+const axis_1 = require("../../components/axis/axis"), tableHelper_1 = require("../../core/tableHelper"), image_cell_1 = require("../group-creater/cell-type/image-cell"), progress_bar_cell_1 = require("../group-creater/cell-type/progress-bar-cell"), spark_line_cell_1 = require("../group-creater/cell-type/spark-line-cell"), get_cell_merge_1 = require("../utils/get-cell-merge"), get_prop_1 = require("../utils/get-prop"), padding_1 = require("../utils/padding"), text_icon_layout_1 = require("../utils/text-icon-layout"), update_height_1 = require("./update-height");
 
 function updateColWidth(scene, col, detaX) {
-    const {autoRowHeight: autoRowHeight} = scene.table.internalProps;
+    const autoRowHeight = "autoHeight" === scene.table.heightMode;
     let needRerangeRow = !1;
     const colOrCornerHeaderColumn = scene.getColGroup(col, !0), oldColOrCornerHeaderColumnWidth = null == colOrCornerHeaderColumn ? void 0 : colOrCornerHeaderColumn.attribute.width;
     if (null == colOrCornerHeaderColumn || colOrCornerHeaderColumn.setAttribute("width", oldColOrCornerHeaderColumnWidth + detaX), 
@@ -48,6 +48,28 @@ function updateColWidth(scene, col, detaX) {
         }
         scene.updateContainerHeight(scene.table.frozenRowCount, newTotalHeight - scene.bodyGroup.attribute.height);
     }
+    const bottomColumn = scene.getColGroupInBottom(col);
+    if (bottomColumn) {
+        const oldBottomColumnWidth = bottomColumn.attribute.width;
+        if (null == bottomColumn || bottomColumn.setAttribute("width", oldBottomColumnWidth + detaX), 
+        null == bottomColumn || bottomColumn.forEachChildren(((cell, index) => {
+            if (updateCellWidth(scene, cell, cell.col, cell.row, oldBottomColumnWidth, detaX, col < scene.table.rowHeaderLevelCount, autoRowHeight)) {
+                const mergeInfo = (0, get_cell_merge_1.getCellMergeInfo)(scene.table, cell.col, cell.row);
+                if (mergeInfo && mergeInfo.end.row - mergeInfo.start.row) for (let row = mergeInfo.start.row; row <= mergeInfo.end.row; row++) resetRowHeight(scene, row); else resetRowHeight(scene, cell.row);
+                needRerangeRow = !0;
+            }
+        })), needRerangeRow) {
+            let newTotalHeight = 0;
+            for (let col = 0; col < scene.table.colCount; col++) {
+                const colGroup = scene.getColGroup(col, !1);
+                let y = 0;
+                colGroup.forEachChildren((cellGroup => {
+                    "cell" === cellGroup.role && (cellGroup.setAttribute("y", y), y += cellGroup.attribute.height);
+                })), newTotalHeight = y;
+            }
+            scene.updateContainerHeight(scene.table.frozenRowCount, newTotalHeight - scene.bodyGroup.attribute.height);
+        }
+    }
     col < scene.frozenColCount ? (scene.cornerHeaderGroup.forEachChildrenSkipChild(((column, index) => {
         column.col > col && column.setAttribute("x", column.attribute.x + detaX);
     })), scene.rowHeaderGroup.forEachChildrenSkipChild(((column, index) => {
@@ -56,6 +78,8 @@ function updateColWidth(scene, col, detaX) {
         column.col > col && column.setAttribute("x", column.attribute.x + detaX);
     })), scene.bodyGroup.forEachChildrenSkipChild(((column, index) => {
         column.col > col && column.setAttribute("x", column.attribute.x + detaX);
+    })), bottomColumn && scene.bottomFrozenGroup.forEachChildrenSkipChild(((column, index) => {
+        column.col > col && column.setAttribute("x", column.attribute.x + detaX);
     }))), scene.table.setColWidth(col, rowHeaderOrBodyColumn.attribute.width, !0);
 }
 
@@ -84,7 +108,13 @@ function updateCellWidth(scene, cell, col, row, width, detaX, isHeader, autoRowH
         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, (0, 
         tableHelper_1.getStyleTheme)(headerStyle, scene.table, col, row, get_prop_1.getProp).theme);
-    } else if ("image" === type || "video" === type) (0, image_cell_1.updateImageCellContentWhileResize)(cellGroup, col, row, scene.table); else {
+    } else if ("image" === type || "video" === type) (0, image_cell_1.updateImageCellContentWhileResize)(cellGroup, col, row, scene.table); else if ("axis" === cellGroup.firstChild.name) {
+        const axisConfig = scene.table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);
+        if (axisConfig) {
+            const axis = new axis_1.CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, scene.table);
+            cellGroup.clear(), cellGroup.appendChild(axis.component), axis.overlap();
+        }
+    } else {
         const style = scene.table._getCellStyle(col, row);
         isHeightChange = (0, text_icon_layout_1.updateCellContentWidth)(cellGroup, distWidth, detaX, autoRowHeight, (0, 
         padding_1.getQuadProps)(style.padding), style.textAlign, style.textBaseline, scene);