@visactor/vtable 0.9.1-alpha.4 → 0.9.1

package/cjs/scenegraph/group-creater/cell-type/video-cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/cell-type/video-cell.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,+CAA4D;AAC5D,sDAAwC;AACxC,+CAA4C;AAC5C,qEAAwE;AACxE,6CAA0C;AAC1C,mDAAyD;AACzD,6CAAkD;AAClD,mDAAkE;AAClE,8CAA8C;AAC9C,2CAA2C;AAG3C,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;AAE/B,SAAgB,oBAAoB,CAClC,WAAkB,EAClB,OAAe,EACf,OAAe,EACf,GAAW,EACX,GAAW,EACX,KAAa,EACb,MAAc,EACd,eAAwB,EACxB,eAAwB,EACxB,OAAyC,EACzC,SAA0B,EAC1B,YAAgC,EAChC,KAAmB,EACnB,SAAsB;;IAEtB,SAAS,GAAG,IAAA,wBAAY,EAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAClD,MAAM,iBAAiB,GAAG,IAAA,4BAAiB,EAAC,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IAErF,IAAI,IAAA,cAAO,EAAC,iBAAiB,CAAC,EAAE;QAC9B,OAAO,GAAG,iBAAiB,CAAC;KAC7B;IACD,IAAI,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,0CAAE,SAAS,EAAE;QAC9B,SAAS,GAAG,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,0CAAE,SAAS,CAAC;KACxC;IACD,IAAI,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,0CAAE,YAAY,EAAE;QACjC,YAAY,GAAG,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,0CAAE,YAAY,CAAC;KAC9C;IAGD,MAAM,SAAS,GAAG,IAAI,aAAK,CAAC;QAC1B,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,OAAO;QACV,KAAK;QACL,MAAM;QAIN,SAAS,EAAE,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,0CAAE,SAAS,mCAAI,SAAS;QACnD,IAAI,EAAE,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,0CAAE,IAAI,mCAAI,SAAS;QACzC,MAAM,EAAE,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,0CAAE,MAAM,mCAAI,SAAS;QAC7C,gBAAgB,EAAE,MAAA,MAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAa,0CAAE,gBAAgB,mCAAI,SAAS;QAC1E,gBAAgB,EAAE,MAAA,MAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAa,0CAAE,gBAAgB,mCAAI,SAAS;QAC1E,MAAM,EAAE,MAAA,MAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAa,0CAAE,MAAM,mCAAI,SAAS;QAEtD,OAAO,EAAE,QAAQ;QAEjB,IAAI,EAAE,IAAI;KACJ,CAAC,CAAC;IACV,SAAS,CAAC,IAAI,GAAG,MAAM,CAAC;IACxB,SAAS,CAAC,GAAG,GAAG,GAAG,CAAC;IACpB,SAAS,CAAC,GAAG,GAAG,GAAG,CAAC;IACpB,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAGhC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC9C,KAAK,CAAC,gBAAgB,CAAC,YAAY,EAAE,GAAS,EAAE;QAC9C,IAAI,eAAe,EAAE;YACnB,IAAA,+BAAkB,EAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;SAC9F;QACD,MAAM,KAAK,GAAG,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC;QACxC,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC;QAE1C,IAAI,eAAe,EAAE;YACnB,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,2CAAuB,EACxE,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,WAAW,EACjB,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAC/B,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CACjC,CAAC;YACF,MAAM,GAAG,GAAG,IAAA,4BAAiB,EAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;YAE9G,KAAK,CAAC,aAAa,CAAC;gBAClB,KAAK,EAAE,UAAU;gBACjB,MAAM,EAAE,WAAW;gBACnB,CAAC,EAAE,GAAG,CAAC,CAAC;gBACR,CAAC,EAAE,GAAG,CAAC,CAAC;aACT,CAAC,CAAC;SACJ;aAAM;YACL,KAAK,CAAC,aAAa,CAAC;gBAClB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;gBACb,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;gBACb,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;gBACtC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;aACzC,CAAC,CAAC;SACJ;QAED,MAAM,IAAI,GAAG,CAAC,CAAC;QACf,MAAM,GAAG,GAAG,CAAC,CAAC;QAEd,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7G,MAAM,OAAO,GACX,IAAI,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAC5G,MAAM,OAAO,GACX,GAAG,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAE9G,MAAM,QAAQ,GAAS,IAAI,WAAI,CAAC;YAC9B,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,CAAC;YACzB,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,CAAC;YACzB,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAG,UAAU,CAAC,IAAY,CAAC,GAAG;YACnC,MAAM,EAAG,UAAU,CAAC,IAAY,CAAC,MAAM;SACxC,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,GAAG,WAAW,CAAC;QAC5B,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEhC,KAAK,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC;IACrC,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,OAAO,GAAG,GAAS,EAAE;QAExB,KAAa,CAAC,KAAK,GAAI,UAAU,CAAC,UAAkB,CAAC,GAAG,CAAC;IAC5D,CAAC,CAAC;IACF,KAAK,CAAC,GAAG,GAAG,KAAK,CAAC;IAClB,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAEtC,MAAM,KAAK,GAAW,IAAA,qBAAW,EAAC;QAChC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QACb,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QACb,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;QACtC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;QACxC,KAAK,EAAE,KAAY;QACnB,MAAM,EAAE,SAAmB;KAC5B,CAAC,CAAC;IACH,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC;IACrB,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAE7B,OAAO,SAAS,CAAC;AACnB,CAAC;AAlID,oDAkIC","file":"video-cell.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { Cursor, IImage, IThemeSpec } from '@visactor/vrender';\nimport { createRect, createImage } from '@visactor/vrender';\nimport * as icons from '../../../icons';\nimport { Group } from '../../graphic/group';\nimport { calcKeepAspectRatioSize } from '../../utils/keep-aspect-ratio';\nimport { Icon } from '../../graphic/icon';\nimport { calcStartPosition } from '../../utils/cell-pos';\nimport { _adjustWidthHeight } from './image-cell';\nimport { getFunctionalProp, getProp } from '../../utils/get-prop';\nimport { isValid } from '../../../tools/util';\nimport { getCellTheme } from './text-cell';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\n\nconst regedIcons = icons.get();\n\nexport function createVideoCellGroup(\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  keepAspectRatio: boolean,\n  imageAutoSizing: boolean,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  table: BaseTableAPI,\n  cellTheme?: IThemeSpec\n) {\n  cellTheme = getCellTheme(table, col, row, cellTheme);\n  const headerStyle = table._getCellStyle(col, row); // to be fixed\n  const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);\n  // const margin = getProp('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\n  // cell\n  const cellGroup = new Group({\n    x: xOrigin,\n    y: yOrigin,\n    width,\n    height,\n    // childrenPickable: false,\n\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  } as any);\n  cellGroup.role = 'cell';\n  cellGroup.col = col;\n  cellGroup.row = row;\n  columnGroup.addChild(cellGroup);\n\n  // video\n  const value = table.getCellValue(col, row);\n  const video = document.createElement('video');\n  video.addEventListener('loadeddata', (): void => {\n    if (imageAutoSizing) {\n      _adjustWidthHeight(col, row, video.videoWidth, video.videoHeight, table.scenegraph, padding);\n    }\n    const width = cellGroup.attribute.width;\n    const height = cellGroup.attribute.height;\n    // 更新宽高\n    if (keepAspectRatio) {\n      const { width: videoWidth, height: videoHeight } = calcKeepAspectRatioSize(\n        video.videoWidth,\n        video.videoHeight,\n        width - padding[1] - padding[3],\n        height - padding[0] - padding[2]\n      );\n      const pos = calcStartPosition(0, 0, width, height, videoWidth, videoHeight, textAlign, textBaseline, padding);\n\n      image.setAttributes({\n        width: videoWidth,\n        height: videoHeight,\n        x: pos.x,\n        y: pos.y\n      });\n    } else {\n      image.setAttributes({\n        x: padding[3],\n        y: padding[0],\n        width: width - padding[1] - padding[3],\n        height: height - padding[2] - padding[0]\n      });\n    }\n\n    const left = 0;\n    const top = 0;\n    // 播放按钮\n    const iconSize = Math.floor(Math.min(width - padding[1] - padding[3], height - padding[2] - padding[0]) / 2);\n    const anchorX =\n      left + (width > image.attribute.width ? image.attribute.x - left + image.attribute.width / 2 : width / 2);\n    const anchorY =\n      top + (height > image.attribute.height ? image.attribute.y - top + image.attribute.height / 2 : height / 2);\n\n    const playIcon: Icon = new Icon({\n      x: anchorX - iconSize / 2,\n      y: anchorY - iconSize / 2,\n      width: iconSize,\n      height: iconSize,\n      image: (regedIcons.play as any).svg,\n      cursor: (regedIcons.play as any).cursor\n    });\n    playIcon.role = 'play-icon';\n    cellGroup.appendChild(playIcon);\n    // 触发重绘\n    table.scenegraph.updateNextFrame();\n  });\n  video.onerror = (): void => {\n    // image.setAttribute('image', (regedIcons.damage_pic as any).svg);\n    (image as any).image = (regedIcons.damage_pic as any).svg;\n  };\n  video.src = value;\n  video.setAttribute('preload', 'auto');\n\n  const image: IImage = createImage({\n    x: padding[3],\n    y: padding[0],\n    width: width - padding[1] - padding[3],\n    height: height - padding[2] - padding[0],\n    image: video as any,\n    cursor: 'pointer' as Cursor\n  });\n  image.name = 'image';\n  cellGroup.appendChild(image);\n\n  return cellGroup;\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/cell-type/video-cell.ts"],"names":[],"mappings":"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","file":"video-cell.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { Cursor, IImage, IThemeSpec } from '@visactor/vrender';\nimport { createRect, createImage } from '@visactor/vrender';\nimport * as icons from '../../../icons';\nimport { Group } from '../../graphic/group';\nimport { calcKeepAspectRatioSize } from '../../utils/keep-aspect-ratio';\nimport { Icon } from '../../graphic/icon';\nimport { calcStartPosition } from '../../utils/cell-pos';\nimport { _adjustWidthHeight } from './image-cell';\nimport { getFunctionalProp, getProp } from '../../utils/get-prop';\nimport { isValid } from '../../../tools/util';\nimport { getCellTheme } from './text-cell';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\n\nconst regedIcons = icons.get();\n\nexport function createVideoCellGroup(\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  keepAspectRatio: boolean,\n  imageAutoSizing: boolean,\n  padding: [number, number, number, number],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  table: BaseTableAPI,\n  cellTheme?: IThemeSpec\n) {\n  cellTheme = getCellTheme(table, col, row, cellTheme);\n  const headerStyle = table._getCellStyle(col, row); // to be fixed\n  const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);\n  // const margin = getProp('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\n  // cell\n  const cellGroup = new Group({\n    x: xOrigin,\n    y: yOrigin,\n    width,\n    height,\n    // childrenPickable: false,\n\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  } as any);\n  cellGroup.role = 'cell';\n  cellGroup.col = col;\n  cellGroup.row = row;\n  columnGroup.addChild(cellGroup);\n\n  // video\n  const value = table.getCellValue(col, row);\n  const video = document.createElement('video');\n  video.addEventListener('loadeddata', (): void => {\n    if (imageAutoSizing) {\n      _adjustWidthHeight(col, row, video.videoWidth, video.videoHeight, table.scenegraph, padding);\n    }\n    const width = cellGroup.attribute.width;\n    const height = cellGroup.attribute.height;\n    // 更新宽高\n    if (keepAspectRatio) {\n      const { width: videoWidth, height: videoHeight } = calcKeepAspectRatioSize(\n        video.videoWidth,\n        video.videoHeight,\n        width - padding[1] - padding[3],\n        height - padding[0] - padding[2]\n      );\n      const pos = calcStartPosition(0, 0, width, height, videoWidth, videoHeight, textAlign, textBaseline, padding);\n\n      image.setAttributes({\n        width: videoWidth,\n        height: videoHeight,\n        x: pos.x,\n        y: pos.y\n      });\n    } else {\n      image.setAttributes({\n        x: padding[3],\n        y: padding[0],\n        width: width - padding[1] - padding[3],\n        height: height - padding[2] - padding[0]\n      });\n    }\n\n    const left = 0;\n    const top = 0;\n    // 播放按钮\n    const iconSize = Math.floor(Math.min(width - padding[1] - padding[3], height - padding[2] - padding[0]) / 2);\n    const anchorX =\n      left + (width > image.attribute.width ? image.attribute.x - left + image.attribute.width / 2 : width / 2);\n    const anchorY =\n      top + (height > image.attribute.height ? image.attribute.y - top + image.attribute.height / 2 : height / 2);\n\n    const playIcon: Icon = new Icon({\n      x: anchorX - iconSize / 2,\n      y: anchorY - iconSize / 2,\n      width: iconSize,\n      height: iconSize,\n      image: (regedIcons.play as any).svg,\n      cursor: (regedIcons.play as any).cursor\n    });\n    playIcon.name = 'play-icon';\n    cellGroup.appendChild(playIcon);\n    // 触发重绘\n    table.scenegraph.updateNextFrame();\n  });\n  video.onerror = (): void => {\n    // image.setAttribute('image', (regedIcons.damage_pic as any).svg);\n    (image as any).image = (regedIcons.damage_pic as any).svg;\n  };\n  video.src = value;\n  video.setAttribute('preload', 'auto');\n\n  const image: IImage = createImage({\n    x: padding[3],\n    y: padding[0],\n    width: width - padding[1] - padding[3],\n    height: height - padding[2] - padding[0],\n    image: video as any,\n    cursor: 'pointer' as Cursor\n  });\n  image.name = 'image';\n  cellGroup.appendChild(image);\n\n  return cellGroup;\n}\n"]}

package/cjs/scenegraph/group-creater/column-helper.d.ts

@@ -1,9 +1,9 @@
 import type { IThemeSpec } from '@visactor/vrender';
-import type { CellType, ICustomLayout, ICustomRender } from '../../ts-types';
+import type { CellType } from '../../ts-types';
 import { Group } from '../graphic/group';
-import type { MergeMap } from './column';
+import type { MergeMap } from '../scenegraph';
 import type { BaseTableAPI } from '../../ts-types/base-table';
-export declare function createComplexColumn(columnGroup: Group, col: number, colWidth: number, rowStart: number, rowEnd: number, mergeMap: MergeMap, defaultRowHeight: number | number[], table: BaseTableAPI, cellType: CellType, rowLimit?: number, customRender?: ICustomRender, customLayout?: ICustomLayout): {
+export declare function createComplexColumn(columnGroup: Group, col: number, colWidth: number, rowStart: number, rowEnd: number, mergeMap: MergeMap, defaultRowHeight: number | number[], table: BaseTableAPI, cellType: CellType, rowLimit?: number): {
     width: number;
     height: number;
 };

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

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.getColumnGroupTheme = exports.createComplexColumn = void 0;
 
-const group_1 = require("../graphic/group"), get_prop_1 = require("../utils/get-prop"), cell_helper_1 = require("./cell-helper"), tableHelper_1 = require("../../core/tableHelper");
+const group_1 = require("../graphic/group"), get_prop_1 = require("../utils/get-prop"), cell_helper_1 = require("./cell-helper"), tableHelper_1 = require("../../core/tableHelper"), helper_1 = require("../../tools/helper"), deal_promise_data_1 = require("../utils/deal-promise-data");
 
-function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, mergeMap, defaultRowHeight, table, cellType, rowLimit, customRender, customLayout) {
-    var _a, _b, _c, _d, _e, _f;
+function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, mergeMap, defaultRowHeight, table, cellType, rowLimit) {
+    var _a, _b, _c, _d, _e;
     let padding, textAlign, textBaseline, maxWidth = 0, isfunctionalProps = !1;
     const useColumnTheme = (table.isListTable() && !table.scenegraph.transpose || table.isPivotTable() && table.internalProps.layoutMap.indicatorsAsCol) && "body" === cellType;
     if (useColumnTheme) if (columnGroup.childrenCount) {
@@ -30,9 +30,9 @@ function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, merge
         mappingRule.bgColor && (bgColorFunc = mappingRule.bgColor.mapping);
     })));
     let y = 0;
-    (null === (_f = columnGroup.lastChild) || void 0 === _f ? void 0 : _f.attribute) && (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" !== cellType ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row), mayHaveIcon = "body" !== cellType || !!(null == define ? void 0 : define.icon);
+        const row = j, define = "body" !== cellType ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row), mayHaveIcon = "body" !== cellType || (!!(null == define ? void 0 : define.icon) || !!(null == define ? void 0 : define.tree));
         let cellTheme;
         if (!useColumnTheme) {
             const headerStyle = table._getCellStyle(col, row);
@@ -58,20 +58,31 @@ function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, merge
             });
         }
         if (mergeResult) {
-            const cellGroup = new group_1.Group({
+            const height = mergeResult.cellHeight / (range.end.row - range.start.row + 1), cellGroup = new group_1.Group({
                 x: 0,
                 y: y,
                 width: 0,
-                height: 0,
+                height: height,
                 visible: !1,
                 pickable: !1
             });
             cellGroup.role = "shadow-cell", cellGroup.col = col, cellGroup.row = row, cellGroup.mergeCol = range.start.col, 
-            cellGroup.mergeRow = range.start.row, columnGroup.addChild(cellGroup), range = table.getCellRange(col, row), 
-            y += mergeResult.cellHeight / (range.end.row - range.start.row + 1), maxWidth = Math.max(maxWidth, mergeResult.cellWidth);
+            cellGroup.mergeRow = range.start.row, columnGroup.addChild(cellGroup), columnGroup.updateColumnRowNumber(row), 
+            columnGroup.updateColumnHeight(height), range = table.getCellRange(col, row), y += height, 
+            maxWidth = Math.max(maxWidth, mergeResult.cellWidth);
         } else {
-            const height = (0, cell_helper_1.createCell)(type, define, table, col, row, colWidth, bgColorFunc, customRender, customLayout, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, isfunctionalProps, isMerge, range, cellTheme).attribute.height;
-            y += isMerge ? height / (range.end.row - range.start.row + 1) : height;
+            const value = table.getCellValue(col, row);
+            if ((0, helper_1.isPromise)(value)) {
+                (0, deal_promise_data_1.dealPromiseData)(value, table, cell_helper_1.createCell.bind(null, type, define, table, col, row, colWidth, bgColorFunc, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, isfunctionalProps, isMerge, range, cellTheme)), 
+                columnGroup.updateColumnRowNumber(row);
+                const height = isMerge ? table.getRowHeight(row) / (range.end.row - range.start.row + 1) : table.getRowHeight(row);
+                columnGroup.updateColumnHeight(height), y += height;
+            } else {
+                const cellGroup = (0, cell_helper_1.createCell)(type, define, table, col, row, colWidth, bgColorFunc, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, isfunctionalProps, isMerge, range, cellTheme);
+                columnGroup.updateColumnRowNumber(row);
+                const height = isMerge ? cellGroup.attribute.height / (range.end.row - range.start.row + 1) : cellGroup.attribute.height;
+                columnGroup.updateColumnHeight(height), y += height;
+            }
         }
         if (rowLimit && row > rowLimit) break;
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/column-helper.ts"],"names":[],"mappings":"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","file":"column-helper.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec } from '@visactor/vrender';\nimport type {\n  CellType,\n  FullExtendStyle,\n  ICustomLayout,\n  ICustomRender,\n  MappingRule,\n  TextColumnDefine\n} from '../../ts-types';\nimport { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from './column';\nimport { getPadding } from '../utils/padding';\nimport { parseFont } from '../utils/font';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { createCell } from './cell-helper';\nimport type { BaseTableAPI, PivotTableProtected } from '../../ts-types/base-table';\nimport { getStyleTheme } from '../../core/tableHelper';\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 cellType\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  cellType: CellType,\n  rowLimit?: number,\n  customRender?: ICustomRender,\n  customLayout?: ICustomLayout\n) {\n  let maxWidth = 0;\n  let padding;\n  let textAlign;\n  let textBaseline;\n  let isfunctionalProps = false;\n  /** useColumnTheme 判断是否可以使用columnTheme */\n  const useColumnTheme =\n    ((table.isListTable() && !table.scenegraph.transpose) ||\n      (table.isPivotTable() && (table.internalProps.layoutMap as PivotHeaderLayoutMap).indicatorsAsCol)) &&\n    cellType === 'body';\n\n  if (useColumnTheme) {\n    if (!columnGroup.childrenCount) {\n      // 只在首屏生效\n      const { theme: columnTheme, hasFunctionPros } = getColumnGroupTheme(col, colWidth, table);\n      isfunctionalProps = hasFunctionPros;\n      // get column header style\n      if (columnTheme._vtable.padding) {\n        padding = columnTheme._vtable.padding;\n      }\n      if (columnTheme.text.textAlign) {\n        textAlign = columnTheme.text.textAlign;\n      }\n      if (columnTheme.text.textBaseline) {\n        textBaseline = columnTheme.text.textBaseline;\n      }\n      columnGroup.setTheme(columnTheme);\n    } else if (columnGroup.theme) {\n      const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n      const { hasFunctionPros } = getStyleTheme(style, table, col, table.columnHeaderLevelCount, getRawProp, false);\n      isfunctionalProps = hasFunctionPros;\n      const columnTheme = columnGroup.theme.userTheme as any;\n      // 渐进加载时获取\n      if (columnTheme._vtable.padding) {\n        padding = columnTheme._vtable.padding;\n      }\n      if (columnTheme.text.textAlign) {\n        textAlign = columnTheme.text.textAlign;\n      }\n      if (columnTheme.text.textBaseline) {\n        textBaseline = columnTheme.text.textBaseline;\n      }\n    }\n  }\n  let bgColorFunc: Function;\n  // 判断是否有mapping  遍历dataset中mappingRules\n  if ((table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules && cellType === 'body') {\n    (table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules?.forEach(\n      (mappingRule: MappingRule, i: number) => {\n        if (mappingRule.bgColor) {\n          bgColorFunc = mappingRule.bgColor.mapping;\n        }\n      }\n    );\n  }\n  let y = 0;\n  if ((columnGroup.lastChild as Group)?.attribute) {\n    // 支持插入单元格\n    y = (columnGroup.lastChild as Group).attribute.y + (columnGroup.lastChild as Group).attribute.height;\n  }\n\n  for (let j = rowStart; j <= rowEnd; j++) {\n    const row = j;\n    const define = cellType !== 'body' ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);\n    const mayHaveIcon = cellType !== 'body' ? true : !!define?.icon;\n    let cellTheme;\n    if (!useColumnTheme) {\n      const headerStyle = table._getCellStyle(col, row);\n      cellTheme = getStyleTheme(headerStyle, table, col, row, getProp).theme;\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    // margin = getProp('margin', headerStyle, col, 0, table)\n\n    let cellGroup;\n    let cellWidth = colWidth;\n    let cellHeight = table.internalProps.autoRowHeight ? 0 : table.getRowHeight(row);\n    const type =\n      (table.isHeader(col, row) ? table._getHeaderLayoutMap(col, row).headerType : table.getBodyColumnType(col, row)) ||\n      'text';\n    // 处理单元格合并\n    let mergeResult;\n    let range;\n    let isMerge;\n    if (cellType !== '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        cellWidth = 0;\n        cellHeight = 0;\n        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            x: 0,\n            y,\n            cellWidth,\n            cellHeight\n          });\n        }\n      }\n    }\n\n    // let cellWidth = 0;\n    // let cellHeight = 0;\n    if (mergeResult) {\n      // 已有Merge单元格，使用空Group占位\n      const cellGroup = new Group({\n        x: 0,\n        y,\n        width: 0,\n        height: 0,\n        visible: false,\n        pickable: false\n      });\n      cellGroup.role = 'shadow-cell';\n      cellGroup.col = col;\n      cellGroup.row = row;\n      cellGroup.mergeCol = range.start.col;\n      cellGroup.mergeRow = range.start.row;\n      columnGroup.addChild(cellGroup);\n      range = table.getCellRange(col, row);\n      y += mergeResult.cellHeight / (range.end.row - range.start.row + 1);\n      maxWidth = Math.max(maxWidth, mergeResult.cellWidth);\n    } else {\n      const cellGroup = createCell(\n        type,\n        define,\n        table,\n        col,\n        row,\n        colWidth,\n        bgColorFunc,\n        customRender,\n        customLayout,\n        cellWidth,\n        cellHeight,\n        columnGroup,\n        y,\n        padding,\n        textAlign,\n        textBaseline,\n        mayHaveIcon,\n        isfunctionalProps,\n        isMerge,\n        range,\n        cellTheme\n      );\n      const height = cellGroup.attribute.height;\n      y += isMerge ? height / (range.end.row - range.start.row + 1) : height;\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"]}
+{"version":3,"sources":["scenegraph/group-creater/column-helper.ts"],"names":[],"mappings":"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","file":"column-helper.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec } from '@visactor/vrender';\nimport type {\n  CellType,\n  FullExtendStyle,\n  ICustomLayout,\n  ICustomRender,\n  MappingRule,\n  TextColumnDefine\n} from '../../ts-types';\nimport { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from '../scenegraph';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { createCell } from './cell-helper';\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';\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 cellType\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  cellType: CellType,\n  rowLimit?: number\n) {\n  let maxWidth = 0;\n  let padding;\n  let textAlign;\n  let textBaseline;\n  let isfunctionalProps = false;\n  /** useColumnTheme 判断是否可以使用columnTheme */\n  const useColumnTheme =\n    ((table.isListTable() && !table.scenegraph.transpose) ||\n      (table.isPivotTable() && (table.internalProps.layoutMap as PivotHeaderLayoutMap).indicatorsAsCol)) &&\n    cellType === 'body';\n\n  if (useColumnTheme) {\n    if (!columnGroup.childrenCount) {\n      // 只在首屏生效\n      const { theme: columnTheme, hasFunctionPros } = getColumnGroupTheme(col, colWidth, table);\n      isfunctionalProps = hasFunctionPros;\n      // get column header style\n      if (columnTheme._vtable.padding) {\n        padding = columnTheme._vtable.padding;\n      }\n      if (columnTheme.text.textAlign) {\n        textAlign = columnTheme.text.textAlign;\n      }\n      if (columnTheme.text.textBaseline) {\n        textBaseline = columnTheme.text.textBaseline;\n      }\n      columnGroup.setTheme(columnTheme);\n    } else if (columnGroup.theme) {\n      const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n      const { hasFunctionPros } = getStyleTheme(style, table, col, table.columnHeaderLevelCount, getRawProp, false);\n      isfunctionalProps = hasFunctionPros;\n      const columnTheme = columnGroup.theme.userTheme as any;\n      // 渐进加载时获取\n      if (columnTheme._vtable.padding) {\n        padding = columnTheme._vtable.padding;\n      }\n      if (columnTheme.text.textAlign) {\n        textAlign = columnTheme.text.textAlign;\n      }\n      if (columnTheme.text.textBaseline) {\n        textBaseline = columnTheme.text.textBaseline;\n      }\n    }\n  }\n  let bgColorFunc: Function;\n  // 判断是否有mapping  遍历dataset中mappingRules\n  if ((table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules && cellType === 'body') {\n    (table.internalProps as PivotTableProtected)?.dataConfig?.mappingRules?.forEach(\n      (mappingRule: MappingRule, i: number) => {\n        if (mappingRule.bgColor) {\n          bgColorFunc = mappingRule.bgColor.mapping;\n        }\n      }\n    );\n  }\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\n  for (let j = rowStart; j <= rowEnd; j++) {\n    const row = j;\n    const define = cellType !== 'body' ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);\n    const mayHaveIcon = cellType !== 'body' ? true : !!define?.icon || !!define?.tree;\n    let cellTheme;\n    if (!useColumnTheme) {\n      const headerStyle = table._getCellStyle(col, row);\n      cellTheme = getStyleTheme(headerStyle, table, col, row, getProp).theme;\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    // margin = getProp('margin', headerStyle, col, 0, table)\n\n    let cellGroup;\n    let cellWidth = colWidth;\n    let cellHeight = table.internalProps.autoRowHeight ? 0 : table.getRowHeight(row);\n    const type =\n      (table.isHeader(col, row) ? table._getHeaderLayoutMap(col, row).headerType : table.getBodyColumnType(col, row)) ||\n      'text';\n    // 处理单元格合并\n    let mergeResult;\n    let range;\n    let isMerge;\n    if (cellType !== '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        cellWidth = 0;\n        cellHeight = 0;\n        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            x: 0,\n            y,\n            cellWidth,\n            cellHeight\n          });\n        }\n      }\n    }\n\n    // let cellWidth = 0;\n    // let cellHeight = 0;\n    if (mergeResult) {\n      const height = mergeResult.cellHeight / (range.end.row - range.start.row + 1);\n      // 已有Merge单元格，使用空Group占位\n      const cellGroup = new Group({\n        x: 0,\n        y,\n        width: 0,\n        height,\n        visible: false,\n        pickable: false\n      });\n      cellGroup.role = 'shadow-cell';\n      cellGroup.col = col;\n      cellGroup.row = row;\n      cellGroup.mergeCol = range.start.col;\n      cellGroup.mergeRow = range.start.row;\n      columnGroup.addChild(cellGroup);\n      columnGroup.updateColumnRowNumber(row);\n      columnGroup.updateColumnHeight(height);\n      range = table.getCellRange(col, row);\n      y += height;\n      maxWidth = Math.max(maxWidth, mergeResult.cellWidth);\n    } else {\n      // deal with promise data\n      const value = table.getCellValue(col, row);\n      if (isPromise(value)) {\n        dealPromiseData(\n          value,\n          table,\n          createCell.bind(\n            null,\n            type,\n            define,\n            table,\n            col,\n            row,\n            colWidth,\n            bgColorFunc,\n            cellWidth,\n            cellHeight,\n            columnGroup,\n            y,\n            padding,\n            textAlign,\n            textBaseline,\n            mayHaveIcon,\n            isfunctionalProps,\n            isMerge,\n            range,\n            cellTheme\n          )\n        );\n        columnGroup.updateColumnRowNumber(row);\n        // const height = table.getRowHeight(row);\n        const height = isMerge\n          ? table.getRowHeight(row) / (range.end.row - range.start.row + 1)\n          : table.getRowHeight(row);\n        columnGroup.updateColumnHeight(height);\n        y += height;\n      } else {\n        const cellGroup = createCell(\n          type,\n          define,\n          table,\n          col,\n          row,\n          colWidth,\n          bgColorFunc,\n          cellWidth,\n          cellHeight,\n          columnGroup,\n          y,\n          padding,\n          textAlign,\n          textBaseline,\n          mayHaveIcon,\n          isfunctionalProps,\n          isMerge,\n          range,\n          cellTheme\n        );\n        columnGroup.updateColumnRowNumber(row);\n        // const height = cellGroup.attribute.height;\n        const height = isMerge\n          ? cellGroup.attribute.height / (range.end.row - range.start.row + 1)\n          : cellGroup.attribute.height;\n        columnGroup.updateColumnHeight(height);\n        y += 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"]}

package/cjs/scenegraph/group-creater/column.d.ts

@@ -1,12 +1,6 @@
 import type { CellType } from '../../ts-types';
 import type { BaseTableAPI } from '../../ts-types/base-table';
 import { Group } from '../graphic/group';
-export type MergeMap = Map<string, {
-    x: number;
-    y: number;
-    cellWidth: number;
-    cellHeight: number;
-}>;
 export declare function createCornerHeaderColGroup(cornerHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI): void;
 export declare function createColHeaderColGroup(colHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI): void;
 export declare function createRowHeaderColGroup(rowHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI): void;

package/cjs/scenegraph/group-creater/column.js

@@ -24,7 +24,7 @@ function createBodyColGroup(bodyGroup, xOrigin, yOrigin, table) {
 
 function createColGroup(containerGroup, xOrigin, yOrigin, colStart, colEnd, rowStart, rowEnd, cellType, table, rowLimit) {
     if (colStart > colEnd || rowStart > rowEnd) return;
-    const {layoutMap: layoutMap, defaultRowHeight: defaultRowHeight, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth} = table.internalProps, mergeMap = new Map;
+    const {layoutMap: layoutMap, defaultRowHeight: defaultRowHeight, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth} = table.internalProps;
     let x = 0, heightMax = 0;
     for (let i = colStart; i <= colEnd; i++) {
         const col = i, colWidth = table.getColWidth(col), columnGroup = new group_1.Group({
@@ -35,17 +35,8 @@ function createColGroup(containerGroup, xOrigin, yOrigin, colStart, colEnd, rowS
             clip: !1,
             pickable: !1
         });
-        let customRender, customLayout;
-        if (columnGroup.role = "column", columnGroup.col = i, containerGroup.addChild(columnGroup), 
-        "body" !== cellType) {
-            const define = table.getHeaderDefine(col, rowStart);
-            customRender = null == define ? void 0 : define.headerCustomRender, customLayout = null == define ? void 0 : define.headerCustomLayout;
-        } else {
-            const define = table.getBodyColumnDefine(col, rowStart);
-            customRender = (null == define ? void 0 : define.customRender) || table.customRender, 
-            customLayout = null == define ? void 0 : define.customLayout;
-        }
-        const {width: default2Width, height: default2Height} = (0, column_helper_1.createComplexColumn)(columnGroup, col, colWidth, rowStart, rowEnd, mergeMap, "columnHeader" === cellType && null != defaultHeaderRowHeight ? defaultHeaderRowHeight : defaultRowHeight, table, cellType, rowLimit, customRender, customLayout);
+        columnGroup.role = "column", columnGroup.col = i, containerGroup.addChild(columnGroup);
+        const {width: default2Width, height: default2Height} = (0, column_helper_1.createComplexColumn)(columnGroup, col, colWidth, rowStart, rowEnd, table.scenegraph.mergeMap, "columnHeader" === cellType && null != defaultHeaderRowHeight ? defaultHeaderRowHeight : defaultRowHeight, table, cellType, rowLimit);
         x += default2Width, heightMax = Math.max(heightMax, default2Height);
     }
     containerGroup.setAttribute("width", x), containerGroup.setAttribute("height", heightMax);

package/cjs/scenegraph/group-creater/column.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/column.ts"],"names":[],"mappings":"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","file":"column.js","sourcesContent":["import type { CellType } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { Group } from '../graphic/group';\nimport { createComplexColumn } from './column-helper';\n\nexport type MergeMap = Map<\n  string,\n  {\n    x: number;\n    y: number;\n    cellWidth: number;\n    cellHeight: number;\n  }\n>;\n/**\n * @description: 处理全部角表头\n * @param {Group} colHeaderGroup 列表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createCornerHeaderColGroup(\n  cornerHeaderGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  table: BaseTableAPI\n) {\n  createColGroup(\n    cornerHeaderGroup,\n    xOrigin,\n    yOrigin,\n    0, // colStart\n    table.rowHeaderLevelCount - 1, // colEnd\n    0, // rowStart\n    table.columnHeaderLevelCount - 1, // rowEnd\n    'cornerHeader', // CellType\n    table\n  );\n}\n\n/**\n * @description: 处理全部列表头\n * @param {Group} colHeaderGroup 列表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createColHeaderColGroup(colHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    colHeaderGroup,\n    xOrigin,\n    yOrigin,\n    table.rowHeaderLevelCount, // colStart\n    table.colCount - 1, // colEnd\n    0, // rowStart\n    table.columnHeaderLevelCount - 1, // rowEnd\n    'columnHeader', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 处理全部行表头\n * @param {Group} rowHeaderGroup 行表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createRowHeaderColGroup(rowHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    rowHeaderGroup,\n    xOrigin,\n    yOrigin,\n    0, // colStart\n    table.rowHeaderLevelCount - 1, // colEnd\n    table.columnHeaderLevelCount, // rowStart\n    table.rowCount - 1, // rowEnd\n    'rowHeader', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 处理内容单元格\n * @param {Group} bodyGroup 内容容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createBodyColGroup(bodyGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    bodyGroup,\n    xOrigin,\n    yOrigin,\n    table.rowHeaderLevelCount, // colStart\n    table.colCount - 1, // colEnd\n    table.columnHeaderLevelCount, // rowStart\n    table.rowCount - 1, // rowEnd\n    'body', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 生成一个列的场景节点\n * @param {Group} containerGroup 列容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {number} colStart 起始col\n * @param {number} colEnd 结束col\n * @param {number} rowStart 起始row\n * @param {number} rowEnd 结束row\n * @param {boolean} isHeader 是否是表头\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createColGroup(\n  containerGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  colStart: number,\n  colEnd: number,\n  rowStart: number,\n  rowEnd: number,\n  cellType: CellType,\n  table: BaseTableAPI,\n  rowLimit?: number\n) {\n  if (colStart > colEnd || rowStart > rowEnd) {\n    return;\n  }\n  const { layoutMap, defaultRowHeight, defaultHeaderRowHeight, defaultColWidth } = table.internalProps;\n  const mergeMap: MergeMap = new Map();\n  let x = 0;\n  let heightMax = 0;\n  for (let i = colStart; i <= colEnd; i++) {\n    const col = i;\n\n    // 宽度模式\n    // const { width: defineWidth } = layoutMap.columnWidths?.[col] || { width: defaultColWidth };\n    // const width = table.getColWidth(col);\n    // const colWidth: number | 'auto' =\n    //   defineWidth === 'auto' ||\n    //   table.scenegraph.transpose ||\n    //   (table.widthMode === 'autoWidth' && !defineWidth)\n    //     ? 'auto'\n    //     : width;\n    const colWidth = table.getColWidth(col);\n\n    const columnGroup = new Group({\n      x: xOrigin + x,\n      y: yOrigin,\n      width: colWidth,\n      height: 0,\n      clip: false,\n      pickable: false\n    });\n    columnGroup.role = 'column';\n    columnGroup.col = i;\n    containerGroup.addChild(columnGroup);\n\n    let customRender;\n    let customLayout;\n\n    if (cellType !== 'body') {\n      const define = table.getHeaderDefine(col, rowStart);\n      customRender = define?.headerCustomRender;\n      customLayout = define?.headerCustomLayout;\n    } else {\n      const define = table.getBodyColumnDefine(col, rowStart);\n      customRender = define?.customRender || table.customRender;\n      customLayout = define?.customLayout;\n    }\n    const { width: default2Width, height: default2Height } = createComplexColumn(\n      columnGroup,\n      col,\n      colWidth,\n      rowStart,\n      rowEnd,\n      mergeMap,\n      cellType === 'columnHeader' ? defaultHeaderRowHeight ?? defaultRowHeight : defaultRowHeight,\n      table,\n      cellType,\n      rowLimit,\n      customRender,\n      customLayout\n    );\n    x += default2Width;\n    heightMax = Math.max(heightMax, default2Height);\n  }\n  // 更新containerGroup尺寸\n  containerGroup.setAttribute('width', x);\n  containerGroup.setAttribute('height', heightMax);\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/column.ts"],"names":[],"mappings":"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","file":"column.js","sourcesContent":["import type { CellType } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { Group } from '../graphic/group';\nimport { createComplexColumn } from './column-helper';\n\n/**\n * @description: 处理全部角表头\n * @param {Group} colHeaderGroup 列表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createCornerHeaderColGroup(\n  cornerHeaderGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  table: BaseTableAPI\n) {\n  createColGroup(\n    cornerHeaderGroup,\n    xOrigin,\n    yOrigin,\n    0, // colStart\n    table.rowHeaderLevelCount - 1, // colEnd\n    0, // rowStart\n    table.columnHeaderLevelCount - 1, // rowEnd\n    'cornerHeader', // CellType\n    table\n  );\n}\n\n/**\n * @description: 处理全部列表头\n * @param {Group} colHeaderGroup 列表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createColHeaderColGroup(colHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    colHeaderGroup,\n    xOrigin,\n    yOrigin,\n    table.rowHeaderLevelCount, // colStart\n    table.colCount - 1, // colEnd\n    0, // rowStart\n    table.columnHeaderLevelCount - 1, // rowEnd\n    'columnHeader', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 处理全部行表头\n * @param {Group} rowHeaderGroup 行表头容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createRowHeaderColGroup(rowHeaderGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    rowHeaderGroup,\n    xOrigin,\n    yOrigin,\n    0, // colStart\n    table.rowHeaderLevelCount - 1, // colEnd\n    table.columnHeaderLevelCount, // rowStart\n    table.rowCount - 1, // rowEnd\n    'rowHeader', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 处理内容单元格\n * @param {Group} bodyGroup 内容容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createBodyColGroup(bodyGroup: Group, xOrigin: number, yOrigin: number, table: BaseTableAPI) {\n  createColGroup(\n    bodyGroup,\n    xOrigin,\n    yOrigin,\n    table.rowHeaderLevelCount, // colStart\n    table.colCount - 1, // colEnd\n    table.columnHeaderLevelCount, // rowStart\n    table.rowCount - 1, // rowEnd\n    'body', // isHeader\n    table\n  );\n}\n\n/**\n * @description: 生成一个列的场景节点\n * @param {Group} containerGroup 列容器Group\n * @param {number} xOrigin x起始坐标\n * @param {number} yOrigin y起始坐标\n * @param {number} colStart 起始col\n * @param {number} colEnd 结束col\n * @param {number} rowStart 起始row\n * @param {number} rowEnd 结束row\n * @param {boolean} isHeader 是否是表头\n * @param {BaseTableAPI} table\n * @return {*}\n */\nexport function createColGroup(\n  containerGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  colStart: number,\n  colEnd: number,\n  rowStart: number,\n  rowEnd: number,\n  cellType: CellType,\n  table: BaseTableAPI,\n  rowLimit?: number\n) {\n  if (colStart > colEnd || rowStart > rowEnd) {\n    return;\n  }\n  const { layoutMap, defaultRowHeight, defaultHeaderRowHeight, defaultColWidth } = table.internalProps;\n  let x = 0;\n  let heightMax = 0;\n  for (let i = colStart; i <= colEnd; i++) {\n    const col = i;\n\n    // 宽度模式\n    // const { width: defineWidth } = layoutMap.columnWidths?.[col] || { width: defaultColWidth };\n    // const width = table.getColWidth(col);\n    // const colWidth: number | 'auto' =\n    //   defineWidth === 'auto' ||\n    //   table.scenegraph.transpose ||\n    //   (table.widthMode === 'autoWidth' && !defineWidth)\n    //     ? 'auto'\n    //     : width;\n    const colWidth = table.getColWidth(col);\n\n    const columnGroup = new Group({\n      x: xOrigin + x,\n      y: yOrigin,\n      width: colWidth,\n      height: 0,\n      clip: false,\n      pickable: false\n    });\n    columnGroup.role = 'column';\n    columnGroup.col = i;\n    containerGroup.addChild(columnGroup);\n    const { width: default2Width, height: default2Height } = createComplexColumn(\n      columnGroup,\n      col,\n      colWidth,\n      rowStart,\n      rowEnd,\n      table.scenegraph.mergeMap,\n      cellType === 'columnHeader' ? defaultHeaderRowHeight ?? defaultRowHeight : defaultRowHeight,\n      table,\n      cellType,\n      rowLimit\n    );\n    x += default2Width;\n    heightMax = Math.max(heightMax, default2Height);\n  }\n  // 更新containerGroup尺寸\n  containerGroup.setAttribute('width', x);\n  containerGroup.setAttribute('height', heightMax);\n}\n"]}

package/cjs/scenegraph/group-creater/progress/proxy.d.ts

@@ -1,9 +1,7 @@
 import type { BaseTableAPI } from '../../../ts-types/base-table';
 import type { Group } from '../../graphic/group';
-import type { Scenegraph } from '../../scenegraph';
 export declare class SceneProxy {
     table: BaseTableAPI;
-    scenegraph: Scenegraph;
     currentRow: number;
     totalRow: number;
     rowLimit: number;

package/cjs/scenegraph/group-creater/progress/proxy.js

@@ -30,13 +30,13 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.SceneProxy = void 0;
 
-const update_height_1 = require("../../layout/update-height"), scenegraph_1 = require("../../scenegraph"), get_prop_1 = require("../../utils/get-prop"), padding_1 = require("../../utils/padding"), column_1 = require("../column"), column_helper_1 = require("../column-helper"), mergeMap = new Map;
+const update_height_1 = require("../../layout/update-height"), empty_group_1 = require("../../utils/empty-group"), get_prop_1 = require("../../utils/get-prop"), padding_1 = require("../../utils/padding"), column_1 = require("../column"), column_helper_1 = require("../column-helper");
 
 class SceneProxy {
     constructor(table) {
         this.currentRow = 0, this.rowLimit = 1e3, this.accurateY = 0, this.rowStart = 0, 
         this.rowEnd = 0, this.referenceRow = 0, this.screenTopRow = 0, this.cellCache = new Map, 
-        this.table = table, this.scenegraph = table.scenegraph;
+        this.table = table, this.table.options.maintainedDataCount && (this.rowLimit = this.table.options.maintainedDataCount);
     }
     setParams() {
         this.bodyTopRow = this.table.columnHeaderLevelCount, this.bodyBottomRow = this.table.rowCount - 1, 
@@ -53,11 +53,12 @@ class SceneProxy {
         this.rowUpdatePos = this.bodyBottomRow;
     }
     createColGroupForFirstScreen(rowHeaderGroup, bodyGroup, xOrigin, yOrigin, table) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, (function*() {
             this.setParams(), (0, column_1.createColGroup)(rowHeaderGroup, xOrigin, yOrigin, 0, table.rowHeaderLevelCount - 1, table.columnHeaderLevelCount, table.rowCount - 1, "rowHeader", table, this.firstScreenRowLimit), 
             (0, column_1.createColGroup)(bodyGroup, xOrigin, yOrigin, table.rowHeaderLevelCount, table.colCount - 1, table.columnHeaderLevelCount, table.rowCount - 1, "body", table, this.firstScreenRowLimit), 
-            bodyGroup.firstChild ? (this.currentRow = bodyGroup.firstChild.lastChild.row, this.rowEnd = this.currentRow, 
-            this.rowUpdatePos = this.rowEnd, this.referenceRow = Math.floor((this.rowEnd - this.rowStart) / 2), 
+            bodyGroup.firstChild ? (this.currentRow = null !== (_b = null === (_a = bodyGroup.firstChild) || void 0 === _a ? void 0 : _a.rowNumber) && void 0 !== _b ? _b : this.totalRow, 
+            this.rowEnd = this.currentRow, this.rowUpdatePos = this.rowEnd, this.referenceRow = Math.floor((this.rowEnd - this.rowStart) / 2), 
             yield this.progress()) : (this.currentRow = this.totalRow, this.rowEnd = this.currentRow, 
             this.rowUpdatePos = this.rowEnd, this.referenceRow = Math.floor((this.rowEnd - this.rowStart) / 2));
         }));
@@ -80,17 +81,20 @@ class SceneProxy {
     }
     createRowCellGroup(onceCount) {
         const endRow = Math.min(this.totalRow, this.currentRow + onceCount);
+        let maxHeight = 0;
         for (let col = this.bodyLeftCol; col <= this.bodyRightCol; col++) {
-            const colGroup = this.scenegraph.getColGroup(col), cellType = col < this.table.rowHeaderLevelCount ? "rowHeader" : "body";
-            (0, column_helper_1.createComplexColumn)(colGroup, col, colGroup.attribute.width, this.currentRow + 1, endRow, mergeMap, this.table.internalProps.defaultRowHeight, this.table, cellType);
+            const colGroup = this.table.scenegraph.getColGroup(col), cellType = col < this.table.rowHeaderLevelCount ? "rowHeader" : "body", {height: height} = (0, 
+            column_helper_1.createComplexColumn)(colGroup, col, colGroup.attribute.width, this.currentRow + 1, endRow, this.table.scenegraph.mergeMap, this.table.internalProps.defaultRowHeight, this.table, cellType);
+            maxHeight = Math.max(maxHeight, height);
         }
-        this.table.internalProps.autoRowHeight && updateAutoRow(this.bodyLeftCol, this.bodyRightCol, this.currentRow + 1, endRow, this.table), 
+        this.table.scenegraph.bodyGroup.setAttribute("height", maxHeight), this.table.internalProps.autoRowHeight && updateAutoRow(this.bodyLeftCol, this.bodyRightCol, this.currentRow + 1, endRow, this.table), 
         this.currentRow = endRow, this.rowEnd = endRow, this.rowUpdatePos = this.rowEnd, 
-        this.referenceRow = Math.floor((endRow - this.rowStart) / 2);
+        this.referenceRow = Math.floor((endRow - this.rowStart) / 2), this.table.scenegraph.updateContainer(), 
+        this.table.scenegraph.updateBorderSizeAndPosition();
     }
     setY(y) {
         return __awaiter(this, void 0, void 0, (function*() {
-            y < this.yLimitTop && this.rowStart === this.bodyTopRow || y > this.yLimitBottom && this.rowEnd === this.bodyBottomRow ? this.scenegraph.setBodyAndRowHeaderY(-y) : this.dynamicSetY(y);
+            y < this.yLimitTop && this.rowStart === this.bodyTopRow || y > this.yLimitBottom && this.rowEnd === this.bodyBottomRow ? this.table.scenegraph.setBodyAndRowHeaderY(-y) : this.dynamicSetY(y);
         }));
     }
     dynamicSetY(y) {
@@ -101,11 +105,11 @@ class SceneProxy {
             this.y = y, this.screenTopRow = screenTopRow;
             const deltaRow = screenTopRow - this.referenceRow;
             deltaRow > 0 ? (this.moveCell(deltaRow, "up", screenTopRow), this.updateBody(y)) : deltaRow < 0 ? (this.moveCell(-deltaRow, "down", screenTopRow), 
-            this.updateBody(y)) : this.updateBody(y), this.scenegraph.updateNextFrame();
+            this.updateBody(y)) : this.updateBody(y), this.table.scenegraph.updateNextFrame();
         }));
     }
     updateBody(y) {
-        this.scenegraph.setBodyAndRowHeaderY(-y);
+        this.table.scenegraph.setBodyAndRowHeaderY(-y);
     }
     moveCell(count, direction, screenTopRow) {
         return __awaiter(this, void 0, void 0, (function*() {
@@ -113,7 +117,7 @@ class SceneProxy {
             count < this.rowEnd - this.rowStart) {
                 const startRow = "up" === direction ? this.rowStart : this.rowEnd - count + 1, endRow = "up" === direction ? this.rowStart + count - 1 : this.rowEnd;
                 for (let col = this.bodyLeftCol; col <= this.bodyRightCol; col++) {
-                    const colGroup = this.scenegraph.getColGroup(col);
+                    const colGroup = this.table.scenegraph.getColGroup(col);
                     for (let row = startRow; row <= endRow; row++) if ("up" === direction) {
                         const cellGroup = colGroup.firstChild;
                         this.updateCellGroupPosition(cellGroup, colGroup.lastChild.row + 1, colGroup.lastChild.attribute.y + colGroup.lastChild.attribute.height), 
@@ -140,7 +144,7 @@ class SceneProxy {
             } else {
                 const distStartRow = "up" === direction ? this.rowStart + count : this.rowStart - count, distEndRow = "up" === direction ? this.rowEnd + count : this.rowEnd - count, distStartRowY = this.table.getRowsHeight(this.bodyTopRow, distStartRow - 1);
                 for (let col = this.bodyLeftCol; col <= this.bodyRightCol; col++) {
-                    this.scenegraph.getColGroup(col).forEachChildren(((cellGroup, index) => {
+                    this.table.scenegraph.getColGroup(col).forEachChildren(((cellGroup, index) => {
                         this.updateCellGroupPosition(cellGroup, "up" === direction ? cellGroup.row + count : cellGroup.row - count, 0 === index ? distStartRowY : cellGroup._prev.attribute.y + cellGroup._prev.attribute.height);
                     }));
                 }
@@ -183,7 +187,7 @@ class SceneProxy {
         cellGroup.needUpdateForAutoRowHeight = !0;
     }
     updateCellGroupContent(cellGroup) {
-        cellGroup.needUpdate && (this.scenegraph.updateCellContent(cellGroup.col, cellGroup.row), 
+        cellGroup.needUpdate && (this.table.scenegraph.updateCellContent(cellGroup.col, cellGroup.row), 
         cellGroup.needUpdate = !1);
     }
     sortCell() {
@@ -210,18 +214,18 @@ class SceneProxy {
         }));
     }
     highPerformanceGetCell(col, row, rowStart = this.rowStart, rowEnd = this.rowEnd) {
-        if (row < rowStart || row > rowEnd) return scenegraph_1.emptyGroup;
+        if (row < rowStart || row > rowEnd) return empty_group_1.emptyGroup;
         if (this.cellCache.get(col)) {
             const cacheCellGoup = this.cellCache.get(col);
             if ((cacheCellGoup._next || cacheCellGoup._prev) && Math.abs(cacheCellGoup.row - row) < row) {
                 let cellGroup = getCellByCache(cacheCellGoup, row);
-                return cellGroup || (cellGroup = this.scenegraph.getCell(col, row)), cellGroup.row && this.cellCache.set(col, cellGroup), 
+                return cellGroup || (cellGroup = this.table.scenegraph.getCell(col, row)), cellGroup.row && this.cellCache.set(col, cellGroup), 
                 cellGroup;
             }
-            const cellGroup = this.scenegraph.getCell(col, row);
+            const cellGroup = this.table.scenegraph.getCell(col, row);
             return cellGroup.row && this.cellCache.set(col, cellGroup), cellGroup;
         }
-        const cellGroup = this.scenegraph.getCell(col, row);
+        const cellGroup = this.table.scenegraph.getCell(col, row);
         return cellGroup.row && this.cellCache.set(col, cellGroup), cellGroup;
     }
 }
@@ -234,7 +238,7 @@ function updateAutoRow(colStart, colEnd, rowStart, rowEnd, table, direction = "u
             const cellGroup = table.scenegraph.getCell(col, row);
             if (!cellGroup.row) continue;
             const text = cellGroup.getChildByName("text") || cellGroup.getChildByName("content"), headerStyle = table._getCellStyle(col, row), padding = (0, 
-            padding_1.getPadding)((0, get_prop_1.getProp)("padding", headerStyle, col, row, table)), height = text.AABBBounds.height() + (padding[0] + padding[2]);
+            padding_1.getQuadProps)((0, get_prop_1.getProp)("padding", headerStyle, col, row, table)), height = text.AABBBounds.height() + (padding[0] + padding[2]);
             maxRowHeight = Math.max(maxRowHeight, height), cellGroup.needUpdateForAutoRowHeight = !1;
         }
         for (let col = colStart; col <= colEnd; col++) {