@visactor/vtable 0.18.0-alpha.0 → 0.18.0-alpha.2

package/cjs/scenegraph/graphic/contributions/rect-contribution-render.d.ts

@@ -1,5 +1,5 @@
-import type { IRect, IContext2d, IRectGraphicAttribute, IMarkAttribute, IGraphicAttribute, IThemeAttribute, IRectRenderContribution, IDrawContext } from '@visactor/vrender';
-import { BaseRenderContributionTime } from '@visactor/vrender';
+import type { IRect, IContext2d, IRectGraphicAttribute, IMarkAttribute, IGraphicAttribute, IThemeAttribute, IRectRenderContribution, IDrawContext } from './../../../vrender';
+import { BaseRenderContributionTime } from './../../../vrender';
 export declare class SplitRectBeforeRenderContribution implements IRectRenderContribution {
     time: BaseRenderContributionTime;
     useStyle: boolean;

package/cjs/scenegraph/graphic/contributions/rect-contribution-render.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.SplitRectAfterRenderContribution = exports.SplitRectBeforeRenderContribution = void 0;
 
-const vrender_1 = require("@visactor/vrender"), group_contribution_render_1 = require("./group-contribution-render");
+const vrender_1 = require("./../../../vrender"), group_contribution_render_1 = require("./group-contribution-render");
 
 let SplitRectBeforeRenderContribution = class {
     constructor() {
@@ -33,7 +33,7 @@ let SplitRectAfterRenderContribution = class {
     }
     drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
         const {width: width = rectAttribute.width, height: height = rectAttribute.height, stroke: stroke = rectAttribute.stroke, strokeArrayColor: strokeArrayColor = rectAttribute.strokeArrayColor, strokeArrayWidth: strokeArrayWidth = rectAttribute.strokeArrayWidth, lineWidth: lineWidth = rectAttribute.lineWidth, strokeColor: strokeColor = rectAttribute.stroke} = rect.attribute;
-        stroke && (Array.isArray(strokeArrayWidth) || 0 !== lineWidth) && (Array.isArray(stroke) || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) && (("number" == typeof lineWidth && 1 & lineWidth || Array.isArray(strokeArrayWidth) && strokeArrayWidth.some((width => 1 & width))) && (x = Math.floor(x) + .5, 
+        stroke && (Array.isArray(strokeArrayWidth) || 0 !== lineWidth) && (Array.isArray(stroke) || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) && ("border-rect" !== rect.name && "table-border-rect" !== rect.name && ("number" == typeof lineWidth && 1 & lineWidth || Array.isArray(strokeArrayWidth) && strokeArrayWidth.some((width => 1 & width))) && (x = Math.floor(x) + .5, 
         y = Math.floor(y) + .5), (0, group_contribution_render_1.renderStroke)(rect, context, x, y, rectAttribute, stroke, strokeArrayWidth || lineWidth, strokeArrayColor || strokeColor, Math.ceil(width), Math.ceil(height)));
     }
 };

package/cjs/scenegraph/graphic/contributions/rect-contribution-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/graphic/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import type {\n  IRect,\n  IContext2d,\n  IRectGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IRectRenderContribution,\n  IGroup,\n  IGroupGraphicAttribute,\n  IDrawContext\n} from '@visactor/vrender';\nimport { BaseRenderContributionTime, injectable } from '@visactor/vrender';\nimport { renderStroke } from './group-contribution-render';\n\n@injectable()\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    // const { stroke = rectAttribute.stroke } = group.attribute as any;\n\n    // if (Array.isArray(stroke)) {\n    //   doFillOrStroke.doStroke = false;\n    // }\n\n    const {\n      stroke = rectAttribute.stroke,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor\n    } = rect.attribute as any;\n\n    if (stroke && (Array.isArray(stroke) || Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor))) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class SplitRectAfterRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const {\n    //   width = rectAttribute.width,\n    //   height = rectAttribute.height,\n    //   stroke = rectAttribute.stroke\n    // } = group.attribute as any;\n\n    // if (!Array.isArray(stroke)) {\n    //   return;\n    // }\n\n    // context.setStrokeStyle(group, group.attribute, x, y, rectAttribute);\n    // // 单独处理每条边界，目前不考虑圆角\n    // context.beginPath();\n    // context.moveTo(x, y);\n    // // top\n    // if (stroke[0]) {\n    //   context.lineTo(x + width, y);\n    // } else {\n    //   context.moveTo(x + width, y);\n    // }\n    // // right\n    // if (stroke[1]) {\n    //   context.lineTo(x + width, y + height);\n    // } else {\n    //   context.moveTo(x + width, y + height);\n    // }\n    // // bottom\n    // if (stroke[2]) {\n    //   context.lineTo(x, y + height);\n    // } else {\n    //   context.moveTo(x, y + height);\n    // }\n    // // left\n    // if (stroke[3]) {\n    //   // 没有close path是，起点和终点不连续，需要调整y保证不出现缺口\n    //   const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;\n    //   context.lineTo(x, adjustY);\n    // } else {\n    //   context.moveTo(x, y);\n    // }\n\n    // context.stroke();\n\n    const {\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      // 基础border\n      stroke = rectAttribute.stroke,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n\n      lineWidth = rectAttribute.lineWidth,\n      strokeColor = rectAttribute.stroke\n      // // select & hover border\n      // highlightStroke = (rectAttribute as any).highlightStroke,\n      // highlightStrokeArrayColor = (rectAttribute as any).highlightStrokeArrayColor,\n      // highlightStrokeArrayWidth = (rectAttribute as any).highlightStrokeArrayWidth,\n      // highlightStrokeArrayPart = (rectAttribute as any).highlightStrokeArrayPart,\n    } = rect.attribute as any;\n\n    if (!stroke || (!Array.isArray(strokeArrayWidth) && lineWidth === 0)) {\n      return;\n    }\n\n    if (Array.isArray(stroke) || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {\n      // let dx = 0;\n      // let dy = 0;\n      if (\n        (typeof lineWidth === 'number' && lineWidth & 1) ||\n        (Array.isArray(strokeArrayWidth) && strokeArrayWidth.some(width => width & 1))\n      ) {\n        x = Math.floor(x) + 0.5;\n        y = Math.floor(y) + 0.5;\n      }\n      renderStroke(\n        rect as IGroup,\n        context,\n        x,\n        y,\n        rectAttribute as Required<IGroupGraphicAttribute>,\n        stroke,\n        strokeArrayWidth || lineWidth,\n        strokeArrayColor || strokeColor,\n        Math.ceil(width),\n        Math.ceil(height)\n      );\n    }\n  }\n}\n\n// 判断是否为整数，如果是整数，需要偏移0.5px\nfunction isInteger(num: number) {\n  return num % 1 === 0;\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/graphic/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import type {\n  IRect,\n  IContext2d,\n  IRectGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IRectRenderContribution,\n  IGroup,\n  IGroupGraphicAttribute,\n  IDrawContext\n} from './../../../vrender';\nimport { BaseRenderContributionTime, injectable } from './../../../vrender';\nimport { renderStroke } from './group-contribution-render';\n\n@injectable()\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    // const { stroke = rectAttribute.stroke } = group.attribute as any;\n\n    // if (Array.isArray(stroke)) {\n    //   doFillOrStroke.doStroke = false;\n    // }\n\n    const {\n      stroke = rectAttribute.stroke,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor\n    } = rect.attribute as any;\n\n    if (stroke && (Array.isArray(stroke) || Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor))) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class SplitRectAfterRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const {\n    //   width = rectAttribute.width,\n    //   height = rectAttribute.height,\n    //   stroke = rectAttribute.stroke\n    // } = group.attribute as any;\n\n    // if (!Array.isArray(stroke)) {\n    //   return;\n    // }\n\n    // context.setStrokeStyle(group, group.attribute, x, y, rectAttribute);\n    // // 单独处理每条边界，目前不考虑圆角\n    // context.beginPath();\n    // context.moveTo(x, y);\n    // // top\n    // if (stroke[0]) {\n    //   context.lineTo(x + width, y);\n    // } else {\n    //   context.moveTo(x + width, y);\n    // }\n    // // right\n    // if (stroke[1]) {\n    //   context.lineTo(x + width, y + height);\n    // } else {\n    //   context.moveTo(x + width, y + height);\n    // }\n    // // bottom\n    // if (stroke[2]) {\n    //   context.lineTo(x, y + height);\n    // } else {\n    //   context.moveTo(x, y + height);\n    // }\n    // // left\n    // if (stroke[3]) {\n    //   // 没有close path是，起点和终点不连续，需要调整y保证不出现缺口\n    //   const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;\n    //   context.lineTo(x, adjustY);\n    // } else {\n    //   context.moveTo(x, y);\n    // }\n\n    // context.stroke();\n\n    const {\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      // 基础border\n      stroke = rectAttribute.stroke,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n\n      lineWidth = rectAttribute.lineWidth,\n      strokeColor = rectAttribute.stroke\n      // // select & hover border\n      // highlightStroke = (rectAttribute as any).highlightStroke,\n      // highlightStrokeArrayColor = (rectAttribute as any).highlightStrokeArrayColor,\n      // highlightStrokeArrayWidth = (rectAttribute as any).highlightStrokeArrayWidth,\n      // highlightStrokeArrayPart = (rectAttribute as any).highlightStrokeArrayPart,\n    } = rect.attribute as any;\n\n    if (!stroke || (!Array.isArray(strokeArrayWidth) && lineWidth === 0)) {\n      return;\n    }\n\n    if (Array.isArray(stroke) || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {\n      // let dx = 0;\n      // let dy = 0;\n      if (\n        rect.name !== 'border-rect' && // border-rect not need offset\n        rect.name !== 'table-border-rect' && // table-border-rect not need offset\n        ((typeof lineWidth === 'number' && lineWidth & 1) ||\n          (Array.isArray(strokeArrayWidth) && strokeArrayWidth.some(width => width & 1)))\n      ) {\n        x = Math.floor(x) + 0.5;\n        y = Math.floor(y) + 0.5;\n      }\n      renderStroke(\n        rect as IGroup,\n        context,\n        x,\n        y,\n        rectAttribute,\n        stroke,\n        strokeArrayWidth || lineWidth,\n        strokeArrayColor || strokeColor,\n        Math.ceil(width),\n        Math.ceil(height)\n      );\n    }\n  }\n}\n\n// 判断是否为整数，如果是整数，需要偏移0.5px\nfunction isInteger(num: number) {\n  return num % 1 === 0;\n}\n"]}

package/cjs/scenegraph/graphic/group.d.ts

@@ -1,5 +1,5 @@
-import type { IRect, INode } from '@visactor/vrender';
-import { Group as VRenderGroup } from '@visactor/vrender';
+import type { IRect, INode } from './../../vrender';
+import { Group as VRenderGroup } from './../../vrender';
 import type { AABBBounds } from '@visactor/vutils';
 export declare class Group extends VRenderGroup {
     role?: string;
@@ -15,6 +15,8 @@ export declare class Group extends VRenderGroup {
     colHeight?: number;
     border?: IRect;
     needUpdate?: boolean;
+    needUpdateWidth?: boolean;
+    needUpdateHeight?: boolean;
     clear(): void;
     getChildByName(name: string, deep?: boolean): any;
     get width(): number;

package/cjs/scenegraph/graphic/group.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Group = void 0;
 
-const vrender_1 = require("@visactor/vrender");
+const vrender_1 = require("./../../vrender");
 
 class Group extends vrender_1.Group {
     clear() {
@@ -104,7 +104,9 @@ class Group extends vrender_1.Group {
             return this._AABBBounds.setValue(x, y, x + width, y + height), this.parent && this.parent.addChildUpdateBoundTag(), 
             this.clearUpdateBoundTag(), this._AABBBounds;
         }
-        return super.doUpdateAABBBounds();
+        return "body" === this.role || "row-header" === this.role || "col-header" === this.role || "right-frozen" === this.role || "bottom-frozen" === this.role || "corner-header" === this.role || "corner-right-top-header" === this.role || "corner-right-bottom-header" === this.role || "corner-left-bottom-header" === this.role ? (this._AABBBounds.setValue(-1 / 0, -1 / 0, 1 / 0, 1 / 0), 
+        this.parent && this.parent.addChildUpdateBoundTag(), this.clearUpdateBoundTag(), 
+        this._AABBBounds) : super.doUpdateAABBBounds();
     }
     updateColumnRowNumber(row) {
         this.rowNumber ? this.rowNumber = Math.max(this.rowNumber, row) : this.rowNumber = row;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/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      if (this.border.type === 'group') {\n        (this.border.firstChild as IRect).setAttribute(\n          'width',\n          (this.border.firstChild as IRect).attribute.width + deltaX\n        );\n      }\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      if (this.border.type === 'group') {\n        (this.border.firstChild as IRect).setAttribute(\n          'width',\n          (this.border.firstChild as IRect).attribute.height + deltaY\n        );\n      }\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.dirtyBounds) {\n    return;\n  }\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":["../src/scenegraph/graphic/group.ts"],"names":[],"mappings":"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","file":"group.js","sourcesContent":["import type { IGraphic, IColor, IRect, INode } from './../../vrender';\nimport { Group as VRenderGroup } from './../../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  needUpdateWidth?: boolean;\n  needUpdateHeight?: 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      if (this.border.type === 'group') {\n        (this.border.firstChild as IRect).setAttribute(\n          'width',\n          (this.border.firstChild as IRect).attribute.width + deltaX\n        );\n      }\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      if (this.border.type === 'group') {\n        (this.border.firstChild as IRect).setAttribute(\n          'width',\n          (this.border.firstChild as IRect).attribute.height + deltaY\n        );\n      }\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    } else if (\n      this.role === 'body' ||\n      this.role === 'row-header' ||\n      this.role === 'col-header' ||\n      this.role === 'right-frozen' ||\n      this.role === 'bottom-frozen' ||\n      this.role === 'corner-header' ||\n      this.role === 'corner-right-top-header' ||\n      this.role === 'corner-right-bottom-header' ||\n      this.role === 'corner-left-bottom-header'\n    ) {\n      // Infinity bounds for manual clip group\n      this._AABBBounds.setValue(-Infinity, -Infinity, Infinity, Infinity);\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.dirtyBounds) {\n    return;\n  }\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/graphic/icon.d.ts

@@ -1,5 +1,5 @@
-import type { IImageGraphicAttribute } from '@visactor/vrender';
-import { Image } from '@visactor/vrender';
+import type { IImageGraphicAttribute } from './../../vrender';
+import { Image } from './../../vrender';
 import type { IIconBase } from '../../ts-types';
 export interface IIconGraphicAttribute extends IImageGraphicAttribute {
     backgroundWidth?: number;

package/cjs/scenegraph/graphic/icon.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Icon = void 0;
 
-const vrender_1 = require("@visactor/vrender");
+const vrender_1 = require("./../../vrender");
 
 class Icon extends vrender_1.Image {
     constructor(params) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/graphic/icon.ts"],"names":[],"mappings":";;;AACA,+CAA0C;AAkB1C,MAAa,IAAK,SAAQ,eAAK;IAM7B,YAAY,MAA6B;QACvC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,KAAK,iBAAiB,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,KAAK,YAAY,EAAE;YACnG,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC;SAC5B;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;SACnD;IAMH,CAAC;IAED,IAAI,eAAe;;QACjB,OAAO,MAAA,MAAA,IAAI,CAAC,SAAS,CAAC,eAAe,mCAAI,IAAI,CAAC,SAAS,CAAC,KAAK,mCAAI,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,gBAAgB;;QAClB,OAAO,MAAA,MAAA,IAAI,CAAC,SAAS,CAAC,gBAAgB,mCAAI,IAAI,CAAC,SAAS,CAAC,MAAM,mCAAI,CAAC,CAAC;IACvE,CAAC;CAaF;AA1CD,oBA0CC","file":"icon.js","sourcesContent":["import type { IImageGraphicAttribute } from '@visactor/vrender';\nimport { Image } from '@visactor/vrender';\nimport type { IIconBase } from '../../ts-types';\n\nexport interface IIconGraphicAttribute extends IImageGraphicAttribute {\n  backgroundWidth?: number;\n  backgroundHeight?: number;\n  backgroundColor?: string;\n  visibleTime?: string;\n  funcType?: string;\n  hoverImage?: string | HTMLImageElement | HTMLCanvasElement;\n  originImage?: string | HTMLImageElement | HTMLCanvasElement;\n  // margin?: [number, number, number, number];\n  marginLeft?: number;\n  marginRight?: number;\n  shape?: 'circle' | 'square';\n  interactive?: boolean;\n}\n\nexport class Icon extends Image {\n  declare attribute: IIconGraphicAttribute;\n  role?: string;\n  tooltip?: IIconBase['tooltip'];\n\n  // eslint-disable-next-line no-useless-constructor\n  constructor(params: IIconGraphicAttribute) {\n    super(params);\n\n    if (this.attribute.visibleTime === 'mouseenter_cell' || this.attribute.visibleTime === 'click_cell') {\n      this.attribute.opacity = 0;\n    }\n\n    if (this.attribute.hoverImage) {\n      this.attribute.originImage = this.attribute.image;\n    }\n\n    // if (this.attribute.margin) {\n    //   this.attribute.boundsPadding = this.attribute.margin;\n    //   this.attribute.dx = this.attribute.margin[3] ?? 0;\n    // }\n  }\n\n  get backgroundWidth(): number {\n    return this.attribute.backgroundWidth ?? this.attribute.width ?? 0;\n  }\n\n  get backgroundHeight(): number {\n    return this.attribute.backgroundHeight ?? this.attribute.height ?? 0;\n  }\n\n  // protected tryUpdateAABBBounds() {\n  //   super.tryUpdateAABBBounds();\n  //   // 扩大范围\n  //   const { width, height } = this.attribute;\n  //   const { backgroundWidth = width, backgroundHeight = height } = this.attribute;\n  //   const expandX = (backgroundWidth - width) / 2;\n  //   const expandY = (backgroundHeight - height) / 2;\n  //   this._AABBBounds.expand([expandY, expandX, expandY, expandX]);\n\n  //   return this._AABBBounds;\n  // }\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/graphic/icon.ts"],"names":[],"mappings":";;;AACA,6CAAwC;AAkBxC,MAAa,IAAK,SAAQ,eAAK;IAM7B,YAAY,MAA6B;QACvC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,KAAK,iBAAiB,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,KAAK,YAAY,EAAE;YACnG,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC;SAC5B;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE;YAC7B,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;SACnD;IAMH,CAAC;IAED,IAAI,eAAe;;QACjB,OAAO,MAAA,MAAA,IAAI,CAAC,SAAS,CAAC,eAAe,mCAAI,IAAI,CAAC,SAAS,CAAC,KAAK,mCAAI,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,gBAAgB;;QAClB,OAAO,MAAA,MAAA,IAAI,CAAC,SAAS,CAAC,gBAAgB,mCAAI,IAAI,CAAC,SAAS,CAAC,MAAM,mCAAI,CAAC,CAAC;IACvE,CAAC;CAaF;AA1CD,oBA0CC","file":"icon.js","sourcesContent":["import type { IImageGraphicAttribute } from './../../vrender';\nimport { Image } from './../../vrender';\nimport type { IIconBase } from '../../ts-types';\n\nexport interface IIconGraphicAttribute extends IImageGraphicAttribute {\n  backgroundWidth?: number;\n  backgroundHeight?: number;\n  backgroundColor?: string;\n  visibleTime?: string;\n  funcType?: string;\n  hoverImage?: string | HTMLImageElement | HTMLCanvasElement;\n  originImage?: string | HTMLImageElement | HTMLCanvasElement;\n  // margin?: [number, number, number, number];\n  marginLeft?: number;\n  marginRight?: number;\n  shape?: 'circle' | 'square';\n  interactive?: boolean;\n}\n\nexport class Icon extends Image {\n  declare attribute: IIconGraphicAttribute;\n  role?: string;\n  tooltip?: IIconBase['tooltip'];\n\n  // eslint-disable-next-line no-useless-constructor\n  constructor(params: IIconGraphicAttribute) {\n    super(params);\n\n    if (this.attribute.visibleTime === 'mouseenter_cell' || this.attribute.visibleTime === 'click_cell') {\n      this.attribute.opacity = 0;\n    }\n\n    if (this.attribute.hoverImage) {\n      this.attribute.originImage = this.attribute.image;\n    }\n\n    // if (this.attribute.margin) {\n    //   this.attribute.boundsPadding = this.attribute.margin;\n    //   this.attribute.dx = this.attribute.margin[3] ?? 0;\n    // }\n  }\n\n  get backgroundWidth(): number {\n    return this.attribute.backgroundWidth ?? this.attribute.width ?? 0;\n  }\n\n  get backgroundHeight(): number {\n    return this.attribute.backgroundHeight ?? this.attribute.height ?? 0;\n  }\n\n  // protected tryUpdateAABBBounds() {\n  //   super.tryUpdateAABBBounds();\n  //   // 扩大范围\n  //   const { width, height } = this.attribute;\n  //   const { backgroundWidth = width, backgroundHeight = height } = this.attribute;\n  //   const expandX = (backgroundWidth - width) / 2;\n  //   const expandY = (backgroundHeight - height) / 2;\n  //   this._AABBBounds.expand([expandY, expandX, expandY, expandX]);\n\n  //   return this._AABBBounds;\n  // }\n}\n"]}

package/cjs/scenegraph/graphic/text.d.ts

@@ -1,2 +1,2 @@
-export type { ITextGraphicAttribute, IWrapTextGraphicAttribute } from '@visactor/vrender';
-export { WrapText } from '@visactor/vrender';
+export type { ITextGraphicAttribute, IWrapTextGraphicAttribute } from './../../vrender';
+export { Text as WrapText } from './../../vrender';

package/cjs/scenegraph/graphic/text.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.WrapText = void 0;
 
-var vrender_1 = require("@visactor/vrender");
+var vrender_1 = require("./../../vrender");
 
 Object.defineProperty(exports, "WrapText", {
     enumerable: !0,
     get: function() {
-        return vrender_1.WrapText;
+        return vrender_1.Text;
     }
 });
 //# sourceMappingURL=text.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/graphic/text.ts"],"names":[],"mappings":";;;AACA,6CAA6C;AAApC,mGAAA,QAAQ,OAAA","file":"text.js","sourcesContent":["export type { ITextGraphicAttribute, IWrapTextGraphicAttribute } from '@visactor/vrender';\nexport { WrapText } from '@visactor/vrender';\n// import { getTheme, graphicUtil, Text, CanvasTextLayout, textDrawOffsetX, textLayoutOffsetY } from '@visactor/vrender';\n// import type { Bounds } from '@visactor/vutils';\n// import { textMeasure } from '../utils/measure-text';\n\n/* WrapText功能/dist/core/contributions/textMeasure/layout\n * 1. 按照宽度限制自动折行或显示省略号\n * 2. 高度限制控制显示内容及省略号\n */\n\n// const WRAP_TEXT_UPDATE_TAG_KEY = ['heightLimit', 'lineClamp', 'autoWrapText'];\n\n// export interface IWrapTextGraphicAttribute extends ITextGraphicAttribute {\n//   // widthLimit: number;\n//   heightLimit?: number;\n//   lineClamp?: number;\n//   autoWrapText?: boolean;\n// }\n// export class WrapText extends Text {\n//   declare attribute: IWrapTextGraphicAttribute;\n\n//   // eslint-disable-next-line no-useless-constructor\n//   constructor(params: IWrapTextGraphicAttribute) {\n//     super(params);\n//   }\n\n//   /**\n//    * 计算单行文字的bounds，可以缓存长度以及截取的文字\n//    * @param text\n//    */\n//   updateSingallineAABBBounds(text: number | string) {\n//     const textTheme = getTheme(this).text;\n//     // const textMeasure = graphicUtil.textMeasure;\n//     let width: number;\n//     let str: string;\n//     const attribute = this.attribute;\n//     const {\n//       maxLineWidth = textTheme.maxLineWidth,\n//       ellipsis = textTheme.ellipsis,\n//       textAlign = textTheme.textAlign,\n//       textBaseline = textTheme.textBaseline,\n//       fontSize = textTheme.fontSize,\n//       fontFamily = textTheme.fontFamily,\n//       fontWeight = textTheme.fontWeight,\n//       stroke = textTheme.stroke,\n//       lineHeight = attribute.lineHeight ?? attribute.fontSize ?? textTheme.fontSize,\n//       lineWidth = textTheme.lineWidth\n//     } = attribute;\n\n//     if (!this.shouldUpdateShape() && this.cache) {\n//       width = this.cache.clipedWidth;\n//       const dx = textDrawOffsetX(textAlign, width);\n//       const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n//       this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\n//       if (stroke) {\n//         this._AABBBounds.expand(lineWidth / 2);\n//       }\n//       return this._AABBBounds;\n//     }\n\n//     if (Number.isFinite(maxLineWidth)) {\n//       if (ellipsis) {\n//         const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis) as string;\n//         const data = textMeasure.clipTextWithSuffix(\n//           text.toString(),\n//           { fontSize, fontFamily },\n//           maxLineWidth,\n//           strEllipsis\n//         );\n//         str = data.str;\n//         width = data.width;\n//       } else {\n//         const data = textMeasure.clipText(text.toString(), { fontSize, fontFamily }, maxLineWidth);\n//         str = data.str;\n//         width = data.width;\n//       }\n//       this.cache.clipedText = str;\n//       this.cache.clipedWidth = width;\n//       // todo 计算原本的宽度\n//     } else {\n//       width = textMeasure.measureTextWidth(text.toString(), { fontSize, fontFamily, fontWeight });\n//       this.cache.clipedText = text.toString();\n//       this.cache.clipedWidth = width;\n//     }\n//     this.clearUpdateShapeTag();\n\n//     const dx = textDrawOffsetX(textAlign, width);\n//     const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n//     this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\n\n//     if (stroke) {\n//       this._AABBBounds.expand(lineWidth / 2);\n//     }\n\n//     return this._AABBBounds;\n//   }\n\n//   /**\n//    * 计算多行文字的bounds，缓存每行文字的布局位置\n//    * 自动折行params.text是数组，因此只重新updateMultilineAABBBounds\n//    * @param text\n//    */\n//   updateMultilineAABBBounds(text: (number | string)[]) {\n//     const textTheme = getTheme(this).text;\n//     const {\n//       fontFamily = textTheme.fontFamily,\n//       textAlign = textTheme.textAlign,\n//       fontWeight = textTheme.fontWeight,\n//       textBaseline = textTheme.textBaseline,\n//       fontSize = textTheme.fontSize,\n//       lineHeight = this.attribute.lineHeight ?? this.attribute.fontSize ?? textTheme.fontSize,\n//       ellipsis = textTheme.ellipsis,\n//       maxLineWidth,\n//       stroke = textTheme.stroke,\n//       lineWidth = textTheme.lineWidth,\n//       // widthLimit,\n//       heightLimit = -1,\n//       lineClamp = (textTheme as any).lineClamp,\n//       autoWrapText = (textTheme as any).autoWrapText\n//     } = this.attribute;\n\n//     if (!this.shouldUpdateShape() && this.cache?.layoutData) {\n//       const bbox = this.cache.layoutData.bbox;\n//       this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n//       if (stroke) {\n//         this._AABBBounds.expand(lineWidth / 2);\n//       }\n//       return this._AABBBounds;\n//     }\n\n//     // const textMeasure = graphicUtil.textMeasure;\n//     const layoutObj = new CanvasTextLayout(fontFamily, { fontSize, fontFamily }, textMeasure as any) as any;\n\n//     // layoutObj内逻辑\n//     const lines = text.map(l => l.toString()) as string[];\n//     const linesLayout: LayoutItemType[] = [];\n//     const bboxWH: [number, number] = [0, 0];\n\n//     let lineCountLimit = Infinity;\n//     if (heightLimit > 0) {\n//       lineCountLimit = Math.max(Math.floor(heightLimit / lineHeight), 1);\n//     }\n//     if (lineClamp) {\n//       // 处理行数限制\n//       lineCountLimit = Math.min(lineCountLimit, lineClamp);\n//     }\n\n//     if (!autoWrapText) {\n//       // 使用所有行中最长的作为lineWidth\n//       let lineWidth = 0;\n//       for (let i = 0, len = lines.length; i < len; i++) {\n//         // 判断是否超过高度限制\n//         if (i < lineCountLimit) {\n//           // 当前行为最后一行\n//           const clip = layoutObj.textMeasure.clipTextWithSuffix(\n//             lines[i],\n//             layoutObj.textOptions,\n//             maxLineWidth,\n//             ellipsis\n//           );\n//           linesLayout.push({\n//             str: clip.str,\n//             width: clip.width\n//           });\n//           lineWidth = Math.max(lineWidth, clip.width);\n//         }\n//       }\n//       bboxWH[0] = lineWidth;\n//     } else if (typeof maxLineWidth === 'number' && maxLineWidth !== Infinity) {\n//       // widthLimit > 0\n//       if (maxLineWidth > 0) {\n//         for (let i = 0; i < lines.length; i++) {\n//           const str = lines[i] as string;\n//           // // 测量当前行宽度\n//           // width = Math.min(\n//           //   layoutObj.textMeasure.measureTextWidth(str, layoutObj.textOptions),\n//           //   maxLineWidth\n//           // );\n\n//           // 判断是否超过高度限制\n//           if (i === lineCountLimit - 1) {\n//             // 当前行为最后一行\n//             const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);\n//             linesLayout.push({\n//               str: clip.str,\n//               width: clip.width\n//             });\n//             break; // 不处理后续行\n//           }\n\n//           // 测量截断位置\n//           const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth);\n//           if (str !== '' && clip.str === '') {\n//             // 宽度限制不足一个字符，至少截取一个字符\n//             clip.str = str.substring(0, 1);\n//             clip.width = textMeasure.measureTextWidth(clip.str, { fontSize, fontFamily, fontWeight });\n//           }\n\n//           linesLayout.push({\n//             str: clip.str,\n//             width: clip.width\n//           });\n//           if (clip.str.length === str.length) {\n//             // 不需要截断\n//           } else {\n//             const newStr = str.substring(clip.str.length);\n//             lines.splice(i + 1, 0, newStr);\n//           }\n//         }\n//       }\n//       // bboxWH[0] = maxLineWidth;\n//       let maxWidth = 0;\n//       linesLayout.forEach(layout => {\n//         maxWidth = Math.max(maxWidth, layout.width);\n//       });\n//       bboxWH[0] = maxWidth;\n//     } else {\n//       // 使用所有行中最长的作为lineWidth\n//       let lineWidth = 0;\n//       let width: number;\n//       let text: string;\n//       for (let i = 0, len = lines.length; i < len; i++) {\n//         // 判断是否超过高度限制\n//         if (i === lineCountLimit - 1) {\n//           // 当前行为最后一行\n//           const clip = layoutObj.textMeasure.clipTextWithSuffix(\n//             lines[i],\n//             layoutObj.textOptions,\n//             maxLineWidth,\n//             ellipsis\n//           );\n//           linesLayout.push({\n//             str: clip.str,\n//             width: clip.width\n//           });\n//           lineWidth = Math.max(lineWidth, clip.width);\n//           break; // 不处理后续行\n//         }\n\n//         text = lines[i] as string;\n//         width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions);\n//         lineWidth = Math.max(lineWidth, width);\n//         linesLayout.push({ str: text, width });\n//       }\n//       bboxWH[0] = lineWidth;\n//     }\n//     bboxWH[1] = linesLayout.length * lineHeight;\n\n//     const bbox = {\n//       xOffset: 0,\n//       yOffset: 0,\n//       width: bboxWH[0],\n//       height: bboxWH[1]\n//     };\n\n//     layoutObj.LayoutBBox(bbox, textAlign, textBaseline as any);\n\n//     const layoutData = layoutObj.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline as any, lineHeight);\n\n//     // const layoutData = layoutObj.GetLayoutByLines(\n//     //   text,\n//     //   textAlign,\n//     //   textBaseline as any,\n//     //   lineHeight,\n//     //   ellipsis === true ? (DefaultTextAttribute.ellipsis as string) : ellipsis || undefined,\n//     //   maxLineWidth\n//     // );\n//     // const { bbox } = layoutData;\n//     this.cache.layoutData = layoutData;\n//     this.clearUpdateShapeTag();\n//     this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n\n//     if (stroke) {\n//       this._AABBBounds.expand(lineWidth / 2);\n//     }\n\n//     return this._AABBBounds;\n//   }\n\n//   needUpdateTags(keys: string[]): boolean {\n//     for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n//       const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n//       if (keys.indexOf(attrKey) !== -1) {\n//         return true;\n//       }\n//     }\n//     return super.needUpdateTags(keys);\n//   }\n//   needUpdateTag(key: string): boolean {\n//     for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n//       const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n//       if (key === attrKey) {\n//         return true;\n//       }\n//     }\n//     return super.needUpdateTag(key);\n//   }\n// }\n"]}
+{"version":3,"sources":["../src/scenegraph/graphic/text.ts"],"names":[],"mappings":";;;AACA,2CAAmD;AAA1C,mGAAA,IAAI,OAAY","file":"text.js","sourcesContent":["export type { ITextGraphicAttribute, IWrapTextGraphicAttribute } from './../../vrender';\nexport { Text as WrapText } from './../../vrender';\n// import { getTheme, graphicUtil, Text, CanvasTextLayout, textDrawOffsetX, textLayoutOffsetY } from '@src/vrender';\n// import type { Bounds } from '@visactor/vutils';\n// import { textMeasure } from '../utils/measure-text';\n\n/* WrapText功能/dist/core/contributions/textMeasure/layout\n * 1. 按照宽度限制自动折行或显示省略号\n * 2. 高度限制控制显示内容及省略号\n */\n\n// const WRAP_TEXT_UPDATE_TAG_KEY = ['heightLimit', 'lineClamp', 'autoWrapText'];\n\n// export interface IWrapTextGraphicAttribute extends ITextGraphicAttribute {\n//   // widthLimit: number;\n//   heightLimit?: number;\n//   lineClamp?: number;\n//   autoWrapText?: boolean;\n// }\n// export class WrapText extends Text {\n//   declare attribute: IWrapTextGraphicAttribute;\n\n//   // eslint-disable-next-line no-useless-constructor\n//   constructor(params: IWrapTextGraphicAttribute) {\n//     super(params);\n//   }\n\n//   /**\n//    * 计算单行文字的bounds，可以缓存长度以及截取的文字\n//    * @param text\n//    */\n//   updateSingallineAABBBounds(text: number | string) {\n//     const textTheme = getTheme(this).text;\n//     // const textMeasure = graphicUtil.textMeasure;\n//     let width: number;\n//     let str: string;\n//     const attribute = this.attribute;\n//     const {\n//       maxLineWidth = textTheme.maxLineWidth,\n//       ellipsis = textTheme.ellipsis,\n//       textAlign = textTheme.textAlign,\n//       textBaseline = textTheme.textBaseline,\n//       fontSize = textTheme.fontSize,\n//       fontFamily = textTheme.fontFamily,\n//       fontWeight = textTheme.fontWeight,\n//       stroke = textTheme.stroke,\n//       lineHeight = attribute.lineHeight ?? attribute.fontSize ?? textTheme.fontSize,\n//       lineWidth = textTheme.lineWidth\n//     } = attribute;\n\n//     if (!this.shouldUpdateShape() && this.cache) {\n//       width = this.cache.clipedWidth;\n//       const dx = textDrawOffsetX(textAlign, width);\n//       const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n//       this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\n//       if (stroke) {\n//         this._AABBBounds.expand(lineWidth / 2);\n//       }\n//       return this._AABBBounds;\n//     }\n\n//     if (Number.isFinite(maxLineWidth)) {\n//       if (ellipsis) {\n//         const strEllipsis = (ellipsis === true ? textTheme.ellipsis : ellipsis) as string;\n//         const data = textMeasure.clipTextWithSuffix(\n//           text.toString(),\n//           { fontSize, fontFamily },\n//           maxLineWidth,\n//           strEllipsis\n//         );\n//         str = data.str;\n//         width = data.width;\n//       } else {\n//         const data = textMeasure.clipText(text.toString(), { fontSize, fontFamily }, maxLineWidth);\n//         str = data.str;\n//         width = data.width;\n//       }\n//       this.cache.clipedText = str;\n//       this.cache.clipedWidth = width;\n//       // todo 计算原本的宽度\n//     } else {\n//       width = textMeasure.measureTextWidth(text.toString(), { fontSize, fontFamily, fontWeight });\n//       this.cache.clipedText = text.toString();\n//       this.cache.clipedWidth = width;\n//     }\n//     this.clearUpdateShapeTag();\n\n//     const dx = textDrawOffsetX(textAlign, width);\n//     const dy = textLayoutOffsetY(textBaseline, lineHeight, fontSize);\n//     this._AABBBounds.set(dx, dy, dx + width, dy + lineHeight);\n\n//     if (stroke) {\n//       this._AABBBounds.expand(lineWidth / 2);\n//     }\n\n//     return this._AABBBounds;\n//   }\n\n//   /**\n//    * 计算多行文字的bounds，缓存每行文字的布局位置\n//    * 自动折行params.text是数组，因此只重新updateMultilineAABBBounds\n//    * @param text\n//    */\n//   updateMultilineAABBBounds(text: (number | string)[]) {\n//     const textTheme = getTheme(this).text;\n//     const {\n//       fontFamily = textTheme.fontFamily,\n//       textAlign = textTheme.textAlign,\n//       fontWeight = textTheme.fontWeight,\n//       textBaseline = textTheme.textBaseline,\n//       fontSize = textTheme.fontSize,\n//       lineHeight = this.attribute.lineHeight ?? this.attribute.fontSize ?? textTheme.fontSize,\n//       ellipsis = textTheme.ellipsis,\n//       maxLineWidth,\n//       stroke = textTheme.stroke,\n//       lineWidth = textTheme.lineWidth,\n//       // widthLimit,\n//       heightLimit = -1,\n//       lineClamp = (textTheme as any).lineClamp,\n//       autoWrapText = (textTheme as any).autoWrapText\n//     } = this.attribute;\n\n//     if (!this.shouldUpdateShape() && this.cache?.layoutData) {\n//       const bbox = this.cache.layoutData.bbox;\n//       this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n//       if (stroke) {\n//         this._AABBBounds.expand(lineWidth / 2);\n//       }\n//       return this._AABBBounds;\n//     }\n\n//     // const textMeasure = graphicUtil.textMeasure;\n//     const layoutObj = new CanvasTextLayout(fontFamily, { fontSize, fontFamily }, textMeasure as any) as any;\n\n//     // layoutObj内逻辑\n//     const lines = text.map(l => l.toString()) as string[];\n//     const linesLayout: LayoutItemType[] = [];\n//     const bboxWH: [number, number] = [0, 0];\n\n//     let lineCountLimit = Infinity;\n//     if (heightLimit > 0) {\n//       lineCountLimit = Math.max(Math.floor(heightLimit / lineHeight), 1);\n//     }\n//     if (lineClamp) {\n//       // 处理行数限制\n//       lineCountLimit = Math.min(lineCountLimit, lineClamp);\n//     }\n\n//     if (!autoWrapText) {\n//       // 使用所有行中最长的作为lineWidth\n//       let lineWidth = 0;\n//       for (let i = 0, len = lines.length; i < len; i++) {\n//         // 判断是否超过高度限制\n//         if (i < lineCountLimit) {\n//           // 当前行为最后一行\n//           const clip = layoutObj.textMeasure.clipTextWithSuffix(\n//             lines[i],\n//             layoutObj.textOptions,\n//             maxLineWidth,\n//             ellipsis\n//           );\n//           linesLayout.push({\n//             str: clip.str,\n//             width: clip.width\n//           });\n//           lineWidth = Math.max(lineWidth, clip.width);\n//         }\n//       }\n//       bboxWH[0] = lineWidth;\n//     } else if (typeof maxLineWidth === 'number' && maxLineWidth !== Infinity) {\n//       // widthLimit > 0\n//       if (maxLineWidth > 0) {\n//         for (let i = 0; i < lines.length; i++) {\n//           const str = lines[i] as string;\n//           // // 测量当前行宽度\n//           // width = Math.min(\n//           //   layoutObj.textMeasure.measureTextWidth(str, layoutObj.textOptions),\n//           //   maxLineWidth\n//           // );\n\n//           // 判断是否超过高度限制\n//           if (i === lineCountLimit - 1) {\n//             // 当前行为最后一行\n//             const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);\n//             linesLayout.push({\n//               str: clip.str,\n//               width: clip.width\n//             });\n//             break; // 不处理后续行\n//           }\n\n//           // 测量截断位置\n//           const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth);\n//           if (str !== '' && clip.str === '') {\n//             // 宽度限制不足一个字符，至少截取一个字符\n//             clip.str = str.substring(0, 1);\n//             clip.width = textMeasure.measureTextWidth(clip.str, { fontSize, fontFamily, fontWeight });\n//           }\n\n//           linesLayout.push({\n//             str: clip.str,\n//             width: clip.width\n//           });\n//           if (clip.str.length === str.length) {\n//             // 不需要截断\n//           } else {\n//             const newStr = str.substring(clip.str.length);\n//             lines.splice(i + 1, 0, newStr);\n//           }\n//         }\n//       }\n//       // bboxWH[0] = maxLineWidth;\n//       let maxWidth = 0;\n//       linesLayout.forEach(layout => {\n//         maxWidth = Math.max(maxWidth, layout.width);\n//       });\n//       bboxWH[0] = maxWidth;\n//     } else {\n//       // 使用所有行中最长的作为lineWidth\n//       let lineWidth = 0;\n//       let width: number;\n//       let text: string;\n//       for (let i = 0, len = lines.length; i < len; i++) {\n//         // 判断是否超过高度限制\n//         if (i === lineCountLimit - 1) {\n//           // 当前行为最后一行\n//           const clip = layoutObj.textMeasure.clipTextWithSuffix(\n//             lines[i],\n//             layoutObj.textOptions,\n//             maxLineWidth,\n//             ellipsis\n//           );\n//           linesLayout.push({\n//             str: clip.str,\n//             width: clip.width\n//           });\n//           lineWidth = Math.max(lineWidth, clip.width);\n//           break; // 不处理后续行\n//         }\n\n//         text = lines[i] as string;\n//         width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions);\n//         lineWidth = Math.max(lineWidth, width);\n//         linesLayout.push({ str: text, width });\n//       }\n//       bboxWH[0] = lineWidth;\n//     }\n//     bboxWH[1] = linesLayout.length * lineHeight;\n\n//     const bbox = {\n//       xOffset: 0,\n//       yOffset: 0,\n//       width: bboxWH[0],\n//       height: bboxWH[1]\n//     };\n\n//     layoutObj.LayoutBBox(bbox, textAlign, textBaseline as any);\n\n//     const layoutData = layoutObj.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline as any, lineHeight);\n\n//     // const layoutData = layoutObj.GetLayoutByLines(\n//     //   text,\n//     //   textAlign,\n//     //   textBaseline as any,\n//     //   lineHeight,\n//     //   ellipsis === true ? (DefaultTextAttribute.ellipsis as string) : ellipsis || undefined,\n//     //   maxLineWidth\n//     // );\n//     // const { bbox } = layoutData;\n//     this.cache.layoutData = layoutData;\n//     this.clearUpdateShapeTag();\n//     this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n\n//     if (stroke) {\n//       this._AABBBounds.expand(lineWidth / 2);\n//     }\n\n//     return this._AABBBounds;\n//   }\n\n//   needUpdateTags(keys: string[]): boolean {\n//     for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n//       const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n//       if (keys.indexOf(attrKey) !== -1) {\n//         return true;\n//       }\n//     }\n//     return super.needUpdateTags(keys);\n//   }\n//   needUpdateTag(key: string): boolean {\n//     for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n//       const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n//       if (key === attrKey) {\n//         return true;\n//       }\n//     }\n//     return super.needUpdateTag(key);\n//   }\n// }\n"]}

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

@@ -1,4 +1,4 @@
-import type { IThemeSpec } from '@visactor/vrender';
+import type { IThemeSpec } from './../../vrender';
 import type { ColumnDefine, ColumnTypeOption } from '../../ts-types';
 import type { Group } from '../graphic/group';
 import type { BaseTableAPI } from '../../ts-types/base-table';

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

@@ -48,10 +48,10 @@ function createCell(type, value, define, table, col, row, colWidth, cellWidth, c
             fill: !1,
             stroke: !1
         }), cellGroup.clear()) : table.internalProps.layoutMap.isAxisCell(col, row) && cellGroup.clear();
-    } 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) {
+    } else if ("image" === type) cellGroup = (0, image_cell_1.createImageCellGroup)(columnGroup, 0, y, col, row, cellWidth, cellHeight, define.keepAspectRatio, define.imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme); else if ("video" === type) cellGroup = (0, 
+    video_cell_1.createVideoCellGroup)(columnGroup, 0, y, col, row, cellWidth, cellHeight, 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, 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);
+        cellGroup = (0, chart_cell_1.createChartCellGroup)(null, columnGroup, 0, y, col, row, cellWidth, cellHeight, 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), 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);
@@ -63,13 +63,14 @@ function createCell(type, value, define, table, col, row, colWidth, cellWidth, c
 }
 
 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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
     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) || table.internalProps.customMergeCell) && (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)) {
+    if (cellTheme.group.cornerRadius = (0, tableHelper_1.getCellCornerRadius)(col, row, table), 
+    !addNew && !isMerge && canUseFastUpdate(col, row, oldCellGroup, autoWrapText, table)) {
         const cellWidth = table.getColWidth(col), cellHeight = table.getRowHeight(row);
         oldCellGroup.setAttributes({
             width: cellWidth,
@@ -79,13 +80,15 @@ function updateCell(col, row, table, addNew) {
             stroke: null !== (_g = null === (_f = null == cellTheme ? void 0 : cellTheme.group) || void 0 === _f ? void 0 : _f.stroke) && void 0 !== _g ? _g : void 0,
             strokeArrayWidth: null !== (_j = null === (_h = null == cellTheme ? void 0 : cellTheme.group) || void 0 === _h ? void 0 : _h.strokeArrayWidth) && void 0 !== _j ? _j : void 0,
             strokeArrayColor: null !== (_l = null === (_k = null == cellTheme ? void 0 : cellTheme.group) || void 0 === _k ? void 0 : _k.strokeArrayColor) && void 0 !== _l ? _l : void 0,
-            cursor: null !== (_o = null === (_m = null == cellTheme ? void 0 : cellTheme.group) || void 0 === _m ? void 0 : _m.cursor) && void 0 !== _o ? _o : void 0
+            cursor: null !== (_o = null === (_m = null == cellTheme ? void 0 : cellTheme.group) || void 0 === _m ? void 0 : _m.cursor) && void 0 !== _o ? _o : void 0,
+            cornerRadius: null !== (_q = null === (_p = null == cellTheme ? void 0 : cellTheme.group) || void 0 === _p ? void 0 : _p.cornerRadius) && void 0 !== _q ? _q : 0,
+            y: table.scenegraph.getCellGroupY(row)
         });
         const textMark = oldCellGroup.getChildByName("text");
         if (textMark) {
             const text = table.getCellValue(col, row), textArr = (0, util_1.convertInternal)(text).replace(/\r?\n/g, "\n").replace(/\r/g, "\n").split("\n"), hierarchyOffset = (0, 
-            get_hierarchy_offset_1.getHierarchyOffset)(col, row, table), lineClamp = cellStyle.lineClamp, padding = null !== (_p = (0, 
-            padding_1.getQuadProps)((0, get_prop_1.getProp)("padding", cellStyle, col, row, table))) && void 0 !== _p ? _p : [ 0, 0, 0, 0 ], textAlign = cellTheme.text.textAlign;
+            get_hierarchy_offset_1.getHierarchyOffset)(col, row, table), lineClamp = cellStyle.lineClamp, padding = null !== (_r = (0, 
+            padding_1.getQuadProps)((0, get_prop_1.getProp)("padding", cellStyle, col, row, table))) && void 0 !== _r ? _r : [ 0, 0, 0, 0 ], textAlign = cellTheme.text.textAlign;
             let x = 0;
             x = "center" === textAlign ? padding[3] + (cellWidth - (padding[1] + padding[3])) / 2 : "right" === textAlign ? padding[3] + cellWidth - (padding[1] + padding[3]) : padding[3];
             const attribute = {
@@ -120,12 +123,14 @@ function updateCell(col, row, table, addNew) {
         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;
+            value = customMergeText, customStyle = customMergeStyle, customStyle && (cellTheme = (0, 
+            tableHelper_1.getStyleTheme)(customStyle, table, range.start.col, range.start.row, get_prop_1.getProp).theme, 
+            cellTheme.group.cornerRadius = (0, tableHelper_1.getCellCornerRadius)(col, row, table));
         }
     }
     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) => {
+    if ((null === (_t = null === (_s = table.internalProps) || void 0 === _s ? void 0 : _s.dataConfig) || void 0 === _t ? void 0 : _t.mappingRules) && !table.isHeader(col, row) && (null === (_w = null === (_v = null === (_u = table.internalProps) || void 0 === _u ? void 0 : _u.dataConfig) || void 0 === _v ? void 0 : _v.mappingRules) || void 0 === _w || _w.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, 
@@ -143,7 +148,7 @@ function updateCell(col, row, table, addNew) {
 
 function updateCellContent(type, value, define, table, col, row, bgColorFunc, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, addNew, cellTheme) {
     var _a, _b;
-    if ((0, helper_1.isPromise)(value) && (value = table.getCellValue(col, row)), oldCellGroup.row !== row || oldCellGroup.col !== col) return null;
+    if ((0, helper_1.isPromise)(value) && (value = table.getCellValue(col, row)), !addNew && (oldCellGroup.row !== row || oldCellGroup.col !== col)) return null;
     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))),