@visactor/vtable 0.11.1-alpha.6 → 0.11.1-alpha.7

package/cjs/index.d.ts

@@ -11,8 +11,9 @@ import { PivotTable } from './PivotTable';
 import { PivotChart } from './PivotChart';
 import type { MousePointerCellEvent } from './ts-types/events';
 import * as CustomLayout from './render/layout';
+export { getDataCellPath } from './tools/get-data-path';
 export * from './render/jsx';
-export declare const version = "0.11.1-alpha.6";
+export declare const version = "0.11.1-alpha.7";
 export { TYPES, core, ListTable, ListTableConstructorOptions, PivotTable, PivotTableConstructorOptions, PivotChartConstructorOptions, PivotChart, IHeaderTreeDefine, IDimension, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, themes, data, MousePointerCellEvent, getIcons, clearGlobal, register, DataStatistics, CustomLayout };
 declare function getIcons(): {
     [key: string]: TYPES.ColumnIconOption;

package/cjs/index.js

@@ -29,7 +29,7 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.CustomLayout = exports.DataStatistics = exports.register = exports.clearGlobal = exports.getIcons = exports.data = exports.themes = exports.PivotChart = exports.PivotTable = exports.ListTable = exports.core = exports.TYPES = exports.version = void 0, 
+}), exports.CustomLayout = exports.DataStatistics = exports.register = exports.clearGlobal = exports.getIcons = exports.data = exports.themes = exports.PivotChart = exports.PivotTable = exports.ListTable = exports.core = exports.TYPES = exports.version = exports.getDataCellPath = void 0, 
 require("core-js/proposals/reflect-metadata");
 
 const TYPES = __importStar(require("./ts-types"));
@@ -85,6 +85,10 @@ Object.defineProperty(exports, "PivotChart", {
 
 const CustomLayout = __importStar(require("./render/layout"));
 
+exports.CustomLayout = CustomLayout;
+
+var get_data_path_1 = require("./tools/get-data-path");
+
 function getIcons() {
     return icons.get();
 }
@@ -93,7 +97,11 @@ function clearGlobal() {
     register.clearAll();
 }
 
-exports.CustomLayout = CustomLayout, __exportStar(require("./render/jsx"), exports), 
-exports.version = "0.11.1-alpha.6", exports.getIcons = getIcons, exports.clearGlobal = clearGlobal, 
-TYPES.AggregationType;
+Object.defineProperty(exports, "getDataCellPath", {
+    enumerable: !0,
+    get: function() {
+        return get_data_path_1.getDataCellPath;
+    }
+}), __exportStar(require("./render/jsx"), exports), exports.version = "0.11.1-alpha.7", 
+exports.getIcons = getIcons, exports.clearGlobal = clearGlobal, TYPES.AggregationType;
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAA4C;AAC5C,kDAAoC;AAwClC,sBAAK;AAvCP,6CAA+B;AAwC7B,oBAAI;AAvCN,6CAA+B;AA0D7B,oBAAI;AAzDN,+CAAiC;AACjC,qDAAuC;AA6DrC,4BAAQ;AA5DV,iDAAmC;AAsDjC,wBAAM;AArDR,yEAA2D;AA+DzD,wCAAc;AA9ChB,2CAAwC;AAmBtC,0FAnBO,qBAAS,OAmBP;AAlBX,6CAA0C;AAoBxC,2FApBO,uBAAU,OAoBP;AAnBZ,6CAA0C;AAsBxC,2FAtBO,uBAAU,OAsBP;AApBZ,8DAAgD;AA2C9C,oCAAY;AAzCd,+CAA6B;AAEhB,QAAA,OAAO,GAAG,gBAAgB,CAAC;AA2CxC,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAhBC,4BAAQ;AAkBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AArBC,kCAAW;AAsBb,KAAK,CAAC,eAAe,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport 'core-js/proposals/reflect-metadata'; // wait for vrender fix\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension\n} from './ts-types';\nimport { ListTable } from './ListTable';\nimport { PivotTable } from './PivotTable';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\n\nexport * from './render/jsx';\n\nexport const version = \"0.11.1-alpha.6\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  IHeaderTreeDefine,\n  IDimension,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n"]}
+{"version":3,"sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAA4C;AAC5C,kDAAoC;AAwClC,sBAAK;AAvCP,6CAA+B;AAwC7B,oBAAI;AAvCN,6CAA+B;AA0D7B,oBAAI;AAzDN,+CAAiC;AACjC,qDAAuC;AA6DrC,4BAAQ;AA5DV,iDAAmC;AAsDjC,wBAAM;AArDR,yEAA2D;AA+DzD,wCAAc;AA9ChB,2CAAwC;AAmBtC,0FAnBO,qBAAS,OAmBP;AAlBX,6CAA0C;AAoBxC,2FApBO,uBAAU,OAoBP;AAnBZ,6CAA0C;AAsBxC,2FAtBO,uBAAU,OAsBP;AApBZ,8DAAgD;AA2C9C,oCAAY;AA1Cd,uDAAwD;AAA/C,gHAAA,eAAe,OAAA;AACxB,+CAA6B;AAEhB,QAAA,OAAO,GAAG,gBAAgB,CAAC;AA2CxC,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAhBC,4BAAQ;AAkBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AArBC,kCAAW;AAsBb,KAAK,CAAC,eAAe,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport 'core-js/proposals/reflect-metadata'; // wait for vrender fix\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension\n} from './ts-types';\nimport { ListTable } from './ListTable';\nimport { PivotTable } from './PivotTable';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\n\nexport const version = \"0.11.1-alpha.7\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  IHeaderTreeDefine,\n  IDimension,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n"]}

package/cjs/scenegraph/group-creater/cell-helper.js

@@ -96,7 +96,7 @@ function updateCell(col, row, table, addNew) {
 
 function updateCellContent(type, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme) {
     var _a, _b;
-    const newCellGroup = createCell(type, define, table, col, row, table.getColWidth(col), cellWidth, cellHeight, addNew ? table.scenegraph.getColGroup(col) : oldCellGroup.parent, addNew ? 0 : oldCellGroup.attribute.y, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, cellTheme);
+    const newCellGroup = createCell(type, define, table, col, row, table.getColWidth(col), cellWidth, cellHeight, addNew ? table.scenegraph.getColGroup(col) : oldCellGroup.parent, addNew ? 0 : table.scenegraph.getCellGroupY(row), padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, cellTheme);
     return addNew || (oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup), oldCellGroup.parent.removeChild(oldCellGroup), 
     (null === (_a = table.scenegraph) || void 0 === _a ? void 0 : _a.proxy.cellCache.get(col)) && (null === (_b = table.scenegraph) || void 0 === _b || _b.proxy.cellCache.set(col, newCellGroup))), 
     newCellGroup;

package/cjs/scenegraph/group-creater/cell-helper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/cell-helper.ts"],"names":[],"mappings":"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","file":"cell-helper.js","sourcesContent":["import type { Cursor, IThemeSpec } from '@visactor/vrender';\nimport type { ProgressBarStyle } from '../../body-helper/style/ProgressBarStyle';\nimport { regUrl } from '../../tools/global';\nimport type {\n  CellRange,\n  ChartColumnDefine,\n  ColumnDefine,\n  ColumnTypeOption,\n  ICustomRender,\n  ImageColumnDefine,\n  MappingRule,\n  ProgressbarColumnDefine,\n  TextColumnDefine\n} from '../../ts-types';\nimport { dealWithCustom } from '../component/custom';\nimport { Group } from '../graphic/group';\nimport { getProp } from '../utils/get-prop';\nimport { createChartCellGroup } from './cell-type/chart-cell';\nimport { createImageCellGroup } from './cell-type/image-cell';\nimport { createProgressBarCell } from './cell-type/progress-bar-cell';\nimport { createSparkLineCellGroup } from './cell-type/spark-line-cell';\nimport { createCellGroup } from './cell-type/text-cell';\nimport { createVideoCellGroup } from './cell-type/video-cell';\nimport type { ICustomLayoutFuc } from '../../ts-types/customLayout';\nimport type { BaseTableAPI, PivotTableProtected } from '../../ts-types/base-table';\nimport { getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\nimport { CartesianAxis } from '../../components/axis/axis';\nimport type { PivotLayoutMap } from '../../layout/pivot-layout';\n\nexport function createCell(\n  type: ColumnTypeOption,\n  define: ColumnDefine,\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  colWidth: number,\n  cellWidth: number,\n  cellHeight: number,\n  columnGroup: Group,\n  y: number,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  isMerge: boolean,\n  range: CellRange,\n  cellTheme: IThemeSpec\n): Group {\n  let bgColorFunc: Function;\n  // 判断是否有mapping  遍历dataset中mappingRules\n  if ((table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules && !table.isHeader(col, row)) {\n    (table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules?.forEach(\n      (mappingRule: MappingRule, i: number) => {\n        if (\n          mappingRule.bgColor &&\n          (table.internalProps.layoutMap as PivotLayoutMap).getIndicatorKey(col, row) ===\n            mappingRule.bgColor.indicatorKey\n        ) {\n          bgColorFunc = mappingRule.bgColor.mapping;\n        }\n      }\n    );\n  }\n  let cellGroup: Group;\n  if (type === 'text' || type === 'link') {\n    if (type === 'link') {\n      //如果是超链接 颜色按照linkColor绘制 TODO：放到方法_getCellStyle中\n      // const columnDefine = table.getHeaderDefine(col, row);\n      const cellValue = table.getCellValue(col, row);\n      const headerStyle = table._getCellStyle(col, row);\n\n      if (\n        type === 'link' &&\n        (('templateLink' in define && define.templateLink) ||\n          !('linkDetect' in define && define.linkDetect) ||\n          regUrl.test(cellValue))\n      ) {\n        if (cellTheme) {\n          cellTheme.text.fill = getProp('linkColor', headerStyle, col, row, table);\n          (cellTheme as any).group.cursor = 'pointer';\n        } else {\n          cellTheme = {\n            text: {\n              fill: getProp('linkColor', headerStyle, col, row, table)\n            },\n            group: {\n              cursor: 'pointer' as Cursor\n            }\n          };\n        }\n      }\n    }\n    // 判断是否有mapping  遍历dataset中mappingRules 但这里还需要根据fieldName来判断\n    if (bgColorFunc) {\n      const cellValue = table.getCellOriginValue(col, row);\n      const bgColor = bgColorFunc(table, cellValue);\n      if (bgColor) {\n        if (cellTheme) {\n          cellTheme.group.fill = bgColor;\n        } else {\n          cellTheme = {\n            group: {\n              fill: bgColor\n            }\n          };\n        }\n      }\n    }\n\n    let customElementsGroup;\n    let renderDefault = true;\n    let customRender;\n    let customLayout;\n    const cellLocation = table.getCellLocation(col, row);\n    if (cellLocation !== 'body') {\n      customRender = define?.headerCustomRender;\n      customLayout = define?.headerCustomLayout;\n    } else {\n      customRender = define?.customRender || table.customRender;\n      customLayout = define?.customLayout;\n    }\n\n    if (customLayout || customRender) {\n      // const { autoRowHeight } = table.internalProps;\n      const customResult = dealWithCustom(\n        customLayout,\n        customRender,\n        col,\n        row,\n        cellWidth,\n        cellHeight,\n        false,\n        table.heightMode === 'autoHeight',\n        table\n      );\n      customElementsGroup = customResult.elementsGroup;\n      renderDefault = customResult.renderDefault;\n    }\n    cellGroup = createCellGroup(\n      table,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      colWidth,\n      cellWidth,\n      cellHeight,\n      padding,\n      textAlign,\n      textBaseline,\n      mayHaveIcon,\n      customElementsGroup,\n      renderDefault,\n      cellTheme\n    );\n    if (isMerge) {\n      cellGroup.mergeCol = range.end.col;\n      cellGroup.mergeRow = range.end.row;\n    }\n\n    const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);\n    if (axisConfig) {\n      const axis = new CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, table);\n      cellGroup.clear();\n      cellGroup.appendChild(axis.component);\n      axis.overlap();\n    } else if (table.internalProps.layoutMap.isEmpty(col, row)) {\n      cellGroup.clear();\n    }\n\n    // if ((define as any)?.isAxis && cellLocation === 'columnHeader') {\n    //   cellGroup.setAttribute('clip', false);\n    //   const axis = new CartesianAxis(\n    //     {\n    //       orient: 'top',\n    //       type: 'band',\n    //       data: ['A', 'B', 'C'],\n    //       title: {\n    //         visible: true,\n    //         text: 'X Axis'\n    //       }\n    //     },\n    //     cellGroup.attribute.width,\n    //     cellGroup.attribute.height,\n    //     table\n    //   );\n    //   cellGroup.clear();\n    //   // axis.component.setAttribute('y', 40);\n    //   cellGroup.appendChild(axis.component);\n    // } else if ((define as any)?.isAxis && cellLocation === 'rowHeader') {\n    //   cellGroup.setAttribute('clip', false);\n    //   const axis = new CartesianAxis(\n    //     {\n    //       orient: 'left',\n    //       type: 'linear',\n    //       range: { min: 0, max: 30 },\n    //       label: {\n    //         flush: true\n    //       },\n    //       grid: {\n    //         visible: true\n    //       },\n    //       title: {\n    //         visible: true,\n    //         text: 'Y Axis'\n    //       }\n    //     },\n    //     cellGroup.attribute.width,\n    //     cellGroup.attribute.height,\n    //     table\n    //   );\n    //   cellGroup.clear();\n    //   // axis.component.setAttribute('x', 80);\n    //   cellGroup.appendChild(axis.component);\n    //   axis.overlap();\n    // }\n  } else if (type === 'image') {\n    // 创建图片单元格\n    cellGroup = createImageCellGroup(\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      (define as ImageColumnDefine).keepAspectRatio,\n      (define as ImageColumnDefine).imageAutoSizing,\n      padding,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme\n    );\n  } else if (type === 'video') {\n    // 创建视频单元格\n    cellGroup = createVideoCellGroup(\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      (define as ImageColumnDefine).keepAspectRatio,\n      (define as ImageColumnDefine).imageAutoSizing,\n      padding,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme\n    );\n  } else if (type === 'chart') {\n    const chartInstance = table.internalProps.layoutMap.getChartInstance(col, row);\n    cellGroup = createChartCellGroup(\n      null,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      padding,\n      table.getCellValue(col, row),\n      (define as ChartColumnDefine).chartModule,\n      table.isPivotChart()\n        ? (table.internalProps.layoutMap as PivotLayoutMap).getChartSpec(col, row)\n        : (define as ChartColumnDefine).chartSpec,\n      chartInstance,\n      (table.internalProps.layoutMap as PivotLayoutMap)?.getChartDataId(col, row) ?? 'data',\n      table,\n      cellTheme\n    );\n  } else if (type === 'progressbar') {\n    const style = table._getCellStyle(col, row) as ProgressBarStyle;\n    const value = table.getCellValue(col, row);\n    const dataValue = table.getCellOriginValue(col, row);\n    // 创建基础文字单元格\n    cellGroup = createCellGroup(\n      table,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      colWidth,\n      cellWidth,\n      cellHeight,\n      padding,\n      textAlign,\n      textBaseline,\n      false,\n      null,\n      true,\n      cellTheme\n    );\n\n    // 创建bar group\n    const progressBarGroup = createProgressBarCell(\n      define as ProgressbarColumnDefine,\n      style,\n      colWidth,\n      value,\n      dataValue,\n      col,\n      row,\n      padding,\n      table\n    );\n    // 进度图插入到文字前，绘制在文字下\n    if (cellGroup.firstChild) {\n      cellGroup.insertBefore(progressBarGroup, cellGroup.firstChild);\n    } else {\n      cellGroup.appendChild(progressBarGroup);\n    }\n  } else if (type === 'sparkline') {\n    cellGroup = createSparkLineCellGroup(\n      null,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      cellWidth,\n      cellHeight,\n      padding,\n      table,\n      cellTheme\n    );\n  }\n\n  return cellGroup;\n}\n\nexport function updateCell(col: number, row: number, table: BaseTableAPI, addNew?: boolean) {\n  // const oldCellGroup = table.scenegraph.getCell(col, row, true);\n  const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, true);\n\n  if (!addNew && oldCellGroup.role === 'empty') {\n    return undefined;\n  }\n\n  const type = table.isHeader(col, row)\n    ? table._getHeaderLayoutMap(col, row).headerType\n    : table.getBodyColumnType(col, row);\n  const cellLocation = table.getCellLocation(col, row);\n  const define = cellLocation !== 'body' ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);\n\n  let isMerge;\n  let range;\n  if (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  }\n\n  let newCellGroup;\n  if (isMerge && (col !== range.start.col || row !== range.start.row)) {\n    // 合并单元格的非起始单元格不需要绘制\n    newCellGroup = new Group({\n      x: 0,\n      y: addNew ? 0 : oldCellGroup.attribute.y,\n      width: 0,\n      height: 0,\n      visible: false,\n      pickable: false\n    });\n    newCellGroup.role = 'shadow-cell';\n    newCellGroup.col = col;\n    newCellGroup.row = row;\n    newCellGroup.mergeCol = range.start.col;\n    newCellGroup.mergeRow = range.start.row;\n\n    if (!addNew) {\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n\n      // update merge cell\n      updateCell(range.start.col, range.start.row, table, false);\n    }\n  } else {\n    const mayHaveIcon = cellLocation !== 'body' ? true : !!define?.icon || !!define?.tree;\n    const headerStyle = table._getCellStyle(col, row);\n    const cellTheme = getStyleTheme(headerStyle, table, col, row, getProp).theme;\n    const padding = cellTheme._vtable.padding;\n    const textAlign = cellTheme._vtable.textAlign;\n    const textBaseline = cellTheme._vtable.textBaseline;\n\n    let bgColorFunc: Function;\n    // 判断是否有mapping  遍历dataset中mappingRules\n    if ((table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules && !table.isHeader(col, row)) {\n      (table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules?.forEach(\n        (mappingRule: MappingRule, i: number) => {\n          if (\n            mappingRule.bgColor &&\n            (table.internalProps.layoutMap as PivotLayoutMap).getIndicatorKey(col, row) ===\n              mappingRule.bgColor.indicatorKey\n          ) {\n            bgColorFunc = mappingRule.bgColor.mapping;\n          }\n        }\n      );\n    }\n\n    let customRender;\n    let customLayout;\n    if (cellLocation !== 'body') {\n      customRender = define?.headerCustomRender;\n      customLayout = define?.headerCustomLayout;\n    } else {\n      customRender = define?.customRender || table.customRender;\n      customLayout = define?.customLayout;\n    }\n\n    let cellWidth;\n    let cellHeight;\n    if (range) {\n      cellWidth = table.getColsWidth(range.start.col, range.end.col);\n      cellHeight = table.getRowsHeight(range.start.row, range.end.row);\n    } else {\n      cellWidth = table.getColWidth(col);\n      cellHeight = table.getRowHeight(row);\n    }\n\n    // deal with promise data\n    const value = table.getCellValue(col, row);\n    if (isPromise(value)) {\n      // clear cell content sync\n      oldCellGroup.removeAllChild();\n\n      // update cell content async\n      dealPromiseData(\n        value,\n        table,\n        updateCellContent.bind(\n          null,\n          type,\n          define,\n          table,\n          col,\n          row,\n          bgColorFunc,\n          cellWidth,\n          cellHeight,\n          oldCellGroup,\n          padding,\n          textAlign,\n          textBaseline,\n          mayHaveIcon,\n          isMerge,\n          range,\n          addNew,\n          cellTheme\n        )\n      );\n    } else {\n      newCellGroup = updateCellContent(\n        type,\n        define,\n        table,\n        col,\n        row,\n        bgColorFunc,\n        cellWidth,\n        cellHeight,\n        oldCellGroup,\n        padding,\n        textAlign,\n        textBaseline,\n        mayHaveIcon,\n        isMerge,\n        range,\n        addNew,\n        cellTheme\n      );\n    }\n  }\n\n  return newCellGroup;\n}\n\nfunction updateCellContent(\n  type: ColumnTypeOption,\n  define: ColumnDefine,\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  bgColorFunc: Function,\n  cellWidth: number,\n  cellHeight: number,\n  oldCellGroup: Group,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  isMerge: boolean,\n  range: CellRange,\n  addNew: boolean,\n  cellTheme?: IThemeSpec\n) {\n  const newCellGroup = createCell(\n    type,\n    define,\n    table,\n    col,\n    row,\n    table.getColWidth(col),\n    cellWidth,\n    cellHeight,\n    // oldCellGroup.parent,\n    addNew ? table.scenegraph.getColGroup(col) : oldCellGroup.parent,\n    // oldCellGroup.attribute.y,\n    addNew ? 0 : oldCellGroup.attribute.y,\n    padding,\n    textAlign,\n    textBaseline,\n    mayHaveIcon,\n    isMerge,\n    range,\n    cellTheme\n  );\n  if (!addNew) {\n    oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n    oldCellGroup.parent.removeChild(oldCellGroup);\n\n    // update cache\n    if (table.scenegraph?.proxy.cellCache.get(col)) {\n      table.scenegraph?.proxy.cellCache.set(col, newCellGroup);\n    }\n  }\n  return newCellGroup;\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/cell-helper.ts"],"names":[],"mappings":"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","file":"cell-helper.js","sourcesContent":["import type { Cursor, IThemeSpec } from '@visactor/vrender';\nimport type { ProgressBarStyle } from '../../body-helper/style/ProgressBarStyle';\nimport { regUrl } from '../../tools/global';\nimport type {\n  CellRange,\n  ChartColumnDefine,\n  ColumnDefine,\n  ColumnTypeOption,\n  ICustomRender,\n  ImageColumnDefine,\n  MappingRule,\n  ProgressbarColumnDefine,\n  TextColumnDefine\n} from '../../ts-types';\nimport { dealWithCustom } from '../component/custom';\nimport { Group } from '../graphic/group';\nimport { getProp } from '../utils/get-prop';\nimport { createChartCellGroup } from './cell-type/chart-cell';\nimport { createImageCellGroup } from './cell-type/image-cell';\nimport { createProgressBarCell } from './cell-type/progress-bar-cell';\nimport { createSparkLineCellGroup } from './cell-type/spark-line-cell';\nimport { createCellGroup } from './cell-type/text-cell';\nimport { createVideoCellGroup } from './cell-type/video-cell';\nimport type { ICustomLayoutFuc } from '../../ts-types/customLayout';\nimport type { BaseTableAPI, PivotTableProtected } from '../../ts-types/base-table';\nimport { getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\nimport { CartesianAxis } from '../../components/axis/axis';\nimport type { PivotLayoutMap } from '../../layout/pivot-layout';\n\nexport function createCell(\n  type: ColumnTypeOption,\n  define: ColumnDefine,\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  colWidth: number,\n  cellWidth: number,\n  cellHeight: number,\n  columnGroup: Group,\n  y: number,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  isMerge: boolean,\n  range: CellRange,\n  cellTheme: IThemeSpec\n): Group {\n  let bgColorFunc: Function;\n  // 判断是否有mapping  遍历dataset中mappingRules\n  if ((table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules && !table.isHeader(col, row)) {\n    (table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules?.forEach(\n      (mappingRule: MappingRule, i: number) => {\n        if (\n          mappingRule.bgColor &&\n          (table.internalProps.layoutMap as PivotLayoutMap).getIndicatorKey(col, row) ===\n            mappingRule.bgColor.indicatorKey\n        ) {\n          bgColorFunc = mappingRule.bgColor.mapping;\n        }\n      }\n    );\n  }\n  let cellGroup: Group;\n  if (type === 'text' || type === 'link') {\n    if (type === 'link') {\n      //如果是超链接 颜色按照linkColor绘制 TODO：放到方法_getCellStyle中\n      // const columnDefine = table.getHeaderDefine(col, row);\n      const cellValue = table.getCellValue(col, row);\n      const headerStyle = table._getCellStyle(col, row);\n\n      if (\n        type === 'link' &&\n        (('templateLink' in define && define.templateLink) ||\n          !('linkDetect' in define && define.linkDetect) ||\n          regUrl.test(cellValue))\n      ) {\n        if (cellTheme) {\n          cellTheme.text.fill = getProp('linkColor', headerStyle, col, row, table);\n          (cellTheme as any).group.cursor = 'pointer';\n        } else {\n          cellTheme = {\n            text: {\n              fill: getProp('linkColor', headerStyle, col, row, table)\n            },\n            group: {\n              cursor: 'pointer' as Cursor\n            }\n          };\n        }\n      }\n    }\n    // 判断是否有mapping  遍历dataset中mappingRules 但这里还需要根据fieldName来判断\n    if (bgColorFunc) {\n      const cellValue = table.getCellOriginValue(col, row);\n      const bgColor = bgColorFunc(table, cellValue);\n      if (bgColor) {\n        if (cellTheme) {\n          cellTheme.group.fill = bgColor;\n        } else {\n          cellTheme = {\n            group: {\n              fill: bgColor\n            }\n          };\n        }\n      }\n    }\n\n    let customElementsGroup;\n    let renderDefault = true;\n    let customRender;\n    let customLayout;\n    const cellLocation = table.getCellLocation(col, row);\n    if (cellLocation !== 'body') {\n      customRender = define?.headerCustomRender;\n      customLayout = define?.headerCustomLayout;\n    } else {\n      customRender = define?.customRender || table.customRender;\n      customLayout = define?.customLayout;\n    }\n\n    if (customLayout || customRender) {\n      // const { autoRowHeight } = table.internalProps;\n      const customResult = dealWithCustom(\n        customLayout,\n        customRender,\n        col,\n        row,\n        cellWidth,\n        cellHeight,\n        false,\n        table.heightMode === 'autoHeight',\n        table\n      );\n      customElementsGroup = customResult.elementsGroup;\n      renderDefault = customResult.renderDefault;\n    }\n    cellGroup = createCellGroup(\n      table,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      colWidth,\n      cellWidth,\n      cellHeight,\n      padding,\n      textAlign,\n      textBaseline,\n      mayHaveIcon,\n      customElementsGroup,\n      renderDefault,\n      cellTheme\n    );\n    if (isMerge) {\n      cellGroup.mergeCol = range.end.col;\n      cellGroup.mergeRow = range.end.row;\n    }\n\n    const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);\n    if (axisConfig) {\n      const axis = new CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, table);\n      cellGroup.clear();\n      cellGroup.appendChild(axis.component);\n      axis.overlap();\n    } else if (table.internalProps.layoutMap.isEmpty(col, row)) {\n      cellGroup.clear();\n    }\n\n    // if ((define as any)?.isAxis && cellLocation === 'columnHeader') {\n    //   cellGroup.setAttribute('clip', false);\n    //   const axis = new CartesianAxis(\n    //     {\n    //       orient: 'top',\n    //       type: 'band',\n    //       data: ['A', 'B', 'C'],\n    //       title: {\n    //         visible: true,\n    //         text: 'X Axis'\n    //       }\n    //     },\n    //     cellGroup.attribute.width,\n    //     cellGroup.attribute.height,\n    //     table\n    //   );\n    //   cellGroup.clear();\n    //   // axis.component.setAttribute('y', 40);\n    //   cellGroup.appendChild(axis.component);\n    // } else if ((define as any)?.isAxis && cellLocation === 'rowHeader') {\n    //   cellGroup.setAttribute('clip', false);\n    //   const axis = new CartesianAxis(\n    //     {\n    //       orient: 'left',\n    //       type: 'linear',\n    //       range: { min: 0, max: 30 },\n    //       label: {\n    //         flush: true\n    //       },\n    //       grid: {\n    //         visible: true\n    //       },\n    //       title: {\n    //         visible: true,\n    //         text: 'Y Axis'\n    //       }\n    //     },\n    //     cellGroup.attribute.width,\n    //     cellGroup.attribute.height,\n    //     table\n    //   );\n    //   cellGroup.clear();\n    //   // axis.component.setAttribute('x', 80);\n    //   cellGroup.appendChild(axis.component);\n    //   axis.overlap();\n    // }\n  } else if (type === 'image') {\n    // 创建图片单元格\n    cellGroup = createImageCellGroup(\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      (define as ImageColumnDefine).keepAspectRatio,\n      (define as ImageColumnDefine).imageAutoSizing,\n      padding,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme\n    );\n  } else if (type === 'video') {\n    // 创建视频单元格\n    cellGroup = createVideoCellGroup(\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      (define as ImageColumnDefine).keepAspectRatio,\n      (define as ImageColumnDefine).imageAutoSizing,\n      padding,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme\n    );\n  } else if (type === 'chart') {\n    const chartInstance = table.internalProps.layoutMap.getChartInstance(col, row);\n    cellGroup = createChartCellGroup(\n      null,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      table.getColWidth(col),\n      table.getRowHeight(row),\n      padding,\n      table.getCellValue(col, row),\n      (define as ChartColumnDefine).chartModule,\n      table.isPivotChart()\n        ? (table.internalProps.layoutMap as PivotLayoutMap).getChartSpec(col, row)\n        : (define as ChartColumnDefine).chartSpec,\n      chartInstance,\n      (table.internalProps.layoutMap as PivotLayoutMap)?.getChartDataId(col, row) ?? 'data',\n      table,\n      cellTheme\n    );\n  } else if (type === 'progressbar') {\n    const style = table._getCellStyle(col, row) as ProgressBarStyle;\n    const value = table.getCellValue(col, row);\n    const dataValue = table.getCellOriginValue(col, row);\n    // 创建基础文字单元格\n    cellGroup = createCellGroup(\n      table,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      colWidth,\n      cellWidth,\n      cellHeight,\n      padding,\n      textAlign,\n      textBaseline,\n      false,\n      null,\n      true,\n      cellTheme\n    );\n\n    // 创建bar group\n    const progressBarGroup = createProgressBarCell(\n      define as ProgressbarColumnDefine,\n      style,\n      colWidth,\n      value,\n      dataValue,\n      col,\n      row,\n      padding,\n      table\n    );\n    // 进度图插入到文字前，绘制在文字下\n    if (cellGroup.firstChild) {\n      cellGroup.insertBefore(progressBarGroup, cellGroup.firstChild);\n    } else {\n      cellGroup.appendChild(progressBarGroup);\n    }\n  } else if (type === 'sparkline') {\n    cellGroup = createSparkLineCellGroup(\n      null,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      cellWidth,\n      cellHeight,\n      padding,\n      table,\n      cellTheme\n    );\n  }\n\n  return cellGroup;\n}\n\nexport function updateCell(col: number, row: number, table: BaseTableAPI, addNew?: boolean) {\n  // const oldCellGroup = table.scenegraph.getCell(col, row, true);\n  const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, true);\n\n  if (!addNew && oldCellGroup.role === 'empty') {\n    return undefined;\n  }\n\n  const type = table.isHeader(col, row)\n    ? table._getHeaderLayoutMap(col, row).headerType\n    : table.getBodyColumnType(col, row);\n  const cellLocation = table.getCellLocation(col, row);\n  const define = cellLocation !== 'body' ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);\n\n  let isMerge;\n  let range;\n  if (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  }\n\n  let newCellGroup;\n  if (isMerge && (col !== range.start.col || row !== range.start.row)) {\n    // 合并单元格的非起始单元格不需要绘制\n    newCellGroup = new Group({\n      x: 0,\n      y: addNew ? 0 : oldCellGroup.attribute.y,\n      width: 0,\n      height: 0,\n      visible: false,\n      pickable: false\n    });\n    newCellGroup.role = 'shadow-cell';\n    newCellGroup.col = col;\n    newCellGroup.row = row;\n    newCellGroup.mergeCol = range.start.col;\n    newCellGroup.mergeRow = range.start.row;\n\n    if (!addNew) {\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n\n      // update merge cell\n      updateCell(range.start.col, range.start.row, table, false);\n    }\n  } else {\n    const mayHaveIcon = cellLocation !== 'body' ? true : !!define?.icon || !!define?.tree;\n    const headerStyle = table._getCellStyle(col, row);\n    const cellTheme = getStyleTheme(headerStyle, table, col, row, getProp).theme;\n    const padding = cellTheme._vtable.padding;\n    const textAlign = cellTheme._vtable.textAlign;\n    const textBaseline = cellTheme._vtable.textBaseline;\n\n    let bgColorFunc: Function;\n    // 判断是否有mapping  遍历dataset中mappingRules\n    if ((table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules && !table.isHeader(col, row)) {\n      (table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules?.forEach(\n        (mappingRule: MappingRule, i: number) => {\n          if (\n            mappingRule.bgColor &&\n            (table.internalProps.layoutMap as PivotLayoutMap).getIndicatorKey(col, row) ===\n              mappingRule.bgColor.indicatorKey\n          ) {\n            bgColorFunc = mappingRule.bgColor.mapping;\n          }\n        }\n      );\n    }\n\n    let customRender;\n    let customLayout;\n    if (cellLocation !== 'body') {\n      customRender = define?.headerCustomRender;\n      customLayout = define?.headerCustomLayout;\n    } else {\n      customRender = define?.customRender || table.customRender;\n      customLayout = define?.customLayout;\n    }\n\n    let cellWidth;\n    let cellHeight;\n    if (range) {\n      cellWidth = table.getColsWidth(range.start.col, range.end.col);\n      cellHeight = table.getRowsHeight(range.start.row, range.end.row);\n    } else {\n      cellWidth = table.getColWidth(col);\n      cellHeight = table.getRowHeight(row);\n    }\n\n    // deal with promise data\n    const value = table.getCellValue(col, row);\n    if (isPromise(value)) {\n      // clear cell content sync\n      oldCellGroup.removeAllChild();\n\n      // update cell content async\n      dealPromiseData(\n        value,\n        table,\n        updateCellContent.bind(\n          null,\n          type,\n          define,\n          table,\n          col,\n          row,\n          bgColorFunc,\n          cellWidth,\n          cellHeight,\n          oldCellGroup,\n          padding,\n          textAlign,\n          textBaseline,\n          mayHaveIcon,\n          isMerge,\n          range,\n          addNew,\n          cellTheme\n        )\n      );\n    } else {\n      newCellGroup = updateCellContent(\n        type,\n        define,\n        table,\n        col,\n        row,\n        bgColorFunc,\n        cellWidth,\n        cellHeight,\n        oldCellGroup,\n        padding,\n        textAlign,\n        textBaseline,\n        mayHaveIcon,\n        isMerge,\n        range,\n        addNew,\n        cellTheme\n      );\n    }\n  }\n\n  return newCellGroup;\n}\n\nfunction updateCellContent(\n  type: ColumnTypeOption,\n  define: ColumnDefine,\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  bgColorFunc: Function,\n  cellWidth: number,\n  cellHeight: number,\n  oldCellGroup: Group,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  mayHaveIcon: boolean,\n  isMerge: boolean,\n  range: CellRange,\n  addNew: boolean,\n  cellTheme?: IThemeSpec\n) {\n  const newCellGroup = createCell(\n    type,\n    define,\n    table,\n    col,\n    row,\n    table.getColWidth(col),\n    cellWidth,\n    cellHeight,\n    // oldCellGroup.parent,\n    addNew ? table.scenegraph.getColGroup(col) : oldCellGroup.parent,\n    // oldCellGroup.attribute.y,\n    addNew ? 0 : table.scenegraph.getCellGroupY(row), // y\n    padding,\n    textAlign,\n    textBaseline,\n    mayHaveIcon,\n    isMerge,\n    range,\n    cellTheme\n  );\n  if (!addNew) {\n    oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n    oldCellGroup.parent.removeChild(oldCellGroup);\n\n    // update cache\n    if (table.scenegraph?.proxy.cellCache.get(col)) {\n      table.scenegraph?.proxy.cellCache.set(col, newCellGroup);\n    }\n  }\n  return newCellGroup;\n}\n"]}

package/cjs/scenegraph/group-creater/progress/update-position/dynamic-set-y.js

@@ -48,17 +48,16 @@ function moveCell(count, direction, screenTopRow, screenTopY, proxy) {
     return __awaiter(this, void 0, void 0, (function*() {
         if ("up" === direction && proxy.rowEnd + count > proxy.bodyBottomRow ? count = proxy.bodyBottomRow - proxy.rowEnd : "down" === direction && proxy.rowStart - count < proxy.bodyTopRow && (count = proxy.rowStart - proxy.bodyTopRow), 
         count < proxy.rowEnd - proxy.rowStart) {
-            updatePartRowPosition("up" === direction ? proxy.rowStart : proxy.rowEnd - count + 1, "up" === direction ? proxy.rowStart + count - 1 : proxy.rowEnd, direction, proxy);
-            const distStartRow = "up" === direction ? proxy.rowEnd + 1 : proxy.rowStart - count, distEndRow = "up" === direction ? proxy.rowEnd + count : proxy.rowStart - 1;
+            const startRow = "up" === direction ? proxy.rowStart : proxy.rowEnd - count + 1, endRow = "up" === direction ? proxy.rowStart + count - 1 : proxy.rowEnd, distStartRow = "up" === direction ? proxy.rowEnd + 1 : proxy.rowStart - count, distEndRow = "up" === direction ? proxy.rowEnd + count : proxy.rowStart - 1;
             let syncTopRow, syncBottomRow;
             if ("autoHeight" === proxy.table.heightMode) syncTopRow = distStartRow, syncBottomRow = distEndRow; else {
                 const topRow = Math.max(proxy.bodyTopRow, screenTopRow - 1 * proxy.screenRowCount), BottomRow = Math.min(proxy.bodyBottomRow, screenTopRow + 2 * proxy.screenRowCount);
                 syncTopRow = Math.max(distStartRow, topRow), syncBottomRow = Math.min(distEndRow, BottomRow);
             }
             if ((0, compute_row_height_1.computeRowsHeight)(proxy.table, syncTopRow, syncBottomRow), 
-            proxy.rowStart = "up" === direction ? proxy.rowStart + count : proxy.rowStart - count, 
+            updatePartRowPosition(startRow, endRow, direction, proxy), proxy.rowStart = "up" === direction ? proxy.rowStart + count : proxy.rowStart - count, 
             proxy.rowEnd = "up" === direction ? proxy.rowEnd + count : proxy.rowEnd - count, 
-            (0, util_1.checkFirstRowMerge)(syncTopRow, proxy), updateRowContent(syncTopRow, syncBottomRow, proxy), 
+            updateRowContent(syncTopRow, syncBottomRow, proxy), (0, util_1.checkFirstRowMerge)(syncTopRow, proxy), 
             "autoHeight" === proxy.table.heightMode) {
                 (0, update_auto_row_1.updateAutoRow)(proxy.bodyLeftCol, proxy.bodyRightCol, syncTopRow, syncBottomRow, proxy.table, direction);
                 const cellGroup = proxy.table.scenegraph.highPerformanceGetCell(proxy.bodyLeftCol, screenTopRow, !0), delaY = screenTopY - (cellGroup.attribute.y + proxy.table.getFrozenRowsHeight() + proxy.table.scenegraph.proxy.deltaY);
@@ -70,15 +69,14 @@ function moveCell(count, direction, screenTopRow, screenTopY, proxy) {
             proxy.rowUpdatePos = distStartRow, proxy.rowUpdateDirection = direction, proxy.table.scenegraph.updateNextFrame(), 
             "autoHeight" !== proxy.table.heightMode && (yield proxy.progress());
         } else {
-            const distStartRow = "up" === direction ? proxy.rowStart + count : proxy.rowStart - count, distEndRow = "up" === direction ? proxy.rowEnd + count : proxy.rowEnd - count;
+            const distStartRow = "up" === direction ? proxy.rowStart + count : proxy.rowStart - count, distEndRow = "up" === direction ? proxy.rowEnd + count : proxy.rowEnd - count, distStartRowY = proxy.table.getRowsHeight(proxy.bodyTopRow, distStartRow - 1);
             let syncTopRow, syncBottomRow;
-            updateAllRowPosition(proxy.table.getRowsHeight(proxy.bodyTopRow, distStartRow - 1), count, direction, proxy), 
             "autoHeight" === proxy.table.heightMode ? (syncTopRow = distStartRow, syncBottomRow = distEndRow) : (syncTopRow = Math.max(proxy.bodyTopRow, screenTopRow - 1 * proxy.screenRowCount), 
             syncBottomRow = Math.min(proxy.bodyBottomRow, screenTopRow + 2 * proxy.screenRowCount)), 
             (0, compute_row_height_1.computeRowsHeight)(proxy.table, syncTopRow, syncBottomRow), 
-            proxy.rowStart = distStartRow, proxy.rowEnd = distEndRow, (0, util_1.checkFirstRowMerge)(syncTopRow, proxy), 
-            updateRowContent(syncTopRow, syncBottomRow, proxy), "autoHeight" === proxy.table.heightMode && (0, 
-            update_auto_row_1.updateAutoRow)(proxy.bodyLeftCol, proxy.bodyRightCol, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? "down" : "up"), 
+            updateAllRowPosition(distStartRowY, count, direction, proxy), proxy.rowStart = distStartRow, 
+            proxy.rowEnd = distEndRow, (0, util_1.checkFirstRowMerge)(syncTopRow, proxy), updateRowContent(syncTopRow, syncBottomRow, proxy), 
+            "autoHeight" === proxy.table.heightMode && (0, update_auto_row_1.updateAutoRow)(proxy.bodyLeftCol, proxy.bodyRightCol, syncTopRow, syncBottomRow, proxy.table, distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? "down" : "up"), 
             proxy.table.scenegraph.proxy.deltaY = 0, proxy.currentRow = "up" === direction ? proxy.currentRow + count : proxy.currentRow - count, 
             proxy.totalRow = "up" === direction ? proxy.totalRow + count : proxy.totalRow - count, 
             proxy.referenceRow = proxy.rowStart + Math.floor((proxy.rowEnd - proxy.rowStart) / 2), 

package/cjs/scenegraph/group-creater/progress/update-position/dynamic-set-y.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/progress/update-position/dynamic-set-y.ts"],"names":[],"mappings":"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","file":"dynamic-set-y.js","sourcesContent":["import { isValid } from '../../../../tools/util';\nimport type { Group } from '../../../graphic/group';\nimport { computeRowsHeight } from '../../../layout/compute-row-height';\nimport type { SceneProxy } from '../proxy';\nimport { updateAutoRow } from './update-auto-row';\nimport { checkFirstRowMerge } from './util';\n\nexport async function dynamicSetY(y: number, proxy: SceneProxy) {\n  // 计算变动row range\n  // const screenTopRow = proxy.table.getRowAt(y).row;\n  // proxy.deltaY = 0;\n  const screenTop = (proxy.table as any).getTargetRowAt(y + proxy.table.scenegraph.colHeaderGroup.attribute.height);\n  if (!screenTop) {\n    return;\n  }\n  const screenTopRow = screenTop.row;\n  const screenTopY = screenTop.top;\n  proxy.screenTopRow = screenTopRow;\n  const deltaRow = screenTopRow - proxy.referenceRow;\n  if (deltaRow > 0) {\n    // 向下滚动，顶部cell group移到底部\n    moveCell(deltaRow, 'up', screenTopRow, screenTopY, proxy);\n    proxy.updateBody(y - proxy.deltaY);\n  } else if (deltaRow < 0) {\n    // 向上滚动，底部cell group移到顶部\n    moveCell(-deltaRow, 'down', screenTopRow, screenTopY, proxy);\n    proxy.updateBody(y - proxy.deltaY);\n  } else {\n    // 不改变row，更新body group范围\n    proxy.updateBody(y - proxy.deltaY);\n  }\n\n  proxy.table.scenegraph.updateNextFrame();\n}\n\nasync function moveCell(\n  count: number,\n  direction: 'up' | 'down',\n  screenTopRow: number,\n  screenTopY: number,\n  proxy: SceneProxy\n) {\n  // 限制count范围\n  if (direction === 'up' && proxy.rowEnd + count > proxy.bodyBottomRow) {\n    count = proxy.bodyBottomRow - proxy.rowEnd;\n  } else if (direction === 'down' && proxy.rowStart - count < proxy.bodyTopRow) {\n    count = proxy.rowStart - proxy.bodyTopRow;\n  }\n\n  // 两种更新模式\n  // 1. count < rowEnd - rowStart：从顶/底部移动count数量的单元格到底/顶部\n  // 2. count >= rowEnd - rowStart：整体移动到目标位置\n  if (count < proxy.rowEnd - proxy.rowStart) {\n    // 计算更新区域\n    const startRow = direction === 'up' ? proxy.rowStart : proxy.rowEnd - count + 1;\n    const endRow = direction === 'up' ? proxy.rowStart + count - 1 : proxy.rowEnd;\n    // console.log('move', startRow, endRow, direction);\n    updatePartRowPosition(startRow, endRow, direction, proxy);\n    const distStartRow = direction === 'up' ? proxy.rowEnd + 1 : proxy.rowStart - count;\n    const distEndRow = direction === 'up' ? proxy.rowEnd + count : proxy.rowStart - 1;\n\n    // 更新同步范围\n    let syncTopRow;\n    let syncBottomRow;\n    if (proxy.table.heightMode === 'autoHeight') {\n      syncTopRow = distStartRow;\n      syncBottomRow = distEndRow;\n    } else {\n      const topRow = Math.max(proxy.bodyTopRow, screenTopRow - proxy.screenRowCount * 1);\n      const BottomRow = Math.min(proxy.bodyBottomRow, screenTopRow + proxy.screenRowCount * 2);\n      // get coincide of distStartRow&distEndRow and topRow&BottomRow\n      syncTopRow = Math.max(distStartRow, topRow);\n      syncBottomRow = Math.min(distEndRow, BottomRow);\n    }\n\n    // const syncTopRow = Math.max(proxy.bodyTopRow, screenTopRow - proxy.screenRowCount * 1);\n    // const syncBottomRow = Math.min(proxy.bodyBottomRow, screenTopRow + proxy.screenRowCount * 2);\n    computeRowsHeight(proxy.table, syncTopRow, syncBottomRow);\n\n    proxy.rowStart = direction === 'up' ? proxy.rowStart + count : proxy.rowStart - count;\n    proxy.rowEnd = direction === 'up' ? proxy.rowEnd + count : proxy.rowEnd - count;\n\n    checkFirstRowMerge(syncTopRow, proxy);\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        direction\n      );\n\n      const cellGroup = proxy.table.scenegraph.highPerformanceGetCell(proxy.bodyLeftCol, screenTopRow, true);\n      const delaY =\n        screenTopY - (cellGroup.attribute.y + proxy.table.getFrozenRowsHeight() + proxy.table.scenegraph.proxy.deltaY);\n      proxy.table.scenegraph.proxy.deltaY += delaY;\n    }\n\n    proxy.currentRow = direction === 'up' ? proxy.currentRow + count : proxy.currentRow - count;\n    proxy.totalRow = direction === 'up' ? proxy.totalRow + count : proxy.totalRow - count;\n    proxy.referenceRow = proxy.rowStart + Math.floor((proxy.rowEnd - proxy.rowStart) / 2);\n    proxy.rowUpdatePos = distStartRow;\n    proxy.rowUpdateDirection = direction;\n\n    proxy.table.scenegraph.updateNextFrame();\n    if (proxy.table.heightMode !== 'autoHeight') {\n      await proxy.progress();\n    }\n  } else {\n    const distStartRow = direction === 'up' ? proxy.rowStart + count : proxy.rowStart - count;\n    const distEndRow = direction === 'up' ? proxy.rowEnd + count : proxy.rowEnd - count;\n    const distStartRowY = proxy.table.getRowsHeight(proxy.bodyTopRow, distStartRow - 1);\n    // 更新distStartRow位置的merge单元格，避免distStartRow位置不是merge的起始位置造成的空白\n\n    // 更新同步范围\n    updateAllRowPosition(distStartRowY, count, direction, proxy);\n    let syncTopRow;\n    let syncBottomRow;\n    if (proxy.table.heightMode === 'autoHeight') {\n      syncTopRow = distStartRow;\n      syncBottomRow = distEndRow;\n    } else {\n      syncTopRow = Math.max(proxy.bodyTopRow, screenTopRow - proxy.screenRowCount * 1);\n      syncBottomRow = Math.min(proxy.bodyBottomRow, screenTopRow + proxy.screenRowCount * 2);\n    }\n    //console.log('更新同步范围', syncTopRow, syncBottomRow);\n\n    computeRowsHeight(proxy.table, syncTopRow, syncBottomRow);\n\n    proxy.rowStart = distStartRow;\n    proxy.rowEnd = distEndRow;\n\n    checkFirstRowMerge(syncTopRow, proxy);\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        distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up' // 跳转到底部时，从下向上对齐\n      );\n    }\n    proxy.table.scenegraph.proxy.deltaY = 0;\n\n    proxy.currentRow = direction === 'up' ? proxy.currentRow + count : proxy.currentRow - count;\n    proxy.totalRow = direction === 'up' ? proxy.totalRow + count : proxy.totalRow - count;\n    proxy.referenceRow = proxy.rowStart + Math.floor((proxy.rowEnd - proxy.rowStart) / 2);\n    proxy.rowUpdatePos = proxy.rowStart;\n    proxy.rowUpdateDirection = distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up';\n\n    proxy.table.scenegraph.updateNextFrame();\n    if (proxy.table.heightMode !== 'autoHeight') {\n      await proxy.progress();\n    }\n  }\n}\n\nfunction updatePartRowPosition(startRow: number, endRow: number, direction: 'up' | 'down', proxy: SceneProxy) {\n  // row header group\n  for (let col = 0; col < proxy.table.rowHeaderLevelCount; col++) {\n    const colGroup = proxy.table.scenegraph.getColGroup(col);\n    for (let row = startRow; row <= endRow; row++) {\n      updateCellGroupPosition(colGroup, direction, proxy);\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    for (let row = startRow; row <= endRow; row++) {\n      updateCellGroupPosition(colGroup, direction, proxy);\n    }\n  }\n  // body group\n  for (let col = proxy.bodyLeftCol; col <= proxy.bodyRightCol; col++) {\n    const colGroup = proxy.table.scenegraph.getColGroup(col);\n    for (let row = startRow; row <= endRow; row++) {\n      updateCellGroupPosition(colGroup, direction, proxy);\n    }\n  }\n}\n\nfunction updateCellGroupPosition(colGroup: Group, direction: 'up' | 'down', proxy: SceneProxy) {\n  if (direction === 'up') {\n    const cellGroup = colGroup.firstChild as Group;\n    proxy.updateCellGroupPosition(\n      cellGroup,\n      (colGroup.lastChild as Group).row + 1,\n      (colGroup.lastChild as Group).attribute.y + proxy.table.getRowHeight((colGroup.lastChild as Group).row) // (colGroup.lastChild as Group).attribute.height\n    );\n    colGroup.appendChild(cellGroup);\n  } else {\n    const cellGroup = colGroup.lastChild as Group;\n    proxy.updateCellGroupPosition(\n      cellGroup,\n      (colGroup.firstChild as Group).row - 1,\n      (colGroup.firstChild as Group).attribute.y - proxy.table.getRowHeight((cellGroup as Group).row) // cellGroup.attribute.height\n    );\n    colGroup.insertBefore(cellGroup, colGroup.firstChild);\n  }\n}\n\nfunction updateAllRowPosition(distStartRowY: number, count: number, direction: 'up' | 'down', proxy: SceneProxy) {\n  // row header group\n  for (let col = 0; col < proxy.table.rowHeaderLevelCount; col++) {\n    const colGroup = proxy.table.scenegraph.getColGroup(col);\n    colGroup?.forEachChildren((cellGroup: Group, index) => {\n      // 这里使用colGroup变量而不是for proxy.rowStart to proxy.rowEndproxy.rowEnd是因为在更新内可能出现row号码重复的情况\n      proxy.updateCellGroupPosition(\n        cellGroup,\n        direction === 'up' ? cellGroup.row + count : cellGroup.row - count,\n        index === 0 // row === proxy.rowStart\n          ? distStartRowY\n          : (cellGroup._prev as Group).attribute.y + proxy.table.getRowHeight((cellGroup._prev as Group).row)\n      );\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      // 这里使用colGroup变量而不是for proxy.rowStart to proxy.rowEndproxy.rowEnd是因为在更新内可能出现row号码重复的情况\n      proxy.updateCellGroupPosition(\n        cellGroup,\n        direction === 'up' ? cellGroup.row + count : cellGroup.row - count,\n        index === 0 // row === proxy.rowStart\n          ? distStartRowY\n          : (cellGroup._prev as Group).attribute.y + proxy.table.getRowHeight((cellGroup._prev as Group).row)\n      );\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      // 这里使用colGroup变量而不是for proxy.rowStart to proxy.rowEndproxy.rowEnd是因为在更新内可能出现row号码重复的情况\n      proxy.updateCellGroupPosition(\n        cellGroup,\n        direction === 'up' ? cellGroup.row + count : cellGroup.row - count,\n        index === 0 // row === proxy.rowStart\n          ? distStartRowY\n          : (cellGroup._prev as Group).attribute.y + proxy.table.getRowHeight((cellGroup._prev as Group).row)\n      );\n    });\n  }\n}\n\nexport function updateRowContent(syncTopRow: number, syncBottomRow: number, proxy: SceneProxy) {\n  // row header group\n  for (let col = 0; col < proxy.table.rowHeaderLevelCount; col++) {\n    for (let row = syncTopRow; row <= syncBottomRow; row++) {\n      // const cellGroup = proxy.table.scenegraph.getCell(col, row);\n      const cellGroup = proxy.highPerformanceGetCell(col, row, true);\n      proxy.updateCellGroupContent(cellGroup);\n    }\n  }\n  // right frozen group\n  for (let col = proxy.table.colCount - proxy.table.rightFrozenColCount; col < proxy.table.colCount; col++) {\n    for (let row = syncTopRow; row <= syncBottomRow; row++) {\n      // const cellGroup = proxy.table.scenegraph.getCell(col, row);\n      const cellGroup = proxy.highPerformanceGetCell(col, row);\n      proxy.updateCellGroupContent(cellGroup);\n    }\n  }\n  // body group\n  for (let col = proxy.bodyLeftCol; col <= proxy.bodyRightCol; col++) {\n    for (let row = syncTopRow; row <= syncBottomRow; row++) {\n      // const cellGroup = proxy.table.scenegraph.getCell(col, row);\n      const cellGroup = proxy.highPerformanceGetCell(col, row);\n      proxy.updateCellGroupContent(cellGroup);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/progress/update-position/dynamic-set-y.ts"],"names":[],"mappings":"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","file":"dynamic-set-y.js","sourcesContent":["import { isValid } from '../../../../tools/util';\nimport type { Group } from '../../../graphic/group';\nimport { computeRowsHeight } from '../../../layout/compute-row-height';\nimport type { SceneProxy } from '../proxy';\nimport { updateAutoRow } from './update-auto-row';\nimport { checkFirstRowMerge } from './util';\n\nexport async function dynamicSetY(y: number, proxy: SceneProxy) {\n  // 计算变动row range\n  // const screenTopRow = proxy.table.getRowAt(y).row;\n  // proxy.deltaY = 0;\n  const screenTop = (proxy.table as any).getTargetRowAt(y + proxy.table.scenegraph.colHeaderGroup.attribute.height);\n  if (!screenTop) {\n    return;\n  }\n  const screenTopRow = screenTop.row;\n  const screenTopY = screenTop.top;\n  proxy.screenTopRow = screenTopRow;\n  const deltaRow = screenTopRow - proxy.referenceRow;\n  if (deltaRow > 0) {\n    // 向下滚动，顶部cell group移到底部\n    moveCell(deltaRow, 'up', screenTopRow, screenTopY, proxy);\n    proxy.updateBody(y - proxy.deltaY);\n  } else if (deltaRow < 0) {\n    // 向上滚动，底部cell group移到顶部\n    moveCell(-deltaRow, 'down', screenTopRow, screenTopY, proxy);\n    proxy.updateBody(y - proxy.deltaY);\n  } else {\n    // 不改变row，更新body group范围\n    proxy.updateBody(y - proxy.deltaY);\n  }\n\n  proxy.table.scenegraph.updateNextFrame();\n}\n\nasync function moveCell(\n  count: number,\n  direction: 'up' | 'down',\n  screenTopRow: number,\n  screenTopY: number,\n  proxy: SceneProxy\n) {\n  // 限制count范围\n  if (direction === 'up' && proxy.rowEnd + count > proxy.bodyBottomRow) {\n    count = proxy.bodyBottomRow - proxy.rowEnd;\n  } else if (direction === 'down' && proxy.rowStart - count < proxy.bodyTopRow) {\n    count = proxy.rowStart - proxy.bodyTopRow;\n  }\n\n  // 两种更新模式\n  // 1. count < rowEnd - rowStart：从顶/底部移动count数量的单元格到底/顶部\n  // 2. count >= rowEnd - rowStart：整体移动到目标位置\n  if (count < proxy.rowEnd - proxy.rowStart) {\n    // 计算更新区域\n    const startRow = direction === 'up' ? proxy.rowStart : proxy.rowEnd - count + 1;\n    const endRow = direction === 'up' ? proxy.rowStart + count - 1 : proxy.rowEnd;\n    const distStartRow = direction === 'up' ? proxy.rowEnd + 1 : proxy.rowStart - count;\n    const distEndRow = direction === 'up' ? proxy.rowEnd + count : proxy.rowStart - 1;\n\n    // 更新同步范围\n    let syncTopRow;\n    let syncBottomRow;\n    if (proxy.table.heightMode === 'autoHeight') {\n      syncTopRow = distStartRow;\n      syncBottomRow = distEndRow;\n    } else {\n      const topRow = Math.max(proxy.bodyTopRow, screenTopRow - proxy.screenRowCount * 1);\n      const BottomRow = Math.min(proxy.bodyBottomRow, screenTopRow + proxy.screenRowCount * 2);\n      // get coincide of distStartRow&distEndRow and topRow&BottomRow\n      syncTopRow = Math.max(distStartRow, topRow);\n      syncBottomRow = Math.min(distEndRow, BottomRow);\n    }\n\n    // const syncTopRow = Math.max(proxy.bodyTopRow, screenTopRow - proxy.screenRowCount * 1);\n    // const syncBottomRow = Math.min(proxy.bodyBottomRow, screenTopRow + proxy.screenRowCount * 2);\n    computeRowsHeight(proxy.table, syncTopRow, syncBottomRow);\n\n    // console.log('move', startRow, endRow, direction);\n    updatePartRowPosition(startRow, endRow, direction, proxy);\n\n    proxy.rowStart = direction === 'up' ? proxy.rowStart + count : proxy.rowStart - count;\n    proxy.rowEnd = direction === 'up' ? proxy.rowEnd + count : proxy.rowEnd - count;\n\n    updateRowContent(syncTopRow, syncBottomRow, proxy);\n    checkFirstRowMerge(syncTopRow, 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        direction\n      );\n\n      const cellGroup = proxy.table.scenegraph.highPerformanceGetCell(proxy.bodyLeftCol, screenTopRow, true);\n      const delaY =\n        screenTopY - (cellGroup.attribute.y + proxy.table.getFrozenRowsHeight() + proxy.table.scenegraph.proxy.deltaY);\n      proxy.table.scenegraph.proxy.deltaY += delaY;\n    }\n\n    proxy.currentRow = direction === 'up' ? proxy.currentRow + count : proxy.currentRow - count;\n    proxy.totalRow = direction === 'up' ? proxy.totalRow + count : proxy.totalRow - count;\n    proxy.referenceRow = proxy.rowStart + Math.floor((proxy.rowEnd - proxy.rowStart) / 2);\n    proxy.rowUpdatePos = distStartRow;\n    proxy.rowUpdateDirection = direction;\n\n    proxy.table.scenegraph.updateNextFrame();\n    if (proxy.table.heightMode !== 'autoHeight') {\n      await proxy.progress();\n    }\n  } else {\n    const distStartRow = direction === 'up' ? proxy.rowStart + count : proxy.rowStart - count;\n    const distEndRow = direction === 'up' ? proxy.rowEnd + count : proxy.rowEnd - count;\n    const distStartRowY = proxy.table.getRowsHeight(proxy.bodyTopRow, distStartRow - 1);\n\n    let syncTopRow;\n    let syncBottomRow;\n    if (proxy.table.heightMode === 'autoHeight') {\n      syncTopRow = distStartRow;\n      syncBottomRow = distEndRow;\n    } else {\n      syncTopRow = Math.max(proxy.bodyTopRow, screenTopRow - proxy.screenRowCount * 1);\n      syncBottomRow = Math.min(proxy.bodyBottomRow, screenTopRow + proxy.screenRowCount * 2);\n    }\n    //console.log('更新同步范围', syncTopRow, syncBottomRow);\n\n    computeRowsHeight(proxy.table, syncTopRow, syncBottomRow);\n\n    // 更新同步范围\n    updateAllRowPosition(distStartRowY, count, direction, proxy);\n\n    proxy.rowStart = distStartRow;\n    proxy.rowEnd = distEndRow;\n\n    checkFirstRowMerge(syncTopRow, proxy);\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        distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up' // 跳转到底部时，从下向上对齐\n      );\n    }\n    proxy.table.scenegraph.proxy.deltaY = 0;\n\n    proxy.currentRow = direction === 'up' ? proxy.currentRow + count : proxy.currentRow - count;\n    proxy.totalRow = direction === 'up' ? proxy.totalRow + count : proxy.totalRow - count;\n    proxy.referenceRow = proxy.rowStart + Math.floor((proxy.rowEnd - proxy.rowStart) / 2);\n    proxy.rowUpdatePos = proxy.rowStart;\n    proxy.rowUpdateDirection = distEndRow > proxy.bodyBottomRow - (proxy.rowEnd - proxy.rowStart + 1) ? 'down' : 'up';\n\n    proxy.table.scenegraph.updateNextFrame();\n    if (proxy.table.heightMode !== 'autoHeight') {\n      await proxy.progress();\n    }\n  }\n}\n\nfunction updatePartRowPosition(startRow: number, endRow: number, direction: 'up' | 'down', proxy: SceneProxy) {\n  // row header group\n  for (let col = 0; col < proxy.table.rowHeaderLevelCount; col++) {\n    const colGroup = proxy.table.scenegraph.getColGroup(col);\n    for (let row = startRow; row <= endRow; row++) {\n      updateCellGroupPosition(colGroup, direction, proxy);\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    for (let row = startRow; row <= endRow; row++) {\n      updateCellGroupPosition(colGroup, direction, proxy);\n    }\n  }\n  // body group\n  for (let col = proxy.bodyLeftCol; col <= proxy.bodyRightCol; col++) {\n    const colGroup = proxy.table.scenegraph.getColGroup(col);\n    for (let row = startRow; row <= endRow; row++) {\n      updateCellGroupPosition(colGroup, direction, proxy);\n    }\n  }\n}\n\nfunction updateCellGroupPosition(colGroup: Group, direction: 'up' | 'down', proxy: SceneProxy) {\n  if (direction === 'up') {\n    const cellGroup = colGroup.firstChild as Group;\n    proxy.updateCellGroupPosition(\n      cellGroup,\n      (colGroup.lastChild as Group).row + 1,\n      (colGroup.lastChild as Group).attribute.y + proxy.table.getRowHeight((colGroup.lastChild as Group).row) // (colGroup.lastChild as Group).attribute.height\n    );\n    colGroup.appendChild(cellGroup);\n  } else {\n    const cellGroup = colGroup.lastChild as Group;\n    proxy.updateCellGroupPosition(\n      cellGroup,\n      (colGroup.firstChild as Group).row - 1,\n      (colGroup.firstChild as Group).attribute.y - proxy.table.getRowHeight((cellGroup as Group).row) // cellGroup.attribute.height\n    );\n    colGroup.insertBefore(cellGroup, colGroup.firstChild);\n  }\n}\n\nfunction updateAllRowPosition(distStartRowY: number, count: number, direction: 'up' | 'down', proxy: SceneProxy) {\n  // row header group\n  for (let col = 0; col < proxy.table.rowHeaderLevelCount; col++) {\n    const colGroup = proxy.table.scenegraph.getColGroup(col);\n    colGroup?.forEachChildren((cellGroup: Group, index) => {\n      // 这里使用colGroup变量而不是for proxy.rowStart to proxy.rowEndproxy.rowEnd是因为在更新内可能出现row号码重复的情况\n      proxy.updateCellGroupPosition(\n        cellGroup,\n        direction === 'up' ? cellGroup.row + count : cellGroup.row - count,\n        index === 0 // row === proxy.rowStart\n          ? distStartRowY\n          : (cellGroup._prev as Group).attribute.y + proxy.table.getRowHeight((cellGroup._prev as Group).row)\n      );\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      // 这里使用colGroup变量而不是for proxy.rowStart to proxy.rowEndproxy.rowEnd是因为在更新内可能出现row号码重复的情况\n      proxy.updateCellGroupPosition(\n        cellGroup,\n        direction === 'up' ? cellGroup.row + count : cellGroup.row - count,\n        index === 0 // row === proxy.rowStart\n          ? distStartRowY\n          : (cellGroup._prev as Group).attribute.y + proxy.table.getRowHeight((cellGroup._prev as Group).row)\n      );\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      // 这里使用colGroup变量而不是for proxy.rowStart to proxy.rowEndproxy.rowEnd是因为在更新内可能出现row号码重复的情况\n      proxy.updateCellGroupPosition(\n        cellGroup,\n        direction === 'up' ? cellGroup.row + count : cellGroup.row - count,\n        index === 0 // row === proxy.rowStart\n          ? distStartRowY\n          : (cellGroup._prev as Group).attribute.y + proxy.table.getRowHeight((cellGroup._prev as Group).row)\n      );\n    });\n  }\n}\n\nexport function updateRowContent(syncTopRow: number, syncBottomRow: number, proxy: SceneProxy) {\n  // row header group\n  for (let col = 0; col < proxy.table.rowHeaderLevelCount; col++) {\n    for (let row = syncTopRow; row <= syncBottomRow; row++) {\n      // const cellGroup = proxy.table.scenegraph.getCell(col, row);\n      const cellGroup = proxy.highPerformanceGetCell(col, row, true);\n      proxy.updateCellGroupContent(cellGroup);\n    }\n  }\n  // right frozen group\n  for (let col = proxy.table.colCount - proxy.table.rightFrozenColCount; col < proxy.table.colCount; col++) {\n    for (let row = syncTopRow; row <= syncBottomRow; row++) {\n      // const cellGroup = proxy.table.scenegraph.getCell(col, row);\n      const cellGroup = proxy.highPerformanceGetCell(col, row);\n      proxy.updateCellGroupContent(cellGroup);\n    }\n  }\n  // body group\n  for (let col = proxy.bodyLeftCol; col <= proxy.bodyRightCol; col++) {\n    for (let row = syncTopRow; row <= syncBottomRow; row++) {\n      // const cellGroup = proxy.table.scenegraph.getCell(col, row);\n      const cellGroup = proxy.highPerformanceGetCell(col, row);\n      proxy.updateCellGroupContent(cellGroup);\n    }\n  }\n}\n"]}

package/cjs/scenegraph/group-creater/progress/update-position/util.js

@@ -10,7 +10,7 @@ function checkFirstRowMerge(row, proxy) {
     for (let col = 0; col < proxy.table.colCount; col++) {
         if (col >= proxy.table.rowHeaderLevelCount && col < proxy.colStart || col > proxy.colEnd && col < proxy.table.colCount - proxy.table.rightFrozenColCount) continue;
         const range = (0, get_cell_merge_1.getCellMergeInfo)(proxy.table, col, row);
-        if (range && range.start.row !== row) {
+        if (range && clearHadMergedRow(range.start.row, range.end.row, col, proxy), range && range.start.row !== row && "cell" !== proxy.highPerformanceGetCell(range.start.col, range.start.row, !0).role) {
             const oldCellGroup = proxy.highPerformanceGetCell(col, row, !0), newCellGroup = (0, 
             cell_helper_1.updateCell)(range.start.col, range.start.row, proxy.table, !0);
             newCellGroup.col = col, newCellGroup.row = row, newCellGroup.setAttribute("y", proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, range.start.row - 1)), 
@@ -24,8 +24,7 @@ function checkFirstColMerge(col, scrolling, proxy) {
     for (let row = 0; row < proxy.table.rowCount; row++) {
         if (row >= proxy.table.columnHeaderLevelCount && row < proxy.rowStart || row > proxy.rowEnd && row < proxy.table.rowCount - proxy.table.bottomFrozenRowCount) continue;
         const range = (0, get_cell_merge_1.getCellMergeInfo)(proxy.table, col, row);
-        if (range && range.start.col !== col) {
-            if (scrolling && checkHasColMerge(range.start.col, range.end.col, row, proxy)) continue;
+        if (range && clearHadMergedColumn(range.start.col, range.end.col, row, proxy), range && range.start.col !== col && "cell" !== proxy.highPerformanceGetCell(range.start.col, range.start.row, !0).role) {
             const oldCellGroup = proxy.highPerformanceGetCell(col, row, !0), newCellGroup = (0, 
             cell_helper_1.updateCell)(range.start.col, range.start.row, proxy.table, !0);
             newCellGroup.col = col, newCellGroup.row = row, newCellGroup.setAttribute("x", proxy.table.getColsWidth(proxy.table.rowHeaderLevelCount, range.start.col - 1) - oldCellGroup.parent.attribute.x), 
@@ -35,6 +34,30 @@ function checkFirstColMerge(col, scrolling, proxy) {
     }
 }
 
+function clearHadMergedRow(rowStart, rowEnd, col, proxy) {
+    for (let row = rowStart; row <= rowEnd; row++) {
+        const cellGroup = proxy.highPerformanceGetCell(col, row, !0);
+        "shadow-cell" !== cellGroup.role && "empty" !== cellGroup.role && cellGroup.row !== rowStart && (cellGroup.role = "shadow-cell", 
+        cellGroup.setAttributes({
+            width: 0,
+            height: proxy.table.getRowHeight(cellGroup.row),
+            y: proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, cellGroup.row - 1)
+        }), cellGroup.clear());
+    }
+}
+
+function clearHadMergedColumn(colStart, colEnd, row, proxy) {
+    for (let col = colStart; col <= colEnd; col++) {
+        const cellGroup = proxy.highPerformanceGetCell(col, row, !0);
+        "shadow-cell" !== cellGroup.role && "empty" !== cellGroup.role && cellGroup.row !== colStart && (cellGroup.role = "shadow-cell", 
+        cellGroup.setAttributes({
+            width: 0,
+            height: proxy.table.getRowHeight(cellGroup.row),
+            y: proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, cellGroup.row - 1)
+        }), cellGroup.clear());
+    }
+}
+
 function checkHasColMerge(colStart, colEnd, row, proxy) {
     for (let col = colStart; col <= colEnd; col++) if ("shadow-cell" !== proxy.highPerformanceGetCell(col, row, !0).role && "empty" !== proxy.highPerformanceGetCell(col, row, !0).role) return !0;
     return !1;

package/cjs/scenegraph/group-creater/progress/update-position/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/progress/update-position/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { table } from 'console';\nimport type { Group } from '../../../graphic/group';\nimport { getCellMergeInfo } from '../../../utils/get-cell-merge';\nimport { updateCell } from '../../cell-helper';\nimport type { SceneProxy } from '../proxy';\nimport { BaseTableAPI } from '../../../../ts-types/base-table';\n\nexport function checkFirstRowMerge(row: number, proxy: SceneProxy) {\n  for (let col = 0; col < proxy.table.colCount; col++) {\n    if (\n      (col >= proxy.table.rowHeaderLevelCount && col < proxy.colStart) ||\n      (col > proxy.colEnd && col < proxy.table.colCount - proxy.table.rightFrozenColCount)\n    ) {\n      continue;\n    }\n    const range = getCellMergeInfo(proxy.table, col, row);\n    if (range && range.start.row !== row) {\n      // 在row的位置添加range.start.row单元格\n      const oldCellGroup = proxy.highPerformanceGetCell(col, row, true);\n      const newCellGroup = updateCell(range.start.col, range.start.row, proxy.table, true);\n\n      newCellGroup.col = col;\n      newCellGroup.row = row;\n      newCellGroup.setAttribute(\n        'y',\n        proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, range.start.row - 1)\n      );\n\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n\n      oldCellGroup.needUpdate = false;\n      newCellGroup.needUpdate = false;\n\n      // update cache\n      if (proxy.cellCache.get(col)) {\n        proxy.cellCache.set(col, newCellGroup);\n      }\n    }\n  }\n}\n\nexport function checkFirstColMerge(col: number, scrolling: boolean, proxy: SceneProxy) {\n  for (let row = 0; row < proxy.table.rowCount; row++) {\n    if (\n      (row >= proxy.table.columnHeaderLevelCount && row < proxy.rowStart) ||\n      (row > proxy.rowEnd && row < proxy.table.rowCount - proxy.table.bottomFrozenRowCount)\n    ) {\n      continue;\n    }\n\n    const range = getCellMergeInfo(proxy.table, col, row);\n    if (range && range.start.col !== col) {\n      if (scrolling && checkHasColMerge(range.start.col, range.end.col, row, proxy)) {\n        continue;\n      }\n      // 在col的位置添加range.start.col单元格\n      const oldCellGroup = proxy.highPerformanceGetCell(col, row, true);\n      const newCellGroup = updateCell(range.start.col, range.start.row, proxy.table, true);\n\n      newCellGroup.col = col;\n      newCellGroup.row = row;\n      newCellGroup.setAttribute(\n        'x',\n        proxy.table.getColsWidth(proxy.table.rowHeaderLevelCount, range.start.col - 1) - oldCellGroup.parent.attribute.x\n      );\n\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n\n      oldCellGroup.needUpdate = false;\n      newCellGroup.needUpdate = false;\n\n      // update cache\n      if (proxy.cellCache.get(col)) {\n        proxy.cellCache.set(col, newCellGroup);\n      }\n    }\n  }\n}\n\nfunction checkHasColMerge(colStart: number, colEnd: number, row: number, proxy: SceneProxy) {\n  for (let col = colStart; col <= colEnd; col++) {\n    if (\n      proxy.highPerformanceGetCell(col, row, true).role !== 'shadow-cell' &&\n      proxy.highPerformanceGetCell(col, row, true).role !== 'empty'\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function getFirstChild(containerGroup: Group): Group {\n  let child = containerGroup.firstChild as Group;\n  while (child.type !== 'group') {\n    child = child._next as Group;\n  }\n  return child;\n}\n\nexport function getLastChild(containerGroup: Group): Group {\n  let child = containerGroup.lastChild as Group;\n  while (child.type !== 'group') {\n    child = child._prev as Group;\n  }\n  return child;\n}\n\nexport function getPrevGroup(group: Group): Group {\n  let child = group._prev as Group;\n  while (child && child.type !== 'group') {\n    child = child._prev as Group;\n  }\n  return child;\n}\n\nexport function getNextGroup(group: Group): Group {\n  let child = group._next as Group;\n  while (child && child.type !== 'group') {\n    child = child._next as Group;\n  }\n  return child;\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/progress/update-position/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { table } from 'console';\nimport type { Group } from '../../../graphic/group';\nimport { getCellMergeInfo } from '../../../utils/get-cell-merge';\nimport { updateCell } from '../../cell-helper';\nimport type { SceneProxy } from '../proxy';\nimport { BaseTableAPI } from '../../../../ts-types/base-table';\n\nexport function checkFirstRowMerge(row: number, proxy: SceneProxy) {\n  for (let col = 0; col < proxy.table.colCount; col++) {\n    if (\n      (col >= proxy.table.rowHeaderLevelCount && col < proxy.colStart) ||\n      (col > proxy.colEnd && col < proxy.table.colCount - proxy.table.rightFrozenColCount)\n    ) {\n      continue;\n    }\n\n    const range = getCellMergeInfo(proxy.table, col, row);\n    // 清除之前mock的Merge cell\n    range && clearHadMergedRow(range.start.row, range.end.row, col, proxy);\n\n    // 重新生成mock的Merge cell\n    if (\n      range &&\n      range.start.row !== row &&\n      proxy.highPerformanceGetCell(range.start.col, range.start.row, true).role !== 'cell'\n    ) {\n      // 在row的位置添加range.start.row单元格\n      const oldCellGroup = proxy.highPerformanceGetCell(col, row, true);\n      const newCellGroup = updateCell(range.start.col, range.start.row, proxy.table, true);\n\n      newCellGroup.col = col;\n      newCellGroup.row = row;\n      newCellGroup.setAttribute(\n        'y',\n        proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, range.start.row - 1)\n      );\n\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n\n      oldCellGroup.needUpdate = false;\n      newCellGroup.needUpdate = false;\n\n      // update cache\n      if (proxy.cellCache.get(col)) {\n        proxy.cellCache.set(col, newCellGroup);\n      }\n    }\n  }\n}\n\nexport function checkFirstColMerge(col: number, scrolling: boolean, proxy: SceneProxy) {\n  for (let row = 0; row < proxy.table.rowCount; row++) {\n    if (\n      (row >= proxy.table.columnHeaderLevelCount && row < proxy.rowStart) ||\n      (row > proxy.rowEnd && row < proxy.table.rowCount - proxy.table.bottomFrozenRowCount)\n    ) {\n      continue;\n    }\n\n    const range = getCellMergeInfo(proxy.table, col, row);\n    // 清除之前mock的Merge cell\n    range && clearHadMergedColumn(range.start.col, range.end.col, row, proxy);\n\n    if (\n      range &&\n      range.start.col !== col &&\n      proxy.highPerformanceGetCell(range.start.col, range.start.row, true).role !== 'cell'\n    ) {\n      // 在col的位置添加range.start.col单元格\n      const oldCellGroup = proxy.highPerformanceGetCell(col, row, true);\n      const newCellGroup = updateCell(range.start.col, range.start.row, proxy.table, true);\n\n      newCellGroup.col = col;\n      newCellGroup.row = row;\n      newCellGroup.setAttribute(\n        'x',\n        proxy.table.getColsWidth(proxy.table.rowHeaderLevelCount, range.start.col - 1) - oldCellGroup.parent.attribute.x\n      );\n\n      oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup);\n      oldCellGroup.parent.removeChild(oldCellGroup);\n\n      oldCellGroup.needUpdate = false;\n      newCellGroup.needUpdate = false;\n\n      // update cache\n      if (proxy.cellCache.get(col)) {\n        proxy.cellCache.set(col, newCellGroup);\n      }\n    }\n  }\n}\n\nfunction clearHadMergedRow(rowStart: number, rowEnd: number, col: number, proxy: SceneProxy) {\n  for (let row = rowStart; row <= rowEnd; row++) {\n    const cellGroup = proxy.highPerformanceGetCell(col, row, true);\n    if (cellGroup.role !== 'shadow-cell' && cellGroup.role !== 'empty' && cellGroup.row !== rowStart) {\n      cellGroup.role = 'shadow-cell';\n      cellGroup.setAttributes({\n        width: 0,\n        height: proxy.table.getRowHeight(cellGroup.row),\n        y: proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, cellGroup.row - 1)\n      });\n      cellGroup.clear();\n    }\n  }\n}\n\nfunction clearHadMergedColumn(colStart: number, colEnd: number, row: number, proxy: SceneProxy) {\n  for (let col = colStart; col <= colEnd; col++) {\n    const cellGroup = proxy.highPerformanceGetCell(col, row, true);\n    if (cellGroup.role !== 'shadow-cell' && cellGroup.role !== 'empty' && cellGroup.row !== colStart) {\n      cellGroup.role = 'shadow-cell';\n      cellGroup.setAttributes({\n        width: 0,\n        height: proxy.table.getRowHeight(cellGroup.row),\n        y: proxy.table.getRowsHeight(proxy.table.columnHeaderLevelCount, cellGroup.row - 1)\n      });\n      cellGroup.clear();\n    }\n  }\n}\n\nfunction checkHasColMerge(colStart: number, colEnd: number, row: number, proxy: SceneProxy) {\n  for (let col = colStart; col <= colEnd; col++) {\n    if (\n      proxy.highPerformanceGetCell(col, row, true).role !== 'shadow-cell' &&\n      proxy.highPerformanceGetCell(col, row, true).role !== 'empty'\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\nexport function getFirstChild(containerGroup: Group): Group {\n  let child = containerGroup.firstChild as Group;\n  while (child.type !== 'group') {\n    child = child._next as Group;\n  }\n  return child;\n}\n\nexport function getLastChild(containerGroup: Group): Group {\n  let child = containerGroup.lastChild as Group;\n  while (child.type !== 'group') {\n    child = child._prev as Group;\n  }\n  return child;\n}\n\nexport function getPrevGroup(group: Group): Group {\n  let child = group._prev as Group;\n  while (child && child.type !== 'group') {\n    child = child._prev as Group;\n  }\n  return child;\n}\n\nexport function getNextGroup(group: Group): Group {\n  let child = group._next as Group;\n  while (child && child.type !== 'group') {\n    child = child._next as Group;\n  }\n  return child;\n}\n"]}

package/cjs/scenegraph/scenegraph.d.ts

@@ -133,4 +133,6 @@ export declare class Scenegraph {
     updateHierarchyIcon(col: number, row: number): void;
     updateRow(removeCells: CellAddress[], addCells: CellAddress[]): void;
     findAndUpdateIcon(group: Group, funcTypeArr: IconFuncTypeEnum[], iconConfig: ColumnIconOption): void;
+    getColumnGroupX(col: number): number;
+    getCellGroupY(row: number): number;
 }

package/cjs/scenegraph/scenegraph.js

@@ -694,6 +694,12 @@ class Scenegraph {
             return !1;
         }));
     }
+    getColumnGroupX(col) {
+        return col < this.table.rowHeaderLevelCount ? this.table.getColsWidth(0, col - 1) : col < this.table.colCount - this.table.rightFrozenColCount ? this.table.getColsWidth(this.table.rowHeaderLevelCount, col - 1) : col < this.table.colCount ? this.table.getColsWidth(this.table.colCount - this.table.bottomFrozenRowCount, col - 1) : 0;
+    }
+    getCellGroupY(row) {
+        return row < this.table.columnHeaderLevelCount ? this.table.getRowsHeight(0, row - 1) : row < this.table.rowCount - this.table.bottomFrozenRowCount ? this.table.getRowsHeight(this.table.columnHeaderLevelCount, row - 1) : row < this.table.rowCount ? this.table.getRowsHeight(this.table.rowCount - this.table.bottomFrozenRowCount, row - 1) : 0;
+    }
 }
 
 function showIcon(scene, cellGroup, visibleTime) {