@visactor/vtable 0.13.4-alpha.5 → 0.13.5

package/cjs/scenegraph/graphic/group.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/graphic/group.ts"],"names":[],"mappings":";;;AACA,+CAA0D;AAK1D,MAAa,KAAM,SAAQ,eAAY;IAerC,KAAK;QACH,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,IAAc;QAMzC,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,eAAe,CAAC,CAAC,KAAe,EAAE,EAAE;YACvC,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE;gBACvB,MAAM,GAAG,KAAK,CAAC;gBACf,OAAO,IAAI,CAAC;aACb;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,IAAI,IAAI,EAAE;YAcR,IAAI,CAAC,eAAe,CAAC,CAAC,KAAe,EAAE,EAAE;gBACvC,IAAK,KAAe,CAAC,cAAc,EAAE;oBACnC,MAAM,MAAM,GAAI,KAAe,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBAC3D,IAAI,MAAM,EAAE;wBACV,MAAM,GAAG,MAAM,CAAC;wBAChB,OAAO,IAAI,CAAC;qBACb;iBACF;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,KAAK;;QACP,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACpC,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,CAAC,QAAQ,EAAE;YAC7C,KAAK,GAAG,CAAC,CAAC;SACX;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAA,IAAI,CAAC,SAAS,CAAC,KAAK,mCAAI,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,MAAM;;QACR,IAAI,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACtC,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,CAAC,QAAQ,EAAE;YAC/C,MAAM,GAAG,CAAC,CAAC;SACZ;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAA,IAAI,CAAC,SAAS,CAAC,MAAM,mCAAI,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,aAAa,CAAC,MAAc;;QAC1B,IAAI,MAAM,KAAK,CAAC,EAAE;YAChB,OAAO;SACR;QACD,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,MAAA,IAAI,CAAC,SAAS,CAAC,KAAK,mCAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;QACjE,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC;SACzE;IACH,CAAC;IAED,cAAc,CAAC,MAAc;;QAC3B,IAAI,MAAM,KAAK,CAAC,EAAE;YAChB,OAAO;SACR;QACD,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,MAAA,IAAI,CAAC,SAAS,CAAC,MAAM,mCAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;QACnE,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;SAC3E;IACH,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,MAAM,KAAK,CAAC,EAAE;YAChB,OAAO;SACR;QACD,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,IAAI,MAAM,KAAK,CAAC,EAAE;YAChB,OAAO;SACR;QACD,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;IACpD,CAAC;IAMD,wBAAwB,CACtB,EAA8C,EAC9C,aAAa,GAAG,aAAa,EAC7B,OAAO,GAAG,KAAK;QAEf,IAAI,OAAO,EAAE;YACX,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;YAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,OAAO,KAAK,EAAE;gBACZ,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE;oBAChC,MAAM,QAAQ,GAAG,EAAE,CAAC,KAAU,EAAE,CAAC,EAAE,CAAC,CAAC;oBACrC,IAAI,QAAQ,EAAE;wBACZ,OAAO;qBACR;iBACF;gBACD,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;aACrB;SACF;aAAM;YACL,IAAI,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,OAAO,KAAK,EAAE;gBACZ,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE;oBAChC,MAAM,QAAQ,GAAG,EAAE,CAAC,KAAU,EAAE,CAAC,EAAE,CAAC,CAAC;oBACrC,IAAI,QAAQ,EAAE;wBACZ,OAAO;qBACR;iBACF;gBACD,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;aACrB;SACF;IACH,CAAC;IAED,WAAW,CAAC,GAAW;QACrB,IAAI,CAAC,GAAG,IAAI,CAAC,WAAoB,CAAC;QAClC,IAAI,CAAC,CAAC,EAAE;YACN,OAAO,IAAI,CAAC;SACb;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE;YAC3C,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE;gBACjB,OAAO,CAAC,CAAC;aACV;YACD,CAAC,GAAG,CAAC,CAAC,KAAc,CAAC;SACtB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CAAC,GAAW;QACrB,IAAI,CAAC,GAAG,IAAI,CAAC,WAAoB,CAAC;QAClC,IAAI,CAAC,CAAC,EAAE;YACN,OAAO,IAAI,CAAC;SACb;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE;YAC3C,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE;gBACjB,OAAO,CAAC,CAAC;aACV;YACD,CAAC,GAAG,CAAC,CAAC,KAAc,CAAC;SACtB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CAAC,KAAa;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE;YACzC,OAAO,KAAK,CAAC,KAAK,CAAC;SACpB;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAES,mBAAmB;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE;gBAClC,OAAO,IAAI,CAAC,WAAW,CAAC;aACzB;YAED,MAAM,UAAU,GAAG,IAAI,CAAC,gCAAgC,EAAE,CAAC;YAE3D,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAE1B,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAExB,OAAO,MAAM,CAAC;SACf;QACD,OAAO,KAAK,CAAC,mBAAmB,EAAE,CAAC;IACrC,CAAC;IA8BS,kBAAkB;QAG1B,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;YACxB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YACjC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;YAC1C,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;YAEvD,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;YACpD,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,WAAW,CAAC;SACzB;QACD,OAAO,KAAK,CAAC,kBAAkB,EAAE,CAAC;IAmBpC,CAAC;IAGD,qBAAqB,CAAC,GAAW;QAC/B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;SACtB;aAAM;YACL,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;SAChD;IACH,CAAC;IAGD,kBAAkB,CAAC,UAAkB;QACnC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC;SAC7B;aAAM;YACL,IAAI,CAAC,SAAS,IAAI,UAAU,CAAC;SAC9B;IACH,CAAC;CACF;AAzRD,sBAyRC;AAED,SAAS,KAAK,CAAC,KAAY,EAAE,UAAmB;IAC9C,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;QAC7C,OAAO;KACR;IAED,IAAI,KAAK,CAAC,WAAW,IAAI,CAAC,UAAU,EAAE;QACpC,OAAO;KACR;IACD,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;AAC5C,CAAC","file":"group.js","sourcesContent":["import type { IGraphic, IColor, IRect, INode } from '@visactor/vrender';\nimport { Group as VRenderGroup } from '@visactor/vrender';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { InteractionState } from '../../ts-types';\nimport type { AABBBounds } from '@visactor/vutils';\n\nexport class Group extends VRenderGroup {\n  role?: string;\n  col?: number;\n  row?: number;\n  mergeCol?: number;\n  mergeRow?: number;\n  rowNumber?: number; // row number of the column group\n  colHeight?: number; // current height of the column group\n  border?: IRect; // table/header/body的border mark，挂载在这里方便更新\n  needUpdate?: boolean;\n\n  /**\n   * @description: 清空Group下全部子元素\n   * @return {*}\n   */\n  clear() {\n    this.removeAllChild();\n  }\n\n  getChildByName(name: string, deep?: boolean): any {\n    // for (let i = 0, j = this.children.length; i < j; i++) {\n    //   if (this.children[i].name === name) {\n    //     return this.children[i] as unknown as T;\n    //   }\n    // }\n    let result = null;\n    this.forEachChildren((child: IGraphic) => {\n      if (child.name === name) {\n        result = child;\n        return true; // 提前退出循环\n      }\n      return false;\n    });\n\n    if (deep) {\n      // for (let i = 0, j = this.children.length; i < j; i++) {\n      //   const child = this.children[i] as Group;\n\n      //   if (!child.getChildByName) {\n      //     continue;\n      //   }\n\n      //   const target = child.getChildByName(name, true);\n\n      //   if (target) {\n      //     return target;\n      //   }\n      // }\n      this.forEachChildren((child: IGraphic) => {\n        if ((child as Group).getChildByName) {\n          const target = (child as Group).getChildByName(name, true);\n          if (target) {\n            result = target;\n            return true;\n          }\n        }\n        return false;\n      });\n    }\n\n    return result;\n  }\n\n  get width() {\n    let width = this.AABBBounds.width();\n    if (width === Infinity || width === -Infinity) {\n      width = 0;\n    }\n    return Math.max(width, this.attribute.width ?? 0);\n  }\n\n  get height() {\n    let height = this.AABBBounds.height();\n    if (height === Infinity || height === -Infinity) {\n      height = 0;\n    }\n    return Math.max(height, this.attribute.height ?? 0);\n  }\n\n  setDeltaWidth(deltaX: number) {\n    if (deltaX === 0) {\n      return;\n    }\n    this.setAttribute('width', (this.attribute.width ?? 0) + deltaX);\n    if (this.border) {\n      this.border.setAttribute('width', this.border.attribute.width + deltaX);\n    }\n  }\n\n  setDeltaHeight(deltaY: number) {\n    if (deltaY === 0) {\n      return;\n    }\n    this.setAttribute('height', (this.attribute.height ?? 0) + deltaY);\n    if (this.border) {\n      this.border.setAttribute('height', this.border.attribute.height + deltaY);\n    }\n  }\n\n  setDeltaX(deltaX: number) {\n    if (deltaX === 0) {\n      return;\n    }\n    this.setAttribute('x', this.attribute.x + deltaX);\n  }\n\n  setDeltaY(deltaY: number) {\n    if (deltaY === 0) {\n      return;\n    }\n    this.setAttribute('y', this.attribute.y + deltaY);\n  }\n\n  /**\n   * @description: 遍历所有子节点，跳过部分节点，默认跳过group的border\n   * @return {*}\n   */\n  forEachChildrenSkipChild<T extends INode = INode>(\n    cb: (item: T, index: number) => void | boolean,\n    skipChildName = 'border-rect',\n    reverse = false\n  ) {\n    if (reverse) {\n      let child = this._lastChild;\n      let i = 0;\n      while (child) {\n        if (child.name !== skipChildName) {\n          const breakTag = cb(child as T, i++);\n          if (breakTag) {\n            return;\n          }\n        }\n        child = child._prev;\n      }\n    } else {\n      let child = this._firstChild;\n      let i = 0;\n      while (child) {\n        if (child.name !== skipChildName) {\n          const breakTag = cb(child as T, i++);\n          if (breakTag) {\n            return;\n          }\n        }\n        child = child._next;\n      }\n    }\n  }\n\n  getColGroup(col: number) {\n    let c = this._firstChild as Group;\n    if (!c) {\n      return null;\n    }\n    for (let i = 0; i < this.childrenCount; i++) {\n      if (c.col === col) {\n        return c;\n      }\n      c = c._next as Group;\n    }\n    return null;\n  }\n\n  getRowGroup(row: number) {\n    let c = this._firstChild as Group;\n    if (!c) {\n      return null;\n    }\n    for (let i = 0; i < this.childrenCount; i++) {\n      if (c.row === row) {\n        return c;\n      }\n      c = c._next as Group;\n    }\n    return null;\n  }\n\n  getChildAt(index: number) {\n    const child = super.getChildAt(index);\n    if (child && child.name === 'border-rect') {\n      return child._next;\n    }\n    return child;\n  }\n\n  protected tryUpdateAABBBounds(): AABBBounds {\n    if (this.role === 'cell') {\n      if (!this.shouldUpdateAABBBounds()) {\n        return this._AABBBounds;\n      }\n      // application.graphicService.beforeUpdateAABBBounds(this, this.stage, true, this._AABBBounds);\n      const selfChange = this.shouldSelfChangeUpdateAABBBounds();\n      // const selfChange = true;\n      const bounds = this.doUpdateAABBBounds();\n      this.addUpdateLayoutTag();\n      // application.graphicService.afterUpdateAABBBounds(this, this.stage, this._AABBBounds, this, selfChange);\n      after(this, selfChange);\n\n      return bounds;\n    }\n    return super.tryUpdateAABBBounds();\n  }\n\n  // 目前优化方案会导致合并单元格无法正常更新列宽（因为合并单元格更新bounds不会触发父节点bounds更新），暂时关闭优化方案\n  // shouldUpdateAABBBoundsForRowMerge(): boolean {\n\n  // }\n\n  // shouldUpdateAABBBounds(): boolean {\n  //   return this.shouldSelfChangeUpdateAABBBounds();\n  //   // // 检索自己是否需要更新\n  //   // if (super.shouldUpdateAABBBounds()) {\n  //   //   return true;\n  //   // }\n  //   // // 检索叶子节点是否有更新（如果children是叶子节点的话）\n  //   // if (this._childUpdateTag & UpdateTag.UPDATE_BOUNDS) {\n  //   //   return true;\n  //   // }\n  //   // // 检索是否子group需要更新\n  //   // let needUpdate = false;\n  //   // this.forEachChildren((node: IGraphic) => {\n  //   //   // 只查找group层级\n  //   //   if (node.isContainer && (node as Group).shouldUpdateAABBBounds()) {\n  //   //     needUpdate = true;\n  //   //     return true;\n  //   //   }\n  //   //   return false;\n  //   // });\n  //   // return needUpdate;\n  // }\n\n  protected doUpdateAABBBounds(): any {\n    // const groupTheme = getTheme(this).group;\n    // debugger;\n    if (this.role === 'cell') {\n      const attribute = this.attribute;\n      const { x, y, width, height } = attribute;\n      this._AABBBounds.setValue(x, y, x + width, y + height);\n      // 更新bounds之后需要设置父节点，否则tag丢失\n      this.parent && this.parent.addChildUpdateBoundTag();\n      this.clearUpdateBoundTag();\n      return this._AABBBounds;\n    }\n    return super.doUpdateAABBBounds();\n    // _AABBBounds\n    // const bounds = graphicService.updateGroupAABBBounds(\n    //   attribute,\n    //   getTheme(this).group,\n    //   this._AABBBounds,\n    //   this\n    // ) as AABBBounds;\n\n    // const { boundsPadding = groupTheme.boundsPadding } = attribute;\n    // const paddingArray = parsePadding(boundsPadding);\n    // if (paddingArray) {\n    //   bounds.expand(paddingArray);\n    // }\n    // // 更新bounds之后需要设置父节点，否则tag丢失\n    // this.parent && this.parent.addChildUpdateBoundTag();\n    // this.clearUpdateBoundTag();\n\n    // this.emit('AAABBBoundsChange');\n  }\n\n  // update column group row number\n  updateColumnRowNumber(row: number) {\n    if (!this.rowNumber) {\n      this.rowNumber = row;\n    } else {\n      this.rowNumber = Math.max(this.rowNumber, row);\n    }\n  }\n\n  // update column height\n  updateColumnHeight(cellHeight: number) {\n    if (!this.colHeight) {\n      this.colHeight = cellHeight;\n    } else {\n      this.colHeight += cellHeight;\n    }\n  }\n}\n\nfunction after(group: Group, selfChange: boolean) {\n  if (!(group.stage && group.stage.renderCount)) {\n    return;\n  }\n  // group的子元素导致的bounds更新不用做dirtyBounds\n  if (group.isContainer && !selfChange) {\n    return;\n  }\n  group.stage.dirty(group.globalAABBBounds);\n}\n"]}
+{"version":3,"sources":["scenegraph/graphic/group.ts"],"names":[],"mappings":"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","file":"group.js","sourcesContent":["import type { IGraphic, IColor, IRect, INode } from '@visactor/vrender';\nimport { Group as VRenderGroup } from '@visactor/vrender';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { InteractionState } from '../../ts-types';\nimport type { AABBBounds } from '@visactor/vutils';\n\nexport class Group extends VRenderGroup {\n  role?: string;\n  col?: number;\n  row?: number;\n  mergeStartCol?: number;\n  mergeStartRow?: number;\n  mergeEndCol?: number;\n  mergeEndRow?: number;\n  contentWidth?: number;\n  contentHeight?: number;\n  rowNumber?: number; // row number of the column group\n  colHeight?: number; // current height of the column group\n  border?: IRect; // table/header/body的border mark，挂载在这里方便更新\n  needUpdate?: boolean;\n\n  /**\n   * @description: 清空Group下全部子元素\n   * @return {*}\n   */\n  clear() {\n    this.removeAllChild();\n  }\n\n  getChildByName(name: string, deep?: boolean): any {\n    // for (let i = 0, j = this.children.length; i < j; i++) {\n    //   if (this.children[i].name === name) {\n    //     return this.children[i] as unknown as T;\n    //   }\n    // }\n    let result = null;\n    this.forEachChildren((child: IGraphic) => {\n      if (child.name === name) {\n        result = child;\n        return true; // 提前退出循环\n      }\n      return false;\n    });\n\n    if (deep) {\n      // for (let i = 0, j = this.children.length; i < j; i++) {\n      //   const child = this.children[i] as Group;\n\n      //   if (!child.getChildByName) {\n      //     continue;\n      //   }\n\n      //   const target = child.getChildByName(name, true);\n\n      //   if (target) {\n      //     return target;\n      //   }\n      // }\n      this.forEachChildren((child: IGraphic) => {\n        if ((child as Group).getChildByName) {\n          const target = (child as Group).getChildByName(name, true);\n          if (target) {\n            result = target;\n            return true;\n          }\n        }\n        return false;\n      });\n    }\n\n    return result;\n  }\n\n  get width() {\n    let width = this.AABBBounds.width();\n    if (width === Infinity || width === -Infinity) {\n      width = 0;\n    }\n    return Math.max(width, this.attribute.width ?? 0);\n  }\n\n  get height() {\n    let height = this.AABBBounds.height();\n    if (height === Infinity || height === -Infinity) {\n      height = 0;\n    }\n    return Math.max(height, this.attribute.height ?? 0);\n  }\n\n  setDeltaWidth(deltaX: number) {\n    if (deltaX === 0) {\n      return;\n    }\n    this.setAttribute('width', (this.attribute.width ?? 0) + deltaX);\n    if (this.border) {\n      this.border.setAttribute('width', this.border.attribute.width + deltaX);\n    }\n  }\n\n  setDeltaHeight(deltaY: number) {\n    if (deltaY === 0) {\n      return;\n    }\n    this.setAttribute('height', (this.attribute.height ?? 0) + deltaY);\n    if (this.border) {\n      this.border.setAttribute('height', this.border.attribute.height + deltaY);\n    }\n  }\n\n  setDeltaX(deltaX: number) {\n    if (deltaX === 0) {\n      return;\n    }\n    this.setAttribute('x', this.attribute.x + deltaX);\n  }\n\n  setDeltaY(deltaY: number) {\n    if (deltaY === 0) {\n      return;\n    }\n    this.setAttribute('y', this.attribute.y + deltaY);\n  }\n\n  /**\n   * @description: 遍历所有子节点，跳过部分节点，默认跳过group的border\n   * @return {*}\n   */\n  forEachChildrenSkipChild<T extends INode = INode>(\n    cb: (item: T, index: number) => void | boolean,\n    skipChildName = 'border-rect',\n    reverse = false\n  ) {\n    if (reverse) {\n      let child = this._lastChild;\n      let i = 0;\n      while (child) {\n        if (child.name !== skipChildName) {\n          const breakTag = cb(child as T, i++);\n          if (breakTag) {\n            return;\n          }\n        }\n        child = child._prev;\n      }\n    } else {\n      let child = this._firstChild;\n      let i = 0;\n      while (child) {\n        if (child.name !== skipChildName) {\n          const breakTag = cb(child as T, i++);\n          if (breakTag) {\n            return;\n          }\n        }\n        child = child._next;\n      }\n    }\n  }\n\n  getColGroup(col: number) {\n    let c = this._firstChild as Group;\n    if (!c) {\n      return null;\n    }\n    for (let i = 0; i < this.childrenCount; i++) {\n      if (c.col === col) {\n        return c;\n      }\n      c = c._next as Group;\n    }\n    return null;\n  }\n\n  getRowGroup(row: number) {\n    let c = this._firstChild as Group;\n    if (!c) {\n      return null;\n    }\n    for (let i = 0; i < this.childrenCount; i++) {\n      if (c.row === row) {\n        return c;\n      }\n      c = c._next as Group;\n    }\n    return null;\n  }\n\n  getChildAt(index: number) {\n    const child = super.getChildAt(index);\n    if (child && child.name === 'border-rect') {\n      return child._next;\n    }\n    return child;\n  }\n\n  protected tryUpdateAABBBounds(): AABBBounds {\n    if (this.role === 'cell') {\n      if (!this.shouldUpdateAABBBounds()) {\n        return this._AABBBounds;\n      }\n      // application.graphicService.beforeUpdateAABBBounds(this, this.stage, true, this._AABBBounds);\n      const selfChange = this.shouldSelfChangeUpdateAABBBounds();\n      // const selfChange = true;\n      const bounds = this.doUpdateAABBBounds();\n      this.addUpdateLayoutTag();\n      // application.graphicService.afterUpdateAABBBounds(this, this.stage, this._AABBBounds, this, selfChange);\n      after(this, selfChange);\n\n      return bounds;\n    }\n    return super.tryUpdateAABBBounds();\n  }\n\n  // 目前优化方案会导致合并单元格无法正常更新列宽（因为合并单元格更新bounds不会触发父节点bounds更新），暂时关闭优化方案\n  // shouldUpdateAABBBoundsForRowMerge(): boolean {\n\n  // }\n\n  // shouldUpdateAABBBounds(): boolean {\n  //   return this.shouldSelfChangeUpdateAABBBounds();\n  //   // // 检索自己是否需要更新\n  //   // if (super.shouldUpdateAABBBounds()) {\n  //   //   return true;\n  //   // }\n  //   // // 检索叶子节点是否有更新（如果children是叶子节点的话）\n  //   // if (this._childUpdateTag & UpdateTag.UPDATE_BOUNDS) {\n  //   //   return true;\n  //   // }\n  //   // // 检索是否子group需要更新\n  //   // let needUpdate = false;\n  //   // this.forEachChildren((node: IGraphic) => {\n  //   //   // 只查找group层级\n  //   //   if (node.isContainer && (node as Group).shouldUpdateAABBBounds()) {\n  //   //     needUpdate = true;\n  //   //     return true;\n  //   //   }\n  //   //   return false;\n  //   // });\n  //   // return needUpdate;\n  // }\n\n  protected doUpdateAABBBounds(): any {\n    // const groupTheme = getTheme(this).group;\n    // debugger;\n    if (this.role === 'cell') {\n      const attribute = this.attribute;\n      const { x, y, width, height } = attribute;\n      this._AABBBounds.setValue(x, y, x + width, y + height);\n      // 更新bounds之后需要设置父节点，否则tag丢失\n      this.parent && this.parent.addChildUpdateBoundTag();\n      this.clearUpdateBoundTag();\n      return this._AABBBounds;\n    }\n    return super.doUpdateAABBBounds();\n    // _AABBBounds\n    // const bounds = graphicService.updateGroupAABBBounds(\n    //   attribute,\n    //   getTheme(this).group,\n    //   this._AABBBounds,\n    //   this\n    // ) as AABBBounds;\n\n    // const { boundsPadding = groupTheme.boundsPadding } = attribute;\n    // const paddingArray = parsePadding(boundsPadding);\n    // if (paddingArray) {\n    //   bounds.expand(paddingArray);\n    // }\n    // // 更新bounds之后需要设置父节点，否则tag丢失\n    // this.parent && this.parent.addChildUpdateBoundTag();\n    // this.clearUpdateBoundTag();\n\n    // this.emit('AAABBBoundsChange');\n  }\n\n  // update column group row number\n  updateColumnRowNumber(row: number) {\n    if (!this.rowNumber) {\n      this.rowNumber = row;\n    } else {\n      this.rowNumber = Math.max(this.rowNumber, row);\n    }\n  }\n\n  // update column height\n  updateColumnHeight(cellHeight: number) {\n    if (!this.colHeight) {\n      this.colHeight = cellHeight;\n    } else {\n      this.colHeight += cellHeight;\n    }\n  }\n}\n\nfunction after(group: Group, selfChange: boolean) {\n  if (!(group.stage && group.stage.renderCount)) {\n    return;\n  }\n  // group的子元素导致的bounds更新不用做dirtyBounds\n  if (group.isContainer && !selfChange) {\n    return;\n  }\n  group.stage.dirty(group.globalAABBBounds);\n}\n"]}

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

@@ -1,6 +1,6 @@
 import type { IThemeSpec } from '@visactor/vrender';
-import type { CellRange, ColumnDefine, ColumnTypeOption } from '../../ts-types';
-import { Group } from '../graphic/group';
+import type { ColumnDefine, ColumnTypeOption } from '../../ts-types';
+import type { Group } from '../graphic/group';
 import type { BaseTableAPI } from '../../ts-types/base-table';
-export declare function createCell(type: ColumnTypeOption, define: ColumnDefine, table: BaseTableAPI, col: number, row: number, colWidth: number, cellWidth: number, cellHeight: number, columnGroup: Group, y: number, padding: [number, number, number, number], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, mayHaveIcon: boolean, isMerge: boolean, range: CellRange, cellTheme: IThemeSpec): Group;
+export declare function createCell(type: ColumnTypeOption, value: string, define: ColumnDefine, table: BaseTableAPI, col: number, row: number, colWidth: number, cellWidth: number, cellHeight: number, columnGroup: Group, y: number, padding: [number, number, number, number], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, mayHaveIcon: boolean, cellTheme: IThemeSpec): Group;
 export declare function updateCell(col: number, row: number, table: BaseTableAPI, addNew?: boolean): Group;

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

@@ -4,16 +4,16 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.updateCell = exports.createCell = void 0;
 
-const global_1 = require("../../tools/global"), custom_1 = require("../component/custom"), group_1 = require("../graphic/group"), get_prop_1 = require("../utils/get-prop"), chart_cell_1 = require("./cell-type/chart-cell"), image_cell_1 = require("./cell-type/image-cell"), progress_bar_cell_1 = require("./cell-type/progress-bar-cell"), spark_line_cell_1 = require("./cell-type/spark-line-cell"), text_cell_1 = require("./cell-type/text-cell"), video_cell_1 = require("./cell-type/video-cell"), tableHelper_1 = require("../../core/tableHelper"), helper_1 = require("../../tools/helper"), deal_promise_data_1 = require("../utils/deal-promise-data"), axis_1 = require("../../components/axis/axis"), checkbox_cell_1 = require("./cell-type/checkbox-cell"), get_hierarchy_offset_1 = require("../utils/get-hierarchy-offset"), padding_1 = require("../utils/padding"), util_1 = require("../../tools/util");
+const global_1 = require("../../tools/global"), custom_1 = require("../component/custom"), get_prop_1 = require("../utils/get-prop"), chart_cell_1 = require("./cell-type/chart-cell"), image_cell_1 = require("./cell-type/image-cell"), progress_bar_cell_1 = require("./cell-type/progress-bar-cell"), spark_line_cell_1 = require("./cell-type/spark-line-cell"), text_cell_1 = require("./cell-type/text-cell"), video_cell_1 = require("./cell-type/video-cell"), tableHelper_1 = require("../../core/tableHelper"), helper_1 = require("../../tools/helper"), deal_promise_data_1 = require("../utils/deal-promise-data"), axis_1 = require("../../components/axis/axis"), checkbox_cell_1 = require("./cell-type/checkbox-cell"), column_helper_1 = require("./column-helper"), get_hierarchy_offset_1 = require("../utils/get-hierarchy-offset"), padding_1 = require("../utils/padding"), util_1 = require("../../tools/util");
 
-function createCell(type, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, cellTheme) {
+function createCell(type, value, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, cellTheme) {
     var _a, _b, _c, _d, _e, _f, _g;
     let bgColorFunc, cellGroup;
     if ((null === (_b = null === (_a = table.internalProps) || void 0 === _a ? void 0 : _a.dataConfig) || void 0 === _b ? void 0 : _b.mappingRules) && !table.isHeader(col, row) && (null === (_e = null === (_d = null === (_c = table.internalProps) || void 0 === _c ? void 0 : _c.dataConfig) || void 0 === _d ? void 0 : _d.mappingRules) || void 0 === _e || _e.forEach(((mappingRule, i) => {
         mappingRule.bgColor && table.internalProps.layoutMap.getIndicatorKey(col, row) === mappingRule.bgColor.indicatorKey && (bgColorFunc = mappingRule.bgColor.mapping);
     }))), "text" === type || "link" === type) {
         if ("link" === type) {
-            const cellValue = table.getCellValue(col, row), headerStyle = table._getCellStyle(col, row);
+            const cellValue = value, headerStyle = table._getCellStyle(col, row);
             "link" === type && ("templateLink" in define && define.templateLink || !("linkDetect" in define) || !define.linkDetect || global_1.regUrl.test(cellValue)) && (cellTheme ? (cellTheme.text.fill = (0, 
             get_prop_1.getProp)("linkColor", headerStyle, col, row, table), cellTheme.group.cursor = "pointer") : cellTheme = {
                 text: {
@@ -39,8 +39,7 @@ function createCell(type, define, table, col, row, colWidth, cellWidth, cellHeig
             const customResult = (0, custom_1.dealWithCustom)(customLayout, customRender, col, row, cellWidth, cellHeight, !1, "autoHeight" === table.heightMode, table);
             customElementsGroup = customResult.elementsGroup, renderDefault = customResult.renderDefault;
         }
-        cellGroup = (0, text_cell_1.createCellGroup)(table, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme), 
-        isMerge && (cellGroup.mergeCol = range.end.col, cellGroup.mergeRow = range.end.row);
+        cellGroup = (0, text_cell_1.createCellGroup)(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme);
         const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(col, row);
         if (axisConfig) {
             const axis = new axis_1.CartesianAxis(axisConfig, cellGroup.attribute.width, cellGroup.attribute.height, table);
@@ -49,10 +48,10 @@ function createCell(type, define, table, col, row, colWidth, cellWidth, cellHeig
     } else if ("image" === type) cellGroup = (0, image_cell_1.createImageCellGroup)(columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), define.keepAspectRatio, define.imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme); else if ("video" === type) cellGroup = (0, 
     video_cell_1.createVideoCellGroup)(columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), define.keepAspectRatio, define.imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme); else if ("chart" === type) {
         const chartInstance = table.internalProps.layoutMap.getChartInstance(col, row);
-        cellGroup = (0, chart_cell_1.createChartCellGroup)(null, columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), padding, table.getCellValue(col, row), define.chartModule, table.isPivotChart() ? table.internalProps.layoutMap.getChartSpec(col, row) : define.chartSpec, chartInstance, null !== (_g = null === (_f = table.internalProps.layoutMap) || void 0 === _f ? void 0 : _f.getChartDataId(col, row)) && void 0 !== _g ? _g : "data", table, cellTheme);
+        cellGroup = (0, chart_cell_1.createChartCellGroup)(null, columnGroup, 0, y, col, row, table.getColWidth(col), table.getRowHeight(row), padding, value, define.chartModule, table.isPivotChart() ? table.internalProps.layoutMap.getChartSpec(col, row) : define.chartSpec, chartInstance, null !== (_g = null === (_f = table.internalProps.layoutMap) || void 0 === _f ? void 0 : _f.getChartDataId(col, row)) && void 0 !== _g ? _g : "data", table, cellTheme);
     } else if ("progressbar" === type) {
-        const style = table._getCellStyle(col, row), value = table.getCellValue(col, row), dataValue = table.getCellOriginValue(col, row);
-        cellGroup = (0, text_cell_1.createCellGroup)(table, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, !1, null, !0, cellTheme);
+        const style = table._getCellStyle(col, row), dataValue = table.getCellOriginValue(col, row);
+        cellGroup = (0, text_cell_1.createCellGroup)(table, value, columnGroup, 0, y, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, !1, null, !0, cellTheme);
         const progressBarGroup = (0, progress_bar_cell_1.createProgressBarCell)(define, style, colWidth, value, dataValue, col, row, padding, table);
         cellGroup.firstChild ? cellGroup.insertBefore(progressBarGroup, cellGroup.firstChild) : cellGroup.appendChild(progressBarGroup);
     } else "sparkline" === type ? cellGroup = (0, spark_line_cell_1.createSparkLineCellGroup)(null, columnGroup, 0, y, col, row, cellWidth, cellHeight, padding, table, cellTheme) : "checkbox" === type && (cellGroup = (0, 
@@ -62,9 +61,12 @@ function createCell(type, define, table, col, row, colWidth, cellWidth, cellHeig
 
 function updateCell(col, row, table, addNew) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-    const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, !0), cellStyle = table._getCellStyle(col, row), autoWrapText = null !== (_a = cellStyle.autoWrapText) && void 0 !== _a ? _a : table.internalProps.autoWrapText, cellTheme = (0, 
-    tableHelper_1.getStyleTheme)(cellStyle, table, col, row, get_prop_1.getProp).theme;
-    if (!addNew && canUseFastUpdate(col, row, oldCellGroup, autoWrapText, table)) {
+    const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, !0), cellStyle = table._getCellStyle(col, row), autoWrapText = null !== (_a = cellStyle.autoWrapText) && void 0 !== _a ? _a : table.internalProps.autoWrapText, cellLocation = table.getCellLocation(col, row), define = "body" !== cellLocation ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);
+    let isMerge, range;
+    ("body" !== cellLocation || (null == define ? void 0 : define.mergeCell)) && (range = table.getCellRange(col, row), 
+    isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row);
+    let cellTheme = (0, tableHelper_1.getStyleTheme)(cellStyle, table, isMerge ? range.start.col : col, isMerge ? range.start.row : row, get_prop_1.getProp).theme;
+    if (!addNew && !isMerge && canUseFastUpdate(col, row, oldCellGroup, autoWrapText, table)) {
         const cellWidth = table.getColWidth(col), cellHeight = table.getRowHeight(row);
         oldCellGroup.setAttributes({
             width: cellWidth,
@@ -96,40 +98,38 @@ function updateCell(col, row, table, addNew) {
         return oldCellGroup;
     }
     if (!addNew && "empty" === oldCellGroup.role) return;
-    const type = table.isHeader(col, row) ? table._getHeaderLayoutMap(col, row).headerType : table.getBodyColumnType(col, row), cellLocation = table.getCellLocation(col, row), define = "body" !== cellLocation ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);
-    let isMerge, range, newCellGroup;
-    if (("body" !== cellLocation || (null == define ? void 0 : define.mergeCell)) && (range = table.getCellRange(col, row), 
-    isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row), 
-    !isMerge || col === range.start.col && row === range.start.row) {
-        const mayHaveIcon = "body" !== cellLocation || (!!(null == define ? void 0 : define.icon) || !!(null == define ? void 0 : define.tree)), padding = cellTheme._vtable.padding, textAlign = cellTheme._vtable.textAlign, textBaseline = cellTheme._vtable.textBaseline;
-        let bgColorFunc, customRender, customLayout, cellWidth, cellHeight;
-        (null === (_r = null === (_q = table.internalProps) || void 0 === _q ? void 0 : _q.dataConfig) || void 0 === _r ? void 0 : _r.mappingRules) && !table.isHeader(col, row) && (null === (_u = null === (_t = null === (_s = table.internalProps) || void 0 === _s ? void 0 : _s.dataConfig) || void 0 === _t ? void 0 : _t.mappingRules) || void 0 === _u || _u.forEach(((mappingRule, i) => {
-            mappingRule.bgColor && table.internalProps.layoutMap.getIndicatorKey(col, row) === mappingRule.bgColor.indicatorKey && (bgColorFunc = mappingRule.bgColor.mapping);
-        }))), "body" !== cellLocation ? (customRender = null == define ? void 0 : define.headerCustomRender, 
-        customLayout = null == define ? void 0 : define.headerCustomLayout) : (customRender = (null == define ? void 0 : define.customRender) || table.customRender, 
-        customLayout = null == define ? void 0 : define.customLayout), range ? (cellWidth = table.getColsWidth(range.start.col, range.end.col), 
-        cellHeight = table.getRowsHeight(range.start.row, range.end.row)) : (cellWidth = table.getColWidth(col), 
-        cellHeight = table.getRowHeight(row));
-        const value = table.getCellValue(col, row);
-        (0, helper_1.isPromise)(value) ? (oldCellGroup.removeAllChild(), (0, deal_promise_data_1.dealPromiseData)(value, table, updateCellContent.bind(null, type, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme))) : newCellGroup = updateCellContent(type, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme);
-    } else newCellGroup = new group_1.Group({
-        x: 0,
-        y: addNew ? 0 : oldCellGroup.attribute.y,
-        width: 0,
-        height: 0,
-        visible: !1,
-        pickable: !1
-    }), newCellGroup.role = "shadow-cell", newCellGroup.col = col, newCellGroup.row = row, 
-    newCellGroup.mergeCol = range.start.col, newCellGroup.mergeRow = range.start.row, 
-    addNew || (oldCellGroup.parent.insertAfter(newCellGroup, oldCellGroup), oldCellGroup.parent.removeChild(oldCellGroup), 
-    updateCell(range.start.col, range.start.row, table, !1));
+    const type = table.isHeader(col, row) ? table._getHeaderLayoutMap(col, row).headerType : table.getBodyColumnType(col, row);
+    let customStyle, newCellGroup, value = table.getCellValue(col, row);
+    if (table.internalProps.customMergeCell) {
+        const customMerge = table.getCustomMerge(col, row);
+        if (customMerge) {
+            const {range: customMergeRange, text: customMergeText, style: customMergeStyle} = customMerge;
+            range = customMergeRange, isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row, 
+            value = customMergeText, customStyle = customMergeStyle, cellTheme = (0, tableHelper_1.getStyleTheme)(customStyle, table, range.start.col, range.start.row, get_prop_1.getProp).theme;
+        }
+    }
+    const mayHaveIcon = "body" !== cellLocation || (!!(null == define ? void 0 : define.icon) || !!(null == define ? void 0 : define.tree)), padding = cellTheme._vtable.padding, textAlign = cellTheme._vtable.textAlign, textBaseline = cellTheme._vtable.textBaseline;
+    let bgColorFunc, customRender, customLayout, cellWidth, cellHeight;
+    if ((null === (_r = null === (_q = table.internalProps) || void 0 === _q ? void 0 : _q.dataConfig) || void 0 === _r ? void 0 : _r.mappingRules) && !table.isHeader(col, row) && (null === (_u = null === (_t = null === (_s = table.internalProps) || void 0 === _s ? void 0 : _s.dataConfig) || void 0 === _t ? void 0 : _t.mappingRules) || void 0 === _u || _u.forEach(((mappingRule, i) => {
+        mappingRule.bgColor && table.internalProps.layoutMap.getIndicatorKey(col, row) === mappingRule.bgColor.indicatorKey && (bgColorFunc = mappingRule.bgColor.mapping);
+    }))), "body" !== cellLocation ? (customRender = null == define ? void 0 : define.headerCustomRender, 
+    customLayout = null == define ? void 0 : define.headerCustomLayout) : (customRender = (null == define ? void 0 : define.customRender) || table.customRender, 
+    customLayout = null == define ? void 0 : define.customLayout), range ? (cellWidth = table.getColsWidth(range.start.col, range.end.col), 
+    cellHeight = table.getRowsHeight(range.start.row, range.end.row)) : (cellWidth = table.getColWidth(col), 
+    cellHeight = table.getRowHeight(row)), (0, helper_1.isPromise)(value) ? (oldCellGroup.removeAllChild(), 
+    (0, deal_promise_data_1.dealPromiseData)(value, table, updateCellContent.bind(null, type, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme))) : newCellGroup = updateCellContent(type, value, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme), 
+    isMerge) {
+        const rangeHeight = table.getRowHeight(row), rangeWidth = table.getColWidth(col), {width: contentWidth} = newCellGroup.attribute, {height: contentHeight} = newCellGroup.attribute;
+        newCellGroup.contentWidth = contentWidth, newCellGroup.contentHeight = contentHeight, 
+        (0, column_helper_1.resizeCellGroup)(newCellGroup, rangeWidth, rangeHeight, range, table);
+    }
     return newCellGroup;
 }
 
-function updateCellContent(type, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme) {
+function updateCellContent(type, value, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, isMerge, range, addNew, cellTheme) {
     var _a, _b;
     if (oldCellGroup.row !== row || oldCellGroup.col !== col) return null;
-    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);
+    const newCellGroup = createCell(type, value, 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, cellTheme);
     return !addNew && oldCellGroup.parent && (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":";;;AAEA,+CAA4C;AAa5C,gDAAqD;AACrD,4CAAyC;AACzC,gDAA4C;AAC5C,uDAA8D;AAC9D,uDAA8D;AAC9D,qEAAsE;AACtE,iEAAuE;AACvE,qDAAwD;AACxD,uDAA8D;AAG9D,wDAAuD;AACvD,+CAA+C;AAC/C,kEAA6D;AAC7D,qDAA2D;AAC3D,6DAAoE;AAGpE,wEAAmE;AACnE,8CAAgD;AAChD,2CAAmD;AAEnD,SAAgB,UAAU,CACxB,IAAsB,EACtB,MAAoB,EACpB,KAAmB,EACnB,GAAW,EACX,GAAW,EACX,QAAgB,EAChB,SAAiB,EACjB,UAAkB,EAClB,WAAkB,EAClB,CAAS,EACT,OAAyC,EACzC,SAA0B,EAC1B,YAAgC,EAChC,WAAoB,EACpB,OAAgB,EAChB,KAAgB,EAChB,SAAqB;;IAErB,IAAI,WAAqB,CAAC;IAE1B,IAAI,CAAA,MAAA,MAAC,KAAK,CAAC,aAAqC,0CAAE,UAAU,0CAAE,YAAY,KAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;QACvG,MAAA,MAAA,MAAC,KAAK,CAAC,aAAqC,0CAAE,UAAU,0CAAE,YAAY,0CAAE,OAAO,CAC7E,CAAC,WAAwB,EAAE,CAAS,EAAE,EAAE;YACtC,IACE,WAAW,CAAC,OAAO;gBAClB,KAAK,CAAC,aAAa,CAAC,SAAkC,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC;oBAC/E,WAAW,CAAC,OAAO,CAAC,YAAY,EAClC;gBACA,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;aAC3C;QACH,CAAC,CACF,CAAC;KACH;IACD,IAAI,SAAgB,CAAC;IACrB,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,MAAM,EAAE;QACtC,IAAI,IAAI,KAAK,MAAM,EAAE;YAGnB,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAElD,IACE,IAAI,KAAK,MAAM;gBACf,CAAC,CAAC,cAAc,IAAI,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC;oBAChD,CAAC,CAAC,YAAY,IAAI,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC;oBAC9C,eAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EACzB;gBACA,IAAI,SAAS,EAAE;oBACb,SAAS,CAAC,IAAI,CAAC,IAAI,GAAG,IAAA,kBAAO,EAAC,WAAW,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;oBACxE,SAAiB,CAAC,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC;iBAC7C;qBAAM;oBACL,SAAS,GAAG;wBACV,IAAI,EAAE;4BACJ,IAAI,EAAE,IAAA,kBAAO,EAAC,WAAW,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC;yBACzD;wBACD,KAAK,EAAE;4BACL,MAAM,EAAE,SAAmB;yBAC5B;qBACF,CAAC;iBACH;aACF;SACF;QAED,IAAI,WAAW,EAAE;YACf,MAAM,SAAS,GAAG,KAAK,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACrD,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAC9C,IAAI,OAAO,EAAE;gBACX,IAAI,SAAS,EAAE;oBACb,SAAS,CAAC,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC;iBAChC;qBAAM;oBACL,SAAS,GAAG;wBACV,KAAK,EAAE;4BACL,IAAI,EAAE,OAAO;yBACd;qBACF,CAAC;iBACH;aACF;SACF;QAED,IAAI,mBAAmB,CAAC;QACxB,IAAI,aAAa,GAAG,IAAI,CAAC;QACzB,IAAI,YAAY,CAAC;QACjB,IAAI,YAAY,CAAC;QACjB,MAAM,YAAY,GAAG,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACrD,IAAI,YAAY,KAAK,MAAM,EAAE;YAC3B,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC;YAC1C,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC;SAC3C;aAAM;YACL,YAAY,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,KAAI,KAAK,CAAC,YAAY,CAAC;YAC1D,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC;SACrC;QAED,IAAI,YAAY,IAAI,YAAY,EAAE;YAEhC,MAAM,YAAY,GAAG,IAAA,uBAAc,EACjC,YAAY,EACZ,YAAY,EACZ,GAAG,EACH,GAAG,EACH,SAAS,EACT,UAAU,EACV,KAAK,EACL,KAAK,CAAC,UAAU,KAAK,YAAY,EACjC,KAAK,CACN,CAAC;YACF,mBAAmB,GAAG,YAAY,CAAC,aAAa,CAAC;YACjD,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC;SAC5C;QACD,SAAS,GAAG,IAAA,2BAAe,EACzB,KAAK,EACL,WAAW,EACX,CAAC,EACD,CAAC,EACD,GAAG,EACH,GAAG,EACH,QAAQ,EACR,SAAS,EACT,UAAU,EACV,OAAO,EACP,SAAS,EACT,YAAY,EACZ,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,SAAS,CACV,CAAC;QACF,IAAI,OAAO,EAAE;YACX,SAAS,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;YACnC,SAAS,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;SACpC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACrF,IAAI,UAAU,EAAE;YACd,MAAM,IAAI,GAAG,IAAI,oBAAa,CAAC,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACzG,SAAS,CAAC,KAAK,EAAE,CAAC;YAClB,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtC,IAAI,CAAC,OAAO,EAAE,CAAC;SAChB;aAAM,IAAI,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;YAC1D,SAAS,CAAC,KAAK,EAAE,CAAC;SACnB;KAgDF;SAAM,IAAI,IAAI,KAAK,OAAO,EAAE;QAE3B,SAAS,GAAG,IAAA,iCAAoB,EAC9B,WAAW,EACX,CAAC,EACD,CAAC,EACD,GAAG,EACH,GAAG,EACH,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,EACtB,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,EACtB,MAA4B,CAAC,eAAe,EAC5C,MAA4B,CAAC,eAAe,EAC7C,OAAO,EACP,SAAS,EACT,YAAY,EACZ,KAAK,EACL,SAAS,CACV,CAAC;KACH;SAAM,IAAI,IAAI,KAAK,OAAO,EAAE;QAE3B,SAAS,GAAG,IAAA,iCAAoB,EAC9B,WAAW,EACX,CAAC,EACD,CAAC,EACD,GAAG,EACH,GAAG,EACH,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,EACtB,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,EACtB,MAA4B,CAAC,eAAe,EAC5C,MAA4B,CAAC,eAAe,EAC7C,OAAO,EACP,SAAS,EACT,YAAY,EACZ,KAAK,EACL,SAAS,CACV,CAAC;KACH;SAAM,IAAI,IAAI,KAAK,OAAO,EAAE;QAC3B,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC/E,SAAS,GAAG,IAAA,iCAAoB,EAC9B,IAAI,EACJ,WAAW,EACX,CAAC,EACD,CAAC,EACD,GAAG,EACH,GAAG,EACH,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,EACtB,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,EACvB,OAAO,EACP,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,EAC3B,MAA4B,CAAC,WAAW,EACzC,KAAK,CAAC,YAAY,EAAE;YAClB,CAAC,CAAE,KAAK,CAAC,aAAa,CAAC,SAAkC,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC;YAChF,CAAC,CAAE,MAA4B,CAAC,SAAS,EAC3C,aAAa,EACb,MAAA,MAAC,KAAK,CAAC,aAAa,CAAC,SAAkC,0CAAE,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,mCAAI,MAAM,EAC3F,KAAK,EACL,SAAS,CACV,CAAC;KACH;SAAM,IAAI,IAAI,KAAK,aAAa,EAAE;QACjC,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAqB,CAAC;QAChE,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,KAAK,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAErD,SAAS,GAAG,IAAA,2BAAe,EACzB,KAAK,EACL,WAAW,EACX,CAAC,EACD,CAAC,EACD,GAAG,EACH,GAAG,EACH,QAAQ,EACR,SAAS,EACT,UAAU,EACV,OAAO,EACP,SAAS,EACT,YAAY,EACZ,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,SAAS,CACV,CAAC;QAGF,MAAM,gBAAgB,GAAG,IAAA,yCAAqB,EAC5C,MAAiC,EACjC,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,EACT,GAAG,EACH,GAAG,EACH,OAAO,EACP,KAAK,CACN,CAAC;QAEF,IAAI,SAAS,CAAC,UAAU,EAAE;YACxB,SAAS,CAAC,YAAY,CAAC,gBAAgB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;SAChE;aAAM;YACL,SAAS,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;SACzC;KACF;SAAM,IAAI,IAAI,KAAK,WAAW,EAAE;QAC/B,SAAS,GAAG,IAAA,0CAAwB,EAClC,IAAI,EACJ,WAAW,EACX,CAAC,EACD,CAAC,EACD,GAAG,EACH,GAAG,EACH,SAAS,EACT,UAAU,EACV,OAAO,EACP,KAAK,EACL,SAAS,CACV,CAAC;KACH;SAAM,IAAI,IAAI,KAAK,UAAU,EAAE;QAC9B,SAAS,GAAG,IAAA,uCAAuB,EACjC,IAAI,EACJ,WAAW,EACX,CAAC,EACD,CAAC,EACD,GAAG,EACH,GAAG,EACH,QAAQ,EACR,SAAS,EACT,UAAU,EACV,OAAO,EACP,SAAS,EACT,YAAY,EACZ,KAAK,EACL,SAAS,EACT,MAA8B,CAC/B,CAAC;KACH;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAnUD,gCAmUC;AAED,SAAgB,UAAU,CAAC,GAAW,EAAE,GAAW,EAAE,KAAmB,EAAE,MAAgB;;IAExF,MAAM,YAAY,GAAG,KAAK,CAAC,UAAU,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7E,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,MAAA,SAAS,CAAC,YAAY,mCAAI,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC;IAChF,MAAM,SAAS,GAAG,IAAA,2BAAa,EAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,kBAAO,CAAC,CAAC,KAAK,CAAC;IAG3E,IAAI,CAAC,MAAM,IAAI,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE;QAE5E,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3C,YAAY,CAAC,aAAa,CAAC;YACzB,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,UAAU;YAElB,SAAS,EAAE,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,0CAAE,SAAS,mCAAI,SAAS;YACnD,IAAI,EAAE,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,0CAAE,IAAI,mCAAI,SAAS;YACzC,MAAM,EAAE,MAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,0CAAE,MAAM,mCAAI,SAAS;YAC7C,gBAAgB,EAAE,MAAA,MAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAa,0CAAE,gBAAgB,mCAAI,SAAS;YAC1E,gBAAgB,EAAE,MAAA,MAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAa,0CAAE,gBAAgB,mCAAI,SAAS;YAC1E,MAAM,EAAE,MAAA,MAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAa,0CAAE,MAAM,mCAAI,SAAS;SAChD,CAAC,CAAC;QAGV,MAAM,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACrD,IAAI,QAAQ,EAAE;YACZ,MAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC1C,MAAM,OAAO,GAAG,IAAA,sBAAe,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/F,MAAM,eAAe,GAAG,IAAA,yCAAkB,EAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YAC5D,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;YACtC,MAAM,OAAO,GAAG,MAAA,IAAA,sBAAY,EAAC,IAAA,kBAAO,EAAC,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,mCAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAE7F,MAAM,SAAS,GAAG;gBAChB,IAAI,EAAE,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;gBAClE,YAAY,EAAE,SAAS,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC;gBAGrE,YAAY,EAAE,KAAK;gBACnB,YAAY;gBACZ,SAAS;gBACT,SAAS,EAAE,YAAY;gBAEvB,WAAW,EAAE,UAAU,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBACnD,QAAQ,EAAE,KAAK;gBACf,EAAE,EAAE,eAAe;aACpB,CAAC;YACF,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;SAC5G;QACD,OAAO,YAAY,CAAC;KACrB;IAED,IAAI,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,KAAK,OAAO,EAAE;QAC5C,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;QACnC,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,UAAU;QAChD,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtC,MAAM,YAAY,GAAG,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,YAAY,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAE/G,IAAI,OAAO,CAAC;IACZ,IAAI,KAAK,CAAC;IACV,IAAI,YAAY,KAAK,MAAM,KAAK,MAA2B,aAA3B,MAAM,uBAAN,MAAM,CAAuB,SAAS,CAAA,EAAE;QAEtE,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACrC,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;KAClF;IAED,IAAI,YAAY,CAAC;IACjB,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QAEnE,YAAY,GAAG,IAAI,aAAK,CAAC;YACvB,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YACxC,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,YAAY,CAAC,IAAI,GAAG,aAAa,CAAC;QAClC,YAAY,CAAC,GAAG,GAAG,GAAG,CAAC;QACvB,YAAY,CAAC,GAAG,GAAG,GAAG,CAAC;QACvB,YAAY,CAAC,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;QACxC,YAAY,CAAC,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;QAExC,IAAI,CAAC,MAAM,EAAE;YACX,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YAC5D,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAG9C,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SAC5D;KACF;SAAM;QACL,MAAM,WAAW,GAAG,YAAY,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAA,IAAI,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAA,CAAC;QAGtF,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC;QAC1C,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC;QAC9C,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC;QAEpD,IAAI,WAAqB,CAAC;QAE1B,IAAI,CAAA,MAAA,MAAC,KAAK,CAAC,aAAqC,0CAAE,UAAU,0CAAE,YAAY,KAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;YACvG,MAAA,MAAA,MAAC,KAAK,CAAC,aAAqC,0CAAE,UAAU,0CAAE,YAAY,0CAAE,OAAO,CAC7E,CAAC,WAAwB,EAAE,CAAS,EAAE,EAAE;gBACtC,IACE,WAAW,CAAC,OAAO;oBAClB,KAAK,CAAC,aAAa,CAAC,SAAkC,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC;wBAC/E,WAAW,CAAC,OAAO,CAAC,YAAY,EAClC;oBACA,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;iBAC3C;YACH,CAAC,CACF,CAAC;SACH;QAED,IAAI,YAAY,CAAC;QACjB,IAAI,YAAY,CAAC;QACjB,IAAI,YAAY,KAAK,MAAM,EAAE;YAC3B,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC;YAC1C,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC;SAC3C;aAAM;YACL,YAAY,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,KAAI,KAAK,CAAC,YAAY,CAAC;YAC1D,YAAY,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC;SACrC;QAED,IAAI,SAAS,CAAC;QACd,IAAI,UAAU,CAAC;QACf,IAAI,KAAK,EAAE;YACT,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/D,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAClE;aAAM;YACL,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACnC,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;SACtC;QAGD,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC3C,IAAI,IAAA,kBAAS,EAAC,KAAK,CAAC,EAAE;YAEpB,YAAY,CAAC,cAAc,EAAE,CAAC;YAG9B,IAAA,mCAAe,EACb,KAAK,EACL,KAAK,EACL,iBAAiB,CAAC,IAAI,CACpB,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,KAAK,EACL,GAAG,EACH,GAAG,EACH,WAAW,EACX,SAAS,EACT,UAAU,EACV,YAAY,EACZ,OAAO,EACP,SAAS,EACT,YAAY,EACZ,WAAW,EACX,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,CACV,CACF,CAAC;SACH;aAAM;YACL,YAAY,GAAG,iBAAiB,CAC9B,IAAI,EACJ,MAAM,EACN,KAAK,EACL,GAAG,EACH,GAAG,EACH,WAAW,EACX,SAAS,EACT,UAAU,EACV,YAAY,EACZ,OAAO,EACP,SAAS,EACT,YAAY,EACZ,WAAW,EACX,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,CACV,CAAC;SACH;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAjMD,gCAiMC;AAED,SAAS,iBAAiB,CACxB,IAAsB,EACtB,MAAoB,EACpB,KAAmB,EACnB,GAAW,EACX,GAAW,EACX,WAAqB,EACrB,SAAiB,EACjB,UAAkB,EAClB,YAAmB,EACnB,OAAyC,EACzC,SAA0B,EAC1B,YAAgC,EAChC,WAAoB,EACpB,OAAgB,EAChB,KAAgB,EAChB,MAAe,EACf,SAAsB;;IAGtB,IAAI,YAAY,CAAC,GAAG,KAAK,GAAG,IAAI,YAAY,CAAC,GAAG,KAAK,GAAG,EAAE;QACxD,OAAO,IAAI,CAAC;KACb;IACD,MAAM,YAAY,GAAG,UAAU,CAC7B,IAAI,EACJ,MAAM,EACN,KAAK,EACL,GAAG,EACH,GAAG,EACH,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,EACtB,SAAS,EACT,UAAU,EAEV,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAEhE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,CAAC,EAChD,OAAO,EACP,SAAS,EACT,YAAY,EACZ,WAAW,EACX,OAAO,EACP,KAAK,EACL,SAAS,CACV,CAAC;IACF,IAAI,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,EAAE;QAClC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC5D,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAG9C,IAAI,MAAA,KAAK,CAAC,UAAU,0CAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC9C,MAAA,KAAK,CAAC,UAAU,0CAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;SAC1D;KACF;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAW,EAAE,GAAW,EAAE,YAAmB,EAAE,YAAqB,EAAE,KAAmB;;IACjH,MAAM,MAAM,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACnD,MAAM,WAAW,GAAG,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAA,IAAI,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAA,CAAC;IACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACnD,MAAM,aAAa,GAAG,KAAK,CAAC,UAAU,KAAK,YAAY,CAAC;IAExD,IACE,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;QACzB,YAAY,CAAC,IAAI,KAAK,MAAM;QAC5B,QAAQ,KAAK,MAAM;QACnB,CAAC,YAAY;QACb,CAAC,aAAa;QACd,CAAC,WAAW;QACZ,CAAA,MAAA,YAAY,CAAC,UAAU,0CAAE,IAAI,MAAK,MAAM,EACxC;QACA,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC","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  CheckboxColumnDefine,\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 { createCheckboxCellGroup } from './cell-type/checkbox-cell';\n// import type { PivotLayoutMap } from '../../layout/pivot-layout';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { getHierarchyOffset } from '../utils/get-hierarchy-offset';\nimport { getQuadProps } from '../utils/padding';\nimport { convertInternal } from '../../tools/util';\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 PivotHeaderLayoutMap).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 PivotHeaderLayoutMap).getChartSpec(col, row)\n        : (define as ChartColumnDefine).chartSpec,\n      chartInstance,\n      (table.internalProps.layoutMap as PivotHeaderLayoutMap)?.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  } else if (type === 'checkbox') {\n    cellGroup = createCheckboxCellGroup(\n      null,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      colWidth,\n      cellWidth,\n      cellHeight,\n      padding,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme,\n      define as CheckboxColumnDefine\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  const cellStyle = table._getCellStyle(col, row);\n  const autoWrapText = cellStyle.autoWrapText ?? table.internalProps.autoWrapText;\n  const cellTheme = getStyleTheme(cellStyle, table, col, row, getProp).theme;\n\n  // fast method for text\n  if (!addNew && canUseFastUpdate(col, row, oldCellGroup, autoWrapText, table)) {\n    // update group\n    const cellWidth = table.getColWidth(col);\n    const cellHeight = table.getRowHeight(row);\n    oldCellGroup.setAttributes({\n      width: cellWidth,\n      height: cellHeight,\n      // 背景相关，cell背景由cellGroup绘制\n      lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n      fill: cellTheme?.group?.fill ?? undefined,\n      stroke: cellTheme?.group?.stroke ?? undefined,\n      strokeArrayWidth: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n      strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n      cursor: (cellTheme?.group as any)?.cursor ?? undefined\n    } as any);\n\n    // update text\n    const textMark = oldCellGroup.getChildByName('text');\n    if (textMark) {\n      const text = table.getCellValue(col, row);\n      const textArr = convertInternal(text).replace(/\\r?\\n/g, '\\n').replace(/\\r/g, '\\n').split('\\n');\n      const hierarchyOffset = getHierarchyOffset(col, row, table);\n      const lineClamp = cellStyle.lineClamp;\n      const padding = getQuadProps(getProp('padding', cellStyle, col, row, table)) ?? [0, 0, 0, 0];\n\n      const attribute = {\n        text: textArr.length === 1 && !autoWrapText ? textArr[0] : textArr, // 单行(no-autoWrapText)为字符串，多行(autoWrapText)为字符串数组\n        maxLineWidth: cellWidth - (padding[1] + padding[3] + hierarchyOffset),\n        // fill: true,\n        // textAlign: 'left',\n        textBaseline: 'top',\n        autoWrapText,\n        lineClamp,\n        wordBreak: 'break-word',\n        // widthLimit: autoColWidth ? -1 : colWidth - (padding[1] + padding[3]),\n        heightLimit: cellHeight - (padding[0] + padding[2]),\n        pickable: false,\n        dx: hierarchyOffset\n      };\n      textMark.setAttributes(cellTheme.text ? (Object.assign({}, cellTheme.text, attribute) as any) : attribute);\n    }\n    return oldCellGroup;\n  }\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 PivotHeaderLayoutMap).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  //解决报错 getCellByCache递归调用 死循环问题\n  if (oldCellGroup.row !== row || oldCellGroup.col !== col) {\n    return null;\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 && oldCellGroup.parent) {\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\nfunction canUseFastUpdate(col: number, row: number, oldCellGroup: Group, autoWrapText: boolean, table: BaseTableAPI) {\n  const define = table.getBodyColumnDefine(col, row);\n  const mayHaveIcon = !!define?.icon || !!define?.tree;\n  const cellType = table.getBodyColumnType(col, row);\n  const autoRowHeight = table.heightMode === 'autoHeight';\n\n  if (\n    !table.isHeader(col, row) &&\n    oldCellGroup.role === 'cell' &&\n    cellType === 'text' &&\n    !autoWrapText &&\n    !autoRowHeight &&\n    !mayHaveIcon &&\n    oldCellGroup.firstChild?.type === 'text'\n  ) {\n    return true;\n  }\n  return false;\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  CheckboxColumnDefine,\n  ColumnDefine,\n  ColumnTypeOption,\n  ICustomRender,\n  ImageColumnDefine,\n  MappingRule,\n  ProgressbarColumnDefine,\n  TextColumnDefine\n} from '../../ts-types';\nimport { dealWithCustom } from '../component/custom';\nimport type { 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 { createCheckboxCellGroup } from './cell-type/checkbox-cell';\n// import type { PivotLayoutMap } from '../../layout/pivot-layout';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { resizeCellGroup } from './column-helper';\nimport { getHierarchyOffset } from '../utils/get-hierarchy-offset';\nimport { getQuadProps } from '../utils/padding';\nimport { convertInternal } from '../../tools/util';\n\nexport function createCell(\n  type: ColumnTypeOption,\n  value: string,\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  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 PivotHeaderLayoutMap).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 = value;\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      value,\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\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      value,\n      (define as ChartColumnDefine).chartModule,\n      table.isPivotChart()\n        ? (table.internalProps.layoutMap as PivotHeaderLayoutMap).getChartSpec(col, row)\n        : (define as ChartColumnDefine).chartSpec,\n      chartInstance,\n      (table.internalProps.layoutMap as PivotHeaderLayoutMap)?.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 dataValue = table.getCellOriginValue(col, row);\n    // 创建基础文字单元格\n    cellGroup = createCellGroup(\n      table,\n      value,\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  } else if (type === 'checkbox') {\n    cellGroup = createCheckboxCellGroup(\n      null,\n      columnGroup,\n      0,\n      y,\n      col,\n      row,\n      colWidth,\n      cellWidth,\n      cellHeight,\n      padding,\n      textAlign,\n      textBaseline,\n      table,\n      cellTheme,\n      define as CheckboxColumnDefine\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  const cellStyle = table._getCellStyle(col, row);\n  const autoWrapText = cellStyle.autoWrapText ?? table.internalProps.autoWrapText;\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 cellTheme = getStyleTheme(\n    cellStyle,\n    table,\n    isMerge ? range.start.col : col,\n    isMerge ? range.start.row : row,\n    getProp\n  ).theme;\n\n  // fast method for text\n  if (!addNew && !isMerge && canUseFastUpdate(col, row, oldCellGroup, autoWrapText, table)) {\n    // update group\n    const cellWidth = table.getColWidth(col);\n    const cellHeight = table.getRowHeight(row);\n    oldCellGroup.setAttributes({\n      width: cellWidth,\n      height: cellHeight,\n      // 背景相关，cell背景由cellGroup绘制\n      lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n      fill: cellTheme?.group?.fill ?? undefined,\n      stroke: cellTheme?.group?.stroke ?? undefined,\n      strokeArrayWidth: (cellTheme?.group as any)?.strokeArrayWidth ?? undefined,\n      strokeArrayColor: (cellTheme?.group as any)?.strokeArrayColor ?? undefined,\n      cursor: (cellTheme?.group as any)?.cursor ?? undefined\n    } as any);\n\n    // update text\n    const textMark = oldCellGroup.getChildByName('text');\n    if (textMark) {\n      const text = table.getCellValue(col, row);\n      const textArr = convertInternal(text).replace(/\\r?\\n/g, '\\n').replace(/\\r/g, '\\n').split('\\n');\n      const hierarchyOffset = getHierarchyOffset(col, row, table);\n      const lineClamp = cellStyle.lineClamp;\n      const padding = getQuadProps(getProp('padding', cellStyle, col, row, table)) ?? [0, 0, 0, 0];\n\n      const attribute = {\n        text: textArr.length === 1 && !autoWrapText ? textArr[0] : textArr, // 单行(no-autoWrapText)为字符串，多行(autoWrapText)为字符串数组\n        maxLineWidth: cellWidth - (padding[1] + padding[3] + hierarchyOffset),\n        // fill: true,\n        // textAlign: 'left',\n        textBaseline: 'top',\n        autoWrapText,\n        lineClamp,\n        wordBreak: 'break-word',\n        // widthLimit: autoColWidth ? -1 : colWidth - (padding[1] + padding[3]),\n        heightLimit: cellHeight - (padding[0] + padding[2]),\n        pickable: false,\n        dx: hierarchyOffset\n      };\n      textMark.setAttributes(cellTheme.text ? (Object.assign({}, cellTheme.text, attribute) as any) : attribute);\n    }\n    return oldCellGroup;\n  }\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  let value = table.getCellValue(col, row);\n\n  let customStyle;\n  if (table.internalProps.customMergeCell) {\n    const customMerge = table.getCustomMerge(col, row);\n    if (customMerge) {\n      const { range: customMergeRange, text: customMergeText, style: customMergeStyle } = customMerge;\n      range = customMergeRange;\n      isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n      value = customMergeText;\n      customStyle = customMergeStyle;\n      cellTheme = getStyleTheme(customStyle, table, range.start.col, range.start.row, getProp).theme;\n    }\n  }\n\n  let newCellGroup;\n  const mayHaveIcon = cellLocation !== 'body' ? true : !!define?.icon || !!define?.tree;\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 PivotHeaderLayoutMap).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  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      value,\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  if (isMerge) {\n    const rangeHeight = table.getRowHeight(row);\n    const rangeWidth = table.getColWidth(col);\n\n    const { width: contentWidth } = newCellGroup.attribute;\n    const { height: contentHeight } = newCellGroup.attribute;\n    newCellGroup.contentWidth = contentWidth;\n    newCellGroup.contentHeight = contentHeight;\n\n    resizeCellGroup(newCellGroup, rangeWidth, rangeHeight, range, table);\n  }\n\n  return newCellGroup;\n}\n\nfunction updateCellContent(\n  type: ColumnTypeOption,\n  value: string,\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  //解决报错 getCellByCache递归调用 死循环问题\n  if (oldCellGroup.row !== row || oldCellGroup.col !== col) {\n    return null;\n  }\n  const newCellGroup = createCell(\n    type,\n    value,\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    cellTheme\n  );\n  if (!addNew && oldCellGroup.parent) {\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\nfunction canUseFastUpdate(col: number, row: number, oldCellGroup: Group, autoWrapText: boolean, table: BaseTableAPI) {\n  const define = table.getBodyColumnDefine(col, row);\n  const mayHaveIcon = !!define?.icon || !!define?.tree;\n  const cellType = table.getBodyColumnType(col, row);\n  const autoRowHeight = table.heightMode === 'autoHeight';\n\n  if (\n    !table.isHeader(col, row) &&\n    oldCellGroup.role === 'cell' &&\n    cellType === 'text' &&\n    !autoWrapText &&\n    !autoRowHeight &&\n    !mayHaveIcon &&\n    oldCellGroup.firstChild?.type === 'text'\n  ) {\n    return true;\n  }\n  return false;\n}\n"]}

package/cjs/scenegraph/group-creater/cell-type/checkbox-cell.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.createCheckboxCellGroup = void 0;
 
-const group_1 = require("../../graphic/group"), vutils_1 = require("@visactor/vutils"), vrender_components_1 = require("@visactor/vrender-components"), get_hierarchy_offset_1 = require("../../utils/get-hierarchy-offset"), helper_1 = require("../../../tools/helper");
+const group_1 = require("../../graphic/group"), vutils_1 = require("@visactor/vutils"), vrender_components_1 = require("@visactor/vrender-components"), get_hierarchy_offset_1 = require("../../utils/get-hierarchy-offset"), helper_1 = require("../../../tools/helper"), get_prop_1 = require("../../utils/get-prop");
 
 function createCheckboxCellGroup(cellGroup, columnGroup, xOrigin, yOrigin, col, row, colWidth, width, height, padding, textAlign, textBaseline, table, cellTheme, define) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
@@ -31,7 +31,8 @@ function createCheckboxCellGroup(cellGroup, columnGroup, xOrigin, yOrigin, col,
 
 function createCheckbox(col, row, colWidth, cellWidth, cellHeight, padding, cellTheme, define, table) {
     var _a, _b, _c, _d;
-    const value = table.getCellValue(col, row), dataValue = table.getCellOriginValue(col, row);
+    const style = table._getCellStyle(col, row), size = (0, get_prop_1.getProp)("size", style, col, row, table), spaceBetweenTextAndIcon = (0, 
+    get_prop_1.getProp)("spaceBetweenTextAndIcon", style, col, row, table), value = table.getCellValue(col, row), dataValue = table.getCellOriginValue(col, row);
     let isChecked, isDisabled, text = null !== (_a = value) && void 0 !== _a ? _a : "";
     (0, vutils_1.isObject)(value) ? (isChecked = value.checked, isDisabled = value.disable, 
     text = value.text) : "boolean" == typeof value && (isChecked = value, text = ""), 
@@ -57,7 +58,7 @@ function createCheckbox(col, row, colWidth, cellWidth, cellHeight, padding, cell
         dataValue: dataValue
     }), autoColWidth = "auto" === colWidth, autoRowHeight = "autoHeight" === table.heightMode, attribute = {
         text: 1 !== text.length || autoWrapText ? text : text[0],
-        maxLineWidth: autoColWidth ? 1 / 0 : cellWidth - (padding[1] + padding[3] + hierarchyOffset),
+        maxLineWidth: autoColWidth ? 1 / 0 : cellWidth - (padding[1] + padding[3] + hierarchyOffset) - size - spaceBetweenTextAndIcon,
         textBaseline: "top",
         autoWrapText: autoWrapText,
         lineClamp: lineClamp,
@@ -71,6 +72,15 @@ function createCheckbox(col, row, colWidth, cellWidth, cellHeight, padding, cell
         x: 0,
         y: 0,
         text: testAttribute,
+        icon: {
+            width: Math.floor(size / 1.4),
+            height: Math.floor(size / 1.4)
+        },
+        box: {
+            width: size,
+            height: size
+        },
+        spaceBetweenTextAndIcon: spaceBetweenTextAndIcon,
         checked: void 0,
         indeterminate: !0,
         disabled: null !== (_c = null != isDisabled ? isDisabled : globalDisable) && void 0 !== _c && _c
@@ -78,6 +88,15 @@ function createCheckbox(col, row, colWidth, cellWidth, cellHeight, padding, cell
         x: 0,
         y: 0,
         text: testAttribute,
+        icon: {
+            width: Math.floor(size / 1.4),
+            height: Math.floor(size / 1.4)
+        },
+        box: {
+            width: size,
+            height: size
+        },
+        spaceBetweenTextAndIcon: spaceBetweenTextAndIcon,
         checked: isChecked,
         indeterminate: void 0,
         disabled: null !== (_d = null != isDisabled ? isDisabled : globalDisable) && void 0 !== _d && _d

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

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/group-creater/cell-type/checkbox-cell.ts"],"names":[],"mappings":"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","file":"checkbox-cell.js","sourcesContent":["import type { ILine, ISymbol, IThemeSpec } from '@visactor/vrender';\nimport { createLine, createSymbol } from '@visactor/vrender';\nimport { PointScale, LinearScale } from '@visactor/vscale';\nimport { isValid } from '../../../tools/util';\nimport { Group } from '../../graphic/group';\nimport type { CellInfo, CheckboxColumnDefine, CheckboxStyleOption, SparklineSpec } from '../../../ts-types';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { isObject } from '@visactor/vutils';\nimport { CheckBox } from '@visactor/vrender-components';\nimport { getHierarchyOffset } from '../../utils/get-hierarchy-offset';\nimport { getOrApply } from '../../../tools/helper';\n\nexport function createCheckboxCellGroup(\n  cellGroup: Group | null,\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  colWidth: number | 'auto',\n  width: number,\n  height: number,\n  padding: number[],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  table: BaseTableAPI,\n  cellTheme: IThemeSpec,\n  define: CheckboxColumnDefine\n) {\n  // cell\n  if (!cellGroup) {\n    cellGroup = new Group({\n      x: xOrigin,\n      y: yOrigin,\n      width,\n      height,\n\n      // 背景相关，cell背景由cellGroup绘制\n      lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n      fill: cellTheme?.group?.fill ?? undefined,\n      stroke: cellTheme?.group?.stroke ?? undefined,\n\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\n  // chart\n  const checkboxComponent = createCheckbox(col, row, colWidth, width, height, padding, cellTheme, define, table);\n  if (checkboxComponent) {\n    cellGroup.appendChild(checkboxComponent);\n  }\n\n  checkboxComponent.render();\n\n  width -= padding[1] + padding[3];\n  height -= padding[0] + padding[2];\n  if (textAlign === 'center') {\n    checkboxComponent.setAttribute('x', padding[3] + (width - checkboxComponent.AABBBounds.width()) / 2);\n  } else if (textAlign === 'right') {\n    checkboxComponent.setAttribute('x', padding[3] + width - checkboxComponent.AABBBounds.width());\n  } else {\n    checkboxComponent.setAttribute('x', padding[3]);\n  }\n\n  if (textBaseline === 'middle') {\n    checkboxComponent.setAttribute('y', padding[0] + (height - checkboxComponent.AABBBounds.height()) / 2);\n  } else if (textBaseline === 'bottom') {\n    checkboxComponent.setAttribute('y', padding[0] + height - checkboxComponent.AABBBounds.height());\n  } else {\n    checkboxComponent.setAttribute('y', padding[0]);\n  }\n\n  return cellGroup;\n}\n\nfunction createCheckbox(\n  col: number,\n  row: number,\n  colWidth: number | 'auto',\n  cellWidth: number,\n  cellHeight: number,\n  padding: number[],\n  cellTheme: IThemeSpec,\n  define: CheckboxColumnDefine,\n  table: BaseTableAPI\n) {\n  const value = table.getCellValue(col, row) as string | { text: string; checked: boolean; disable: boolean } | boolean;\n  const dataValue = table.getCellOriginValue(col, row);\n  let isChecked;\n  let isDisabled;\n  let text = (value as string) ?? '';\n  if (isObject(value)) {\n    isChecked = value.checked;\n    isDisabled = value.disable;\n    text = value.text;\n  } else if (typeof value === 'boolean') {\n    isChecked = value;\n    text = '';\n  }\n  isChecked = table.stateManeger.syncCheckedState(col, row, define.field as string | number, isChecked);\n  const hierarchyOffset = getHierarchyOffset(col, row, table);\n  const cellStyle = table._getCellStyle(col, row) as CheckboxStyleOption; // to be fixed\n  const autoWrapText = cellStyle.autoWrapText ?? table.internalProps.autoWrapText;\n  const { lineClamp } = cellStyle;\n  const { checked, disable } = define;\n  if (isChecked === undefined || isChecked === null || typeof isChecked === 'function') {\n    //isChecked无效值 取全局设置的值\n    const globalChecked = getOrApply(checked as any, {\n      col,\n      row,\n      table,\n      context: null,\n      value,\n      dataValue\n    });\n    isChecked = table.stateManeger.syncCheckedState(col, row, define.field as string | number, globalChecked);\n  }\n  const globalDisable = getOrApply(disable as any, {\n    col,\n    row,\n    table,\n    context: null,\n    value,\n    dataValue\n  });\n\n  const autoColWidth = colWidth === 'auto';\n  const autoRowHeight = table.heightMode === 'autoHeight';\n\n  const attribute = {\n    text: text.length === 1 && !autoWrapText ? text[0] : text, // 单行(no-autoWrapText)为字符串，多行(autoWrapText)为字符串数组\n    maxLineWidth: autoColWidth ? Infinity : cellWidth - (padding[1] + padding[3] + hierarchyOffset),\n    // fill: true,\n    // textAlign: 'left',\n    textBaseline: 'top',\n    autoWrapText,\n    lineClamp,\n    wordBreak: 'break-word',\n    // widthLimit: autoColWidth ? -1 : colWidth - (padding[1] + padding[3]),\n    heightLimit: autoRowHeight ? -1 : cellHeight - (padding[0] + padding[2]),\n    pickable: false,\n    dx: hierarchyOffset\n  };\n  const testAttribute = cellTheme.text ? (Object.assign({}, cellTheme.text, attribute) as any) : attribute;\n  let checkbox;\n  if (isChecked === 'indeterminate') {\n    checkbox = new CheckBox({\n      x: 0,\n      y: 0,\n      text: testAttribute,\n      checked: undefined,\n      indeterminate: true,\n      disabled: isDisabled ?? globalDisable ?? false\n    });\n  } else {\n    checkbox = new CheckBox({\n      x: 0,\n      y: 0,\n      text: testAttribute,\n      checked: isChecked,\n      indeterminate: undefined,\n      disabled: isDisabled ?? globalDisable ?? false\n    });\n  }\n  checkbox.name = 'checkbox';\n\n  return checkbox;\n}\n"]}
+{"version":3,"sources":["scenegraph/group-creater/cell-type/checkbox-cell.ts"],"names":[],"mappings":"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","file":"checkbox-cell.js","sourcesContent":["import type { ILine, ISymbol, IThemeSpec } from '@visactor/vrender';\nimport { createLine, createSymbol } from '@visactor/vrender';\nimport { PointScale, LinearScale } from '@visactor/vscale';\nimport { isValid } from '../../../tools/util';\nimport { Group } from '../../graphic/group';\nimport type { CellInfo, CheckboxColumnDefine, CheckboxStyleOption, SparklineSpec } from '../../../ts-types';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { isObject } from '@visactor/vutils';\nimport { CheckBox } from '@visactor/vrender-components';\nimport { getHierarchyOffset } from '../../utils/get-hierarchy-offset';\nimport { getOrApply } from '../../../tools/helper';\nimport type { CheckboxStyle } from '../../../body-helper/style/CheckboxStyle';\nimport { getProp } from '../../utils/get-prop';\n\nexport function createCheckboxCellGroup(\n  cellGroup: Group | null,\n  columnGroup: Group,\n  xOrigin: number,\n  yOrigin: number,\n  col: number,\n  row: number,\n  colWidth: number | 'auto',\n  width: number,\n  height: number,\n  padding: number[],\n  textAlign: CanvasTextAlign,\n  textBaseline: CanvasTextBaseline,\n  table: BaseTableAPI,\n  cellTheme: IThemeSpec,\n  define: CheckboxColumnDefine\n) {\n  // cell\n  if (!cellGroup) {\n    cellGroup = new Group({\n      x: xOrigin,\n      y: yOrigin,\n      width,\n      height,\n\n      // 背景相关，cell背景由cellGroup绘制\n      lineWidth: cellTheme?.group?.lineWidth ?? undefined,\n      fill: cellTheme?.group?.fill ?? undefined,\n      stroke: cellTheme?.group?.stroke ?? undefined,\n\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\n  // checkbox\n  const checkboxComponent = createCheckbox(col, row, colWidth, width, height, padding, cellTheme, define, table);\n  if (checkboxComponent) {\n    cellGroup.appendChild(checkboxComponent);\n  }\n\n  checkboxComponent.render();\n\n  width -= padding[1] + padding[3];\n  height -= padding[0] + padding[2];\n  if (textAlign === 'center') {\n    checkboxComponent.setAttribute('x', padding[3] + (width - checkboxComponent.AABBBounds.width()) / 2);\n  } else if (textAlign === 'right') {\n    checkboxComponent.setAttribute('x', padding[3] + width - checkboxComponent.AABBBounds.width());\n  } else {\n    checkboxComponent.setAttribute('x', padding[3]);\n  }\n\n  if (textBaseline === 'middle') {\n    checkboxComponent.setAttribute('y', padding[0] + (height - checkboxComponent.AABBBounds.height()) / 2);\n  } else if (textBaseline === 'bottom') {\n    checkboxComponent.setAttribute('y', padding[0] + height - checkboxComponent.AABBBounds.height());\n  } else {\n    checkboxComponent.setAttribute('y', padding[0]);\n  }\n\n  return cellGroup;\n}\n\nfunction createCheckbox(\n  col: number,\n  row: number,\n  colWidth: number | 'auto',\n  cellWidth: number,\n  cellHeight: number,\n  padding: number[],\n  cellTheme: IThemeSpec,\n  define: CheckboxColumnDefine,\n  table: BaseTableAPI\n) {\n  const style = table._getCellStyle(col, row) as CheckboxStyle;\n  const size = getProp('size', style, col, row, table);\n  const spaceBetweenTextAndIcon = getProp('spaceBetweenTextAndIcon', style, col, row, table);\n\n  const value = table.getCellValue(col, row) as string | { text: string; checked: boolean; disable: boolean } | boolean;\n  const dataValue = table.getCellOriginValue(col, row);\n  let isChecked;\n  let isDisabled;\n  let text = (value as string) ?? '';\n  if (isObject(value)) {\n    isChecked = value.checked;\n    isDisabled = value.disable;\n    text = value.text;\n  } else if (typeof value === 'boolean') {\n    isChecked = value;\n    text = '';\n  }\n  isChecked = table.stateManeger.syncCheckedState(col, row, define.field as string | number, isChecked);\n  const hierarchyOffset = getHierarchyOffset(col, row, table);\n  const cellStyle = table._getCellStyle(col, row) as CheckboxStyleOption; // to be fixed\n  const autoWrapText = cellStyle.autoWrapText ?? table.internalProps.autoWrapText;\n  const { lineClamp } = cellStyle;\n  const { checked, disable } = define;\n  if (isChecked === undefined || isChecked === null || typeof isChecked === 'function') {\n    //isChecked无效值 取全局设置的值\n    const globalChecked = getOrApply(checked as any, {\n      col,\n      row,\n      table,\n      context: null,\n      value,\n      dataValue\n    });\n    isChecked = table.stateManeger.syncCheckedState(col, row, define.field as string | number, globalChecked);\n  }\n  const globalDisable = getOrApply(disable as any, {\n    col,\n    row,\n    table,\n    context: null,\n    value,\n    dataValue\n  });\n\n  const autoColWidth = colWidth === 'auto';\n  const autoRowHeight = table.heightMode === 'autoHeight';\n\n  const attribute = {\n    text: text.length === 1 && !autoWrapText ? text[0] : text, // 单行(no-autoWrapText)为字符串，多行(autoWrapText)为字符串数组\n    maxLineWidth: autoColWidth\n      ? Infinity\n      : cellWidth - (padding[1] + padding[3] + hierarchyOffset) - size - spaceBetweenTextAndIcon,\n    // fill: true,\n    // textAlign: 'left',\n    textBaseline: 'top',\n    autoWrapText,\n    lineClamp,\n    wordBreak: 'break-word',\n    // widthLimit: autoColWidth ? -1 : colWidth - (padding[1] + padding[3]),\n    heightLimit: autoRowHeight ? -1 : cellHeight - (padding[0] + padding[2]),\n    pickable: false,\n    dx: hierarchyOffset\n  };\n  const testAttribute = cellTheme.text ? (Object.assign({}, cellTheme.text, attribute) as any) : attribute;\n  let checkbox;\n  if (isChecked === 'indeterminate') {\n    checkbox = new CheckBox({\n      x: 0,\n      y: 0,\n      text: testAttribute,\n      icon: {\n        width: Math.floor(size / 1.4), // icon : box => 10 : 14\n        height: Math.floor(size / 1.4)\n      },\n      box: {\n        width: size,\n        height: size\n      },\n      spaceBetweenTextAndIcon,\n      checked: undefined,\n      indeterminate: true,\n      disabled: isDisabled ?? globalDisable ?? false\n    });\n  } else {\n    checkbox = new CheckBox({\n      x: 0,\n      y: 0,\n      text: testAttribute,\n      icon: {\n        width: Math.floor(size / 1.4), // icon : box => 10 : 14\n        height: Math.floor(size / 1.4)\n      },\n      box: {\n        width: size,\n        height: size\n      },\n      spaceBetweenTextAndIcon,\n      checked: isChecked,\n      indeterminate: undefined,\n      disabled: isDisabled ?? globalDisable ?? false\n    });\n  }\n  checkbox.name = 'checkbox';\n\n  return checkbox;\n}\n"]}

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

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

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_1 = require("@visactor/vrender"), vutils_1 = require("@visactor/vutils"), group_1 = require("../../graphic/group"), get_prop_1 = require("../../utils/get-prop"), text_icon_layout_1 = require("../../utils/text-icon-layout");
 
-function createCellGroup(table, columnGroup, xOrigin, yOrigin, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme) {
+function createCellGroup(table, value, columnGroup, xOrigin, yOrigin, col, row, colWidth, cellWidth, cellHeight, padding, textAlign, textBaseline, mayHaveIcon, customElementsGroup, renderDefault, cellTheme) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
     const headerStyle = table._getCellStyle(col, row), functionalPadding = (0, get_prop_1.getFunctionalProp)("padding", headerStyle, col, row, table);
     (0, vutils_1.isValid)(functionalPadding) && (padding = functionalPadding), (null === (_a = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _a ? void 0 : _a.textAlign) && (textAlign = null === (_b = null == cellTheme ? void 0 : cellTheme.text) || void 0 === _b ? void 0 : _b.textAlign), 
@@ -27,7 +27,7 @@ function createCellGroup(table, columnGroup, xOrigin, yOrigin, col, row, colWidt
     });
     if (cellGroup.role = "cell", cellGroup.col = col, cellGroup.row = row, null == columnGroup || columnGroup.addChild(cellGroup), 
     customElementsGroup && cellGroup.appendChild(customElementsGroup), renderDefault) {
-        const textStr = table.getCellValue(col, row);
+        const textStr = value;
         let icons;
         if (mayHaveIcon && (icons = table.getCellIcons(col, row)), (0, text_icon_layout_1.createCellContent)(cellGroup, icons, textStr, padding, autoColWidth, autoRowHeight, autoWrapText, "number" == typeof lineClamp ? lineClamp : void 0, cellWidth, cellHeight, textAlign, textBaseline, table, cellTheme), 
         null === (_t = null == cellTheme ? void 0 : cellTheme._vtable) || void 0 === _t ? void 0 : _t.marked) {