@visactor/vtable 0.23.2-alpha.0 → 0.23.2

package/es/scenegraph/group-creater/cell-type/text-cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/group-creater/cell-type/text-cell.ts"],"names":[],"mappings":"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","file":"text-cell.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec, Group as VGroup } from './../../../vrender';\nimport { createArc } from './../../../vrender';\nimport { isValid } from '@visactor/vutils';\nimport { Group } from '../../graphic/group';\n// import { parseFont } from '../../utils/font';\nimport { getFunctionalProp } from '../../utils/get-prop';\nimport { createCellContent } from '../../utils/text-icon-layout';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { getStyleTheme } from '../../../core/tableHelper';\nimport type { CellRange } from '../../../ts-types';\nimport { getCellBorderStrokeWidth } from '../../utils/cell-border-stroke-width';\n\n/**\n * @description: 创建单元格场景节点\n * @param {Group} columnGroup 列Group\n * @param {number} xOrigin 起始x坐标\n * @param {number} yOrigin 起始y坐标\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @param {number | 'auto'} colWidth 配置列宽\n * @param {number} padding 单元格padding\n * @param {CanvasTextAlign} textAlign\n * @param {CanvasTextBaseline} textBaseline\n * @param {boolean} noWrap 不进行折行（default column type）\n * @param {IThemeSpec} cellTheme 单元格主题\n * @return {Group}\n */\nexport function createCellGroup(\n  table: BaseTableAPI,\n  value: string,\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  // rowHeight: number,\n  colWidth: number | 'auto',\n  cellWidth: number,\n  cellHeight: number,\n  padding: number[],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  customElementsGroup: VGroup,\n  renderDefault: boolean,\n  cellTheme: IThemeSpec,\n  range: CellRange | undefined\n): Group {\n  const headerStyle = table._getCellStyle(col, row); // to be fixed\n  const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);\n  if (isValid(functionalPadding)) {\n    padding = functionalPadding;\n  }\n  if (cellTheme?.text?.textAlign) {\n    textAlign = cellTheme?.text?.textAlign;\n  }\n  if (cellTheme?.text?.textBaseline) {\n    textBaseline = cellTheme?.text?.textBaseline;\n  }\n  const autoRowHeight = table.heightMode === 'autoHeight';\n  const autoColWidth = colWidth === 'auto';\n  const autoWrapText = headerStyle.autoWrapText ?? table.internalProps.autoWrapText;\n  const lineClamp = headerStyle.lineClamp;\n\n  // cell\n  const strokeArrayWidth = getCellBorderStrokeWidth(col, row, cellTheme, table);\n  const cellGroup = new Group({\n    x: xOrigin,\n    y: yOrigin,\n    width: cellWidth,\n    height: cellHeight,\n    // 背景相关，cell背景由cellGroup绘制\n    lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n    fill: cellTheme?.group?.fill ?? undefined,\n    stroke: cellTheme?.group?.stroke ?? undefined,\n    strokeArrayWidth: strokeArrayWidth ?? undefined,\n    strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n    cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n    lineDash: cellTheme?.group?.lineDash ?? undefined,\n\n    lineCap: 'butt',\n\n    clip: true,\n\n    cornerRadius: cellTheme.group.cornerRadius\n  } as any);\n  cellGroup.role = 'cell';\n  cellGroup.col = col;\n  cellGroup.row = row;\n  // columnGroup?.addChild(cellGroup); // fix promise cell row order in column\n  columnGroup?.addCellGroup(cellGroup);\n  if (customElementsGroup) {\n    cellGroup.appendChild(customElementsGroup);\n  }\n  if (renderDefault) {\n    const textStr: string = value;\n    let icons;\n    if (mayHaveIcon) {\n      let iconCol = col;\n      let iconRow = row;\n      if (range) {\n        iconCol = range.start.col;\n        iconRow = range.start.row;\n      }\n      icons = table.getCellIcons(iconCol, iconRow);\n    }\n\n    createCellContent(\n      cellGroup,\n      icons,\n      textStr,\n      padding as any,\n      autoColWidth,\n      autoRowHeight,\n      autoWrapText,\n      typeof lineClamp === 'number' ? lineClamp : undefined,\n      // autoColWidth ? 0 : colWidth,\n      // table.getRowHeight(row),\n      cellWidth,\n      cellHeight,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme,\n      range\n    );\n\n    if ((cellTheme as any)?._vtable?.marked) {\n      const mark = createArc({\n        x: cellGroup.attribute.width,\n        y: 0,\n        startAngle: Math.PI / 2,\n        endAngle: Math.PI,\n        outerRadius: 6,\n        fill: '#3073F2',\n        pickable: false\n      });\n      mark.name = 'mark';\n\n      cellGroup.appendChild(mark);\n    }\n  }\n  if (customElementsGroup) {\n    cellGroup.setAttributes({\n      width: Math.max(cellGroup.attribute.width, customElementsGroup.attribute.width ?? 0),\n      height: Math.max(cellGroup.attribute.height, customElementsGroup.attribute.height ?? 0)\n    });\n  }\n  return cellGroup;\n}\n\n// /**\n//  * @description: 获取函数式赋值的样式，记录在cellTheme中\n//  * @param {BaseTableAPI} table\n//  * @param {number} col\n//  * @param {number} row\n//  * @param {IThemeSpec} cellTheme\n//  * @return {IThemeSpec | undefined}\n//  */\n// export function getCellTheme(\n//   table: BaseTableAPI,\n//   col: number,\n//   row: number,\n//   cellTheme?: IThemeSpec\n// ): IThemeSpec | undefined {\n//   // get column header style\n//   const headerStyle = table._getCellStyle(col, row);\n\n//   const theme = getStyleTheme(headerStyle, table, col, row, getFunctionalProp).theme;\n\n//   for (const prop in theme.group) {\n//     if (isValid(theme.group[prop])) {\n//       if (!cellTheme) {\n//         cellTheme = {};\n//       }\n\n//       if (!cellTheme.group) {\n//         cellTheme.group = {};\n//       }\n\n//       cellTheme.group[prop] = theme.group[prop];\n//     }\n//   }\n\n//   for (const prop in theme.text) {\n//     if (isValid(theme.text[prop])) {\n//       if (!cellTheme) {\n//         cellTheme = {};\n//       }\n\n//       if (!cellTheme.text) {\n//         cellTheme.text = {};\n//       }\n\n//       cellTheme.text[prop] = theme.text[prop];\n//     }\n//   }\n\n//   for (const prop in theme._vtable) {\n//     if (isValid(theme._vtable[prop])) {\n//       if (!cellTheme) {\n//         cellTheme = {};\n//       }\n\n//       if (!(cellTheme as any)._vtable) {\n//         (cellTheme as any)._vtable = {};\n//       }\n\n//       (cellTheme as any)._vtable[prop] = theme._vtable[prop];\n//     }\n//   }\n//   return cellTheme;\n// }\n"]}
+{"version":3,"sources":["../src/scenegraph/group-creater/cell-type/text-cell.ts"],"names":[],"mappings":"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","file":"text-cell.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec, Group as VGroup } from './../../../vrender';\nimport { createArc } from './../../../vrender';\nimport { isValid } from '@visactor/vutils';\nimport { Group } from '../../graphic/group';\n// import { parseFont } from '../../utils/font';\nimport { getFunctionalProp } from '../../utils/get-prop';\nimport { createCellContent } from '../../utils/text-icon-layout';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { getStyleTheme } from '../../../core/tableHelper';\nimport type { CellRange } from '../../../ts-types';\nimport { getCellBorderStrokeWidth } from '../../utils/cell-border-stroke-width';\n\n/**\n * @description: 创建单元格场景节点\n * @param {Group} columnGroup 列Group\n * @param {number} xOrigin 起始x坐标\n * @param {number} yOrigin 起始y坐标\n * @param {number} col\n * @param {number} row\n * @param {BaseTableAPI} table\n * @param {number | 'auto'} colWidth 配置列宽\n * @param {number} padding 单元格padding\n * @param {CanvasTextAlign} textAlign\n * @param {CanvasTextBaseline} textBaseline\n * @param {boolean} noWrap 不进行折行（default column type）\n * @param {IThemeSpec} cellTheme 单元格主题\n * @return {Group}\n */\nexport function createCellGroup(\n  table: BaseTableAPI,\n  value: string,\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  // rowHeight: number,\n  colWidth: number | 'auto',\n  cellWidth: number,\n  cellHeight: number,\n  padding: number[],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  customElementsGroup: VGroup,\n  renderDefault: boolean,\n  cellTheme: IThemeSpec,\n  range: CellRange | undefined\n): Group {\n  const headerStyle = table._getCellStyle(col, row); // to be fixed\n  const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);\n  if (isValid(functionalPadding)) {\n    padding = functionalPadding;\n  }\n  if (cellTheme?.text?.textAlign) {\n    textAlign = cellTheme?.text?.textAlign;\n  }\n  if (cellTheme?.text?.textBaseline) {\n    textBaseline = cellTheme?.text?.textBaseline;\n  }\n  // let autoRowHeight = table.heightMode === 'autoHeight';\n  const autoRowHeight = table.isAutoRowHeight(row);\n  const autoColWidth = colWidth === 'auto';\n  const autoWrapText = headerStyle.autoWrapText ?? table.internalProps.autoWrapText;\n  const lineClamp = headerStyle.lineClamp;\n\n  // cell\n  const strokeArrayWidth = getCellBorderStrokeWidth(col, row, cellTheme, table);\n  const cellGroup = new Group({\n    x: xOrigin,\n    y: yOrigin,\n    width: cellWidth,\n    height: cellHeight,\n    // 背景相关，cell背景由cellGroup绘制\n    lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n    fill: cellTheme?.group?.fill ?? undefined,\n    stroke: cellTheme?.group?.stroke ?? undefined,\n    strokeArrayWidth: strokeArrayWidth ?? undefined,\n    strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n    cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n    lineDash: cellTheme?.group?.lineDash ?? undefined,\n\n    lineCap: 'butt',\n\n    clip: true,\n\n    cornerRadius: cellTheme.group.cornerRadius\n  } as any);\n  cellGroup.role = 'cell';\n  cellGroup.col = col;\n  cellGroup.row = row;\n  // columnGroup?.addChild(cellGroup); // fix promise cell row order in column\n  columnGroup?.addCellGroup(cellGroup);\n  if (customElementsGroup) {\n    cellGroup.appendChild(customElementsGroup);\n  }\n  if (renderDefault) {\n    const textStr: string = value;\n    let icons;\n    if (mayHaveIcon) {\n      let iconCol = col;\n      let iconRow = row;\n      if (range) {\n        iconCol = range.start.col;\n        iconRow = range.start.row;\n      }\n      icons = table.getCellIcons(iconCol, iconRow);\n    }\n\n    createCellContent(\n      cellGroup,\n      icons,\n      textStr,\n      padding as any,\n      autoColWidth,\n      autoRowHeight,\n      autoWrapText,\n      typeof lineClamp === 'number' ? lineClamp : undefined,\n      // autoColWidth ? 0 : colWidth,\n      // table.getRowHeight(row),\n      cellWidth,\n      cellHeight,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme,\n      range\n    );\n\n    if ((cellTheme as any)?._vtable?.marked) {\n      const mark = createArc({\n        x: cellGroup.attribute.width,\n        y: 0,\n        startAngle: Math.PI / 2,\n        endAngle: Math.PI,\n        outerRadius: 6,\n        fill: '#3073F2',\n        pickable: false\n      });\n      mark.name = 'mark';\n\n      cellGroup.appendChild(mark);\n    }\n  }\n  if (customElementsGroup) {\n    cellGroup.setAttributes({\n      width: Math.max(cellGroup.attribute.width, customElementsGroup.attribute.width ?? 0),\n      height: Math.max(cellGroup.attribute.height, customElementsGroup.attribute.height ?? 0)\n    });\n  }\n  return cellGroup;\n}\n\n// /**\n//  * @description: 获取函数式赋值的样式，记录在cellTheme中\n//  * @param {BaseTableAPI} table\n//  * @param {number} col\n//  * @param {number} row\n//  * @param {IThemeSpec} cellTheme\n//  * @return {IThemeSpec | undefined}\n//  */\n// export function getCellTheme(\n//   table: BaseTableAPI,\n//   col: number,\n//   row: number,\n//   cellTheme?: IThemeSpec\n// ): IThemeSpec | undefined {\n//   // get column header style\n//   const headerStyle = table._getCellStyle(col, row);\n\n//   const theme = getStyleTheme(headerStyle, table, col, row, getFunctionalProp).theme;\n\n//   for (const prop in theme.group) {\n//     if (isValid(theme.group[prop])) {\n//       if (!cellTheme) {\n//         cellTheme = {};\n//       }\n\n//       if (!cellTheme.group) {\n//         cellTheme.group = {};\n//       }\n\n//       cellTheme.group[prop] = theme.group[prop];\n//     }\n//   }\n\n//   for (const prop in theme.text) {\n//     if (isValid(theme.text[prop])) {\n//       if (!cellTheme) {\n//         cellTheme = {};\n//       }\n\n//       if (!cellTheme.text) {\n//         cellTheme.text = {};\n//       }\n\n//       cellTheme.text[prop] = theme.text[prop];\n//     }\n//   }\n\n//   for (const prop in theme._vtable) {\n//     if (isValid(theme._vtable[prop])) {\n//       if (!cellTheme) {\n//         cellTheme = {};\n//       }\n\n//       if (!(cellTheme as any)._vtable) {\n//         (cellTheme as any)._vtable = {};\n//       }\n\n//       (cellTheme as any)._vtable[prop] = theme._vtable[prop];\n//     }\n//   }\n//   return cellTheme;\n// }\n"]}

package/es/scenegraph/group-creater/column-helper.js

@@ -25,7 +25,7 @@ export function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd
                     const mergeSize = dealMerge(range, mergeMap, table, rowStart > range.start.row);
                     cellWidth = mergeSize.cellWidth, cellHeight = mergeSize.cellHeight;
                 }
-                value = customMergeText, customStyle = customMergeStyle, (customLayout || customRender) && (customResult = dealWithCustom(customLayout, customRender, customMergeRange.start.col, customMergeRange.start.row, table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col), table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row), !1, "autoHeight" === table.heightMode, [ 0, 0, 0, 0 ], table));
+                value = customMergeText, customStyle = customMergeStyle, (customLayout || customRender) && (customResult = dealWithCustom(customLayout, customRender, customMergeRange.start.col, customMergeRange.start.row, table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col), table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row), !1, table.isAutoRowHeight(row), [ 0, 0, 0, 0 ], table));
             }
         }
         let colForDefine = col, rowForDefine = row;

package/es/scenegraph/group-creater/column-helper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/group-creater/column-helper.ts"],"names":[],"mappings":"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","file":"column-helper.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec } from './../../vrender';\nimport type { CellLocation, CellRange, ColumnDefine, IRowSeriesNumber, TextColumnDefine } from '../../ts-types';\nimport type { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from '../scenegraph';\nimport { createCell, dealWithMergeCellSize, resizeCellGroup } from './cell-helper';\nimport type { BaseTableAPI, HeaderData } from '../../ts-types/base-table';\nimport { getCellCornerRadius, getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\nimport { dealWithCustom } from '../component/custom';\n/**\n * 创建复合列 同一列支持创建不同类型单元格\n * @param columnGroup 列Group\n * @param col\n * @param colWidth 配置列宽\n * @param rowStart\n * @param rowEnd\n * @param mergeMap merge单元格信息\n * @param defaultRowHeight\n * @param table\n * @param cellLocation\n * @param rowLimit\n * @param customRender\n * @param customLayout\n * @returns\n */\nexport function createComplexColumn(\n  columnGroup: Group,\n  col: number,\n  colWidth: number,\n  rowStart: number,\n  rowEnd: number,\n  mergeMap: MergeMap,\n  defaultRowHeight: number | number[],\n  table: BaseTableAPI,\n  cellLocation: CellLocation,\n  rowLimit?: number\n) {\n  let padding;\n  let textAlign;\n  let textBaseline;\n  /** useColumnTheme 判断是否可以使用columnTheme */\n  // insert cell into column group top\n  let y = 0;\n  // if (columnGroup.colHeight) {\n  //   // insert cell into column group bottom\n  //   y = columnGroup.colHeight;\n  // }\n  if (columnGroup.lastChild && (columnGroup.lastChild as Group).row === rowStart - 1) {\n    y = (columnGroup.lastChild as Group).attribute.y + (columnGroup.lastChild as Group).attribute.height;\n  } else if (columnGroup.colHeight) {\n    y = columnGroup.colHeight;\n  }\n\n  for (let j = rowStart; j <= rowEnd; j++) {\n    const row = j;\n    let value = table.getCellValue(col, row);\n\n    // 处理单元格合并\n    let cellWidth = colWidth;\n    // let cellHeight = table.internalProps.autoRowHeight ? 0 : table.getRowHeight(row);\n    let cellHeight = table.getRowHeight(row);\n    let range;\n    let isMerge;\n    let customStyle;\n    let customResult;\n    if (table.internalProps.customMergeCell) {\n      const customMerge = table.getCustomMerge(col, row);\n      if (customMerge) {\n        const {\n          range: customMergeRange,\n          text: customMergeText,\n          style: customMergeStyle,\n          customLayout,\n          customRender\n        } = customMerge;\n        range = customMergeRange;\n        isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n        if (isMerge) {\n          const needUpdateRange = rowStart > range.start.row;\n          const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n          cellWidth = mergeSize.cellWidth;\n          cellHeight = mergeSize.cellHeight;\n        }\n        value = customMergeText;\n        customStyle = customMergeStyle;\n\n        if (customLayout || customRender) {\n          customResult = dealWithCustom(\n            customLayout,\n            customRender,\n            customMergeRange.start.col,\n            customMergeRange.start.row,\n            table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col),\n            table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row),\n            false,\n            table.heightMode === 'autoHeight',\n            [0, 0, 0, 0],\n            table\n          );\n        }\n      }\n    }\n\n    let colForDefine = col;\n    let rowForDefine = row;\n    if (range) {\n      colForDefine = range.start.col;\n      rowForDefine = range.start.row;\n    }\n    const define =\n      cellLocation !== 'body'\n        ? table.getHeaderDefine(colForDefine, rowForDefine)\n        : table.getBodyColumnDefine(colForDefine, rowForDefine);\n    const mayHaveIcon =\n      cellLocation !== 'body'\n        ? true\n        : (define as IRowSeriesNumber)?.dragOrder || !!define?.icon || !!(define as ColumnDefine)?.tree;\n\n    if (!range && (cellLocation !== 'body' || (define as TextColumnDefine)?.mergeCell)) {\n      // 只有表头或者column配置合并单元格后再进行信息获取\n      range = table.getCellRange(col, row);\n      isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n      // 所有Merge单元格，只保留左上角一个真实的单元格，其他使用空Group占位\n      if (isMerge) {\n        const needUpdateRange = rowStart > range.start.row;\n        const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n        cellWidth = mergeSize.cellWidth;\n        cellHeight = mergeSize.cellHeight;\n      }\n    }\n\n    const cellStyle = customStyle || table._getCellStyle(col, row);\n    const cellTheme = getStyleTheme(\n      cellStyle,\n      table,\n      range ? range.start.col : col,\n      range ? range.start.row : row,\n      getProp\n    ).theme;\n    cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);\n    cellTheme.group.width = colWidth;\n    cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;\n    if (cellTheme._vtable.padding) {\n      padding = cellTheme._vtable.padding;\n    }\n    if (cellTheme.text.textAlign) {\n      textAlign = cellTheme.text.textAlign;\n    }\n    if (cellTheme.text.textBaseline) {\n      textBaseline = cellTheme.text.textBaseline;\n    }\n\n    // enable clip body\n    if (cellLocation !== 'body' && !cellTheme.group.fill) {\n      cellTheme.group.fill = '#fff';\n    }\n    // margin = getProp('margin', headerStyle, col, 0, table)\n\n    const type =\n      (table.isHeader(col, row)\n        ? (table._getHeaderLayoutMap(col, row) as HeaderData).headerType\n        : table.getBodyColumnType(col, row)) || 'text';\n\n    // deal with promise data\n    if (isPromise(value)) {\n      dealPromiseData(\n        value,\n        table,\n        createCell.bind(\n          null,\n          type,\n          value,\n          define,\n          table,\n          col,\n          row,\n          colWidth,\n          cellWidth,\n          cellHeight,\n          columnGroup,\n          y,\n          padding,\n          textAlign,\n          textBaseline,\n          mayHaveIcon,\n          cellTheme,\n          range,\n          customResult\n        )\n      );\n      columnGroup.updateColumnRowNumber(row);\n      const height = table.getRowHeight(row);\n      columnGroup.updateColumnHeight(height);\n      y += height;\n    } else {\n      const cellGroup = createCell(\n        type,\n        value,\n        define as ColumnDefine,\n        table,\n        col,\n        row,\n        colWidth,\n        cellWidth,\n        cellHeight,\n        columnGroup,\n        y,\n        padding,\n        textAlign,\n        textBaseline,\n        mayHaveIcon,\n        cellTheme,\n        range,\n        customResult\n      );\n      columnGroup.updateColumnRowNumber(row);\n      if (isMerge) {\n        const rangeHeight = table.getRowHeight(row);\n        const rangeWidth = table.getColWidth(col);\n\n        const { width: contentWidth } = cellGroup.attribute;\n        const { height: contentHeight } = cellGroup.attribute;\n        cellGroup.contentWidth = contentWidth;\n        cellGroup.contentHeight = contentHeight;\n\n        // resizeCellGroup(cellGroup, rangeWidth, rangeHeight, range, table);\n        dealWithMergeCellSize(range, contentWidth, contentHeight, padding, textAlign, textBaseline, table);\n        columnGroup.updateColumnHeight(rangeHeight);\n        y += rangeHeight;\n      } else {\n        columnGroup.updateColumnHeight(cellGroup.attribute.height);\n        y += cellGroup.attribute.height;\n      }\n    }\n    if (rowLimit && row > rowLimit) {\n      break;\n    }\n  }\n\n  columnGroup.setAttribute('width', colWidth);\n  return {\n    width: colWidth,\n    height: y\n  };\n}\n\n/**\n * 获取列分组主题\n * @param col 列索引\n * @param colWidth 列宽\n * @param table 表格实例\n * @returns 列分组主题\n */\nexport function getColumnGroupTheme(\n  col: number,\n  colWidth: number,\n  table: BaseTableAPI\n): { theme: IThemeSpec & { _vtable: any }; hasFunctionPros: boolean } {\n  const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n  const { theme: columnTheme, hasFunctionPros } = getStyleTheme(\n    style,\n    table,\n    col,\n    table.columnHeaderLevelCount,\n    getRawProp\n  );\n\n  // get column header style\n  columnTheme.group.width = colWidth;\n  columnTheme.group.height = 0;\n  return { theme: columnTheme, hasFunctionPros };\n}\n\nfunction dealMerge(range: CellRange, mergeMap: MergeMap, table: BaseTableAPI, forceUpdate: boolean) {\n  let cellWidth = 0;\n  let cellHeight = 0;\n  const mergeResult = mergeMap.get(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`);\n  if (!mergeResult || forceUpdate) {\n    for (let col = range.start.col; col <= range.end.col; col++) {\n      cellWidth += table.getColWidth(col);\n    }\n\n    // let cellHeight = 0;\n    for (let i = range.start.row; i <= range.end.row; i++) {\n      cellHeight += table.getRowHeight(i);\n    }\n\n    mergeMap.set(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`, {\n      cellWidth,\n      cellHeight\n    });\n  } else {\n    cellWidth = mergeResult.cellWidth;\n    cellHeight = mergeResult.cellHeight;\n  }\n  return {\n    cellWidth,\n    cellHeight\n  };\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/group-creater/column-helper.ts"],"names":[],"mappings":"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","file":"column-helper.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec } from './../../vrender';\nimport type { CellLocation, CellRange, ColumnDefine, IRowSeriesNumber, TextColumnDefine } from '../../ts-types';\nimport type { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from '../scenegraph';\nimport { createCell, dealWithMergeCellSize, resizeCellGroup } from './cell-helper';\nimport type { BaseTableAPI, HeaderData } from '../../ts-types/base-table';\nimport { getCellCornerRadius, getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\nimport { dealWithCustom } from '../component/custom';\n/**\n * 创建复合列 同一列支持创建不同类型单元格\n * @param columnGroup 列Group\n * @param col\n * @param colWidth 配置列宽\n * @param rowStart\n * @param rowEnd\n * @param mergeMap merge单元格信息\n * @param defaultRowHeight\n * @param table\n * @param cellLocation\n * @param rowLimit\n * @param customRender\n * @param customLayout\n * @returns\n */\nexport function createComplexColumn(\n  columnGroup: Group,\n  col: number,\n  colWidth: number,\n  rowStart: number,\n  rowEnd: number,\n  mergeMap: MergeMap,\n  defaultRowHeight: number | number[],\n  table: BaseTableAPI,\n  cellLocation: CellLocation,\n  rowLimit?: number\n) {\n  let padding;\n  let textAlign;\n  let textBaseline;\n  /** useColumnTheme 判断是否可以使用columnTheme */\n  // insert cell into column group top\n  let y = 0;\n  // if (columnGroup.colHeight) {\n  //   // insert cell into column group bottom\n  //   y = columnGroup.colHeight;\n  // }\n  if (columnGroup.lastChild && (columnGroup.lastChild as Group).row === rowStart - 1) {\n    y = (columnGroup.lastChild as Group).attribute.y + (columnGroup.lastChild as Group).attribute.height;\n  } else if (columnGroup.colHeight) {\n    y = columnGroup.colHeight;\n  }\n\n  for (let j = rowStart; j <= rowEnd; j++) {\n    const row = j;\n    let value = table.getCellValue(col, row);\n\n    // 处理单元格合并\n    let cellWidth = colWidth;\n    // let cellHeight = table.internalProps.autoRowHeight ? 0 : table.getRowHeight(row);\n    let cellHeight = table.getRowHeight(row);\n    let range;\n    let isMerge;\n    let customStyle;\n    let customResult;\n    if (table.internalProps.customMergeCell) {\n      const customMerge = table.getCustomMerge(col, row);\n      if (customMerge) {\n        const {\n          range: customMergeRange,\n          text: customMergeText,\n          style: customMergeStyle,\n          customLayout,\n          customRender\n        } = customMerge;\n        range = customMergeRange;\n        isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n        if (isMerge) {\n          const needUpdateRange = rowStart > range.start.row;\n          const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n          cellWidth = mergeSize.cellWidth;\n          cellHeight = mergeSize.cellHeight;\n        }\n        value = customMergeText;\n        customStyle = customMergeStyle;\n\n        if (customLayout || customRender) {\n          customResult = dealWithCustom(\n            customLayout,\n            customRender,\n            customMergeRange.start.col,\n            customMergeRange.start.row,\n            table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col),\n            table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row),\n            false,\n            // table.heightMode === 'autoHeight',\n            table.isAutoRowHeight(row),\n            [0, 0, 0, 0],\n            table\n          );\n        }\n      }\n    }\n\n    let colForDefine = col;\n    let rowForDefine = row;\n    if (range) {\n      colForDefine = range.start.col;\n      rowForDefine = range.start.row;\n    }\n    const define =\n      cellLocation !== 'body'\n        ? table.getHeaderDefine(colForDefine, rowForDefine)\n        : table.getBodyColumnDefine(colForDefine, rowForDefine);\n    const mayHaveIcon =\n      cellLocation !== 'body'\n        ? true\n        : (define as IRowSeriesNumber)?.dragOrder || !!define?.icon || !!(define as ColumnDefine)?.tree;\n\n    if (!range && (cellLocation !== 'body' || (define as TextColumnDefine)?.mergeCell)) {\n      // 只有表头或者column配置合并单元格后再进行信息获取\n      range = table.getCellRange(col, row);\n      isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n      // 所有Merge单元格，只保留左上角一个真实的单元格，其他使用空Group占位\n      if (isMerge) {\n        const needUpdateRange = rowStart > range.start.row;\n        const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n        cellWidth = mergeSize.cellWidth;\n        cellHeight = mergeSize.cellHeight;\n      }\n    }\n\n    const cellStyle = customStyle || table._getCellStyle(col, row);\n    const cellTheme = getStyleTheme(\n      cellStyle,\n      table,\n      range ? range.start.col : col,\n      range ? range.start.row : row,\n      getProp\n    ).theme;\n    cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);\n    cellTheme.group.width = colWidth;\n    cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;\n    if (cellTheme._vtable.padding) {\n      padding = cellTheme._vtable.padding;\n    }\n    if (cellTheme.text.textAlign) {\n      textAlign = cellTheme.text.textAlign;\n    }\n    if (cellTheme.text.textBaseline) {\n      textBaseline = cellTheme.text.textBaseline;\n    }\n\n    // enable clip body\n    if (cellLocation !== 'body' && !cellTheme.group.fill) {\n      cellTheme.group.fill = '#fff';\n    }\n    // margin = getProp('margin', headerStyle, col, 0, table)\n\n    const type =\n      (table.isHeader(col, row)\n        ? (table._getHeaderLayoutMap(col, row) as HeaderData).headerType\n        : table.getBodyColumnType(col, row)) || 'text';\n\n    // deal with promise data\n    if (isPromise(value)) {\n      dealPromiseData(\n        value,\n        table,\n        createCell.bind(\n          null,\n          type,\n          value,\n          define,\n          table,\n          col,\n          row,\n          colWidth,\n          cellWidth,\n          cellHeight,\n          columnGroup,\n          y,\n          padding,\n          textAlign,\n          textBaseline,\n          mayHaveIcon,\n          cellTheme,\n          range,\n          customResult\n        )\n      );\n      columnGroup.updateColumnRowNumber(row);\n      const height = table.getRowHeight(row);\n      columnGroup.updateColumnHeight(height);\n      y += height;\n    } else {\n      const cellGroup = createCell(\n        type,\n        value,\n        define as ColumnDefine,\n        table,\n        col,\n        row,\n        colWidth,\n        cellWidth,\n        cellHeight,\n        columnGroup,\n        y,\n        padding,\n        textAlign,\n        textBaseline,\n        mayHaveIcon,\n        cellTheme,\n        range,\n        customResult\n      );\n      columnGroup.updateColumnRowNumber(row);\n      if (isMerge) {\n        const rangeHeight = table.getRowHeight(row);\n        const rangeWidth = table.getColWidth(col);\n\n        const { width: contentWidth } = cellGroup.attribute;\n        const { height: contentHeight } = cellGroup.attribute;\n        cellGroup.contentWidth = contentWidth;\n        cellGroup.contentHeight = contentHeight;\n\n        // resizeCellGroup(cellGroup, rangeWidth, rangeHeight, range, table);\n        dealWithMergeCellSize(range, contentWidth, contentHeight, padding, textAlign, textBaseline, table);\n        columnGroup.updateColumnHeight(rangeHeight);\n        y += rangeHeight;\n      } else {\n        columnGroup.updateColumnHeight(cellGroup.attribute.height);\n        y += cellGroup.attribute.height;\n      }\n    }\n    if (rowLimit && row > rowLimit) {\n      break;\n    }\n  }\n\n  columnGroup.setAttribute('width', colWidth);\n  return {\n    width: colWidth,\n    height: y\n  };\n}\n\n/**\n * 获取列分组主题\n * @param col 列索引\n * @param colWidth 列宽\n * @param table 表格实例\n * @returns 列分组主题\n */\nexport function getColumnGroupTheme(\n  col: number,\n  colWidth: number,\n  table: BaseTableAPI\n): { theme: IThemeSpec & { _vtable: any }; hasFunctionPros: boolean } {\n  const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n  const { theme: columnTheme, hasFunctionPros } = getStyleTheme(\n    style,\n    table,\n    col,\n    table.columnHeaderLevelCount,\n    getRawProp\n  );\n\n  // get column header style\n  columnTheme.group.width = colWidth;\n  columnTheme.group.height = 0;\n  return { theme: columnTheme, hasFunctionPros };\n}\n\nfunction dealMerge(range: CellRange, mergeMap: MergeMap, table: BaseTableAPI, forceUpdate: boolean) {\n  let cellWidth = 0;\n  let cellHeight = 0;\n  const mergeResult = mergeMap.get(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`);\n  if (!mergeResult || forceUpdate) {\n    for (let col = range.start.col; col <= range.end.col; col++) {\n      cellWidth += table.getColWidth(col);\n    }\n\n    // let cellHeight = 0;\n    for (let i = range.start.row; i <= range.end.row; i++) {\n      cellHeight += table.getRowHeight(i);\n    }\n\n    mergeMap.set(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`, {\n      cellWidth,\n      cellHeight\n    });\n  } else {\n    cellWidth = mergeResult.cellWidth;\n    cellHeight = mergeResult.cellHeight;\n  }\n  return {\n    cellWidth,\n    cellHeight\n  };\n}\n"]}

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

@@ -1,3 +1,5 @@
+import { isValid } from "@visactor/vutils";
+
 export function updateAutoRow(colStart, colEnd, rowStart, rowEnd, table, direction = "up", part) {
     var _a, _b;
     if ("up" === direction) for (let col = colStart; col <= colEnd; col++) for (let row = rowStart; row <= rowEnd; row++) {
@@ -5,10 +7,10 @@ export function updateAutoRow(colStart, colEnd, rowStart, rowEnd, table, directi
         if (!cellGroup.row) continue;
         let y;
         if (cellGroup._prev) y = (null === (_a = cellGroup._prev) || void 0 === _a ? void 0 : _a.attribute.y) + table.getRowHeight(cellGroup._prev.row); else if (part) {
-            y = table.scenegraph.highPerformanceGetCell(col, rowEnd + 1, !0).attribute.y;
-            for (let r = rowStart; r <= rowEnd; r++) y -= table.getRowHeight(r);
+            if (y = table.scenegraph.highPerformanceGetCell(col, rowEnd + 1, !0).attribute.y, 
+            isValid(y)) for (let r = rowStart; r <= rowEnd; r++) y -= table.getRowHeight(r);
         } else y = table.getRowsHeight(table.columnHeaderLevelCount, cellGroup.row - 1);
-        cellGroup.setAttribute("y", y);
+        isValid(y) && cellGroup.setAttribute("y", y);
     } else for (let col = colStart; col <= colEnd; col++) for (let row = rowEnd; row >= rowStart; row--) {
         const cellGroup = table.scenegraph.highPerformanceGetCell(col, row, !0);
         if (!cellGroup.row) continue;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/group-creater/progress/update-position/update-auto-row.ts"],"names":[],"mappings":"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","file":"update-auto-row.js","sourcesContent":["import type { BaseTableAPI } from '../../../../ts-types/base-table';\nimport type { Group } from '../../../graphic/group';\n\nexport function updateAutoRow(\n  colStart: number,\n  colEnd: number,\n  rowStart: number,\n  rowEnd: number,\n  table: BaseTableAPI,\n  direction: 'up' | 'down' = 'up',\n  part?: boolean\n) {\n  // 更新y位置\n  if (direction === 'up') {\n    for (let col = colStart; col <= colEnd; col++) {\n      for (let row = rowStart; row <= rowEnd; row++) {\n        const cellGroup = table.scenegraph.highPerformanceGetCell(col, row, true);\n        if (!cellGroup.row) {\n          continue;\n        }\n        let y;\n        if (cellGroup._prev) {\n          // y = ((cellGroup._prev as Group)?.attribute.y ?? 0) + ((cellGroup._prev as Group)?.attribute.height ?? 0);\n          y = (cellGroup._prev as Group)?.attribute.y + table.getRowHeight((cellGroup._prev as Group).row);\n        } else if (part) {\n          const baseCellGroup = table.scenegraph.highPerformanceGetCell(col, rowEnd + 1, true);\n          y = baseCellGroup.attribute.y;\n          for (let r = rowStart; r <= rowEnd; r++) {\n            y -= table.getRowHeight(r);\n          }\n        } else {\n          // 估计位置\n          y = table.getRowsHeight(table.columnHeaderLevelCount, cellGroup.row - 1);\n        }\n        cellGroup.setAttribute('y', y);\n      }\n    }\n  } else {\n    for (let col = colStart; col <= colEnd; col++) {\n      for (let row = rowEnd; row >= rowStart; row--) {\n        const cellGroup = table.scenegraph.highPerformanceGetCell(col, row, true);\n        if (!cellGroup.row) {\n          continue;\n        }\n        let y;\n        if (cellGroup._next) {\n          // y = ((cellGroup._next as Group)?.attribute.y ?? 0) - (cellGroup.attribute.height ?? 0);\n          y = (cellGroup._next as Group)?.attribute.y - table.getRowHeight(cellGroup.row);\n        } else if (part) {\n          const baseCellGroup = table.scenegraph.highPerformanceGetCell(col, rowStart - 1, true);\n          y = baseCellGroup.attribute.y;\n          for (let r = rowStart - 1; r < rowEnd; r++) {\n            y += table.getRowHeight(r);\n          }\n        } else {\n          // 估计位置\n          y = table.getRowsHeight(table.columnHeaderLevelCount, cellGroup.row - 1);\n          // console.log('估计位置', table.getRowsHeight(table.columnHeaderLevelCount, cellGroup.row));\n        }\n        cellGroup.setAttribute('y', y);\n      }\n    }\n  }\n\n  // update y limit in proxy\n  const totalActualBodyRowCount = Math.min(\n    table.scenegraph.proxy.rowLimit,\n    table.scenegraph.proxy.bodyBottomRow - table.scenegraph.proxy.bodyTopRow + 1\n  );\n  // 渐进加载总row数量\n  const totalBodyHeight = table.getRowsHeight(\n    table.columnHeaderLevelCount,\n    table.columnHeaderLevelCount + totalActualBodyRowCount\n  );\n  const totalHeight = table.getRowsHeight(table.columnHeaderLevelCount, table.rowCount - 1);\n  table.scenegraph.proxy.yLimitTop = totalBodyHeight / 2;\n  table.scenegraph.proxy.yLimitBottom = totalHeight - totalBodyHeight / 2;\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/group-creater/progress/update-position/update-auto-row.ts"],"names":[],"mappings":"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","file":"update-auto-row.js","sourcesContent":["import { isValid } from '@visactor/vutils';\nimport type { BaseTableAPI } from '../../../../ts-types/base-table';\nimport type { Group } from '../../../graphic/group';\n\nexport function updateAutoRow(\n  colStart: number,\n  colEnd: number,\n  rowStart: number,\n  rowEnd: number,\n  table: BaseTableAPI,\n  direction: 'up' | 'down' = 'up',\n  part?: boolean\n) {\n  // 更新y位置\n  if (direction === 'up') {\n    for (let col = colStart; col <= colEnd; col++) {\n      for (let row = rowStart; row <= rowEnd; row++) {\n        const cellGroup = table.scenegraph.highPerformanceGetCell(col, row, true);\n        if (!cellGroup.row) {\n          continue;\n        }\n        let y;\n        if (cellGroup._prev) {\n          // y = ((cellGroup._prev as Group)?.attribute.y ?? 0) + ((cellGroup._prev as Group)?.attribute.height ?? 0);\n          y = (cellGroup._prev as Group)?.attribute.y + table.getRowHeight((cellGroup._prev as Group).row);\n        } else if (part) {\n          const baseCellGroup = table.scenegraph.highPerformanceGetCell(col, rowEnd + 1, true);\n          y = baseCellGroup.attribute.y;\n          if (isValid(y)) {\n            for (let r = rowStart; r <= rowEnd; r++) {\n              y -= table.getRowHeight(r);\n            }\n          }\n        } else {\n          // 估计位置\n          y = table.getRowsHeight(table.columnHeaderLevelCount, cellGroup.row - 1);\n        }\n        if (isValid(y)) {\n          cellGroup.setAttribute('y', y);\n        }\n      }\n    }\n  } else {\n    for (let col = colStart; col <= colEnd; col++) {\n      for (let row = rowEnd; row >= rowStart; row--) {\n        const cellGroup = table.scenegraph.highPerformanceGetCell(col, row, true);\n        if (!cellGroup.row) {\n          continue;\n        }\n        let y;\n        if (cellGroup._next) {\n          // y = ((cellGroup._next as Group)?.attribute.y ?? 0) - (cellGroup.attribute.height ?? 0);\n          y = (cellGroup._next as Group)?.attribute.y - table.getRowHeight(cellGroup.row);\n        } else if (part) {\n          const baseCellGroup = table.scenegraph.highPerformanceGetCell(col, rowStart - 1, true);\n          y = baseCellGroup.attribute.y;\n          for (let r = rowStart - 1; r < rowEnd; r++) {\n            y += table.getRowHeight(r);\n          }\n        } else {\n          // 估计位置\n          y = table.getRowsHeight(table.columnHeaderLevelCount, cellGroup.row - 1);\n          // console.log('估计位置', table.getRowsHeight(table.columnHeaderLevelCount, cellGroup.row));\n        }\n        cellGroup.setAttribute('y', y);\n      }\n    }\n  }\n\n  // update y limit in proxy\n  const totalActualBodyRowCount = Math.min(\n    table.scenegraph.proxy.rowLimit,\n    table.scenegraph.proxy.bodyBottomRow - table.scenegraph.proxy.bodyTopRow + 1\n  );\n  // 渐进加载总row数量\n  const totalBodyHeight = table.getRowsHeight(\n    table.columnHeaderLevelCount,\n    table.columnHeaderLevelCount + totalActualBodyRowCount\n  );\n  const totalHeight = table.getRowsHeight(table.columnHeaderLevelCount, table.rowCount - 1);\n  table.scenegraph.proxy.yLimitTop = totalBodyHeight / 2;\n  table.scenegraph.proxy.yLimitBottom = totalHeight - totalBodyHeight / 2;\n}\n"]}

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

@@ -82,13 +82,13 @@ export function updateCellHeight(scene, cell, col, row, distHeight, detaY, isHea
                     let width = cell.attribute.width, height = cell.attribute.height;
                     isMergeCellGroup(cell) && (width = scene.table.getColsWidth(cell.mergeStartCol, cell.mergeEndCol), 
                     height = scene.table.getRowsHeight(cell.mergeStartRow, cell.mergeEndRow));
-                    const customResult = dealWithCustom(customLayout, customRender, col, row, width, height, !1, "autoHeight" === scene.table.heightMode, padding, scene.table);
+                    const customResult = dealWithCustom(customLayout, customRender, col, row, width, height, !1, scene.table.isAutoRowHeight(row), padding, scene.table);
                     customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
                 }
                 cell.childrenCount > 0 && customElementsGroup ? cell.insertBefore(customElementsGroup, cell.firstChild) : customElementsGroup && cell.appendChild(customElementsGroup);
             }
         }
-        updateMergeCellContentHeight(cell, distHeight, detaY, "autoHeight" === scene.table.heightMode, renderDefault, scene.table);
+        updateMergeCellContentHeight(cell, distHeight, detaY, scene.table.isAutoRowHeight(row), renderDefault, scene.table);
     }
 }
 

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

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

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

@@ -1,4 +1,4 @@
-import { isNumber } from "@visactor/vutils";
+import { isNumber, isValid } from "@visactor/vutils";
 
 import { Group } from "../graphic/group";
 
@@ -10,6 +10,18 @@ import { deduplication } from "../../tools/util";
 
 export function updateRow(removeCells, addCells, updateCells, table) {
     const scene = table.scenegraph, removeRows = deduplication(removeCells.map((cell => cell.row))).sort(((a, b) => b - a)), addRows = deduplication(addCells.map((cell => cell.row))).sort(((a, b) => a - b)), updateRows = deduplication(updateCells.map((cell => cell.row))).sort(((a, b) => a - b));
+    let rowUpdatePos;
+    if (updateRows.length) {
+        rowUpdatePos = _getUpdateRowIndexUseCellNode(updateRows[0] - 1, updateRows[updateRows.length - 1] + 1, scene);
+    }
+    if (addRows.length) {
+        const pos = _getUpdateRowIndexUseCellNode(addRows[0] - 1, addRows[addRows.length - 1] + 1, scene);
+        rowUpdatePos = isValid(rowUpdatePos) ? isValid(pos) ? Math.min(rowUpdatePos, pos) : rowUpdatePos : pos;
+    }
+    if (removeRows.length) {
+        const pos = _getUpdateRowIndexUseCellNode(removeRows[0] - 1, removeRows[removeRows.length - 1] + 1, scene);
+        rowUpdatePos = isValid(rowUpdatePos) ? isValid(pos) ? Math.min(rowUpdatePos, pos) : rowUpdatePos : pos;
+    }
     removeRows.forEach((row => {
         removeRow(row, scene);
     }));
@@ -18,33 +30,34 @@ export function updateRow(removeCells, addCells, updateCells, table) {
         rowHeightsMap.delete(row);
     })), removeRows.length) {
         resetRowNumber(scene);
-        const rowUpdatePos = updateMergeCellGroup(removeRows[removeRows.length - 1] - 1, removeRows[0] - removeRows.length + 1, scene);
-        isNumber(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos));
+        const pos = _getUpdateRowIndex(removeRows[removeRows.length - 1] - 1, removeRows[0] - removeRows.length + 1, scene);
+        rowUpdatePos = isValid(rowUpdatePos) ? isValid(pos) ? Math.min(rowUpdatePos, pos) : rowUpdatePos : pos;
     }
     let updateAfter;
     if (scene.table._clearRowRangeHeightsMap(), addRows.forEach((row => {
         const needUpdateAfter = addRow(row, scene);
         updateAfter = null != updateAfter ? updateAfter : needUpdateAfter, rowHeightsMap.insert(row);
     })), resetRowNumberAndY(scene), addRows.length) {
-        const rowUpdatePos = updateMergeCellGroup(addRows[0] - 1, addRows[addRows.length - 1] + 1, scene);
-        isNumber(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos));
+        const pos = _getUpdateRowIndex(addRows[0] - 1, addRows[addRows.length - 1] + 1, scene);
+        rowUpdatePos = isValid(rowUpdatePos) ? isValid(pos) ? Math.min(rowUpdatePos, pos) : rowUpdatePos : pos;
     }
     for (let col = 0; col < table.colCount; col++) updateRows.forEach((r => {
         const mergeInfo = getCellMergeInfo(scene.table, col, r);
         if (mergeInfo) for (let col = mergeInfo.start.col; col <= mergeInfo.end.col; col++) for (let row = mergeInfo.start.row; row <= mergeInfo.end.row; row++) updateCell(col, row, scene.table, !1); else updateCell(col, r, scene.table, !1);
     }));
     if (updateRows.length) {
-        const rowUpdatePos = updateMergeCellGroup(updateRows[0] - 1, updateRows[updateRows.length - 1] + 1, scene);
-        isNumber(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos));
+        const pos = _getUpdateRowIndex(updateRows[0] - 1, updateRows[updateRows.length - 1] + 1, scene);
+        rowUpdatePos = isValid(rowUpdatePos) ? isValid(pos) ? Math.min(rowUpdatePos, pos) : rowUpdatePos : pos;
     }
     if (isNumber(updateAfter)) {
         for (let col = 0; col < table.colCount; col++) for (let row = updateAfter; row < table.rowCount; row++) {
             const cellGroup = scene.highPerformanceGetCell(col, row, !0);
             cellGroup && (cellGroup.needUpdate = !0);
         }
-        scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, updateAfter);
+        rowUpdatePos = isValid(rowUpdatePos) ? isValid(updateAfter) ? Math.min(rowUpdatePos, updateAfter) : rowUpdatePos : updateAfter;
     }
-    if (addRows.length) {
+    if (isNumber(rowUpdatePos) && (scene.proxy.rowUpdatePos = Math.min(scene.proxy.rowUpdatePos, rowUpdatePos)), 
+    addRows.length) {
         if (!isNumber(updateAfter)) {
             const minRow = Math.min(...addRows);
             scene.proxy.rowUpdatePos = Math.min(minRow, scene.proxy.rowUpdatePos);
@@ -198,20 +211,51 @@ function removeCellGroup(row, scene) {
     }
 }
 
-function updateMergeCellGroup(beforeRow, afterRow, scene) {
+function _getUpdateRowIndex(beforeRow, afterRow, scene) {
     let updateRow;
     for (let col = 0; col < scene.table.colCount; col++) {
         const rangeBefore = scene.table.getCellRange(col, beforeRow);
-        rangeBefore.start.row <= beforeRow + 1 && rangeBefore.end.row >= beforeRow + 1 && (updateCellGroup(rangeBefore, scene), 
-        updateRow = rangeBefore.start.row);
+        let row;
+        rangeBefore.start.row <= beforeRow + 1 && rangeBefore.end.row >= beforeRow + 1 && (addNeedUpdateTag(rangeBefore, scene), 
+        row = rangeBefore.start.row);
         const rangeAfter = scene.table.getCellRange(col, afterRow);
-        rangeAfter.start.row <= afterRow - 1 && rangeAfter.end.row >= afterRow - 1 && (updateCellGroup(rangeAfter, scene), 
-        updateRow = rangeBefore.start.row);
+        rangeAfter.start.row <= afterRow + 1 && rangeAfter.end.row >= afterRow + 1 && (addNeedUpdateTag(rangeAfter, scene), 
+        row = rangeAfter.start.row), isValid(row) && (updateRow = isValid(updateRow) ? Math.min(updateRow, row) : row);
+    }
+    return updateRow;
+}
+
+function _getUpdateRowIndexUseCellNode(beforeRow, afterRow, scene) {
+    let updateRow;
+    for (let col = 0; col < scene.table.colCount; col++) {
+        let row;
+        const beforeCell = scene.highPerformanceGetCell(col, beforeRow);
+        beforeCell.mergeStartRow && beforeCell.mergeEndRow && beforeCell.mergeEndRow > beforeRow && (addNeedUpdateTag({
+            start: {
+                row: beforeCell.mergeStartRow,
+                col: "autoHeight" === scene.table.heightMode ? 0 : beforeCell.mergeStartCol
+            },
+            end: {
+                row: beforeCell.mergeEndRow,
+                col: "autoHeight" === scene.table.heightMode ? scene.table.colCount - 1 : beforeCell.mergeEndCol
+            }
+        }, scene), row = beforeCell.mergeStartRow);
+        const afterCell = scene.highPerformanceGetCell(col, afterRow);
+        afterCell.mergeStartRow && afterCell.mergeEndRow && afterCell.mergeStartRow < afterRow && (addNeedUpdateTag({
+            start: {
+                row: afterCell.mergeStartRow,
+                col: "autoHeight" === scene.table.heightMode ? 0 : afterCell.mergeStartCol
+            },
+            end: {
+                row: afterCell.mergeEndRow,
+                col: "autoHeight" === scene.table.heightMode ? scene.table.colCount - 1 : afterCell.mergeEndCol
+            }
+        }, scene), row = afterCell.mergeStartRow), isValid(row) && (updateRow = isValid(updateRow) ? Math.min(updateRow, row) : row);
     }
     return updateRow;
 }
 
-function updateCellGroup(range, scene) {
+function addNeedUpdateTag(range, scene) {
     const {start: start, end: end} = range;
     for (let col = start.col; col <= end.col; col++) for (let row = start.row; row <= end.row; row++) {
         const cellGroup = scene.highPerformanceGetCell(col, row, !0);