@visactor/vtable 0.13.4 → 0.14.0

package/es/render/layout/tag.d.ts

@@ -0,0 +1,14 @@
+import type { TagAttributes } from '@visactor/vrender-components';
+import { Tag as VTag } from '@visactor/vrender-components';
+import type { BaseTableAPI } from '../../ts-types/base-table';
+type ITagOption = {
+    marginTop?: number;
+    marginRight?: number;
+    marginBottom?: number;
+    marginLeft?: number;
+} & TagAttributes;
+export declare class Tag extends VTag {
+    constructor(options: ITagOption);
+    getSize(table: BaseTableAPI): void;
+}
+export {};

package/es/render/layout/tag.js

@@ -0,0 +1,15 @@
+import { Tag as VTag } from "@visactor/vrender-components";
+
+import { isArray } from "@visactor/vutils";
+
+export class Tag extends VTag {
+    constructor(options) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        const isPaddingNumber = isArray(options.boundsPadding), padding = [ null !== (_b = null !== (_a = options.marginTop) && void 0 !== _a ? _a : isPaddingNumber ? options.boundsPadding[0] : options.boundsPadding) && void 0 !== _b ? _b : 0, null !== (_d = null !== (_c = options.marginRight) && void 0 !== _c ? _c : isPaddingNumber ? options.boundsPadding[1] : options.boundsPadding) && void 0 !== _d ? _d : 0, null !== (_g = null !== (_e = options.marginBottom) && void 0 !== _e ? _e : isPaddingNumber ? null !== (_f = options.boundsPadding[2]) && void 0 !== _f ? _f : options.boundsPadding[0] : options.boundsPadding) && void 0 !== _g ? _g : 0, null !== (_k = null !== (_h = options.marginLeft) && void 0 !== _h ? _h : isPaddingNumber ? null !== (_j = options.boundsPadding[3]) && void 0 !== _j ? _j : options.boundsPadding[1] : options.boundsPadding) && void 0 !== _k ? _k : 0 ];
+        options.boundsPadding = padding, super(options);
+    }
+    getSize(table) {
+        this.AABBBounds.width();
+    }
+}
+//# sourceMappingURL=tag.js.map

package/es/render/layout/tag.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["render/layout/tag.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,IAAI,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAU3C,MAAM,OAAO,GAAI,SAAQ,IAAI;IAC3B,YAAY,OAAmB;;QAC7B,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG;YACd,MAAA,MAAA,OAAO,CAAC,SAAS,mCAAI,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,mCAAI,CAAC;YAC9F,MAAA,MAAA,OAAO,CAAC,WAAW,mCAAI,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,mCAAI,CAAC;YAChG,MAAA,MAAA,OAAO,CAAC,YAAY,mCAClB,CAAC,eAAe,CAAC,CAAC,CAAC,MAAA,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,mCAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,mCAChG,CAAC;YACH,MAAA,MAAA,OAAO,CAAC,UAAU,mCAChB,CAAC,eAAe,CAAC,CAAC,CAAC,MAAA,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,mCAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,mCAChG,CAAC;SACJ,CAAC;QACF,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC;QAEhC,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;IACD,OAAO,CAAC,KAAmB;QACzB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;CACF","file":"tag.js","sourcesContent":["import type { TagAttributes } from '@visactor/vrender-components';\nimport { Tag as VTag } from '@visactor/vrender-components';\nimport { isArray } from '@visactor/vutils';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\ntype ITagOption = {\n  marginTop?: number;\n  marginRight?: number;\n  marginBottom?: number;\n  marginLeft?: number;\n} & TagAttributes;\n\nexport class Tag extends VTag {\n  constructor(options: ITagOption) {\n    const isPaddingNumber = isArray(options.boundsPadding);\n    const padding = [\n      options.marginTop ?? (isPaddingNumber ? options.boundsPadding[0] : options.boundsPadding) ?? 0,\n      options.marginRight ?? (isPaddingNumber ? options.boundsPadding[1] : options.boundsPadding) ?? 0,\n      options.marginBottom ??\n        (isPaddingNumber ? options.boundsPadding[2] ?? options.boundsPadding[0] : options.boundsPadding) ??\n        0,\n      options.marginLeft ??\n        (isPaddingNumber ? options.boundsPadding[3] ?? options.boundsPadding[1] : options.boundsPadding) ??\n        0\n    ];\n    options.boundsPadding = padding;\n\n    super(options);\n  }\n  getSize(table: BaseTableAPI) {\n    this.AABBBounds.width();\n  }\n}\n"]}

package/es/render/layout/text.d.ts

@@ -1,50 +1,13 @@
-import type { TextAlignType, TextBaselineType } from '../../ts-types';
+import { WrapText, type IWrapTextGraphicAttribute } from '@visactor/vrender';
 import type { BaseTableAPI } from '../../ts-types/base-table';
-import type { ElementOptions } from './element';
-import { BaseElement } from './element';
-type TextOptions = {
-    text: string;
-    fill?: string | boolean;
-    color?: string | boolean;
-    stroke?: string | boolean;
-    lineWidth: number;
-    fontSize?: number;
-    fontFamily?: string;
-    fontWeight?: string | number;
-    fontVariant?: string;
-    fontStyle?: string;
-    ellipsis?: boolean | string;
-    maxLineWidth?: number;
-    textAlign?: TextAlignType;
-    textBaseline?: TextBaselineType;
-    lineHeight?: number;
-    underline?: number;
-    lineThrough?: number;
-    heightLimit?: number;
-    lineClamp?: number;
-} & ElementOptions;
-export declare class Text extends BaseElement {
-    type: 'text';
-    text: string;
-    fill: string | boolean;
-    color?: string | boolean;
-    stroke?: string | boolean;
-    lineWidth: number;
-    fontSize: number;
-    fontFamily: string;
-    fontWeight?: string | number;
-    fontVariant?: string;
-    fontStyle?: string;
-    ellipsis?: boolean | string;
-    maxLineWidth?: number;
-    textAlign?: TextAlignType;
-    textBaseline?: TextBaselineType;
-    lineHeight?: number;
-    underline?: number;
-    lineThrough?: number;
-    heightLimit?: number;
-    lineClamp?: number;
-    constructor(options: TextOptions);
+type ITextOption = {
+    marginTop?: number;
+    marginRight?: number;
+    marginBottom?: number;
+    marginLeft?: number;
+} & IWrapTextGraphicAttribute;
+export declare class Text extends WrapText {
+    constructor(options: ITextOption);
     getSize(table: BaseTableAPI): void;
 }
 export {};

package/es/render/layout/text.js

@@ -1,25 +1,17 @@
-import { BaseElement } from "./element";
+import { WrapText } from "@visactor/vrender";
 
-export class Text extends BaseElement {
+import { isArray } from "@visactor/vutils";
+
+export class Text extends WrapText {
     constructor(options) {
-        super(options), this.type = "text", this.text = options.text, this.fontSize = options.fontSize || 12, 
-        this.fontFamily = options.fontFamily || "Arial,sans-serif", this.fill = options.color || options.fill || "black", 
-        this.textBaseline = options.textBaseline || "top", this.textAlign = options.textAlign || "left", 
-        options.stroke && (this.stroke = options.stroke), options.lineWidth && (this.lineWidth = options.lineWidth), 
-        options.fontWeight && (this.fontWeight = options.fontWeight), options.fontVariant && (this.fontVariant = options.fontVariant), 
-        options.fontStyle && (this.fontStyle = options.fontStyle), options.ellipsis && (this.ellipsis = options.ellipsis), 
-        options.maxLineWidth && (this.maxLineWidth = options.maxLineWidth), options.lineHeight && (this.lineHeight = options.lineHeight), 
-        options.underline && (this.underline = options.underline), options.lineThrough && (this.lineThrough = options.lineThrough), 
-        options.heightLimit && (this.heightLimit = options.heightLimit), options.lineClamp && (this.lineClamp = options.lineClamp);
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        options.textBaseline || (options.textBaseline = "top");
+        const isPaddingNumber = isArray(options.boundsPadding), padding = [ null !== (_b = null !== (_a = options.marginTop) && void 0 !== _a ? _a : isPaddingNumber ? options.boundsPadding[0] : options.boundsPadding) && void 0 !== _b ? _b : 0, null !== (_d = null !== (_c = options.marginRight) && void 0 !== _c ? _c : isPaddingNumber ? options.boundsPadding[1] : options.boundsPadding) && void 0 !== _d ? _d : 0, null !== (_g = null !== (_e = options.marginBottom) && void 0 !== _e ? _e : isPaddingNumber ? null !== (_f = options.boundsPadding[2]) && void 0 !== _f ? _f : options.boundsPadding[0] : options.boundsPadding) && void 0 !== _g ? _g : 0, null !== (_k = null !== (_h = options.marginLeft) && void 0 !== _h ? _h : isPaddingNumber ? null !== (_j = options.boundsPadding[3]) && void 0 !== _j ? _j : options.boundsPadding[1] : options.boundsPadding) && void 0 !== _k ? _k : 0 ];
+        options.boundsPadding = padding, options.fill = null !== (_l = options.fill) && void 0 !== _l ? _l : "#000", 
+        super(options);
     }
     getSize(table) {
-        const {width: width, height: height} = table.measureText(this.text, {
-            fontSize: this.fontSize,
-            fontWeight: this.fontWeight,
-            fontFamily: this.fontFamily
-        });
-        this.width = width, this.height = height, this.initLayoutSize(), this.background && (this.dx += this.background.expandX || 0, 
-        this.dy += this.background.expandY || 0);
+        this.AABBBounds.width();
     }
 }
 //# sourceMappingURL=text.js.map

package/es/render/layout/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["render/layout/text.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAwBxC,MAAM,OAAO,IAAK,SAAQ,WAAW;IAsBnC,YAAY,OAAoB;QAC9B,KAAK,CAAC,OAAO,CAAC,CAAC;QAtBjB,SAAI,GAAW,MAAM,CAAC;QAuBpB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,kBAAkB,CAAC;QAC3D,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC;QACrD,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC;QAClD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC;QAE7C,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QACjD,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1D,OAAO,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7D,OAAO,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAChE,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1D,OAAO,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QACvD,OAAO,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;QACnE,OAAO,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7D,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1D,OAAO,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAChE,OAAO,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAChE,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,CAAC,KAAmB;QACzB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE;YACrD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;YACxC,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC;SACzC;IACH,CAAC;CACF","file":"text.js","sourcesContent":["import type { TextAlignType, TextBaselineType } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { ElementOptions } from './element';\nimport { BaseElement } from './element';\n\ntype TextOptions = {\n  text: string;\n  fill?: string | boolean;\n  color?: string | boolean;\n  stroke?: string | boolean;\n  lineWidth: number;\n  fontSize?: number;\n  fontFamily?: string;\n  fontWeight?: string | number;\n  fontVariant?: string;\n  fontStyle?: string;\n  ellipsis?: boolean | string;\n  maxLineWidth?: number;\n  textAlign?: TextAlignType;\n  textBaseline?: TextBaselineType;\n  lineHeight?: number;\n  underline?: number;\n  lineThrough?: number;\n  heightLimit?: number;\n  lineClamp?: number;\n} & ElementOptions;\n\nexport class Text extends BaseElement {\n  type: 'text' = 'text';\n  text: string;\n  fill: string | boolean;\n  color?: string | boolean;\n  stroke?: string | boolean;\n  lineWidth: number;\n  fontSize: number;\n  fontFamily: string;\n  fontWeight?: string | number;\n  fontVariant?: string;\n  fontStyle?: string;\n  ellipsis?: boolean | string;\n  maxLineWidth?: number;\n  textAlign?: TextAlignType;\n  textBaseline?: TextBaselineType;\n  lineHeight?: number;\n  underline?: number;\n  lineThrough?: number;\n  heightLimit?: number;\n  lineClamp?: number;\n\n  constructor(options: TextOptions) {\n    super(options);\n    this.text = options.text;\n    this.fontSize = options.fontSize || 12;\n    this.fontFamily = options.fontFamily || 'Arial,sans-serif';\n    this.fill = options.color || options.fill || 'black';\n    this.textBaseline = options.textBaseline || 'top';\n    this.textAlign = options.textAlign || 'left';\n\n    options.stroke && (this.stroke = options.stroke);\n    options.lineWidth && (this.lineWidth = options.lineWidth);\n    options.fontWeight && (this.fontWeight = options.fontWeight);\n    options.fontVariant && (this.fontVariant = options.fontVariant);\n    options.fontStyle && (this.fontStyle = options.fontStyle);\n    options.ellipsis && (this.ellipsis = options.ellipsis);\n    options.maxLineWidth && (this.maxLineWidth = options.maxLineWidth);\n    options.lineHeight && (this.lineHeight = options.lineHeight);\n    options.underline && (this.underline = options.underline);\n    options.lineThrough && (this.lineThrough = options.lineThrough);\n    options.heightLimit && (this.heightLimit = options.heightLimit);\n    options.lineClamp && (this.lineClamp = options.lineClamp);\n  }\n\n  getSize(table: BaseTableAPI) {\n    const { width, height } = table.measureText(this.text, {\n      fontSize: this.fontSize,\n      fontWeight: this.fontWeight,\n      fontFamily: this.fontFamily\n    });\n    this.width = width;\n    this.height = height;\n    this.initLayoutSize();\n\n    if (this.background) {\n      this.dx += this.background.expandX || 0;\n      this.dy += this.background.expandY || 0;\n    }\n  }\n}\n"]}
+{"version":3,"sources":["render/layout/text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAkC,MAAM,mBAAmB,CAAC;AAG7E,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAS3C,MAAM,OAAO,IAAK,SAAQ,QAAQ;IAChC,YAAY,OAAoB;;QAC9B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YACzB,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC;SAC9B;QACD,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG;YACd,MAAA,MAAA,OAAO,CAAC,SAAS,mCAAI,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,mCAAI,CAAC;YAC9F,MAAA,MAAA,OAAO,CAAC,WAAW,mCAAI,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,mCAAI,CAAC;YAChG,MAAA,MAAA,OAAO,CAAC,YAAY,mCAClB,CAAC,eAAe,CAAC,CAAC,CAAC,MAAA,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,mCAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,mCAChG,CAAC;YACH,MAAA,MAAA,OAAO,CAAC,UAAU,mCAChB,CAAC,eAAe,CAAC,CAAC,CAAC,MAAA,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,mCAAI,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,mCAChG,CAAC;SACJ,CAAC;QACF,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC;QAChC,OAAO,CAAC,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,MAAM,CAAC;QAEtC,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;IACD,OAAO,CAAC,KAAmB;QACzB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;CACF","file":"text.js","sourcesContent":["import { WrapText, type IWrapTextGraphicAttribute } from '@visactor/vrender';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { TagAttributes } from '@visactor/vrender-components';\nimport { isArray } from '@visactor/vutils';\n\ntype ITextOption = {\n  marginTop?: number;\n  marginRight?: number;\n  marginBottom?: number;\n  marginLeft?: number;\n} & IWrapTextGraphicAttribute;\n\nexport class Text extends WrapText {\n  constructor(options: ITextOption) {\n    if (!options.textBaseline) {\n      options.textBaseline = 'top';\n    }\n    const isPaddingNumber = isArray(options.boundsPadding);\n    const padding = [\n      options.marginTop ?? (isPaddingNumber ? options.boundsPadding[0] : options.boundsPadding) ?? 0,\n      options.marginRight ?? (isPaddingNumber ? options.boundsPadding[1] : options.boundsPadding) ?? 0,\n      options.marginBottom ??\n        (isPaddingNumber ? options.boundsPadding[2] ?? options.boundsPadding[0] : options.boundsPadding) ??\n        0,\n      options.marginLeft ??\n        (isPaddingNumber ? options.boundsPadding[3] ?? options.boundsPadding[1] : options.boundsPadding) ??\n        0\n    ];\n    options.boundsPadding = padding;\n    options.fill = options.fill ?? '#000';\n\n    super(options);\n  }\n  getSize(table: BaseTableAPI) {\n    this.AABBBounds.width();\n  }\n}\n"]}

package/es/scenegraph/component/custom.d.ts

@@ -1,8 +1,8 @@
+import { Group as VGroup } from '@visactor/vrender';
 import type { ICustomLayout, ICustomRender } from '../../ts-types';
-import { Group } from '../graphic/group';
 import type { BaseTableAPI } from '../../ts-types/base-table';
 export declare function dealWithCustom(customLayout: ICustomLayout, customRender: ICustomRender, col: number, row: number, width: number, height: number, autoWidth: boolean, autoHeight: boolean, table: BaseTableAPI): {
-    elementsGroup: Group;
+    elementsGroup: VGroup;
     renderDefault: boolean;
 };
 export declare function decodeReactDom(dom: any): any;

package/es/scenegraph/component/custom.js

@@ -1,6 +1,6 @@
 import { createArc, createCircle, createLine, createRect, Group as VGroup } from "@visactor/vrender";
 
-import { isFunction, isString, isValid } from "@visactor/vutils";
+import { isFunction, isObject, isString, isValid } from "@visactor/vutils";
 
 import { Group } from "../graphic/group";
 
@@ -27,9 +27,8 @@ export function dealWithCustom(customLayout, customRender, col, row, width, heig
             table: table
         });
         customRenderObj.rootContainer && (customRenderObj.rootContainer = decodeReactDom(customRenderObj.rootContainer)), 
-        customRenderObj.rootContainer instanceof VGroup ? (elementsGroup = customRenderObj.rootContainer, 
-        elementsGroup.name = "custom-container") : customRenderObj.rootContainer && (customElements = customRenderObj.rootContainer.getElements(void 0, !1, !1)), 
-        renderDefault = customRenderObj.renderDefault;
+        customRenderObj.rootContainer instanceof VGroup && (elementsGroup = customRenderObj.rootContainer, 
+        elementsGroup.name = "custom-container"), renderDefault = customRenderObj.renderDefault;
     } else if ("function" == typeof customRender) {
         const customRenderObj = customRender({
             col: col,
@@ -53,7 +52,7 @@ export function dealWithCustom(customLayout, customRender, col, row, width, heig
     if (customElements) {
         elementsGroup = adjustElementToGroup(customElements, autoWidth ? expectedWidth : width, autoHeight ? expectedHeight : height, table.getCellValue(col, row));
     }
-    return {
+    return dealPercentCalc(elementsGroup, width, height), {
         elementsGroup: elementsGroup,
         renderDefault: renderDefault
     };
@@ -198,8 +197,8 @@ function adjustElementsPos(originalElements, width, height, value) {
         const originalElement = originalElements[i], element = Object.assign({}, originalElement);
         for (const name in element) element.hasOwnProperty(name) && isFunction(element[name]) && (element[name] = element[name](value));
         const rect = element;
-        isValid(rect.x) && (rect.x = isString(rect.x) ? transformString(rect.x, width - borderLineWidths[1]) : Number(rect.x), 
-        rect.y = isString(rect.y) ? transformString(rect.y, height - borderLineWidths[2]) : Number(rect.y)), 
+        isValid(rect.x) && (rect.x = isString(rect.x) ? transformString(rect.x, width - borderLineWidths[1]) : Number(rect.x)), 
+        isValid(rect.y) && (rect.y = isString(rect.y) ? transformString(rect.y, height - borderLineWidths[2]) : Number(rect.y)), 
         "width" in element && (element.width = isString(element.width) ? transformString(element.width, width - borderLineWidths[1]) : Number(element.width)), 
         "height" in element && (element.height = isString(element.height) ? transformString(element.height, height - borderLineWidths[2]) : Number(element.height)), 
         "radius" in element && (element.radius = isString(element.radius) ? transformString(element.radius, Math.min(width - borderLineWidths[1], height - borderLineWidths[2])) : Number(element.radius)), 
@@ -217,6 +216,15 @@ function transformString(str, size) {
     return str.endsWith("px") ? parseInt(str, 10) : str.endsWith("%") && size ? parseInt(str, 10) / 100 * size : parseInt(str, 10);
 }
 
+function dealPercentCalc(group, parentWidth, parentHeight) {
+    group && group.forEachChildren((child => {
+        var _a, _b;
+        isObject(child.attribute.width) && child.attribute.width.percent && child.setAttribute("width", child.attribute.width.percent / 100 * parentWidth + (null !== (_a = child.attribute.width.delta) && void 0 !== _a ? _a : 0)), 
+        isObject(child.attribute.height) && child.attribute.height.percent && child.setAttribute("height", child.attribute.height.percent / 100 * parentHeight + (null !== (_b = child.attribute.height.delta) && void 0 !== _b ? _b : 0)), 
+        "group" === child.type && dealPercentCalc(child, child.attribute.width, child.attribute.height);
+    }));
+}
+
 export function decodeReactDom(dom) {
     if (!dom.$$typeof) return dom;
     const type = dom.type, {attribute: attribute, children: children} = dom.props, g = type({

package/es/scenegraph/component/custom.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/component/custom.ts"],"names":[],"mappings":"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","file":"custom.js","sourcesContent":["import type { Cursor } from '@visactor/vrender';\nimport { createArc, createCircle, createLine, createRect, Group as VGroup } from '@visactor/vrender';\nimport { isFunction, isString, isValid } from '@visactor/vutils';\nimport type { ICustomLayout, ICustomRender, ICustomRenderElement, ICustomRenderElements } from '../../ts-types';\nimport { Group } from '../graphic/group';\nimport { Icon } from '../graphic/icon';\nimport { WrapText } from '../graphic/text';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { Rect } from '../../render/layout';\n\nexport function dealWithCustom(\n  customLayout: ICustomLayout,\n  customRender: ICustomRender,\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  autoWidth: boolean,\n  autoHeight: boolean,\n  table: BaseTableAPI\n) {\n  let renderDefault = true;\n  let expectedWidth: number;\n  let expectedHeight: number;\n  let customElements;\n  let elementsGroup: Group;\n\n  if (typeof customLayout === 'function') {\n    const arg = {\n      col,\n      row,\n      dataValue: table.getCellOriginValue(col, row),\n      value: table.getCellValue(col, row) || '',\n      rect: {\n        left: 0,\n        top: 0,\n        right: width,\n        bottom: height,\n        width,\n        height\n      },\n      table\n    };\n    const customRenderObj = customLayout(arg);\n    if (customRenderObj.rootContainer) {\n      customRenderObj.rootContainer = decodeReactDom(customRenderObj.rootContainer);\n    }\n    // expectedWidth = customRenderObj.expectedWidth;\n    // expectedHeight = customRenderObj.expectedHeight;\n    if (customRenderObj.rootContainer instanceof VGroup) {\n      elementsGroup = customRenderObj.rootContainer;\n      elementsGroup.name = 'custom-container';\n    } else if (customRenderObj.rootContainer) {\n      customElements = customRenderObj.rootContainer.getElements(undefined, false, false);\n    }\n    renderDefault = customRenderObj.renderDefault;\n  } else if (typeof customRender === 'function') {\n    const arg = {\n      col,\n      row,\n      dataValue: table.getCellOriginValue(col, row),\n      value: table.getCellValue(col, row) || '',\n      rect: {\n        left: 0,\n        top: 0,\n        right: width,\n        bottom: height,\n        width,\n        height\n      },\n      table\n    };\n    const customRenderObj = customRender(arg);\n    if (customRenderObj) {\n      customElements = customRenderObj.elements;\n      renderDefault = customRenderObj.renderDefault;\n      expectedWidth = customRenderObj.expectedWidth;\n      expectedHeight = customRenderObj.expectedHeight;\n    }\n  } else if (customRender) {\n    expectedWidth = customRender.expectedWidth;\n    expectedHeight = customRender.expectedHeight;\n    customElements = customRender.elements;\n    renderDefault = customRender.renderDefault;\n  }\n\n  if (customElements) {\n    const value = table.getCellValue(col, row);\n    elementsGroup = adjustElementToGroup(\n      customElements,\n      autoWidth ? expectedWidth : width,\n      autoHeight ? expectedHeight : height,\n      value\n    );\n  }\n\n  return {\n    elementsGroup,\n    renderDefault\n  };\n}\n\nfunction adjustElementToGroup(\n  elements: ICustomRenderElements,\n  width: number,\n  height: number,\n  value: any\n): Group | undefined {\n  const customGroup = new Group({\n    x: 0,\n    y: 0,\n    width,\n    height,\n    fill: false,\n    stroke: false,\n    pickable: false\n  });\n  customGroup.name = 'custom-container';\n\n  const elementsAdjusted = adjustElementsPos(elements, width, height, value);\n  elementsAdjusted.forEach(element => {\n    switch (element.type) {\n      case 'arc':\n        const arc = createArc({\n          x: element.x as number,\n          y: element.y as number,\n          dx: (element.dx ?? 0) as number,\n          dy: (element.dy ?? 0) as number,\n          fill: element.fill as string,\n          stroke: element.stroke as string,\n          outerRadius: element.radius as number,\n          startAngle: element.startAngle as number,\n          endAngle: element.endAngle as number,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor\n        });\n        customGroup.appendChild(arc);\n        break;\n      case 'text':\n        if (element.background) {\n          const expandX = element.background?.expandX ?? 0;\n          const expandY = element.background?.expandY ?? 0;\n          const textBackRect = createRect({\n            x: (element.x as number) - expandX,\n            y: (element.y as number) - expandY,\n            dx: (element.dx ?? 0) as number,\n            dy: (element.dy ?? 0) as number,\n            width: element.width + expandX * 2,\n            height: element.height + expandY * 2,\n            cornerRadius: element.background?.cornerRadius ?? 0,\n            // fill: true,\n            fill: element.background?.fill ?? '#888'\n          });\n          customGroup.appendChild(textBackRect);\n        }\n        const text = new WrapText(\n          Object.assign(\n            {\n              pickable: !!element.clickable,\n              fill: element.color ?? element.fill\n            },\n            element as any\n          )\n        );\n        customGroup.appendChild(text);\n        break;\n      case 'rect':\n        const rect = createRect({\n          x: element.x as number,\n          y: element.y as number,\n          dx: (element.dx ?? 0) as number,\n          dy: (element.dy ?? 0) as number,\n          width: element.width as number,\n          height: element.height as number,\n          cornerRadius: element.radius as number,\n          fill: element.fill as string,\n          stroke: element.stroke as string,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor\n        });\n        customGroup.appendChild(rect);\n        break;\n      case 'circle':\n        const circle = createCircle({\n          x: element.x as number,\n          y: element.y as number,\n          dx: (element.dx ?? 0) as number,\n          dy: (element.dy ?? 0) as number,\n          radius: element.radius as number,\n          fill: element.fill as string,\n          stroke: element.stroke as string,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor\n        });\n        customGroup.appendChild(circle);\n        break;\n      case 'icon':\n        const icon = new Icon({\n          x: element.x as number,\n          y: element.y as number,\n          dx: (element.dx ?? 0) as number,\n          dy: (element.dy ?? 0) as number,\n          width: element.width as number,\n          height: element.height as number,\n          image: element.svg as string,\n          backgroundWidth: element.hover ? ((element.hover.width ?? element.width) as number) : undefined,\n          backgroundHeight: element.hover ? ((element.hover.width ?? element.width) as number) : undefined,\n          backgroundColor: element.hover ? element.hover.bgColor ?? 'rgba(22,44,66,0.2)' : undefined,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor\n        });\n        icon.role = 'icon-custom';\n        customGroup.appendChild(icon);\n        break;\n      case 'image':\n        const image = new Icon({\n          x: element.x as number,\n          y: element.y as number,\n          dx: (element.dx ?? 0) as number,\n          dy: (element.dy ?? 0) as number,\n          width: element.width as number,\n          height: element.height as number,\n          image: element.src as string,\n          backgroundWidth: element.hover ? ((element.hover.width ?? element.width) as number) : undefined,\n          backgroundHeight: element.hover ? ((element.hover.width ?? element.width) as number) : undefined,\n          backgroundColor: element.hover ? element.hover.bgColor ?? 'rgba(22,44,66,0.2)' : undefined,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor,\n          shape: element.shape\n        });\n        image.role = 'image-custom';\n        customGroup.appendChild(image);\n        break;\n\n      case 'line':\n        const line = createLine({\n          points: element.points,\n          stroke: element.stroke as string,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor\n        });\n        customGroup.appendChild(line);\n        break;\n    }\n  });\n\n  return customGroup;\n}\n\nfunction adjustElementsPos(\n  originalElements: ICustomRenderElements,\n  // rect: RectProps,\n  width: number,\n  height: number,\n  // borderLineWidths: number[],\n  value: any\n): ICustomRenderElements {\n  const result: ICustomRenderElements = [];\n  // const { left, top, width, height } = rect;\n  const left = 0;\n  const top = 0;\n  const borderLineWidths = [0, 0, 0, 0];\n\n  for (let i = 0; i < originalElements.length; i++) {\n    const originalElement = originalElements[i];\n    const element = Object.assign({}, originalElement);\n    // 执行相关函数\n    for (const name in element) {\n      if (element.hasOwnProperty(name) && isFunction(element[name])) {\n        element[name] = (element[name] as Function)(value);\n      }\n    }\n\n    // 转换字符串值（百分比、px）\n    const rect = element as Rect;\n    if (isValid(rect.x)) {\n      rect.x = isString(rect.x)\n        ? transformString((rect as any).x as string, width - borderLineWidths[1])\n        : Number(rect.x);\n      rect.y = isString(rect.y)\n        ? transformString((rect as any).y as string, height - borderLineWidths[2])\n        : Number(rect.y);\n    }\n    if ('width' in element) {\n      element.width = isString(element.width)\n        ? transformString(element.width as string, width - borderLineWidths[1])\n        : Number(element.width);\n    }\n    if ('height' in element) {\n      element.height = isString(element.height)\n        ? transformString(element.height as string, height - borderLineWidths[2])\n        : Number(element.height);\n    }\n    if ('radius' in element) {\n      element.radius = isString(element.radius)\n        ? transformString(element.radius as string, Math.min(width - borderLineWidths[1], height - borderLineWidths[2]))\n        : Number(element.radius);\n    }\n    if ('hover' in element) {\n      // 转换字符串值（百分比、px）\n      element.hover.x = isString(element.hover.x)\n        ? transformString(element.hover.x as string, width - borderLineWidths[1])\n        : Number(element.hover.x);\n      element.hover.y = isString(element.hover.y)\n        ? transformString(element.hover.y as string, height - borderLineWidths[2])\n        : Number(element.hover.y);\n      element.hover.width = isString(element.hover.width)\n        ? transformString(element.hover.width as string, width - borderLineWidths[1])\n        : Number(element.hover.width);\n\n      element.hover.height = isString(element.hover.height)\n        ? transformString(element.hover.height as string, height - borderLineWidths[2])\n        : Number(element.hover.height);\n      element.hover.x += left;\n      element.hover.y += top;\n    }\n    // 矫正位置\n    rect.x = rect.x + left;\n    rect.y = rect.y + top;\n\n    result.push(element as unknown as ICustomRenderElement);\n  }\n\n  return result;\n}\n\nfunction transformString(str: string, size?: number): number {\n  if (str.endsWith('px')) {\n    return parseInt(str, 10);\n  } else if (str.endsWith('%') && size) {\n    return (parseInt(str, 10) / 100) * size;\n  }\n  return parseInt(str, 10);\n}\n\n// temp devode for react jsx customLayout\nexport function decodeReactDom(dom: any) {\n  if (!dom.$$typeof) {\n    // not react\n    return dom;\n  }\n  const type = dom.type;\n  const { attribute, children } = dom.props;\n  const g = type({ attribute });\n  g.id = attribute.id;\n  g.name = attribute.name;\n  children &&\n    children.length &&\n    children.forEach((item: any) => {\n      const c = decodeReactDom(item);\n      g.add(c);\n    });\n  return g;\n}\n"]}
+{"version":3,"sources":["scenegraph/component/custom.ts"],"names":[],"mappings":"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","file":"custom.js","sourcesContent":["import type { Cursor } from '@visactor/vrender';\nimport { createArc, createCircle, createLine, createRect, Group as VGroup } from '@visactor/vrender';\nimport { isFunction, isObject, isString, isValid } from '@visactor/vutils';\nimport type {\n  ICustomLayout,\n  ICustomRender,\n  ICustomRenderElement,\n  ICustomRenderElements,\n  RectElement\n} from '../../ts-types';\nimport { Group } from '../graphic/group';\nimport { Icon } from '../graphic/icon';\nimport { WrapText } from '../graphic/text';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { percentCalcObj, Rect } from '../../render/layout';\n\nexport function dealWithCustom(\n  customLayout: ICustomLayout,\n  customRender: ICustomRender,\n  col: number,\n  row: number,\n  width: number,\n  height: number,\n  autoWidth: boolean,\n  autoHeight: boolean,\n  table: BaseTableAPI\n) {\n  let renderDefault = true;\n  let expectedWidth: number;\n  let expectedHeight: number;\n  let customElements;\n  let elementsGroup: VGroup;\n\n  if (typeof customLayout === 'function') {\n    const arg = {\n      col,\n      row,\n      dataValue: table.getCellOriginValue(col, row),\n      value: table.getCellValue(col, row) || '',\n      rect: {\n        left: 0,\n        top: 0,\n        right: width,\n        bottom: height,\n        width,\n        height\n      },\n      table\n    };\n    const customRenderObj = customLayout(arg);\n    if (customRenderObj.rootContainer) {\n      customRenderObj.rootContainer = decodeReactDom(customRenderObj.rootContainer);\n    }\n    // expectedWidth = customRenderObj.expectedWidth;\n    // expectedHeight = customRenderObj.expectedHeight;\n    if (customRenderObj.rootContainer instanceof VGroup) {\n      elementsGroup = customRenderObj.rootContainer;\n      elementsGroup.name = 'custom-container';\n      // } else if (customRenderObj.rootContainer) {\n      //   customElements = customRenderObj.rootContainer.getElements(undefined, false, false);\n    }\n    renderDefault = customRenderObj.renderDefault;\n  } else if (typeof customRender === 'function') {\n    const arg = {\n      col,\n      row,\n      dataValue: table.getCellOriginValue(col, row),\n      value: table.getCellValue(col, row) || '',\n      rect: {\n        left: 0,\n        top: 0,\n        right: width,\n        bottom: height,\n        width,\n        height\n      },\n      table\n    };\n    const customRenderObj = customRender(arg);\n    if (customRenderObj) {\n      customElements = customRenderObj.elements;\n      renderDefault = customRenderObj.renderDefault;\n      expectedWidth = customRenderObj.expectedWidth;\n      expectedHeight = customRenderObj.expectedHeight;\n    }\n  } else if (customRender) {\n    expectedWidth = customRender.expectedWidth;\n    expectedHeight = customRender.expectedHeight;\n    customElements = customRender.elements;\n    renderDefault = customRender.renderDefault;\n  }\n\n  if (customElements) {\n    const value = table.getCellValue(col, row);\n    elementsGroup = adjustElementToGroup(\n      customElements,\n      autoWidth ? expectedWidth : width,\n      autoHeight ? expectedHeight : height,\n      value\n    );\n  }\n\n  // for percent calc\n  dealPercentCalc(elementsGroup, width, height);\n\n  return {\n    elementsGroup,\n    renderDefault\n  };\n}\n\nfunction adjustElementToGroup(\n  elements: ICustomRenderElements,\n  width: number,\n  height: number,\n  value: any\n): Group | undefined {\n  const customGroup = new Group({\n    x: 0,\n    y: 0,\n    width,\n    height,\n    fill: false,\n    stroke: false,\n    pickable: false\n  });\n  customGroup.name = 'custom-container';\n\n  const elementsAdjusted = adjustElementsPos(elements, width, height, value);\n  elementsAdjusted.forEach(element => {\n    switch (element.type) {\n      case 'arc':\n        const arc = createArc({\n          x: element.x as number,\n          y: element.y as number,\n          dx: (element.dx ?? 0) as number,\n          dy: (element.dy ?? 0) as number,\n          fill: element.fill as string,\n          stroke: element.stroke as string,\n          outerRadius: element.radius as number,\n          startAngle: element.startAngle as number,\n          endAngle: element.endAngle as number,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor\n        });\n        customGroup.appendChild(arc);\n        break;\n      case 'text':\n        if (element.background) {\n          const expandX = element.background?.expandX ?? 0;\n          const expandY = element.background?.expandY ?? 0;\n          const textBackRect = createRect({\n            x: (element.x as number) - expandX,\n            y: (element.y as number) - expandY,\n            dx: (element.dx ?? 0) as number,\n            dy: (element.dy ?? 0) as number,\n            width: element.width + expandX * 2,\n            height: element.height + expandY * 2,\n            cornerRadius: element.background?.cornerRadius ?? 0,\n            // fill: true,\n            fill: element.background?.fill ?? '#888'\n          });\n          customGroup.appendChild(textBackRect);\n        }\n        const text = new WrapText(\n          Object.assign(\n            {\n              pickable: !!element.clickable,\n              fill: element.color ?? element.fill\n            },\n            element as any\n          )\n        );\n        customGroup.appendChild(text);\n        break;\n      case 'rect':\n        const rect = createRect({\n          x: element.x as number,\n          y: element.y as number,\n          dx: (element.dx ?? 0) as number,\n          dy: (element.dy ?? 0) as number,\n          width: element.width as number,\n          height: element.height as number,\n          cornerRadius: element.radius as number,\n          fill: element.fill as string,\n          stroke: element.stroke as string,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor\n        });\n        customGroup.appendChild(rect);\n        break;\n      case 'circle':\n        const circle = createCircle({\n          x: element.x as number,\n          y: element.y as number,\n          dx: (element.dx ?? 0) as number,\n          dy: (element.dy ?? 0) as number,\n          radius: element.radius as number,\n          fill: element.fill as string,\n          stroke: element.stroke as string,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor\n        });\n        customGroup.appendChild(circle);\n        break;\n      case 'icon':\n        const icon = new Icon({\n          x: element.x as number,\n          y: element.y as number,\n          dx: (element.dx ?? 0) as number,\n          dy: (element.dy ?? 0) as number,\n          width: element.width as number,\n          height: element.height as number,\n          image: element.svg as string,\n          backgroundWidth: element.hover ? ((element.hover.width ?? element.width) as number) : undefined,\n          backgroundHeight: element.hover ? ((element.hover.width ?? element.width) as number) : undefined,\n          backgroundColor: element.hover ? element.hover.bgColor ?? 'rgba(22,44,66,0.2)' : undefined,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor\n        });\n        icon.role = 'icon-custom';\n        customGroup.appendChild(icon);\n        break;\n      case 'image':\n        const image = new Icon({\n          x: element.x as number,\n          y: element.y as number,\n          dx: (element.dx ?? 0) as number,\n          dy: (element.dy ?? 0) as number,\n          width: element.width as number,\n          height: element.height as number,\n          image: element.src as string,\n          backgroundWidth: element.hover ? ((element.hover.width ?? element.width) as number) : undefined,\n          backgroundHeight: element.hover ? ((element.hover.width ?? element.width) as number) : undefined,\n          backgroundColor: element.hover ? element.hover.bgColor ?? 'rgba(22,44,66,0.2)' : undefined,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor,\n          shape: element.shape\n        });\n        image.role = 'image-custom';\n        customGroup.appendChild(image);\n        break;\n\n      case 'line':\n        const line = createLine({\n          points: element.points,\n          stroke: element.stroke as string,\n          pickable: !!element.clickable,\n          cursor: element.cursor as Cursor\n        });\n        customGroup.appendChild(line);\n        break;\n    }\n  });\n\n  return customGroup;\n}\n\nfunction adjustElementsPos(\n  originalElements: ICustomRenderElements,\n  // rect: RectProps,\n  width: number,\n  height: number,\n  // borderLineWidths: number[],\n  value: any\n): ICustomRenderElements {\n  const result: ICustomRenderElements = [];\n  // const { left, top, width, height } = rect;\n  const left = 0;\n  const top = 0;\n  const borderLineWidths = [0, 0, 0, 0];\n\n  for (let i = 0; i < originalElements.length; i++) {\n    const originalElement = originalElements[i];\n    const element = Object.assign({}, originalElement);\n    // 执行相关函数\n    for (const name in element) {\n      if (element.hasOwnProperty(name) && isFunction(element[name])) {\n        element[name] = (element[name] as Function)(value);\n      }\n    }\n\n    // 转换字符串值（百分比、px）\n    const rect = element as RectElement;\n    if (isValid(rect.x)) {\n      rect.x = isString(rect.x)\n        ? transformString((rect as any).x as string, width - borderLineWidths[1])\n        : Number(rect.x);\n    }\n    if (isValid(rect.y)) {\n      rect.y = isString(rect.y)\n        ? transformString((rect as any).y as string, height - borderLineWidths[2])\n        : Number(rect.y);\n    }\n    if ('width' in element) {\n      element.width = isString(element.width)\n        ? transformString(element.width as string, width - borderLineWidths[1])\n        : Number(element.width);\n    }\n    if ('height' in element) {\n      element.height = isString(element.height)\n        ? transformString(element.height as string, height - borderLineWidths[2])\n        : Number(element.height);\n    }\n    if ('radius' in element) {\n      element.radius = isString(element.radius)\n        ? transformString(element.radius as string, Math.min(width - borderLineWidths[1], height - borderLineWidths[2]))\n        : Number(element.radius);\n    }\n    if ('hover' in element) {\n      // 转换字符串值（百分比、px）\n      element.hover.x = isString(element.hover.x)\n        ? transformString(element.hover.x as string, width - borderLineWidths[1])\n        : Number(element.hover.x);\n      element.hover.y = isString(element.hover.y)\n        ? transformString(element.hover.y as string, height - borderLineWidths[2])\n        : Number(element.hover.y);\n      element.hover.width = isString(element.hover.width)\n        ? transformString(element.hover.width as string, width - borderLineWidths[1])\n        : Number(element.hover.width);\n\n      element.hover.height = isString(element.hover.height)\n        ? transformString(element.hover.height as string, height - borderLineWidths[2])\n        : Number(element.hover.height);\n      element.hover.x += left;\n      element.hover.y += top;\n    }\n    // 矫正位置\n    rect.x = rect.x + left;\n    rect.y = rect.y + top;\n\n    result.push(element as unknown as ICustomRenderElement);\n  }\n\n  return result;\n}\n\nfunction transformString(str: string, size?: number): number {\n  if (str.endsWith('px')) {\n    return parseInt(str, 10);\n  } else if (str.endsWith('%') && size) {\n    return (parseInt(str, 10) / 100) * size;\n  }\n  return parseInt(str, 10);\n}\n\nfunction dealPercentCalc(group: VGroup, parentWidth: number, parentHeight: number) {\n  if (!group) {\n    return;\n  }\n  group.forEachChildren((child: VGroup) => {\n    if (isObject(child.attribute.width) && (child.attribute.width as percentCalcObj).percent) {\n      child.setAttribute(\n        'width',\n        ((child.attribute.width as percentCalcObj).percent / 100) * parentWidth +\n          ((child.attribute.width as percentCalcObj).delta ?? 0)\n      );\n    }\n\n    if (isObject(child.attribute.height) && (child.attribute.height as percentCalcObj).percent) {\n      child.setAttribute(\n        'height',\n        ((child.attribute.height as percentCalcObj).percent / 100) * parentHeight +\n          ((child.attribute.height as percentCalcObj).delta ?? 0)\n      );\n    }\n\n    if (child.type === 'group') {\n      dealPercentCalc(child, child.attribute.width, child.attribute.height);\n    }\n  });\n}\n\n// temp devode for react jsx customLayout\nexport function decodeReactDom(dom: any) {\n  if (!dom.$$typeof) {\n    // not react\n    return dom;\n  }\n  const type = dom.type;\n  const { attribute, children } = dom.props;\n  const g = type({ attribute });\n  g.id = attribute.id;\n  g.name = attribute.name;\n  children &&\n    children.length &&\n    children.forEach((item: any) => {\n      const c = decodeReactDom(item);\n      g.add(c);\n    });\n  return g;\n}\n"]}

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

@@ -5,8 +5,12 @@ export declare class Group extends VRenderGroup {
     role?: string;
     col?: number;
     row?: number;
-    mergeCol?: number;
-    mergeRow?: number;
+    mergeStartCol?: number;
+    mergeStartRow?: number;
+    mergeEndCol?: number;
+    mergeEndRow?: number;
+    contentWidth?: number;
+    contentHeight?: number;
     rowNumber?: number;
     colHeight?: number;
     border?: IRect;

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

@@ -1 +1 @@
-{"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  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/es/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;