@visactor/vtable 0.18.0-alpha.2 → 0.18.0

package/es/scenegraph/group-creater/cell-type/text-cell.d.ts

@@ -1,4 +1,5 @@
 import type { IThemeSpec, Group as VGroup } from './../../../vrender';
 import { Group } from '../../graphic/group';
 import type { BaseTableAPI } from '../../../ts-types/base-table';
-export declare function createCellGroup(table: BaseTableAPI, value: string, columnGroup: Group, xOrigin: number, yOrigin: number, col: number, row: number, colWidth: number | 'auto', cellWidth: number, cellHeight: number, padding: number[], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, mayHaveIcon: boolean, customElementsGroup: VGroup, renderDefault: boolean, cellTheme: IThemeSpec): Group;
+import type { CellRange } from '../../../ts-types';
+export declare function createCellGroup(table: BaseTableAPI, value: string, columnGroup: Group, xOrigin: number, yOrigin: number, col: number, row: number, colWidth: number | 'auto', cellWidth: number, cellHeight: number, padding: number[], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, mayHaveIcon: boolean, customElementsGroup: VGroup, renderDefault: boolean, cellTheme: IThemeSpec, range: CellRange | undefined): Group;

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

@@ -8,7 +8,7 @@ import { getFunctionalProp } from "../../utils/get-prop";
 
 import { createCellContent } from "../../utils/text-icon-layout";
 
-export function createCellGroup(table, value, columnGroup, xOrigin, yOrigin, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme) {
+export function createCellGroup(table, value, columnGroup, xOrigin, yOrigin, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme, range) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
     const headerStyle = table._getCellStyle(col, row), functionalPadding = getFunctionalProp("padding", headerStyle, col, row, table);
     isValid(functionalPadding) && (padding = functionalPadding), (null === (_a = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _a ? void 0 : _a.textAlign) && (textAlign = null === (_b = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _b ? void 0 : _b.textAlign), 
@@ -32,7 +32,11 @@ export function createCellGroup(table, value, columnGroup, xOrigin, yOrigin, col
     customElementsGroup && cellGroup.appendChild(customElementsGroup), renderDefault) {
         const textStr = value;
         let icons;
-        if (mayHaveIcon && (icons = table.getCellIcons(col, row)), createCellContent(cellGroup, icons, textStr, padding, autoColWidth, autoRowHeight, autoWrapText, "number" == typeof lineClamp ? lineClamp : void 0, cellWidth, cellHeight, textAlign, textBaseline, table, cellTheme), 
+        if (mayHaveIcon) {
+            let iconCol = col, iconRow = row;
+            range && (iconCol = range.start.col, iconRow = range.start.row), icons = table.getCellIcons(iconCol, iconRow);
+        }
+        if (createCellContent(cellGroup, icons, textStr, padding, autoColWidth, autoRowHeight, autoWrapText, "number" == typeof lineClamp ? lineClamp : void 0, cellWidth, cellHeight, textAlign, textBaseline, table, cellTheme, range), 
         null === (_t = null == cellTheme ? void 0 : cellTheme._vtable) || void 0 === _t ? void 0 : _t.marked) {
             const mark = createArc({
                 x: cellGroup.attribute.width,

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';\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): 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 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: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n    strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n    cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n\n    lineCap: 'square',\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);\n  if (customElementsGroup) {\n    cellGroup.appendChild(customElementsGroup);\n  }\n  if (renderDefault) {\n    const textStr: string = value;\n    let icons;\n    if (mayHaveIcon) {\n      icons = table.getCellIcons(col, row);\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    );\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';\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 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: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n    strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n    cursor: (cellTheme?.group as any)?.cursor ?? undefined,\n\n    lineCap: 'square',\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);\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

@@ -10,24 +10,29 @@ import { dealPromiseData } from "../utils/deal-promise-data";
 
 import { isArray } from "@visactor/vutils";
 
+import { dealWithCustom } from "../component/custom";
+
 export function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, mergeMap, defaultRowHeight, table, cellLocation, rowLimit) {
     let padding, textAlign, textBaseline, y = 0;
     columnGroup.lastChild && columnGroup.lastChild.row === rowStart - 1 ? y = columnGroup.lastChild.attribute.y + columnGroup.lastChild.attribute.height : columnGroup.colHeight && (y = columnGroup.colHeight);
     for (let j = rowStart; j <= rowEnd; j++) {
-        const row = j, define = "body" !== cellLocation ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row), mayHaveIcon = "body" !== cellLocation || (!!(null == define ? void 0 : define.icon) || !!(null == define ? void 0 : define.tree));
-        let range, isMerge, customStyle, value = table.getCellValue(col, row), cellWidth = colWidth, cellHeight = table.getRowHeight(row);
+        const row = j;
+        let range, isMerge, customStyle, customResult, value = table.getCellValue(col, row), cellWidth = colWidth, cellHeight = table.getRowHeight(row);
         if (table.internalProps.customMergeCell) {
             const customMerge = table.getCustomMerge(col, row);
             if (customMerge) {
-                const {range: customMergeRange, text: customMergeText, style: customMergeStyle} = customMerge;
+                const {range: customMergeRange, text: customMergeText, style: customMergeStyle, customLayout: customLayout, customRender: customRender} = customMerge;
                 if (range = customMergeRange, isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row, 
                 isMerge) {
                     const mergeSize = dealMerge(range, mergeMap, table);
                     cellWidth = mergeSize.cellWidth, cellHeight = mergeSize.cellHeight;
                 }
-                value = customMergeText, customStyle = customMergeStyle;
+                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));
             }
         }
+        let colForDefine = col, rowForDefine = row;
+        range && (colForDefine = range.start.col, rowForDefine = range.start.row);
+        const define = "body" !== cellLocation ? table.getHeaderDefine(colForDefine, rowForDefine) : table.getBodyColumnDefine(colForDefine, rowForDefine), mayHaveIcon = "body" !== cellLocation || (!!(null == define ? void 0 : define.icon) || !!(null == define ? void 0 : define.tree));
         if (!range && ("body" !== cellLocation || (null == define ? void 0 : define.mergeCell)) && (range = table.getCellRange(col, row), 
         isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row, 
         isMerge)) {
@@ -41,12 +46,12 @@ export function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd
         cellTheme.text.textBaseline && (textBaseline = cellTheme.text.textBaseline), "body" === cellLocation || cellTheme.group.fill || (cellTheme.group.fill = "#fff");
         const type = (table.isHeader(col, row) ? table._getHeaderLayoutMap(col, row).headerType : table.getBodyColumnType(col, row)) || "text";
         if (isPromise(value)) {
-            dealPromiseData(value, table, createCell.bind(null, type, value, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, cellTheme)), 
+            dealPromiseData(value, table, createCell.bind(null, type, value, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, cellTheme, range, customResult)), 
             columnGroup.updateColumnRowNumber(row);
             const height = table.getRowHeight(row);
             columnGroup.updateColumnHeight(height), y += height;
         } else {
-            const cellGroup = createCell(type, value, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, cellTheme);
+            const cellGroup = createCell(type, value, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, cellTheme, range, customResult);
             if (columnGroup.updateColumnRowNumber(row), isMerge) {
                 const rangeHeight = table.getRowHeight(row), rangeWidth = table.getColWidth(col), {width: contentWidth} = cellGroup.attribute, {height: contentHeight} = cellGroup.attribute;
                 cellGroup.contentWidth = contentWidth, cellGroup.contentHeight = contentHeight, 

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 { IGraphic, IThemeSpec } from './../../vrender';\nimport type { CellLocation, CellRange, TextColumnDefine } from '../../ts-types';\nimport type { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from '../scenegraph';\nimport { createCell } from './cell-helper';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { getCellCornerRadius, getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\nimport { isArray } from '@visactor/vutils';\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    const define = cellLocation !== 'body' ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);\n    const mayHaveIcon = cellLocation !== 'body' ? true : !!define?.icon || !!define?.tree;\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    if (table.internalProps.customMergeCell) {\n      const customMerge = table.getCustomMerge(col, row);\n      if (customMerge) {\n        const { range: customMergeRange, text: customMergeText, style: customMergeStyle } = customMerge;\n        range = customMergeRange;\n        isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n        if (isMerge) {\n          const mergeSize = dealMerge(range, mergeMap, table);\n          cellWidth = mergeSize.cellWidth;\n          cellHeight = mergeSize.cellHeight;\n        }\n        value = customMergeText;\n        customStyle = customMergeStyle;\n      }\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 mergeSize = dealMerge(range, mergeMap, table);\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) ? table._getHeaderLayoutMap(col, row).headerType : table.getBodyColumnType(col, row)) ||\n      '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        )\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,\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      );\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        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\nexport function resizeCellGroup(\n  cellGroup: Group,\n  rangeWidth: number,\n  rangeHeight: number,\n  range: CellRange,\n  table: BaseTableAPI\n) {\n  const { col, row } = cellGroup;\n  const dx = -table.getColsWidth(range.start.col, col - 1);\n  const dy = -table.getRowsHeight(range.start.row, row - 1);\n\n  cellGroup.forEachChildren((child: IGraphic) => {\n    child.setAttributes({\n      dx: (child.attribute.dx ?? 0) + dx,\n      dy: (child.attribute.dy ?? 0) + dy\n    });\n  });\n\n  const lineWidth = cellGroup.attribute.lineWidth;\n  const isLineWidthArray = isArray(lineWidth);\n  const newLineWidth = [0, 0, 0, 0];\n\n  if (col === range.start.col) {\n    newLineWidth[3] = isLineWidthArray ? lineWidth[3] : lineWidth;\n  }\n  if (row === range.start.row) {\n    newLineWidth[0] = isLineWidthArray ? lineWidth[0] : lineWidth;\n  }\n  if (col === range.end.col) {\n    newLineWidth[1] = isLineWidthArray ? lineWidth[1] : lineWidth;\n  }\n  if (row === range.end.row) {\n    newLineWidth[2] = isLineWidthArray ? lineWidth[2] : lineWidth;\n  }\n\n  const widthChange = rangeWidth !== cellGroup.attribute.width;\n  const heightChange = rangeHeight !== cellGroup.attribute.height;\n\n  cellGroup.setAttributes({\n    width: rangeWidth,\n    height: rangeHeight,\n    strokeArrayWidth: newLineWidth\n  } as any);\n\n  cellGroup.mergeStartCol = range.start.col;\n  cellGroup.mergeStartRow = range.start.row;\n  cellGroup.mergeEndCol = range.end.col;\n  cellGroup.mergeEndRow = range.end.row;\n\n  return {\n    widthChange,\n    heightChange\n  };\n}\n\nfunction dealMerge(range: CellRange, mergeMap: MergeMap, table: BaseTableAPI) {\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) {\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 { IGraphic, IThemeSpec } from './../../vrender';\nimport type { CellLocation, CellRange, TextColumnDefine } from '../../ts-types';\nimport type { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from '../scenegraph';\nimport { createCell } from './cell-helper';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { getCellCornerRadius, getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\nimport { isArray } from '@visactor/vutils';\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 mergeSize = dealMerge(range, mergeMap, table);\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 = cellLocation !== 'body' ? true : !!define?.icon || !!define?.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 mergeSize = dealMerge(range, mergeMap, table);\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) ? table._getHeaderLayoutMap(col, row).headerType : table.getBodyColumnType(col, row)) ||\n      '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,\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        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\nexport function resizeCellGroup(\n  cellGroup: Group,\n  rangeWidth: number,\n  rangeHeight: number,\n  range: CellRange,\n  table: BaseTableAPI\n) {\n  const { col, row } = cellGroup;\n  const dx = -table.getColsWidth(range.start.col, col - 1);\n  const dy = -table.getRowsHeight(range.start.row, row - 1);\n\n  cellGroup.forEachChildren((child: IGraphic) => {\n    child.setAttributes({\n      dx: (child.attribute.dx ?? 0) + dx,\n      dy: (child.attribute.dy ?? 0) + dy\n    });\n  });\n\n  const lineWidth = cellGroup.attribute.lineWidth;\n  const isLineWidthArray = isArray(lineWidth);\n  const newLineWidth = [0, 0, 0, 0];\n\n  if (col === range.start.col) {\n    newLineWidth[3] = isLineWidthArray ? lineWidth[3] : lineWidth;\n  }\n  if (row === range.start.row) {\n    newLineWidth[0] = isLineWidthArray ? lineWidth[0] : lineWidth;\n  }\n  if (col === range.end.col) {\n    newLineWidth[1] = isLineWidthArray ? lineWidth[1] : lineWidth;\n  }\n  if (row === range.end.row) {\n    newLineWidth[2] = isLineWidthArray ? lineWidth[2] : lineWidth;\n  }\n\n  const widthChange = rangeWidth !== cellGroup.attribute.width;\n  const heightChange = rangeHeight !== cellGroup.attribute.height;\n\n  cellGroup.setAttributes({\n    width: rangeWidth,\n    height: rangeHeight,\n    strokeArrayWidth: newLineWidth\n  } as any);\n\n  cellGroup.mergeStartCol = range.start.col;\n  cellGroup.mergeStartRow = range.start.row;\n  cellGroup.mergeEndCol = range.end.col;\n  cellGroup.mergeEndRow = range.end.row;\n\n  return {\n    widthChange,\n    heightChange\n  };\n}\n\nfunction dealMerge(range: CellRange, mergeMap: MergeMap, table: BaseTableAPI) {\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) {\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/sort-horizontal.js

@@ -30,15 +30,22 @@ import { updateColContent } from "./dynamic-set-x";
 
 export function sortHorizontal(proxy) {
     return __awaiter(this, void 0, void 0, (function*() {
-        proxy.table.scenegraph.bottomFrozenGroup.forEachChildren(((colGroup, index) => {
-            "group" === colGroup.type && (colGroup.needUpdate = !0, null == colGroup || colGroup.forEachChildren((cellGroup => {
-                cellGroup.needUpdate = !0;
-            })));
-        })), proxy.table.scenegraph.bodyGroup.forEachChildren(((colGroup, index) => {
+        proxy.table.scenegraph.bodyGroup.forEachChildren(((colGroup, index) => {
             "group" === colGroup.type && (colGroup.needUpdate = !0, null == colGroup || colGroup.forEachChildren((cellGroup => {
                 cellGroup.needUpdate = !0;
             })));
         }));
+        for (let col = proxy.colStart; col <= proxy.colEnd; col++) {
+            const columnGroup = proxy.table.scenegraph.getColGroup(col);
+            null == columnGroup || columnGroup.setAttribute("chartInstance", void 0);
+            for (let row = proxy.table.rowCount - proxy.table.bottomFrozenRowCount; row < proxy.table.rowCount; row++) proxy.table.scenegraph.updateCellContent(col, row);
+        }
+        for (let col = proxy.table.colCount - proxy.table.rightFrozenColCount; col < proxy.table.colCount; col++) {
+            const columnGroup = proxy.table.scenegraph.getColGroup(col);
+            null == columnGroup || columnGroup.setAttribute("chartInstance", void 0);
+            for (let row = proxy.rowStart; row <= proxy.rowEnd; row++) proxy.table.scenegraph.updateCellContent(col, row);
+            for (let row = proxy.table.rowCount - proxy.table.bottomFrozenRowCount; row < proxy.table.rowCount; row++) proxy.table.scenegraph.updateCellContent(col, row);
+        }
         const syncLeftCol = Math.max(proxy.bodyLeftCol, proxy.screenLeftCol - 1 * proxy.screenColCount), syncRightCol = Math.min(proxy.bodyRightCol, proxy.screenLeftCol + 2 * proxy.screenColCount);
         computeColsWidth(proxy.table, syncLeftCol, syncRightCol), updateColContent(syncLeftCol, syncRightCol, proxy), 
         proxy.colUpdatePos = proxy.colStart, proxy.colUpdateDirection = proxy.colEnd > proxy.bodyRightCol - (proxy.colEnd - proxy.colStart + 1) ? "right" : "left", 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/group-creater/progress/update-position/sort-horizontal.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAErE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,MAAM,UAAgB,cAAc,CAAC,KAAiB;;QAgBpD,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,QAAe,EAAE,KAAa,EAAE,EAAE;YAC1F,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC7B,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC;gBAC3B,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,CAAC,CAAC,SAAgB,EAAE,EAAE;oBAC5C,SAAiB,CAAC,UAAU,GAAG,IAAI,CAAC;gBACvC,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,QAAe,EAAE,KAAa,EAAE,EAAE;YAClF,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC7B,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC;gBAC3B,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,CAAC,CAAC,SAAgB,EAAE,EAAE;oBAC5C,SAAiB,CAAC,UAAU,GAAG,IAAI,CAAC;gBACvC,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAGH,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;QAChG,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;QAElG,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;QAEzD,gBAAgB,CAAC,WAAW,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;QASnD,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC;QACpC,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,YAAY,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAiBtH,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC;QACzC,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;CAAA","file":"sort-horizontal.js","sourcesContent":["import type { Group } from '../../../graphic/group';\nimport { computeColsWidth } from '../../../layout/compute-col-width';\nimport type { SceneProxy } from '../proxy';\nimport { updateColContent } from './dynamic-set-x';\nimport { updateAutoColumn } from './update-auto-column';\n\nexport async function sortHorizontal(proxy: SceneProxy) {\n  // for (let col = proxy.colStart; col <= proxy.colEnd; col++) {\n  //   const colGroup = proxy.table.scenegraph.getColGroup(col);\n  //   colGroup.needUpdate = true;\n  //   colGroup?.forEachChildren((cellGroup: Group) => {\n  //     (cellGroup as any).needUpdate = true;\n  //   });\n  // }\n  // proxy.table.scenegraph.colHeaderGroup.forEachChildren((colGroup: Group, index: number) => {\n  //   if (colGroup.type === 'group') {\n  //     colGroup.needUpdate = true;\n  //     colGroup?.forEachChildren((cellGroup: Group) => {\n  //       (cellGroup as any).needUpdate = true;\n  //     });\n  //   }\n  // });\n  proxy.table.scenegraph.bottomFrozenGroup.forEachChildren((colGroup: Group, index: number) => {\n    if (colGroup.type === 'group') {\n      colGroup.needUpdate = true;\n      colGroup?.forEachChildren((cellGroup: Group) => {\n        (cellGroup as any).needUpdate = true;\n      });\n    }\n  });\n  proxy.table.scenegraph.bodyGroup.forEachChildren((colGroup: Group, index: number) => {\n    if (colGroup.type === 'group') {\n      colGroup.needUpdate = true;\n      colGroup?.forEachChildren((cellGroup: Group) => {\n        (cellGroup as any).needUpdate = true;\n      });\n    }\n  });\n\n  // 更新同步范围\n  const syncLeftCol = Math.max(proxy.bodyLeftCol, proxy.screenLeftCol - proxy.screenColCount * 1);\n  const syncRightCol = Math.min(proxy.bodyRightCol, proxy.screenLeftCol + proxy.screenColCount * 2);\n\n  computeColsWidth(proxy.table, syncLeftCol, syncRightCol);\n\n  updateColContent(syncLeftCol, syncRightCol, proxy);\n\n  // updateAutoColumn(\n  //   syncLeftCol, // colStart\n  //   syncRightCol, // colEnd\n  //   proxy.table,\n  //   proxy.colEnd > proxy.bodyRightCol - (proxy.colEnd - proxy.colStart + 1) ? 'right' : 'left' // 跳转到右侧时，从右向左对齐\n  // );\n\n  proxy.colUpdatePos = proxy.colStart;\n  proxy.colUpdateDirection = proxy.colEnd > proxy.bodyRightCol - (proxy.colEnd - proxy.colStart + 1) ? 'right' : 'left';\n\n  // if (\n  //   proxy.colEnd === proxy.table.scenegraph.proxy.bodyRightCol &&\n  //   proxy.colStart === proxy.table.scenegraph.proxy.bodyLeftCol\n  // ) {\n  //   // 全量更新，do nothing\n  // } else if (proxy.colEnd === proxy.table.scenegraph.proxy.bodyRightCol) {\n  //   const totalWidth = proxy.table.getAllColsWidth();\n  //   const left = totalWidth - proxy.table.scenegraph.width;\n  //   // proxy.updateBody(top);\n  //   proxy.table.scenegraph.setBodyAndColHeaderX(-left);\n  // } else if (proxy.colStart === proxy.table.scenegraph.proxy.bodyLeftCol) {\n  //   // proxy.updateBody(0);\n  //   proxy.table.scenegraph.setBodyAndColHeaderX(0);\n  // }\n\n  proxy.table.scenegraph.updateNextFrame();\n  await proxy.progress();\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/group-creater/progress/update-position/sort-horizontal.ts"],"names":[],"mappings":"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","file":"sort-horizontal.js","sourcesContent":["import type { Group } from '../../../graphic/group';\nimport { computeColsWidth } from '../../../layout/compute-col-width';\nimport type { SceneProxy } from '../proxy';\nimport { updateColContent } from './dynamic-set-x';\nimport { updateAutoColumn } from './update-auto-column';\n\nexport async function sortHorizontal(proxy: SceneProxy) {\n  // 更新左 中 右 左下 底部 右下 部分的单元格需更新标记\n  proxy.table.scenegraph.bodyGroup.forEachChildren((colGroup: Group, index: number) => {\n    if (colGroup.type === 'group') {\n      colGroup.needUpdate = true;\n      colGroup?.forEachChildren((cellGroup: Group) => {\n        (cellGroup as any).needUpdate = true;\n      });\n    }\n  });\n  for (let col = proxy.colStart; col <= proxy.colEnd; col++) {\n    // 将该列的chartInstance清除掉\n    const columnGroup = proxy.table.scenegraph.getColGroup(col);\n    columnGroup?.setAttribute('chartInstance', undefined);\n    for (let row = proxy.table.rowCount - proxy.table.bottomFrozenRowCount; row < proxy.table.rowCount; row++) {\n      proxy.table.scenegraph.updateCellContent(col, row);\n    }\n  }\n  for (let col = proxy.table.colCount - proxy.table.rightFrozenColCount; col < proxy.table.colCount; col++) {\n    // 将该列的chartInstance清除掉\n    const columnGroup = proxy.table.scenegraph.getColGroup(col);\n    columnGroup?.setAttribute('chartInstance', undefined);\n    for (let row = proxy.rowStart; row <= proxy.rowEnd; row++) {\n      proxy.table.scenegraph.updateCellContent(col, row);\n    }\n    for (let row = proxy.table.rowCount - proxy.table.bottomFrozenRowCount; row < proxy.table.rowCount; row++) {\n      proxy.table.scenegraph.updateCellContent(col, row);\n    }\n  }\n  // 更新同步范围\n  const syncLeftCol = Math.max(proxy.bodyLeftCol, proxy.screenLeftCol - proxy.screenColCount * 1);\n  const syncRightCol = Math.min(proxy.bodyRightCol, proxy.screenLeftCol + proxy.screenColCount * 2);\n\n  computeColsWidth(proxy.table, syncLeftCol, syncRightCol);\n\n  updateColContent(syncLeftCol, syncRightCol, proxy);\n\n  // updateAutoColumn(\n  //   syncLeftCol, // colStart\n  //   syncRightCol, // colEnd\n  //   proxy.table,\n  //   proxy.colEnd > proxy.bodyRightCol - (proxy.colEnd - proxy.colStart + 1) ? 'right' : 'left' // 跳转到右侧时，从右向左对齐\n  // );\n\n  proxy.colUpdatePos = proxy.colStart;\n  proxy.colUpdateDirection = proxy.colEnd > proxy.bodyRightCol - (proxy.colEnd - proxy.colStart + 1) ? 'right' : 'left';\n\n  // if (\n  //   proxy.colEnd === proxy.table.scenegraph.proxy.bodyRightCol &&\n  //   proxy.colStart === proxy.table.scenegraph.proxy.bodyLeftCol\n  // ) {\n  //   // 全量更新，do nothing\n  // } else if (proxy.colEnd === proxy.table.scenegraph.proxy.bodyRightCol) {\n  //   const totalWidth = proxy.table.getAllColsWidth();\n  //   const left = totalWidth - proxy.table.scenegraph.width;\n  //   // proxy.updateBody(top);\n  //   proxy.table.scenegraph.setBodyAndColHeaderX(-left);\n  // } else if (proxy.colStart === proxy.table.scenegraph.proxy.bodyLeftCol) {\n  //   // proxy.updateBody(0);\n  //   proxy.table.scenegraph.setBodyAndColHeaderX(0);\n  // }\n\n  proxy.table.scenegraph.updateNextFrame();\n  await proxy.progress();\n}\n"]}

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

@@ -31,24 +31,29 @@ import { updateRowContent } from "./dynamic-set-y";
 import { updateAutoRow } from "./update-auto-row";
 
 export function sortVertical(proxy) {
+    var _a;
     return __awaiter(this, void 0, void 0, (function*() {
-        for (let col = 0; col < proxy.table.frozenColCount; col++) {
-            const colGroup = proxy.table.scenegraph.getColGroup(col);
-            null == colGroup || colGroup.forEachChildren(((cellGroup, index) => {
+        proxy.table.scenegraph.bodyGroup.forEachChildren(((colGroup, index) => {
+            "group" === colGroup.type && (colGroup.needUpdate = !0, null == colGroup || colGroup.forEachChildren((cellGroup => {
                 cellGroup.needUpdate = !0;
-            }));
+            })));
+        }));
+        for (let col = 0; null !== (_a = col < proxy.table.frozenColCount) && void 0 !== _a && _a; col++) {
+            const columnGroup = proxy.table.scenegraph.getColGroup(col);
+            null == columnGroup || columnGroup.setAttribute("chartInstance", void 0);
+            for (let row = proxy.rowStart; row <= proxy.rowEnd; row++) proxy.table.scenegraph.updateCellContent(col, row);
+            for (let row = proxy.table.rowCount - proxy.table.bottomFrozenRowCount; row < proxy.table.rowCount; row++) proxy.table.scenegraph.updateCellContent(col, row);
         }
-        for (let col = proxy.table.colCount - proxy.table.rightFrozenColCount; col < proxy.table.colCount; col++) {
-            const colGroup = proxy.table.scenegraph.getColGroup(col);
-            null == colGroup || colGroup.forEachChildren(((cellGroup, index) => {
-                cellGroup.needUpdate = !0;
-            }));
+        for (let col = proxy.colStart; col <= proxy.colEnd; col++) {
+            const columnGroup = proxy.table.scenegraph.getColGroup(col);
+            null == columnGroup || columnGroup.setAttribute("chartInstance", void 0);
+            for (let row = proxy.table.rowCount - proxy.table.bottomFrozenRowCount; row < proxy.table.rowCount; row++) proxy.table.scenegraph.updateCellContent(col, row);
         }
-        for (let col = proxy.bodyLeftCol; col <= proxy.bodyRightCol; col++) {
-            const colGroup = proxy.table.scenegraph.getColGroup(col);
-            null == colGroup || colGroup.forEachChildren(((cellGroup, index) => {
-                cellGroup.needUpdate = !0;
-            }));
+        for (let col = proxy.table.colCount - proxy.table.rightFrozenColCount; col < proxy.table.colCount; col++) {
+            const columnGroup = proxy.table.scenegraph.getColGroup(col);
+            null == columnGroup || columnGroup.setAttribute("chartInstance", void 0);
+            for (let row = proxy.rowStart; row <= proxy.rowEnd; row++) proxy.table.scenegraph.updateCellContent(col, row);
+            for (let row = proxy.table.rowCount - proxy.table.bottomFrozenRowCount; row < proxy.table.rowCount; row++) proxy.table.scenegraph.updateCellContent(col, row);
         }
         let syncTopRow, syncBottomRow;
         "autoHeight" === proxy.table.heightMode ? (syncTopRow = proxy.rowStart, syncBottomRow = proxy.rowEnd) : (syncTopRow = Math.max(proxy.bodyTopRow, proxy.screenTopRow - 1 * proxy.screenRowCount), 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/group-creater/progress/update-position/sort-vertical.ts"],"names":[],"mappings":"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","file":"sort-vertical.js","sourcesContent":["import type { Group } from '../../../graphic/group';\nimport { computeRowsHeight } from '../../../layout/compute-row-height';\nimport type { SceneProxy } from '../proxy';\nimport { updateRowContent } from './dynamic-set-y';\nimport { updateAutoRow } from './update-auto-row';\n\nexport async function sortVertical(proxy: SceneProxy) {\n  // for (let col = proxy.bodyLeftCol; col <= proxy.bodyRightCol; col++) {\n  //   for (let row = proxy.rowStart; row <= proxy.rowEnd; row++) {\n  //     // const cellGroup = proxy.table.scenegraph.getCell(col, row);\n  //     const cellGroup = proxy.highPerformanceGetCell(col, row);\n  //     cellGroup.needUpdate = true;\n  //   }\n  // }\n\n  // row header group\n  for (let col = 0; col < proxy.table.frozenColCount; col++) {\n    const colGroup = proxy.table.scenegraph.getColGroup(col);\n    colGroup?.forEachChildren((cellGroup: Group, index) => {\n      cellGroup.needUpdate = true;\n    });\n  }\n  // right frozen group\n  for (let col = proxy.table.colCount - proxy.table.rightFrozenColCount; col < proxy.table.colCount; col++) {\n    const colGroup = proxy.table.scenegraph.getColGroup(col);\n    colGroup?.forEachChildren((cellGroup: Group, index) => {\n      cellGroup.needUpdate = true;\n    });\n  }\n  // body group\n  for (let col = proxy.bodyLeftCol; col <= proxy.bodyRightCol; col++) {\n    const colGroup = proxy.table.scenegraph.getColGroup(col);\n    colGroup?.forEachChildren((cellGroup: Group, index) => {\n      cellGroup.needUpdate = true;\n    });\n  }\n\n  // 更新同步范围\n  let syncTopRow;\n  let syncBottomRow;\n  if (proxy.table.heightMode === 'autoHeight') {\n    syncTopRow = proxy.rowStart;\n    syncBottomRow = proxy.rowEnd;\n  } else {\n    syncTopRow = Math.max(proxy.bodyTopRow, proxy.screenTopRow - proxy.screenRowCount * 1);\n    syncBottomRow = Math.min(proxy.bodyBottomRow, proxy.screenTopRow + proxy.screenRowCount * 2);\n  }\n  // console.log('sort更新同步范围', syncTopRow, syncBottomRow);\n\n  computeRowsHeight(proxy.table, syncTopRow, syncBottomRow);\n\n  updateRowContent(syncTopRow, syncBottomRow, proxy);\n\n  if (proxy.table.heightMode === 'autoHeight') {\n    updateAutoRow(\n      proxy.bodyLeftCol, // colStart\n      proxy.bodyRightCol, // colEnd\n      syncTopRow, // rowStart\n      syncBottomRow, // rowEnd\n      proxy.table,\n      proxy.rowEnd > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up' // 跳转到底部时，从下向上对齐\n    );\n  }\n  proxy.rowUpdatePos = proxy.rowStart;\n  proxy.rowUpdateDirection = proxy.rowEnd > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up';\n\n  // if (\n  //   proxy.rowEnd === proxy.table.scenegraph.proxy.bodyBottomRow &&\n  //   proxy.rowStart === proxy.table.scenegraph.proxy.bodyTopRow\n  // ) {\n  //   // 全量更新，do nothing\n  // } else if (proxy.rowEnd === proxy.table.scenegraph.proxy.bodyBottomRow) {\n  //   const totalHeight = proxy.table.getAllRowsHeight();\n  //   const top = totalHeight - proxy.table.scenegraph.height;\n  //   proxy.updateBody(top);\n  // } else if (proxy.rowStart === proxy.table.scenegraph.proxy.bodyTopRow) {\n  //   proxy.updateBody(0);\n  // }\n\n  proxy.table.scenegraph.updateNextFrame();\n  if (proxy.table.heightMode !== 'autoHeight') {\n    await proxy.progress();\n  }\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/group-creater/progress/update-position/sort-vertical.ts"],"names":[],"mappings":"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","file":"sort-vertical.js","sourcesContent":["import type { Group } from '../../../graphic/group';\nimport { computeRowsHeight } from '../../../layout/compute-row-height';\nimport type { SceneProxy } from '../proxy';\nimport { updateRowContent } from './dynamic-set-y';\nimport { updateAutoRow } from './update-auto-row';\n\nexport async function sortVertical(proxy: SceneProxy) {\n  // 更新左 中 右 左下 底部 右下 部分的单元格需更新标记\n  proxy.table.scenegraph.bodyGroup.forEachChildren((colGroup: Group, index: number) => {\n    if (colGroup.type === 'group') {\n      colGroup.needUpdate = true;\n      colGroup?.forEachChildren((cellGroup: Group) => {\n        (cellGroup as any).needUpdate = true;\n      });\n    }\n  });\n\n  for (let col = 0; col < proxy.table.frozenColCount ?? 0; col++) {\n    // 将该列的chartInstance清除掉\n    const columnGroup = proxy.table.scenegraph.getColGroup(col);\n    columnGroup?.setAttribute('chartInstance', undefined);\n    for (let row = proxy.rowStart; row <= proxy.rowEnd; row++) {\n      proxy.table.scenegraph.updateCellContent(col, row);\n    }\n    for (let row = proxy.table.rowCount - proxy.table.bottomFrozenRowCount; row < proxy.table.rowCount; row++) {\n      proxy.table.scenegraph.updateCellContent(col, row);\n    }\n  }\n  for (let col = proxy.colStart; col <= proxy.colEnd; col++) {\n    // 将该列的chartInstance清除掉\n    const columnGroup = proxy.table.scenegraph.getColGroup(col);\n    columnGroup?.setAttribute('chartInstance', undefined);\n    for (let row = proxy.table.rowCount - proxy.table.bottomFrozenRowCount; row < proxy.table.rowCount; row++) {\n      proxy.table.scenegraph.updateCellContent(col, row);\n    }\n  }\n  for (let col = proxy.table.colCount - proxy.table.rightFrozenColCount; col < proxy.table.colCount; col++) {\n    // 将该列的chartInstance清除掉\n    const columnGroup = proxy.table.scenegraph.getColGroup(col);\n    columnGroup?.setAttribute('chartInstance', undefined);\n    for (let row = proxy.rowStart; row <= proxy.rowEnd; row++) {\n      proxy.table.scenegraph.updateCellContent(col, row);\n    }\n    for (let row = proxy.table.rowCount - proxy.table.bottomFrozenRowCount; row < proxy.table.rowCount; row++) {\n      proxy.table.scenegraph.updateCellContent(col, row);\n    }\n  }\n\n  // 更新同步范围\n  let syncTopRow;\n  let syncBottomRow;\n  if (proxy.table.heightMode === 'autoHeight') {\n    syncTopRow = proxy.rowStart;\n    syncBottomRow = proxy.rowEnd;\n  } else {\n    syncTopRow = Math.max(proxy.bodyTopRow, proxy.screenTopRow - proxy.screenRowCount * 1);\n    syncBottomRow = Math.min(proxy.bodyBottomRow, proxy.screenTopRow + proxy.screenRowCount * 2);\n  }\n  // console.log('sort更新同步范围', syncTopRow, syncBottomRow);\n\n  computeRowsHeight(proxy.table, syncTopRow, syncBottomRow);\n\n  updateRowContent(syncTopRow, syncBottomRow, proxy);\n\n  if (proxy.table.heightMode === 'autoHeight') {\n    updateAutoRow(\n      proxy.bodyLeftCol, // colStart\n      proxy.bodyRightCol, // colEnd\n      syncTopRow, // rowStart\n      syncBottomRow, // rowEnd\n      proxy.table,\n      proxy.rowEnd > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up' // 跳转到底部时，从下向上对齐\n    );\n  }\n  proxy.rowUpdatePos = proxy.rowStart;\n  proxy.rowUpdateDirection = proxy.rowEnd > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up';\n\n  // if (\n  //   proxy.rowEnd === proxy.table.scenegraph.proxy.bodyBottomRow &&\n  //   proxy.rowStart === proxy.table.scenegraph.proxy.bodyTopRow\n  // ) {\n  //   // 全量更新，do nothing\n  // } else if (proxy.rowEnd === proxy.table.scenegraph.proxy.bodyBottomRow) {\n  //   const totalHeight = proxy.table.getAllRowsHeight();\n  //   const top = totalHeight - proxy.table.scenegraph.height;\n  //   proxy.updateBody(top);\n  // } else if (proxy.rowStart === proxy.table.scenegraph.proxy.bodyTopRow) {\n  //   proxy.updateBody(0);\n  // }\n\n  proxy.table.scenegraph.updateNextFrame();\n  if (proxy.table.heightMode !== 'autoHeight') {\n    await proxy.progress();\n  }\n}\n"]}

package/es/scenegraph/layout/move-cell.d.ts

@@ -1,2 +1,3 @@
 import type { BaseTableAPI } from '../../ts-types/base-table';
-export declare function moveHeaderPosition(colSource: number, rowSource: number, colTarget: number, rowTarget: number, table: BaseTableAPI): void;
+import type { CellRange } from '../../ts-types';
+export declare function moveHeaderPosition(colSource: number, rowSource: number, colTarget: number, rowTarget: number, sourceMergeInfo: false | CellRange, targetMergeInfo: false | CellRange, table: BaseTableAPI): void;

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

@@ -1,25 +1,17 @@
-import { getCellMergeInfo } from "../utils/get-cell-merge";
-
-export function moveHeaderPosition(colSource, rowSource, colTarget, rowTarget, table) {
+export function moveHeaderPosition(colSource, rowSource, colTarget, rowTarget, sourceMergeInfo, targetMergeInfo, table) {
     const scene = table.scenegraph, cellLocation = table.getCellLocation(colTarget, rowTarget), direction = "columnHeader" === cellLocation ? "column" : "rowHeader" === cellLocation ? "row" : void 0;
     let sourceColStart = 0, sourceRowStart = 0, sourceColEnd = 0, sourceRowEnd = 0, targetColStart = 0, targetRowStart = 0, targetColEnd = 0, targetRowEnd = 0;
-    if ("column" === direction) {
-        const sourceMergeInfo = getCellMergeInfo(table, colSource, rowSource), targetMergeInfo = getCellMergeInfo(table, colTarget, rowTarget);
-        sourceMergeInfo && targetMergeInfo ? (sourceColStart = sourceMergeInfo.start.col, 
-        sourceColEnd = sourceMergeInfo.end.col, targetColStart = targetMergeInfo.start.col, 
-        targetColEnd = targetMergeInfo.end.col, sourceRowStart = sourceMergeInfo.start.row, 
-        targetRowStart = targetMergeInfo.start.row) : (sourceColStart = colSource, sourceColEnd = colSource, 
-        targetColStart = colTarget, targetColEnd = colTarget, sourceRowStart = rowSource, 
-        targetRowStart = rowTarget), sourceRowEnd = table.rowCount - 1, targetRowEnd = table.rowCount - 1;
-    } else if ("row" === direction) {
-        const sourceMergeInfo = getCellMergeInfo(table, colSource, rowSource), targetMergeInfo = getCellMergeInfo(table, colTarget, rowTarget);
-        sourceMergeInfo && targetMergeInfo ? (sourceRowStart = sourceMergeInfo.start.row, 
-        sourceRowEnd = sourceMergeInfo.end.row, targetRowStart = targetMergeInfo.start.row, 
-        targetRowEnd = targetMergeInfo.end.row, sourceColStart = sourceMergeInfo.start.col, 
-        targetColStart = targetMergeInfo.start.col) : (sourceRowStart = rowSource, sourceRowEnd = rowSource, 
-        targetRowStart = rowTarget, targetRowEnd = rowTarget, sourceColStart = colSource, 
-        targetColStart = colTarget), sourceColEnd = table.colCount - 1, targetColEnd = table.colCount - 1;
-    }
+    "column" === direction ? (sourceMergeInfo && targetMergeInfo ? (sourceColStart = sourceMergeInfo.start.col, 
+    sourceColEnd = sourceMergeInfo.end.col, targetColStart = targetMergeInfo.start.col, 
+    targetColEnd = targetMergeInfo.end.col, sourceRowStart = sourceMergeInfo.start.row, 
+    targetRowStart = targetMergeInfo.start.row) : (sourceColStart = colSource, sourceColEnd = colSource, 
+    targetColStart = colTarget, targetColEnd = colTarget, sourceRowStart = rowSource, 
+    targetRowStart = rowTarget), sourceRowEnd = table.rowCount - 1, targetRowEnd = table.rowCount - 1) : "row" === direction && (sourceMergeInfo && targetMergeInfo ? (sourceRowStart = sourceMergeInfo.start.row, 
+    sourceRowEnd = sourceMergeInfo.end.row, targetRowStart = targetMergeInfo.start.row, 
+    targetRowEnd = targetMergeInfo.end.row, sourceColStart = sourceMergeInfo.start.col, 
+    targetColStart = targetMergeInfo.start.col) : (sourceRowStart = rowSource, sourceRowEnd = rowSource, 
+    targetRowStart = rowTarget, targetRowEnd = rowTarget, sourceColStart = colSource, 
+    targetColStart = colTarget), sourceColEnd = table.colCount - 1, targetColEnd = table.colCount - 1);
     const updateColStart = Math.min(sourceColStart, targetColStart), updateColEnd = Math.max(sourceColEnd, targetColEnd), updateRowStart = Math.min(sourceRowStart, targetRowStart), updateRowEnd = Math.max(sourceRowEnd, targetRowEnd);
     for (let col = updateColStart; col <= updateColEnd; col++) {
         const columnWidth = table.getColWidth(col), columnHeaderGroup = table.scenegraph.getColGroup(col, !0), columnGroup = table.scenegraph.getColGroup(col), columnBottomGroup = table.scenegraph.getColGroupInBottom(col);

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

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

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

@@ -10,7 +10,7 @@ import { getQuadProps } from "../utils/padding";
 
 import { updateCellContentHeight } from "../utils/text-icon-layout";
 
-import { dealWithCustom } from "../component/custom";
+import { dealWithCustom, getCustomCellMergeCustom } from "../component/custom";
 
 import { updateImageCellContentWhileResize } from "../group-creater/cell-type/image-cell";
 
@@ -23,7 +23,9 @@ import { resizeCellGroup } from "../group-creater/column-helper";
 export function updateRowHeight(scene, row, detaY, skipTableHeightMap) {
     skipTableHeightMap || scene.table._setRowHeight(row, scene.table.getRowHeight(row) + detaY, !0);
     for (let col = 0; col < scene.table.colCount; col++) {
-        const cell = scene.getCell(col, row), mergeInfo = getCellMergeInfo(scene.table, col, row);
+        const cell = scene.getCell(col, row);
+        if ("empty" === cell.role) continue;
+        const mergeInfo = getCellMergeInfo(scene.table, col, row);
         if (mergeInfo && mergeInfo.start.col !== col) continue;
         updateCellHeightForRow(scene, cell, col, row, cell.attribute.height + detaY, detaY, scene.table.isHeader(col, row)), 
         scene.updateCellContentWhileResize(col, row);
@@ -62,21 +64,23 @@ export function updateCellHeight(scene, cell, col, row, distHeight, detaY, isHea
         let renderDefault = !0;
         const customContainer = cell.getChildByName("custom-container");
         if (customContainer) {
-            let customElementsGroup, customRender, customLayout;
-            customContainer.removeAllChild(), cell.removeChild(customContainer);
-            if ("body" !== scene.table.getCellLocation(col, row)) {
-                const define = scene.table.getHeaderDefine(col, row);
-                customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout;
-            } else {
-                const define = scene.table.getBodyColumnDefine(col, row);
-                customRender = (null == define ? void 0 : define.customRender) || scene.table.customRender, 
-                customLayout = null == define ? void 0 : define.customLayout;
-            }
-            if (customLayout || customRender) {
-                const style = scene.table._getCellStyle(col, row), padding = getQuadProps(getProp("padding", style, col, row, scene.table)), customResult = dealWithCustom(customLayout, customRender, col, row, cell.attribute.width, cell.attribute.height, !1, "autoHeight" === scene.table.heightMode, padding, scene.table);
-                customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
+            let customElementsGroup;
+            if (customContainer.removeAllChild(), cell.removeChild(customContainer), !getCustomCellMergeCustom(col, row, cell, scene.table)) {
+                let customRender, customLayout;
+                if ("body" !== scene.table.getCellLocation(col, row)) {
+                    const define = scene.table.getHeaderDefine(col, row);
+                    customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout;
+                } else {
+                    const define = scene.table.getBodyColumnDefine(col, row);
+                    customRender = (null == define ? void 0 : define.customRender) || scene.table.customRender, 
+                    customLayout = null == define ? void 0 : define.customLayout;
+                }
+                if (customLayout || customRender) {
+                    const style = scene.table._getCellStyle(col, row), padding = getQuadProps(getProp("padding", style, col, row, scene.table)), customResult = dealWithCustom(customLayout, customRender, col, row, cell.attribute.width, cell.attribute.height, !1, "autoHeight" === scene.table.heightMode, padding, scene.table);
+                    customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
+                }
+                cell.childrenCount > 0 && customElementsGroup ? cell.insertBefore(customElementsGroup, cell.firstChild) : customElementsGroup && cell.appendChild(customElementsGroup);
             }
-            cell.childrenCount > 0 ? cell.insertBefore(customElementsGroup, cell.firstChild) : cell.appendChild(customElementsGroup);
         }
         if (renderDefault) {
             const style = scene.table._getCellStyle(col, row);