@visactor/vtable 0.9.0-alpha.0-alpha.0 → 0.9.1-alpha.2

package/cjs/plugins/themes.js

@@ -2,5 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.themes = void 0, exports.themes = {};
-//# sourceMappingURL=themes.js.map
+}), exports.themes = void 0, exports.themes = {};

package/cjs/render/layout/arc.d.ts

@@ -6,8 +6,8 @@ type SectorOptions = {
     endDegree?: number;
     clockWise?: boolean;
     lineWidth?: number;
-    fillColor?: string;
-    strokeColor?: string;
+    fill?: string | boolean;
+    stroke?: string | boolean;
 } & ElementOptions;
 export declare class Sector extends BaseElement {
     type: 'arc';
@@ -16,8 +16,8 @@ export declare class Sector extends BaseElement {
     endDegree: number;
     clockWise: boolean;
     lineWidth: number;
-    fillColor: string;
-    strokeColor: string;
+    fill: string | boolean;
+    stroke: string | boolean;
     constructor(options: SectorOptions);
 }
 export {};

package/cjs/render/layout/arc.js

@@ -10,8 +10,8 @@ class Sector extends element_1.BaseElement {
     constructor(options) {
         super(options), this.type = "arc", this.startDegree = 0, this.endDegree = 360, this.clockWise = !0, 
         this.radius = options.radius, this.startDegree = options.startDegree, this.endDegree = options.endDegree, 
-        this.clockWise = options.clockWise, this.lineWidth = options.lineWidth, this.fillColor = options.fillColor, 
-        this.strokeColor = options.strokeColor, this.width = 2 * this.radius, this.height = 2 * this.radius, 
+        this.clockWise = options.clockWise, this.lineWidth = options.lineWidth, this.fill = options.fill, 
+        this.stroke = options.stroke, this.width = 2 * this.radius, this.height = 2 * this.radius, 
         this.initLayoutSize(), this.dx += this.radius, this.dy += this.radius;
     }
 }

package/cjs/render/layout/arc.js.map

@@ -1 +1 @@
-{"version":3,"sources":["render/layout/arc.ts"],"names":[],"mappings":";;;AACA,uCAAwC;AAYxC,MAAa,MAAO,SAAQ,qBAAW;IAUrC,YAAY,OAAsB;QAChC,KAAK,CAAC,OAAO,CAAC,CAAC;QAVjB,SAAI,GAAU,KAAK,CAAC;QAEpB,gBAAW,GAAG,CAAC,CAAC;QAChB,cAAS,GAAG,GAAG,CAAC;QAChB,cAAS,GAAG,IAAI,CAAC;QAOf,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QAEvC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAE9B,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;QACvB,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;IACzB,CAAC;CACF;AA5BD,wBA4BC","file":"arc.js","sourcesContent":["import type { ElementOptions } from './element';\nimport { BaseElement } from './element';\n\ntype SectorOptions = {\n  radius: number;\n  startDegree?: number;\n  endDegree?: number;\n  clockWise?: boolean;\n  lineWidth?: number;\n  fillColor?: string;\n  strokeColor?: string;\n} & ElementOptions;\n\nexport class Sector extends BaseElement {\n  type: 'arc' = 'arc';\n  radius: number;\n  startDegree = 0;\n  endDegree = 360;\n  clockWise = true;\n  lineWidth: number;\n  fillColor: string;\n  strokeColor: string;\n\n  constructor(options: SectorOptions) {\n    super(options);\n    this.radius = options.radius;\n    this.startDegree = options.startDegree;\n    this.endDegree = options.endDegree;\n    this.clockWise = options.clockWise;\n    this.lineWidth = options.lineWidth;\n    this.fillColor = options.fillColor;\n    this.strokeColor = options.strokeColor;\n\n    this.width = this.radius * 2;\n    this.height = this.radius * 2;\n\n    this.initLayoutSize();\n\n    this.dx += this.radius;\n    this.dy += this.radius;\n  }\n}\n"]}
+{"version":3,"sources":["render/layout/arc.ts"],"names":[],"mappings":";;;AACA,uCAAwC;AAYxC,MAAa,MAAO,SAAQ,qBAAW;IAUrC,YAAY,OAAsB;QAChC,KAAK,CAAC,OAAO,CAAC,CAAC;QAVjB,SAAI,GAAU,KAAK,CAAC;QAEpB,gBAAW,GAAG,CAAC,CAAC;QAChB,cAAS,GAAG,GAAG,CAAC;QAChB,cAAS,GAAG,IAAI,CAAC;QAOf,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAE9B,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;QACvB,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;IACzB,CAAC;CACF;AA5BD,wBA4BC","file":"arc.js","sourcesContent":["import type { ElementOptions } from './element';\nimport { BaseElement } from './element';\n\ntype SectorOptions = {\n  radius: number;\n  startDegree?: number;\n  endDegree?: number;\n  clockWise?: boolean;\n  lineWidth?: number;\n  fill?: string | boolean;\n  stroke?: string | boolean;\n} & ElementOptions;\n\nexport class Sector extends BaseElement {\n  type: 'arc' = 'arc';\n  radius: number;\n  startDegree = 0;\n  endDegree = 360;\n  clockWise = true;\n  lineWidth: number;\n  fill: string | boolean;\n  stroke: string | boolean;\n\n  constructor(options: SectorOptions) {\n    super(options);\n    this.radius = options.radius;\n    this.startDegree = options.startDegree;\n    this.endDegree = options.endDegree;\n    this.clockWise = options.clockWise;\n    this.lineWidth = options.lineWidth;\n    this.fill = options.fill;\n    this.stroke = options.stroke;\n\n    this.width = this.radius * 2;\n    this.height = this.radius * 2;\n\n    this.initLayoutSize();\n\n    this.dx += this.radius;\n    this.dy += this.radius;\n  }\n}\n"]}

package/cjs/render/layout/circle.d.ts

@@ -4,16 +4,16 @@ type CircleOptions = {
     radius: number;
     radian?: number;
     lineWidth?: number;
-    fillColor?: string;
-    strokeColor?: string;
+    fill?: string | boolean;
+    stroke?: string | boolean;
 } & ElementOptions;
 export declare class Circle extends BaseElement {
     type: 'circle';
     radius: number;
     radian: number;
     lineWidth: number;
-    fillColor: string;
-    strokeColor: string;
+    fill: string | boolean;
+    stroke: string | boolean;
     constructor(options: CircleOptions);
 }
 export {};

package/cjs/render/layout/circle.js

@@ -9,7 +9,7 @@ const element_1 = require("./element");
 class Circle extends element_1.BaseElement {
     constructor(options) {
         super(options), this.type = "circle", this.radius = options.radius, this.radian = options.radian, 
-        this.lineWidth = options.lineWidth, this.fillColor = options.fillColor, this.strokeColor = options.strokeColor, 
+        this.lineWidth = options.lineWidth, this.fill = options.fill, this.stroke = options.stroke, 
         this.width = 2 * this.radius, this.height = 2 * this.radius, this.initLayoutSize(), 
         this.dx += this.radius, this.dy += this.radius;
     }

package/cjs/render/layout/circle.js.map

@@ -1 +1 @@
-{"version":3,"sources":["render/layout/circle.ts"],"names":[],"mappings":";;;AACA,uCAAwC;AAUxC,MAAa,MAAO,SAAQ,qBAAW;IAQrC,YAAY,OAAsB;QAChC,KAAK,CAAC,OAAO,CAAC,CAAC;QARjB,SAAI,GAAa,QAAQ,CAAC;QASxB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QAEvC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAE9B,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;QACvB,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;IACzB,CAAC;CACF;AAxBD,wBAwBC","file":"circle.js","sourcesContent":["import type { ElementOptions } from './element';\nimport { BaseElement } from './element';\n\ntype CircleOptions = {\n  radius: number;\n  radian?: number;\n  lineWidth?: number;\n  fillColor?: string;\n  strokeColor?: string;\n} & ElementOptions;\n\nexport class Circle extends BaseElement {\n  type: 'circle' = 'circle';\n  radius: number;\n  radian: number;\n  lineWidth: number;\n  fillColor: string;\n  strokeColor: string;\n\n  constructor(options: CircleOptions) {\n    super(options);\n    this.radius = options.radius;\n    this.radian = options.radian;\n    this.lineWidth = options.lineWidth;\n    this.fillColor = options.fillColor;\n    this.strokeColor = options.strokeColor;\n\n    this.width = this.radius * 2;\n    this.height = this.radius * 2;\n\n    this.initLayoutSize();\n\n    this.dx += this.radius;\n    this.dy += this.radius;\n  }\n}\n"]}
+{"version":3,"sources":["render/layout/circle.ts"],"names":[],"mappings":";;;AACA,uCAAwC;AAUxC,MAAa,MAAO,SAAQ,qBAAW;IAQrC,YAAY,OAAsB;QAChC,KAAK,CAAC,OAAO,CAAC,CAAC;QARjB,SAAI,GAAa,QAAQ,CAAC;QASxB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAE9B,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;QACvB,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;IACzB,CAAC;CACF;AAxBD,wBAwBC","file":"circle.js","sourcesContent":["import type { ElementOptions } from './element';\nimport { BaseElement } from './element';\n\ntype CircleOptions = {\n  radius: number;\n  radian?: number;\n  lineWidth?: number;\n  fill?: string | boolean;\n  stroke?: string | boolean;\n} & ElementOptions;\n\nexport class Circle extends BaseElement {\n  type: 'circle' = 'circle';\n  radius: number;\n  radian: number;\n  lineWidth: number;\n  fill: string | boolean;\n  stroke: string | boolean;\n\n  constructor(options: CircleOptions) {\n    super(options);\n    this.radius = options.radius;\n    this.radian = options.radian;\n    this.lineWidth = options.lineWidth;\n    this.fill = options.fill;\n    this.stroke = options.stroke;\n\n    this.width = this.radius * 2;\n    this.height = this.radius * 2;\n\n    this.initLayoutSize();\n\n    this.dx += this.radius;\n    this.dy += this.radius;\n  }\n}\n"]}

package/cjs/render/layout/container.js

@@ -75,8 +75,8 @@ class Container extends element_1.BaseElement {
                 width: this.width,
                 height: this.height,
                 borderRadius: 0,
-                strokeColor: "red",
-                fillColor: "rgba(255, 0, 0, 0.2)",
+                stroke: "red",
+                fill: "rgba(255, 0, 0, 0.2)",
                 lineWidth: 4
             });
             boundsRect.x += this.x + parentPos.parentX, boundsRect.y += this.y + parentPos.parentY, 

package/cjs/render/layout/container.js.map

@@ -1 +1 @@
-{"version":3,"sources":["render/layout/container.ts"],"names":[],"mappings":"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","file":"container.js","sourcesContent":["import { isNumber } from '../../tools/util';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { DirectionKey } from './direction';\nimport { DIRECTION_KEY } from './direction';\nimport type { ElementOptions } from './element';\nimport { BaseElement } from './element';\nimport { Line } from './line';\nimport type { percentCalcObj } from './percent-calc';\nimport { Rect } from './rect';\n\ntype containerOptions = {\n  width?: number | percentCalcObj;\n  height?: number | percentCalcObj;\n  direction?: 'row' | 'column'; // 布局主方向\n  justifyContent?: 'start' | 'end' | 'center'; // 布局方向上的对齐方式\n  alignItems?: 'start' | 'end' | 'center'; // 布局交叉方向上的对齐方式\n  alignContent?: 'start' | 'end' | 'center'; // 布局交叉方向上多根轴线的对齐方式\n  showBounds?: boolean; // 是否显示bounds\n} & ElementOptions;\n\nexport class Container extends BaseElement {\n  type: 'container' = 'container';\n  declare width: number;\n  _widthObj: percentCalcObj;\n  declare height: number;\n  _heightObj: percentCalcObj;\n  needCalcSize = false;\n  direction: 'row' | 'column'; // 布局主方向\n  justifyContent: 'start' | 'end' | 'center'; // 布局方向上的对齐方式\n  alignItems: 'start' | 'end' | 'center'; // 布局交叉方向上的对齐方式\n  alignContent: 'start' | 'end' | 'center'; // 布局交叉方向上多根轴线的对齐方式\n  lines: Line[] = [];\n  currentLine?: Line;\n  currentLineY = 0;\n  table: BaseTableAPI;\n  directionKey: DirectionKey;\n  showBounds: boolean;\n  offsetY = 0;\n  isRoot?: boolean;\n\n  constructor(options: containerOptions) {\n    super(options);\n    this.direction = options.direction || 'row';\n    this.justifyContent = options.justifyContent || 'start';\n    this.alignItems = options.alignItems || 'start';\n    this.alignContent = options.alignContent || 'start';\n\n    if (isNumber(options.width)) {\n      this.width = options.width as number;\n    } else {\n      this._widthObj = options.width as percentCalcObj;\n      this.needCalcSize = true;\n    }\n    if (isNumber(options.height)) {\n      this.height = options.height as number;\n    } else {\n      this._heightObj = options.height as percentCalcObj;\n      this.needCalcSize = true;\n    }\n\n    this.directionKey = DIRECTION_KEY[this.direction];\n\n    this.showBounds = options.showBounds || false;\n\n    this.initLayoutSize();\n  }\n\n  add(element: BaseElement) {\n    if (this.needCalcSize) {\n      throw new Error('Need to specify a parent element before adding a child element when use percent size!');\n    }\n\n    if (element.type === 'container') {\n      (element as Container).calcSize(this.width, this.height);\n    }\n\n    if (this.currentLine && this.currentLine.canAdd(element)) {\n      this.currentLine.add(element);\n    } else {\n      if (this.currentLine) {\n        this.currentLine.addAble = false; // 关闭当前行\n        this.currentLineY += this.currentLine[this.directionKey.height]; // 更新目前line y位置\n        this.currentLine.lineFinish();\n      }\n      // this.currentLine = new Line(this.width);\n      this.currentLine = new Line(this[this.directionKey.width], this.direction, this.justifyContent, this.alignItems);\n      this.currentLine[this.directionKey.y] = this.currentLineY;\n      this.currentLine.add(element);\n      this.lines.push(this.currentLine);\n    }\n  }\n\n  // 交叉方向上多根轴线的对齐方式\n  updateYAlign() {\n    const offsetY = this[this.directionKey.height] - this.currentLineY;\n    if (this.alignContent === 'center') {\n      this.offsetY = offsetY / 2;\n    } else if (this.alignContent === 'start') {\n      this.offsetY = 0;\n    } else {\n      this.offsetY = offsetY;\n    }\n  }\n\n  getSize() {\n    const result = {\n      width: 0,\n      height: 0\n    };\n    if (this.currentLine && this.currentLine.addAble) {\n      result[this.directionKey.height] = this.currentLineY + this.currentLine[this.directionKey.height];\n    } else {\n      result[this.directionKey.height] = this.currentLineY;\n    }\n\n    for (let i = 0; i < this.lines.length; i++) {\n      const line = this.lines[i];\n      if (result[this.directionKey.width] < line[this.directionKey.width]) {\n        result[this.directionKey.width] = line[this.directionKey.width];\n      }\n    }\n    return result;\n  }\n\n  getContentSize() {\n    const result = {\n      width: 0,\n      height: 0\n    };\n\n    const calcFlag = {\n      width: true,\n      height: true\n    };\n\n    if (!this.isRoot && !this._heightObj) {\n      calcFlag.height = false;\n      result.height = this.height;\n    }\n    if (!this.isRoot && !this._widthObj) {\n      calcFlag.width = false;\n      result.width = this.width;\n    }\n\n    for (let i = 0; i < this.lines.length; i++) {\n      const line = this.lines[i];\n      const size = line.getContentSize();\n      if (calcFlag[this.directionKey.width] && result[this.directionKey.width] < size[this.directionKey.width]) {\n        result[this.directionKey.width] = size[this.directionKey.width];\n      }\n\n      if (calcFlag[this.directionKey.height]) {\n        result[this.directionKey.height] += size[this.directionKey.height];\n      }\n    }\n\n    return result;\n  }\n\n  calcSize(parentWidth: number, parentHeight: number) {\n    if (this._heightObj) {\n      this.height = (parentHeight * this._heightObj.percent) / 100 + this._heightObj.delta;\n      this.needCalcSize = false;\n      this.initLayoutSize();\n    }\n    if (this._widthObj) {\n      this.width = (parentWidth * this._widthObj.percent) / 100 + this._widthObj.delta;\n      this.needCalcSize = false;\n      this.initLayoutSize();\n    }\n  }\n\n  // 获取平坦后的全部子图元，更新子图元xy位置信息\n  getElements(\n    parentPos: { parentX: number; parentY: number } = { parentX: 0, parentY: 0 },\n    isHover = false,\n    isSelect = false\n  ) {\n    // 关闭最后一行\n    if (this.currentLine && this.currentLine.addAble) {\n      this.currentLine.addAble = false; // 关闭当前行\n      this.currentLineY += this.currentLine[this.directionKey.height]; // 更新目前line y位置\n      this.currentLine.lineFinish();\n    }\n\n    // 处理alignContent\n    this.updateYAlign();\n\n    const elements = [];\n    if (this.showBounds) {\n      const boundsRect = new Rect({\n        width: this.width,\n        height: this.height,\n        borderRadius: 0,\n        strokeColor: 'red',\n        fillColor: 'rgba(255, 0, 0, 0.2)',\n        lineWidth: 4\n      });\n      boundsRect.x += this.x + parentPos.parentX;\n      boundsRect.y += this.y + parentPos.parentY;\n      elements.push(boundsRect);\n    }\n    // const parentPos = { parentX, parentY };\n    for (let i = 0; i < this.lines.length; i++) {\n      const line = this.lines[i];\n      line[this.directionKey.y] += this.offsetY;\n      // const linesElements = line.getElements(table, this.x + parentX, this.y + parentY);\n      const linesElements = line.getElements(\n        {\n          [this.directionKey.parentX]: this.x + parentPos.parentX,\n          [this.directionKey.parentY]: this.y + parentPos.parentY\n        } as any,\n        isHover,\n        isSelect\n      );\n      elements.push(...linesElements);\n    }\n\n    return elements;\n  }\n}\n"]}
+{"version":3,"sources":["render/layout/container.ts"],"names":[],"mappings":"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","file":"container.js","sourcesContent":["import { isNumber } from '../../tools/util';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { DirectionKey } from './direction';\nimport { DIRECTION_KEY } from './direction';\nimport type { ElementOptions } from './element';\nimport { BaseElement } from './element';\nimport { Line } from './line';\nimport type { percentCalcObj } from './percent-calc';\nimport { Rect } from './rect';\n\ntype containerOptions = {\n  width?: number | percentCalcObj;\n  height?: number | percentCalcObj;\n  direction?: 'row' | 'column'; // 布局主方向\n  justifyContent?: 'start' | 'end' | 'center'; // 布局方向上的对齐方式\n  alignItems?: 'start' | 'end' | 'center'; // 布局交叉方向上的对齐方式\n  alignContent?: 'start' | 'end' | 'center'; // 布局交叉方向上多根轴线的对齐方式\n  showBounds?: boolean; // 是否显示bounds\n} & ElementOptions;\n\nexport class Container extends BaseElement {\n  type: 'container' = 'container';\n  declare width: number;\n  _widthObj: percentCalcObj;\n  declare height: number;\n  _heightObj: percentCalcObj;\n  needCalcSize = false;\n  direction: 'row' | 'column'; // 布局主方向\n  justifyContent: 'start' | 'end' | 'center'; // 布局方向上的对齐方式\n  alignItems: 'start' | 'end' | 'center'; // 布局交叉方向上的对齐方式\n  alignContent: 'start' | 'end' | 'center'; // 布局交叉方向上多根轴线的对齐方式\n  lines: Line[] = [];\n  currentLine?: Line;\n  currentLineY = 0;\n  table: BaseTableAPI;\n  directionKey: DirectionKey;\n  showBounds: boolean;\n  offsetY = 0;\n  isRoot?: boolean;\n\n  constructor(options: containerOptions) {\n    super(options);\n    this.direction = options.direction || 'row';\n    this.justifyContent = options.justifyContent || 'start';\n    this.alignItems = options.alignItems || 'start';\n    this.alignContent = options.alignContent || 'start';\n\n    if (isNumber(options.width)) {\n      this.width = options.width as number;\n    } else {\n      this._widthObj = options.width as percentCalcObj;\n      this.needCalcSize = true;\n    }\n    if (isNumber(options.height)) {\n      this.height = options.height as number;\n    } else {\n      this._heightObj = options.height as percentCalcObj;\n      this.needCalcSize = true;\n    }\n\n    this.directionKey = DIRECTION_KEY[this.direction];\n\n    this.showBounds = options.showBounds || false;\n\n    this.initLayoutSize();\n  }\n\n  add(element: BaseElement) {\n    if (this.needCalcSize) {\n      throw new Error('Need to specify a parent element before adding a child element when use percent size!');\n    }\n\n    if (element.type === 'container') {\n      (element as Container).calcSize(this.width, this.height);\n    }\n\n    if (this.currentLine && this.currentLine.canAdd(element)) {\n      this.currentLine.add(element);\n    } else {\n      if (this.currentLine) {\n        this.currentLine.addAble = false; // 关闭当前行\n        this.currentLineY += this.currentLine[this.directionKey.height]; // 更新目前line y位置\n        this.currentLine.lineFinish();\n      }\n      // this.currentLine = new Line(this.width);\n      this.currentLine = new Line(this[this.directionKey.width], this.direction, this.justifyContent, this.alignItems);\n      this.currentLine[this.directionKey.y] = this.currentLineY;\n      this.currentLine.add(element);\n      this.lines.push(this.currentLine);\n    }\n  }\n\n  // 交叉方向上多根轴线的对齐方式\n  updateYAlign() {\n    const offsetY = this[this.directionKey.height] - this.currentLineY;\n    if (this.alignContent === 'center') {\n      this.offsetY = offsetY / 2;\n    } else if (this.alignContent === 'start') {\n      this.offsetY = 0;\n    } else {\n      this.offsetY = offsetY;\n    }\n  }\n\n  getSize() {\n    const result = {\n      width: 0,\n      height: 0\n    };\n    if (this.currentLine && this.currentLine.addAble) {\n      result[this.directionKey.height] = this.currentLineY + this.currentLine[this.directionKey.height];\n    } else {\n      result[this.directionKey.height] = this.currentLineY;\n    }\n\n    for (let i = 0; i < this.lines.length; i++) {\n      const line = this.lines[i];\n      if (result[this.directionKey.width] < line[this.directionKey.width]) {\n        result[this.directionKey.width] = line[this.directionKey.width];\n      }\n    }\n    return result;\n  }\n\n  getContentSize() {\n    const result = {\n      width: 0,\n      height: 0\n    };\n\n    const calcFlag = {\n      width: true,\n      height: true\n    };\n\n    if (!this.isRoot && !this._heightObj) {\n      calcFlag.height = false;\n      result.height = this.height;\n    }\n    if (!this.isRoot && !this._widthObj) {\n      calcFlag.width = false;\n      result.width = this.width;\n    }\n\n    for (let i = 0; i < this.lines.length; i++) {\n      const line = this.lines[i];\n      const size = line.getContentSize();\n      if (calcFlag[this.directionKey.width] && result[this.directionKey.width] < size[this.directionKey.width]) {\n        result[this.directionKey.width] = size[this.directionKey.width];\n      }\n\n      if (calcFlag[this.directionKey.height]) {\n        result[this.directionKey.height] += size[this.directionKey.height];\n      }\n    }\n\n    return result;\n  }\n\n  calcSize(parentWidth: number, parentHeight: number) {\n    if (this._heightObj) {\n      this.height = (parentHeight * this._heightObj.percent) / 100 + this._heightObj.delta;\n      this.needCalcSize = false;\n      this.initLayoutSize();\n    }\n    if (this._widthObj) {\n      this.width = (parentWidth * this._widthObj.percent) / 100 + this._widthObj.delta;\n      this.needCalcSize = false;\n      this.initLayoutSize();\n    }\n  }\n\n  // 获取平坦后的全部子图元，更新子图元xy位置信息\n  getElements(\n    parentPos: { parentX: number; parentY: number } = { parentX: 0, parentY: 0 },\n    isHover = false,\n    isSelect = false\n  ) {\n    // 关闭最后一行\n    if (this.currentLine && this.currentLine.addAble) {\n      this.currentLine.addAble = false; // 关闭当前行\n      this.currentLineY += this.currentLine[this.directionKey.height]; // 更新目前line y位置\n      this.currentLine.lineFinish();\n    }\n\n    // 处理alignContent\n    this.updateYAlign();\n\n    const elements = [];\n    if (this.showBounds) {\n      const boundsRect = new Rect({\n        width: this.width,\n        height: this.height,\n        borderRadius: 0,\n        stroke: 'red',\n        fill: 'rgba(255, 0, 0, 0.2)',\n        lineWidth: 4\n      });\n      boundsRect.x += this.x + parentPos.parentX;\n      boundsRect.y += this.y + parentPos.parentY;\n      elements.push(boundsRect);\n    }\n    // const parentPos = { parentX, parentY };\n    for (let i = 0; i < this.lines.length; i++) {\n      const line = this.lines[i];\n      line[this.directionKey.y] += this.offsetY;\n      // const linesElements = line.getElements(table, this.x + parentX, this.y + parentY);\n      const linesElements = line.getElements(\n        {\n          [this.directionKey.parentX]: this.x + parentPos.parentX,\n          [this.directionKey.parentY]: this.y + parentPos.parentY\n        } as any,\n        isHover,\n        isSelect\n      );\n      elements.push(...linesElements);\n    }\n\n    return elements;\n  }\n}\n"]}

package/cjs/render/layout/element.d.ts

@@ -6,10 +6,8 @@ export type ElementOptions = {
     marginTop?: number;
     marginBottom?: number;
     background?: {
-        fill?: boolean;
-        stroke?: boolean;
-        strokeColor?: string;
-        fillColor?: string;
+        stroke?: string | boolean;
+        fill?: string | boolean;
         lineWidth?: number;
         borderRadius?: number;
         expandX?: number;
@@ -32,10 +30,8 @@ export declare class BaseElement {
     dx: number;
     dy: number;
     background?: {
-        fill?: boolean;
-        stroke?: boolean;
-        strokeColor?: string;
-        fillColor?: string;
+        stroke?: string | boolean;
+        fill?: string | boolean;
         lineWidth?: number;
         cornerRadius?: number;
         expandX?: number;

package/cjs/render/layout/element.js.map

@@ -1 +1 @@
-{"version":3,"sources":["render/layout/element.ts"],"names":[],"mappings":";;;AAqBA,MAAa,WAAW;IA0BtB,YAAY,OAAuB;;QAvBnC,MAAC,GAAG,CAAC,CAAC;QACN,MAAC,GAAG,CAAC,CAAC;QACN,UAAK,GAAG,CAAC,CAAC;QACV,WAAM,GAAG,CAAC,CAAC;QAOX,OAAE,GAAG,CAAC,CAAC;QACP,OAAE,GAAG,CAAC,CAAC;QAaL,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,MAAA,OAAO,CAAC,UAAU,mCAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,MAAA,OAAO,CAAC,WAAW,mCAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,GAAG,MAAA,OAAO,CAAC,SAAS,mCAAI,CAAC,CAAC;QACxC,IAAI,CAAC,YAAY,GAAG,MAAA,OAAO,CAAC,YAAY,mCAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,SAAS,CAAC;IACpD,CAAC;IAED,OAAO,CAAC,KAAmB;QACzB,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;IAED,cAAc;QACZ,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACnE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC;QAErE,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACvD,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SACzD;QAED,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;QAC1B,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;IAC3B,CAAC;CACF;AAnDD,kCAmDC","file":"element.js","sourcesContent":["import type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport type ElementOptions = {\n  id?: string;\n  marginLeft?: number;\n  marginRight?: number;\n  marginTop?: number;\n  marginBottom?: number;\n  background?: {\n    fill?: boolean;\n    stroke?: boolean;\n    strokeColor?: string;\n    fillColor?: string;\n    lineWidth?: number;\n    borderRadius?: number;\n    expandX?: number;\n    expandY?: number;\n  };\n};\n\n// Element用作基础布局，图元继承Element\nexport class BaseElement {\n  type: string;\n  id?: string;\n  x = 0;\n  y = 0;\n  width = 0;\n  height = 0;\n  marginLeft: number;\n  marginRight: number;\n  marginTop: number;\n  marginBottom: number;\n  layoutWidth: number;\n  layoutHeight: number;\n  dx = 0;\n  dy = 0;\n  background?: {\n    fill?: boolean;\n    stroke?: boolean;\n    strokeColor?: string;\n    fillColor?: string;\n    lineWidth?: number;\n    cornerRadius?: number;\n    expandX?: number;\n    expandY?: number;\n  };\n\n  constructor(options: ElementOptions) {\n    this.id = options.id;\n    this.marginLeft = options.marginLeft ?? 0;\n    this.marginRight = options.marginRight ?? 0;\n    this.marginTop = options.marginTop ?? 0;\n    this.marginBottom = options.marginBottom ?? 0;\n    this.background = options.background || undefined;\n  }\n\n  getSize(table: BaseTableAPI) {\n    this.initLayoutSize();\n  }\n\n  initLayoutSize() {\n    this.layoutWidth = this.width + this.marginLeft + this.marginRight;\n    this.layoutHeight = this.height + this.marginTop + this.marginBottom;\n\n    if (this.background) {\n      this.layoutWidth += (this.background.expandX || 0) * 2;\n      this.layoutHeight += (this.background.expandY || 0) * 2;\n    }\n\n    this.dx = this.marginLeft;\n    this.dy = this.marginTop;\n  }\n}\n"]}
+{"version":3,"sources":["render/layout/element.ts"],"names":[],"mappings":";;;AAqBA,MAAa,WAAW;IA0BtB,YAAY,OAAuB;;QAvBnC,MAAC,GAAG,CAAC,CAAC;QACN,MAAC,GAAG,CAAC,CAAC;QACN,UAAK,GAAG,CAAC,CAAC;QACV,WAAM,GAAG,CAAC,CAAC;QAOX,OAAE,GAAG,CAAC,CAAC;QACP,OAAE,GAAG,CAAC,CAAC;QAaL,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,MAAA,OAAO,CAAC,UAAU,mCAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,MAAA,OAAO,CAAC,WAAW,mCAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,GAAG,MAAA,OAAO,CAAC,SAAS,mCAAI,CAAC,CAAC;QACxC,IAAI,CAAC,YAAY,GAAG,MAAA,OAAO,CAAC,YAAY,mCAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,SAAS,CAAC;IACpD,CAAC;IAED,OAAO,CAAC,KAAmB;QACzB,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;IAED,cAAc;QACZ,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACnE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC;QAErE,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACvD,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SACzD;QAED,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;QAC1B,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;IAC3B,CAAC;CACF;AAnDD,kCAmDC","file":"element.js","sourcesContent":["import type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport type ElementOptions = {\n  id?: string;\n  marginLeft?: number;\n  marginRight?: number;\n  marginTop?: number;\n  marginBottom?: number;\n  background?: {\n    // fill?: boolean;\n    // stroke?: boolean;\n    stroke?: string | boolean;\n    fill?: string | boolean;\n    lineWidth?: number;\n    borderRadius?: number;\n    expandX?: number;\n    expandY?: number;\n  };\n};\n\n// Element用作基础布局，图元继承Element\nexport class BaseElement {\n  type: string;\n  id?: string;\n  x = 0;\n  y = 0;\n  width = 0;\n  height = 0;\n  marginLeft: number;\n  marginRight: number;\n  marginTop: number;\n  marginBottom: number;\n  layoutWidth: number;\n  layoutHeight: number;\n  dx = 0;\n  dy = 0;\n  background?: {\n    // fill?: boolean;\n    // stroke?: boolean;\n    stroke?: string | boolean;\n    fill?: string | boolean;\n    lineWidth?: number;\n    cornerRadius?: number;\n    expandX?: number;\n    expandY?: number;\n  };\n\n  constructor(options: ElementOptions) {\n    this.id = options.id;\n    this.marginLeft = options.marginLeft ?? 0;\n    this.marginRight = options.marginRight ?? 0;\n    this.marginTop = options.marginTop ?? 0;\n    this.marginBottom = options.marginBottom ?? 0;\n    this.background = options.background || undefined;\n  }\n\n  getSize(table: BaseTableAPI) {\n    this.initLayoutSize();\n  }\n\n  initLayoutSize() {\n    this.layoutWidth = this.width + this.marginLeft + this.marginRight;\n    this.layoutHeight = this.height + this.marginTop + this.marginBottom;\n\n    if (this.background) {\n      this.layoutWidth += (this.background.expandX || 0) * 2;\n      this.layoutHeight += (this.background.expandY || 0) * 2;\n    }\n\n    this.dx = this.marginLeft;\n    this.dy = this.marginTop;\n  }\n}\n"]}

package/cjs/render/layout/rect.d.ts

@@ -5,8 +5,8 @@ type RectOptions = {
     height: number;
     lineWidth?: number;
     borderRadius?: number;
-    fillColor?: string;
-    strokeColor?: string;
+    fill?: string | boolean;
+    stroke?: string | boolean;
 } & ElementOptions;
 export declare class Rect extends BaseElement {
     type: 'rect';
@@ -15,8 +15,8 @@ export declare class Rect extends BaseElement {
     lineWidth: number;
     borderRadius: number;
     radius: number;
-    fillColor: string;
-    strokeColor: string;
+    fill: string | boolean;
+    stroke: string | boolean;
     constructor(options: RectOptions);
 }
 export {};

package/cjs/render/layout/rect.js

@@ -10,7 +10,7 @@ class Rect extends element_1.BaseElement {
     constructor(options) {
         super(options), this.type = "rect", this.width = options.width, this.height = options.height, 
         this.lineWidth = options.lineWidth || 0, this.borderRadius = options.borderRadius || 0, 
-        this.radius = this.borderRadius, this.fillColor = options.fillColor || "#777", this.strokeColor = options.strokeColor || void 0, 
+        this.radius = this.borderRadius, this.fill = options.fill || "#777", this.stroke = options.stroke || void 0, 
         this.initLayoutSize();
     }
 }

package/cjs/render/layout/rect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["render/layout/rect.ts"],"names":[],"mappings":";;;AACA,uCAAwC;AAWxC,MAAa,IAAK,SAAQ,qBAAW;IAUnC,YAAY,OAAoB;QAC9B,KAAK,CAAC,OAAO,CAAC,CAAC;QAVjB,SAAI,GAAW,MAAM,CAAC;QAWpB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC;QAC7C,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,SAAS,CAAC;QAEpD,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;CACF;AAtBD,oBAsBC","file":"rect.js","sourcesContent":["import type { ElementOptions } from './element';\nimport { BaseElement } from './element';\n\ntype RectOptions = {\n  width: number;\n  height: number;\n  lineWidth?: number;\n  borderRadius?: number;\n  fillColor?: string;\n  strokeColor?: string;\n} & ElementOptions;\n\nexport class Rect extends BaseElement {\n  type: 'rect' = 'rect';\n  declare width: number;\n  declare height: number;\n  lineWidth: number;\n  borderRadius: number;\n  radius: number;\n  fillColor: string;\n  strokeColor: string;\n\n  constructor(options: RectOptions) {\n    super(options);\n    this.width = options.width;\n    this.height = options.height;\n    this.lineWidth = options.lineWidth || 0;\n    this.borderRadius = options.borderRadius || 0;\n    this.radius = this.borderRadius;\n    this.fillColor = options.fillColor || '#777';\n    this.strokeColor = options.strokeColor || undefined;\n\n    this.initLayoutSize();\n  }\n}\n"]}
+{"version":3,"sources":["render/layout/rect.ts"],"names":[],"mappings":";;;AACA,uCAAwC;AAWxC,MAAa,IAAK,SAAQ,qBAAW;IAUnC,YAAY,OAAoB;QAC9B,KAAK,CAAC,OAAO,CAAC,CAAC;QAVjB,SAAI,GAAW,MAAM,CAAC;QAWpB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,SAAS,CAAC;QAE1C,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;CACF;AAtBD,oBAsBC","file":"rect.js","sourcesContent":["import type { ElementOptions } from './element';\nimport { BaseElement } from './element';\n\ntype RectOptions = {\n  width: number;\n  height: number;\n  lineWidth?: number;\n  borderRadius?: number;\n  fill?: string | boolean;\n  stroke?: string | boolean;\n} & ElementOptions;\n\nexport class Rect extends BaseElement {\n  type: 'rect' = 'rect';\n  declare width: number;\n  declare height: number;\n  lineWidth: number;\n  borderRadius: number;\n  radius: number;\n  fill: string | boolean;\n  stroke: string | boolean;\n\n  constructor(options: RectOptions) {\n    super(options);\n    this.width = options.width;\n    this.height = options.height;\n    this.lineWidth = options.lineWidth || 0;\n    this.borderRadius = options.borderRadius || 0;\n    this.radius = this.borderRadius;\n    this.fill = options.fill || '#777';\n    this.stroke = options.stroke || undefined;\n\n    this.initLayoutSize();\n  }\n}\n"]}

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

@@ -5,15 +5,14 @@ type TextOptions = {
     text: string;
     fontSize?: number;
     fontFamily?: string;
-    fillColor?: string;
+    fill?: string | boolean;
 } & ElementOptions;
 export declare class Text extends BaseElement {
     type: 'text';
     text: string;
     fontSize: number;
     fontFamily: string;
-    fillColor: string;
-    color: string;
+    fill: string | boolean;
     textBaseline: 'top';
     textAlign: 'left';
     constructor(options: TextOptions);

package/cjs/render/layout/text.js

@@ -10,7 +10,7 @@ class Text extends element_1.BaseElement {
     constructor(options) {
         super(options), this.type = "text", this.textBaseline = "top", this.textAlign = "left", 
         this.text = options.text, this.fontSize = options.fontSize || 12, this.fontFamily = options.fontFamily || "sans-serif", 
-        this.color = this.fillColor = options.fillColor || "black";
+        this.fill = options.fill || "black";
     }
     getSize(table) {
         const {width: width, height: height} = table.measureText(this.text, {

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

@@ -1 +1 @@
-{"version":3,"sources":["render/layout/text.ts"],"names":[],"mappings":";;;AAEA,uCAAwC;AASxC,MAAa,IAAK,SAAQ,qBAAW;IAWnC,YAAY,OAAoB;QAC9B,KAAK,CAAC,OAAO,CAAC,CAAC;QAXjB,SAAI,GAAW,MAAM,CAAC;QAOtB,iBAAY,GAAU,KAAK,CAAC;QAC5B,cAAS,GAAW,MAAM,CAAC;QAIzB,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,YAAY,CAAC;QACrD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC;IAE7D,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;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;AAlCD,oBAkCC","file":"text.js","sourcesContent":["import type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { ElementOptions } from './element';\nimport { BaseElement } from './element';\n\ntype TextOptions = {\n  text: string;\n  fontSize?: number;\n  fontFamily?: string;\n  fillColor?: string;\n} & ElementOptions;\n\nexport class Text extends BaseElement {\n  type: 'text' = 'text';\n  text: string;\n  fontSize: number;\n  fontFamily: string;\n  fillColor: string;\n  color: string;\n  // font: string;\n  textBaseline: 'top' = 'top';\n  textAlign: 'left' = 'left';\n\n  constructor(options: TextOptions) {\n    super(options);\n    this.text = options.text;\n    this.fontSize = options.fontSize || 12;\n    this.fontFamily = options.fontFamily || 'sans-serif';\n    this.color = this.fillColor = options.fillColor || 'black';\n    // this.font = `${this.fontSize}px ${this.fontFamily}`;\n  }\n\n  getSize(table: BaseTableAPI) {\n    const { width, height } = table.measureText(this.text, {\n      fontSize: this.fontSize,\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":";;;AAEA,uCAAwC;AASxC,MAAa,IAAK,SAAQ,qBAAW;IASnC,YAAY,OAAoB;QAC9B,KAAK,CAAC,OAAO,CAAC,CAAC;QATjB,SAAI,GAAW,MAAM,CAAC;QAKtB,iBAAY,GAAU,KAAK,CAAC;QAC5B,cAAS,GAAW,MAAM,CAAC;QAIzB,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,YAAY,CAAC;QACrD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC;IAEtC,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;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;AAhCD,oBAgCC","file":"text.js","sourcesContent":["import type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { ElementOptions } from './element';\nimport { BaseElement } from './element';\n\ntype TextOptions = {\n  text: string;\n  fontSize?: number;\n  fontFamily?: string;\n  fill?: string | boolean;\n} & ElementOptions;\n\nexport class Text extends BaseElement {\n  type: 'text' = 'text';\n  text: string;\n  fontSize: number;\n  fontFamily: string;\n  fill: string | boolean;\n  textBaseline: 'top' = 'top';\n  textAlign: 'left' = 'left';\n\n  constructor(options: TextOptions) {\n    super(options);\n    this.text = options.text;\n    this.fontSize = options.fontSize || 12;\n    this.fontFamily = options.fontFamily || 'sans-serif';\n    this.fill = options.fill || 'black';\n    // this.font = `${this.fontSize}px ${this.fontFamily}`;\n  }\n\n  getSize(table: BaseTableAPI) {\n    const { width, height } = table.measureText(this.text, {\n      fontSize: this.fontSize,\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"]}

package/cjs/scenegraph/component/cell-mover.js

@@ -15,12 +15,11 @@ class CellMover {
             x: 0,
             y: 0,
             symbolType: "triangle",
-            fillColor: columnMoverLineColor
+            fill: columnMoverLineColor
         }), this.columnMoverLine = (0, vrender_1.createLine)({
             visible: !1,
             pickable: !1,
-            stroke: !0,
-            strokeColor: columnMoverLineColor,
+            stroke: columnMoverLineColor,
             lineWidth: columnMoverLineWidth,
             x: 0,
             y: 0,
@@ -34,8 +33,7 @@ class CellMover {
         }), this.columnMoverBack = (0, vrender_1.createRect)({
             visible: !1,
             pickable: !1,
-            fill: !0,
-            fillColor: columnMoverShadowBlockColor,
+            fill: columnMoverShadowBlockColor,
             x: 0,
             y: 0,
             width: 0,

package/cjs/scenegraph/component/cell-mover.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/component/cell-mover.ts"],"names":[],"mappings":"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","file":"cell-mover.js","sourcesContent":["import type { ILine, IRect, ISymbol } from '@visactor/vrender';\nimport { createLine, createRect, createSymbol } from '@visactor/vrender';\nimport { getCellMergeInfo } from '../utils/get-cell-merge';\nimport type { Group } from '../graphic/group';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport class CellMover {\n  columnMoverLabel: ISymbol;\n  columnMoverLine: ILine;\n  columnMoverBack: IRect;\n  table: BaseTableAPI;\n  x?: number;\n\n  constructor(table: BaseTableAPI) {\n    const columnMoverLineWidth = table.theme.dragHeaderSplitLine.lineWidth;\n    const columnMoverLineColor = table.theme.dragHeaderSplitLine.lineColor;\n    const columnMoverShadowBlockColor = table.theme.dragHeaderSplitLine.shadowBlockColor;\n\n    this.columnMoverLabel = createSymbol({\n      visible: false,\n      pickable: false,\n      x: 0,\n      y: 0,\n      symbolType: 'triangle',\n      fillColor: columnMoverLineColor as string\n    });\n    this.columnMoverLine = createLine({\n      visible: false,\n      pickable: false,\n      stroke: true,\n      strokeColor: columnMoverLineColor as string,\n      lineWidth: columnMoverLineWidth as number,\n      x: 0,\n      y: 0,\n      points: [\n        { x: 0, y: 0 },\n        { x: 0, y: 0 }\n      ]\n    });\n\n    // 列顺序调整阴影块\n    this.columnMoverBack = createRect({\n      visible: false,\n      pickable: false,\n      fill: true,\n      fillColor: columnMoverShadowBlockColor,\n      // fillOpacity: 0.3,\n      x: 0,\n      y: 0,\n      width: 0,\n      height: 0\n    });\n\n    this.table = table;\n  }\n\n  appand(parent: Group) {\n    parent.appendChild(this.columnMoverLabel);\n    parent.appendChild(this.columnMoverLine);\n    parent.appendChild(this.columnMoverBack);\n  }\n\n  show(col: number, row: number, delta: number) {\n    const cellType = this.table.getCellType(col, row);\n    const mergeInfo = getCellMergeInfo(this.table, col, row);\n    if (mergeInfo) {\n      col = mergeInfo.start.col;\n      row = mergeInfo.start.row;\n    }\n\n    let rectX = 0;\n    let rectY = 0;\n    let rectWidth = 0;\n    let rectHeight = 0;\n    let rectDx = 0;\n    let rectDy = 0;\n    let symbolX = 0;\n    let symbolY = 0;\n    let symbolRotate = Math.PI;\n    const linePoints: { x: number; y: number }[] = [];\n    if (cellType === 'columnHeader') {\n      rectX = this.table.getColsWidth(0, col - 1) - this.table.stateManeger.scroll.horizontalBarPos;\n      rectY = this.table.getRowsHeight(0, this.table.frozenRowCount - 1);\n      rectHeight = this.table.tableNoFrameHeight;\n      if (mergeInfo) {\n        rectWidth = this.table.getColsWidth(mergeInfo.start.col, mergeInfo.end.col);\n      } else {\n        rectWidth = this.table.getColWidth(col);\n      }\n      rectDx = rectX - delta;\n\n      symbolX = rectX + rectWidth;\n      symbolY = 2;\n\n      linePoints.push({ x: 0, y: 0 });\n      linePoints.push({ x: 0, y: this.table.tableNoFrameHeight });\n    } else if (cellType === 'rowHeader') {\n      rectY = this.table.getRowsHeight(0, row - 1) - this.table.stateManeger.scroll.verticalBarPos;\n      rectX = this.table.getColsWidth(0, this.table.frozenColCount - 1);\n      rectWidth = this.table.tableNoFrameWidth;\n      if (mergeInfo) {\n        rectHeight = this.table.getRowsHeight(mergeInfo.start.row, mergeInfo.end.row);\n      } else {\n        rectHeight = this.table.getRowHeight(row);\n      }\n      rectDy = rectY - delta;\n\n      symbolX = 2;\n      symbolY = rectY + rectHeight;\n      symbolRotate = Math.PI / 2;\n\n      linePoints.push({ x: 0, y: 0 });\n      linePoints.push({ x: this.table.tableNoFrameWidth, y: 0 });\n    }\n\n    this.columnMoverBack.setAttributes({\n      visible: true,\n      x: rectX - rectDx,\n      y: rectY - rectDy,\n      width: rectWidth,\n      height: rectHeight,\n      dx: rectDx,\n      dy: rectDy\n    });\n    this.columnMoverLine.setAttributes({\n      x: symbolX,\n      y: symbolY,\n      visible: true,\n      points: linePoints\n    });\n    this.columnMoverLabel.setAttributes({\n      visible: true,\n      x: symbolX,\n      y: symbolY,\n      angle: symbolRotate\n    });\n  }\n\n  hide() {\n    this.columnMoverLabel.setAttribute('visible', false);\n    this.columnMoverLine.setAttribute('visible', false);\n    this.columnMoverBack.setAttribute('visible', false);\n  }\n\n  update(backX: number | undefined, lineX: number | undefined, backY: number | undefined, lineY: number | undefined) {\n    if (typeof backX === 'number' && typeof lineX === 'number') {\n      this.columnMoverLabel.setAttribute('x', lineX - this.table.stateManeger.scroll.horizontalBarPos);\n      this.columnMoverLine.setAttribute('x', lineX - this.table.stateManeger.scroll.horizontalBarPos);\n      this.columnMoverBack.setAttribute('x', backX);\n    } else if (typeof backY === 'number' && typeof lineY === 'number') {\n      this.columnMoverLabel.setAttribute('y', lineY - this.table.stateManeger.scroll.verticalBarPos);\n      this.columnMoverLine.setAttribute('y', lineY - this.table.stateManeger.scroll.verticalBarPos);\n      this.columnMoverBack.setAttribute('y', backY);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/component/cell-mover.ts"],"names":[],"mappings":"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","file":"cell-mover.js","sourcesContent":["import type { ILine, IRect, ISymbol } from '@visactor/vrender';\nimport { createLine, createRect, createSymbol } from '@visactor/vrender';\nimport { getCellMergeInfo } from '../utils/get-cell-merge';\nimport type { Group } from '../graphic/group';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport class CellMover {\n  columnMoverLabel: ISymbol;\n  columnMoverLine: ILine;\n  columnMoverBack: IRect;\n  table: BaseTableAPI;\n  x?: number;\n\n  constructor(table: BaseTableAPI) {\n    const columnMoverLineWidth = table.theme.dragHeaderSplitLine.lineWidth;\n    const columnMoverLineColor = table.theme.dragHeaderSplitLine.lineColor;\n    const columnMoverShadowBlockColor = table.theme.dragHeaderSplitLine.shadowBlockColor;\n\n    this.columnMoverLabel = createSymbol({\n      visible: false,\n      pickable: false,\n      x: 0,\n      y: 0,\n      symbolType: 'triangle',\n      fill: columnMoverLineColor as string\n    });\n    this.columnMoverLine = createLine({\n      visible: false,\n      pickable: false,\n      stroke: columnMoverLineColor as string,\n      lineWidth: columnMoverLineWidth as number,\n      x: 0,\n      y: 0,\n      points: [\n        { x: 0, y: 0 },\n        { x: 0, y: 0 }\n      ]\n    });\n\n    // 列顺序调整阴影块\n    this.columnMoverBack = createRect({\n      visible: false,\n      pickable: false,\n      fill: columnMoverShadowBlockColor,\n      x: 0,\n      y: 0,\n      width: 0,\n      height: 0\n    });\n\n    this.table = table;\n  }\n\n  appand(parent: Group) {\n    parent.appendChild(this.columnMoverLabel);\n    parent.appendChild(this.columnMoverLine);\n    parent.appendChild(this.columnMoverBack);\n  }\n\n  show(col: number, row: number, delta: number) {\n    const cellType = this.table.getCellType(col, row);\n    const mergeInfo = getCellMergeInfo(this.table, col, row);\n    if (mergeInfo) {\n      col = mergeInfo.start.col;\n      row = mergeInfo.start.row;\n    }\n\n    let rectX = 0;\n    let rectY = 0;\n    let rectWidth = 0;\n    let rectHeight = 0;\n    let rectDx = 0;\n    let rectDy = 0;\n    let symbolX = 0;\n    let symbolY = 0;\n    let symbolRotate = Math.PI;\n    const linePoints: { x: number; y: number }[] = [];\n    if (cellType === 'columnHeader') {\n      rectX = this.table.getColsWidth(0, col - 1) - this.table.stateManeger.scroll.horizontalBarPos;\n      rectY = this.table.getRowsHeight(0, this.table.frozenRowCount - 1);\n      rectHeight = this.table.tableNoFrameHeight;\n      if (mergeInfo) {\n        rectWidth = this.table.getColsWidth(mergeInfo.start.col, mergeInfo.end.col);\n      } else {\n        rectWidth = this.table.getColWidth(col);\n      }\n      rectDx = rectX - delta;\n\n      symbolX = rectX + rectWidth;\n      symbolY = 2;\n\n      linePoints.push({ x: 0, y: 0 });\n      linePoints.push({ x: 0, y: this.table.tableNoFrameHeight });\n    } else if (cellType === 'rowHeader') {\n      rectY = this.table.getRowsHeight(0, row - 1) - this.table.stateManeger.scroll.verticalBarPos;\n      rectX = this.table.getColsWidth(0, this.table.frozenColCount - 1);\n      rectWidth = this.table.tableNoFrameWidth;\n      if (mergeInfo) {\n        rectHeight = this.table.getRowsHeight(mergeInfo.start.row, mergeInfo.end.row);\n      } else {\n        rectHeight = this.table.getRowHeight(row);\n      }\n      rectDy = rectY - delta;\n\n      symbolX = 2;\n      symbolY = rectY + rectHeight;\n      symbolRotate = Math.PI / 2;\n\n      linePoints.push({ x: 0, y: 0 });\n      linePoints.push({ x: this.table.tableNoFrameWidth, y: 0 });\n    }\n\n    this.columnMoverBack.setAttributes({\n      visible: true,\n      x: rectX - rectDx,\n      y: rectY - rectDy,\n      width: rectWidth,\n      height: rectHeight,\n      dx: rectDx,\n      dy: rectDy\n    });\n    this.columnMoverLine.setAttributes({\n      x: symbolX,\n      y: symbolY,\n      visible: true,\n      points: linePoints\n    });\n    this.columnMoverLabel.setAttributes({\n      visible: true,\n      x: symbolX,\n      y: symbolY,\n      angle: symbolRotate\n    });\n  }\n\n  hide() {\n    this.columnMoverLabel.setAttribute('visible', false);\n    this.columnMoverLine.setAttribute('visible', false);\n    this.columnMoverBack.setAttribute('visible', false);\n  }\n\n  update(backX: number | undefined, lineX: number | undefined, backY: number | undefined, lineY: number | undefined) {\n    if (typeof backX === 'number' && typeof lineX === 'number') {\n      this.columnMoverLabel.setAttribute('x', lineX - this.table.stateManeger.scroll.horizontalBarPos);\n      this.columnMoverLine.setAttribute('x', lineX - this.table.stateManeger.scroll.horizontalBarPos);\n      this.columnMoverBack.setAttribute('x', backX);\n    } else if (typeof backY === 'number' && typeof lineY === 'number') {\n      this.columnMoverLabel.setAttribute('y', lineY - this.table.stateManeger.scroll.verticalBarPos);\n      this.columnMoverLine.setAttribute('y', lineY - this.table.stateManeger.scroll.verticalBarPos);\n      this.columnMoverBack.setAttribute('y', backY);\n    }\n  }\n}\n"]}

package/cjs/scenegraph/component/custom.js

@@ -72,10 +72,8 @@ function adjustElementToGroup(elements, width, height, value) {
                 y: element.y,
                 dx: null !== (_a = element.dx) && void 0 !== _a ? _a : 0,
                 dy: null !== (_b = element.dy) && void 0 !== _b ? _b : 0,
-                fill: !!element.fillColor,
-                fillColor: element.fillColor,
-                stroke: !!element.strokeColor,
-                strokeColor: element.strokeColor,
+                fill: element.fill,
+                stroke: element.stroke,
                 outerRadius: element.radius,
                 startAngle: element.startAngle,
                 endAngle: element.endAngle,
@@ -96,14 +94,11 @@ function adjustElementToGroup(elements, width, height, value) {
                     width: element.width + 2 * expandX,
                     height: element.height + 2 * expandY,
                     borderRadius: null !== (_k = null === (_j = element.background) || void 0 === _j ? void 0 : _j.borderRadius) && void 0 !== _k ? _k : 0,
-                    fill: !0,
-                    fillColor: null !== (_m = null === (_l = element.background) || void 0 === _l ? void 0 : _l.fillColor) && void 0 !== _m ? _m : "#888"
+                    fill: null !== (_m = null === (_l = element.background) || void 0 === _l ? void 0 : _l.fill) && void 0 !== _m ? _m : "#888"
                 });
                 customGroup.appendChild(textBackRect);
             }
             const text = new text_1.WrapText(Object.assign({
-                fill: !!element.fillColor,
-                stroke: !!element.strokeColor,
                 pickable: !!element.clickable
             }, element));
             customGroup.appendChild(text);
@@ -118,10 +113,8 @@ function adjustElementToGroup(elements, width, height, value) {
                 width: element.width,
                 height: element.height,
                 borderRadius: element.radius,
-                fill: !!element.fillColor,
-                fillColor: element.fillColor,
-                stroke: !!element.strokeColor,
-                strokeColor: element.strokeColor,
+                fill: element.fill,
+                stroke: element.stroke,
                 pickable: !!element.clickable,
                 cursor: element.cursor
             });
@@ -135,10 +128,8 @@ function adjustElementToGroup(elements, width, height, value) {
                 dx: null !== (_q = element.dx) && void 0 !== _q ? _q : 0,
                 dy: null !== (_r = element.dy) && void 0 !== _r ? _r : 0,
                 radius: element.radius,
-                fill: !!element.fillColor,
-                fillColor: element.fillColor,
-                stroke: !!element.strokeColor,
-                strokeColor: element.strokeColor,
+                fill: element.fill,
+                stroke: element.stroke,
                 pickable: !!element.clickable,
                 cursor: element.cursor
             });

package/cjs/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, createRect, TextAlignType, TextBaselineType } from '@visactor/vrender';\nimport { isFunction, isString } from '../../tools/util';\nimport type {\n  ICustomLayout,\n  ICustomRender,\n  ICustomRenderElement,\n  ICustomRenderElements,\n  ICustomRenderFuc,\n  ICustomRenderObj\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';\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  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    // expectedWidth = customRenderObj.expectedWidth;\n    // expectedHeight = customRenderObj.expectedHeight;\n    customElements = customRenderObj.rootContainer.getElements(undefined, false, false);\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    customElements = customRenderObj.elements;\n    renderDefault = customRenderObj.renderDefault;\n    expectedWidth = customRenderObj.expectedWidth;\n    expectedHeight = customRenderObj.expectedHeight;\n  } else if (customRender) {\n    expectedWidth = customRender.expectedWidth;\n    expectedHeight = customRender.expectedHeight;\n    customElements = customRender.elements;\n    renderDefault = customRender.renderDefault;\n  }\n\n  let elementsGroup: Group;\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    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.fillColor,\n          fillColor: element.fillColor as string,\n          stroke: !!element.strokeColor,\n          strokeColor: element.strokeColor 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            borderRadius: element.background?.borderRadius ?? 0,\n            fill: true,\n            fillColor: element.background?.fillColor ?? '#888'\n          });\n          customGroup.appendChild(textBackRect);\n        }\n        const text = new WrapText(\n          Object.assign(\n            {\n              fill: !!element.fillColor,\n              stroke: !!element.strokeColor,\n              pickable: !!element.clickable\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          borderRadius: element.radius as number,\n          fill: !!element.fillColor,\n          fillColor: element.fillColor as string,\n          stroke: !!element.strokeColor,\n          strokeColor: element.strokeColor 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.fillColor,\n          fillColor: element.fillColor as string,\n          stroke: !!element.strokeColor,\n          strokeColor: element.strokeColor 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  });\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    element.x = isString(element.x)\n      ? transformString(element.x as string, width - borderLineWidths[1])\n      : Number(element.x);\n    element.y = isString(element.y)\n      ? transformString(element.y as string, height - borderLineWidths[2])\n      : Number(element.y);\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    element.x = element.x + left;\n    element.y = element.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"]}
+{"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, createRect, TextAlignType, TextBaselineType } from '@visactor/vrender';\nimport { isFunction, isString } from '../../tools/util';\nimport type {\n  ICustomLayout,\n  ICustomRender,\n  ICustomRenderElement,\n  ICustomRenderElements,\n  ICustomRenderFuc,\n  ICustomRenderObj\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';\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  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    // expectedWidth = customRenderObj.expectedWidth;\n    // expectedHeight = customRenderObj.expectedHeight;\n    customElements = customRenderObj.rootContainer.getElements(undefined, false, false);\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    customElements = customRenderObj.elements;\n    renderDefault = customRenderObj.renderDefault;\n    expectedWidth = customRenderObj.expectedWidth;\n    expectedHeight = customRenderObj.expectedHeight;\n  } else if (customRender) {\n    expectedWidth = customRender.expectedWidth;\n    expectedHeight = customRender.expectedHeight;\n    customElements = customRender.elements;\n    renderDefault = customRender.renderDefault;\n  }\n\n  let elementsGroup: Group;\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    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            borderRadius: element.background?.borderRadius ?? 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            },\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          borderRadius: 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  });\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    element.x = isString(element.x)\n      ? transformString(element.x as string, width - borderLineWidths[1])\n      : Number(element.x);\n    element.y = isString(element.y)\n      ? transformString(element.y as string, height - borderLineWidths[2])\n      : Number(element.y);\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    element.x = element.x + left;\n    element.y = element.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"]}

package/cjs/scenegraph/component/menu.js

@@ -32,10 +32,8 @@ class MenuHandler {
         this._table = table, this._menuInstance = new group_1.Group({
             x: 0,
             y: 0,
-            fill: !0,
-            fillColor: menuStyle.bgColor,
-            stroke: !0,
-            strokeColor: menuStyle.borderColor,
+            fill: menuStyle.bgColor,
+            stroke: menuStyle.borderColor,
             borderRadius: menuStyle.borderRadius,
             lineWidth: menuStyle.borderWidth
         }), this._menuInfo = {
@@ -95,13 +93,12 @@ class MenuHandler {
                 y: y,
                 x: x,
                 height: menuStyle.lineHeight,
-                fill: !0,
-                fillColor: menuStyle.bgColor
+                fill: menuStyle.bgColor
             });
             group.role = "menu-item", this._menuInstance.appendChild(group), group.stateProxy = stateName => "hover" === stateName ? {
-                fillColor: menuStyle.hoverBgColor
+                fill: menuStyle.hoverBgColor
             } : {
-                fillColor: menuStyle.bgColor
+                fill: menuStyle.bgColor
             }, group.addEventListener("pointerenter", (e => {
                 group.addState("hover", !0, !1), this._table.scenegraph.updateNextFrame();
             })), group.addEventListener("pointerleave", (e => {
@@ -110,8 +107,7 @@ class MenuHandler {
             const textMark = new vrender_1.Text({
                 x: menuStyle.menuItemPadding,
                 y: menuStyle.menuItemPadding,
-                fill: !0,
-                fillColor: isisHighlight ? menuStyle.highlightColor : menuStyle.color,
+                fill: isisHighlight ? menuStyle.highlightColor : menuStyle.color,
                 text: text,
                 textBaseline: "top",
                 fontSize: menuStyle.fontSize,