@visactor/vrender 0.14.3 → 0.15.0-alpha.0

package/es/graphic/builtin-symbol/utils.js

@@ -1,17 +1,35 @@
+import { isArray, AABBBounds } from "@visactor/vutils";
+
 import { renderCommandList } from "../../common/render-command-list";
 
+const tempBounds = new AABBBounds;
+
 export class CustomSymbolClass {
-    constructor(type, path) {
-        this.pathStr = "", this.type = type, this.path = path;
+    constructor(type, path, isSvg = !1) {
+        this.pathStr = "", this.type = type, isArray(path) ? this.svgCache = path : this.path = path, 
+        this.isSvg = isSvg;
     }
-    drawOffset(ctx, size, x, y, offset) {
-        return renderCommandList(this.path.commandList, ctx, x, y, size + offset, size + offset), 
-        !1;
+    drawOffset(ctx, size, x, y, offset, z, cb) {
+        return this.isSvg ? !!this.svgCache && (this.svgCache.forEach((item => {
+            ctx.beginPath(), renderCommandList(item.path.commandList, ctx, x, y, size, size), 
+            cb && cb(item.path, item.attribute);
+        })), !1) : (renderCommandList(this.path.commandList, ctx, x, y, size + offset, size + offset), 
+        !1);
     }
-    draw(ctx, size, x, y) {
-        return renderCommandList(this.path.commandList, ctx, x, y, size, size), !1;
+    draw(ctx, size, x, y, z, cb) {
+        return this.isSvg ? !!this.svgCache && (this.svgCache.forEach((item => {
+            ctx.beginPath(), renderCommandList(item.path.commandList, ctx, x, y, size, size), 
+            cb && cb(item.path, item.attribute);
+        })), !1) : (renderCommandList(this.path.commandList, ctx, x, y, size, size), !1);
     }
     bounds(size, bounds) {
+        if (this.isSvg) {
+            if (!this.svgCache) return;
+            return bounds.clear(), void this.svgCache.forEach((({path: path}) => {
+                tempBounds.x1 = path.bounds.x1 * size, tempBounds.y1 = path.bounds.y1 * size, tempBounds.x2 = path.bounds.x2 * size, 
+                tempBounds.y2 = path.bounds.y2 * size, bounds.union(tempBounds);
+            }));
+        }
         this.path.bounds && (bounds.x1 = this.path.bounds.x1 * size, bounds.y1 = this.path.bounds.y1 * size, 
         bounds.x2 = this.path.bounds.x2 * size, bounds.y2 = this.path.bounds.y2 * size);
     }

package/es/graphic/builtin-symbol/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/graphic/builtin-symbol/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAGrE,MAAM,OAAO,iBAAiB;IAK5B,YAAY,IAAY,EAAE,IAAmB;QAF7C,YAAO,GAAW,EAAE,CAAC;QAGnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,UAAU,CAAC,GAAe,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS,EAAE,MAAc;QAC5E,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,GAAG,MAAM,EAAE,IAAI,GAAG,MAAM,CAAC,CAAC;QAClF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC,GAAe,EAAE,IAAY,EAAE,CAAS,EAAE,CAAS;QACtD,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAChE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,CAAC,IAAY,EAAE,MAAe;QAClC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACrB,OAAO;SACR;QACD,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC;QACvC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC;QACvC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC;QACvC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC;IACzC,CAAC;CACF","file":"utils.js","sourcesContent":["import type { IBounds } from '@visactor/vutils';\nimport { renderCommandList } from '../../common/render-command-list';\nimport type { IContext2d, ICustomPath2D, ISymbolClass } from '../../interface';\n\nexport class CustomSymbolClass implements ISymbolClass {\n  type: string;\n  path: ICustomPath2D;\n  pathStr: string = '';\n\n  constructor(type: string, path: ICustomPath2D) {\n    this.type = type;\n    this.path = path;\n  }\n\n  drawOffset(ctx: IContext2d, size: number, x: number, y: number, offset: number) {\n    renderCommandList(this.path.commandList, ctx, x, y, size + offset, size + offset);\n    return false;\n  }\n\n  draw(ctx: IContext2d, size: number, x: number, y: number) {\n    renderCommandList(this.path.commandList, ctx, x, y, size, size);\n    return false;\n  }\n\n  bounds(size: number, bounds: IBounds) {\n    if (!this.path.bounds) {\n      return;\n    }\n    bounds.x1 = this.path.bounds.x1 * size;\n    bounds.y1 = this.path.bounds.y1 * size;\n    bounds.x2 = this.path.bounds.x2 * size;\n    bounds.y2 = this.path.bounds.y2 * size;\n  }\n}\n\n// export function CustomSymbol(): ISymbolClass {\n\n// }\n"]}
+{"version":3,"sources":["../../src/graphic/builtin-symbol/utils.ts"],"names":[],"mappings":"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","file":"utils.js","sourcesContent":["import { isArray, type IBounds, AABBBounds } from '@visactor/vutils';\nimport { renderCommandList } from '../../common/render-command-list';\nimport type { IContext2d, ICustomPath2D, IGraphicAttribute, ISymbolClass } from '../../interface';\n\nconst tempBounds = new AABBBounds();\nexport class CustomSymbolClass implements ISymbolClass {\n  type: string;\n  path: ICustomPath2D;\n  pathStr: string = '';\n  isSvg: boolean;\n  svgCache?: { path: ICustomPath2D; attribute: Partial<IGraphicAttribute> }[];\n\n  constructor(\n    type: string,\n    path: ICustomPath2D | { path: ICustomPath2D; attribute: Partial<IGraphicAttribute> }[],\n    isSvg: boolean = false\n  ) {\n    this.type = type;\n    if (isArray(path)) {\n      this.svgCache = path;\n    } else {\n      this.path = path;\n    }\n    this.isSvg = isSvg;\n  }\n\n  drawOffset(\n    ctx: IContext2d,\n    size: number,\n    x: number,\n    y: number,\n    offset: number,\n    z?: number,\n    cb?: (path: ICustomPath2D, attribute?: Record<string, any>) => void\n  ) {\n    if (this.isSvg) {\n      if (!this.svgCache) {\n        return false;\n      }\n      this.svgCache.forEach(item => {\n        ctx.beginPath();\n        renderCommandList(item.path.commandList, ctx, x, y, size, size);\n        cb && cb(item.path, item.attribute);\n      });\n      return false;\n    }\n    renderCommandList(this.path.commandList, ctx, x, y, size + offset, size + offset);\n    return false;\n  }\n\n  draw(\n    ctx: IContext2d,\n    size: number,\n    x: number,\n    y: number,\n    z?: number,\n    cb?: (path: ICustomPath2D, attribute?: Record<string, any>) => void\n  ) {\n    if (this.isSvg) {\n      if (!this.svgCache) {\n        return false;\n      }\n      this.svgCache.forEach(item => {\n        ctx.beginPath();\n        renderCommandList(item.path.commandList, ctx, x, y, size, size);\n        cb && cb(item.path, item.attribute);\n      });\n      return false;\n    }\n    renderCommandList(this.path.commandList, ctx, x, y, size, size);\n    return false;\n  }\n\n  bounds(size: number, bounds: IBounds) {\n    if (this.isSvg) {\n      if (!this.svgCache) {\n        return;\n      }\n      bounds.clear();\n      this.svgCache.forEach(({ path }) => {\n        tempBounds.x1 = path.bounds.x1 * size;\n        tempBounds.y1 = path.bounds.y1 * size;\n        tempBounds.x2 = path.bounds.x2 * size;\n        tempBounds.y2 = path.bounds.y2 * size;\n        bounds.union(tempBounds);\n      });\n      return;\n    }\n    if (!this.path.bounds) {\n      return;\n    }\n    bounds.x1 = this.path.bounds.x1 * size;\n    bounds.y1 = this.path.bounds.y1 * size;\n    bounds.x2 = this.path.bounds.x2 * size;\n    bounds.y2 = this.path.bounds.y2 * size;\n  }\n}\n\n// export function CustomSymbol(): ISymbolClass {\n\n// }\n"]}

package/es/graphic/config.js

@@ -84,7 +84,8 @@ export const DefaultStyle = Object.assign(Object.assign(Object.assign({
     texturePadding: 2,
     backgroundMode: 0,
     blur: 0,
-    cursor: null
+    cursor: null,
+    html: null
 }, DefaultFillStyle), DefaultStrokeStyle), DefaultLayout);
 
 export const DefaultConnectAttribute = {

package/es/graphic/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/graphic/config.ts"],"names":[],"mappings":"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","file":"config.js","sourcesContent":["// 存放公共属性\nimport { Matrix, pi2 } from '@visactor/vutils';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport type {\n  IArcGraphicAttribute,\n  IAreaGraphicAttribute,\n  IGraphicAttribute,\n  ICircleGraphicAttribute,\n  IFillStyle,\n  IGlyphGraphicAttribute,\n  IGroupGraphicAttribute,\n  IImageGraphicAttribute,\n  ILineGraphicAttribute,\n  IPathGraphicAttribute,\n  IPolygonGraphicAttribute,\n  IRect3dGraphicAttribute,\n  IRectGraphicAttribute,\n  IStrokeStyle,\n  IGraphicStyle,\n  ISymbolGraphicAttribute,\n  ITextAttribute,\n  ITextGraphicAttribute,\n  IRichTextGraphicAttribute,\n  ITransform,\n  RichTextWordBreak,\n  RichTextVerticalDirection,\n  RichTextGlobalAlignType,\n  RichTextGlobalBaselineType,\n  IRichTextIconGraphicAttribute,\n  IConnectedStyle,\n  ILayout\n} from '../interface';\n\nexport const DefaultLayout: ILayout = {\n  alignSelf: 'auto'\n};\n\nexport const DefaultTransform: ITransform = {\n  x: 0,\n  y: 0,\n  z: 0,\n  dx: 0,\n  dy: 0,\n  dz: 0,\n  scrollX: 0,\n  scrollY: 0,\n  scaleX: 1,\n  scaleY: 1,\n  scaleZ: 1,\n  angle: 0,\n  alpha: 0,\n  beta: 0,\n  anchor: [0, 0],\n  anchor3d: [0, 0],\n  postMatrix: new Matrix()\n};\n\nexport const DefaultFillStyle: IFillStyle = {\n  fillOpacity: 1,\n  fill: false,\n  shadowBlur: 0,\n  shadowColor: 'black',\n  shadowOffsetX: 0,\n  shadowOffsetY: 0\n};\n\nconst commonStroke: Omit<IStrokeStyle, 'outerBorder' | 'innerBorder'> = {\n  strokeOpacity: 1,\n  lineDash: [],\n  lineDashOffset: 0,\n  lineWidth: 1,\n  lineCap: 'butt',\n  lineJoin: 'miter',\n  miterLimit: 10,\n  strokeBoundsBuffer: 2,\n  stroke: false\n};\n\nexport const DefaultStrokeStyle: IStrokeStyle = {\n  outerBorder: { ...commonStroke, distance: 0 },\n  innerBorder: { ...commonStroke, distance: 0 },\n  ...commonStroke\n};\n\nexport const DefaultTextStyle: Required<ITextAttribute> = {\n  text: '',\n  maxLineWidth: Infinity,\n  textAlign: 'left',\n  textBaseline: 'alphabetic',\n  fontSize: 16,\n  // @ts-ignore\n  fontFamily: `PingFang SC,Microsoft Yahei,system-ui,-apple-system,segoe ui,\n    Roboto,Helvetica,Arial,sans-serif, apple color emoji,segoe ui emoji,segoe ui symbol`,\n  fontWeight: '',\n  ellipsis: '…',\n  fontVariant: '',\n  fontStyle: '',\n  lineHeight: undefined,\n  underline: 0,\n  lineThrough: 0,\n  scaleIn3d: false,\n  direction: 'horizontal',\n  wordBreak: 'break-all'\n};\n\nexport const DefaultStyle: IGraphicStyle = {\n  opacity: 1,\n  background: null,\n  texture: null,\n  textureColor: 'black',\n  textureSize: 10,\n  texturePadding: 2,\n  backgroundMode: 0,\n  blur: 0,\n  cursor: null,\n  ...DefaultFillStyle,\n  ...DefaultStrokeStyle,\n  ...DefaultLayout\n};\n\nexport const DefaultConnectAttribute: Required<IConnectedStyle> = {\n  connectedType: 'none',\n  // connectedStyle: {\n  //   stroke: DefaultStrokeStyle.stroke,\n  //   strokeOpacity: DefaultStrokeStyle.strokeOpacity,\n  //   lineDash: DefaultStrokeStyle.lineDash,\n  //   lineDashOffset: DefaultStrokeStyle.lineDashOffset,\n  //   lineCap: DefaultStrokeStyle.lineCap,\n  //   lineJoin: DefaultStrokeStyle.lineJoin,\n  //   lineWidth: DefaultStrokeStyle.lineWidth,\n  //   fill: DefaultFillStyle.fill,\n  //   fillOpacity: DefaultFillStyle.fillOpacity\n  // },\n  connectedStyle: {}, // 默认全都继承父属性\n  connectedX: NaN,\n  connectedY: NaN\n} as IConnectedStyle;\n\nexport const DefaultAttribute: Required<IGraphicAttribute> = {\n  strokeSeg: null,\n  pickable: true,\n  childrenPickable: true,\n  visible: true,\n  zIndex: 0,\n  layout: null,\n  boundsPadding: 0,\n  pickMode: 'accurate',\n  customPickShape: null,\n  boundsMode: 'accurate',\n  keepDirIn3d: true,\n  ...DefaultStyle,\n  ...DefaultTransform\n};\n\nexport function addAttributeToPrototype(obj: Record<string, any>, c: any, keys: string[]) {\n  keys.forEach(key => {\n    c.prototype[key] = obj[key];\n  });\n}\nexport function rewriteProto(obj: Record<string, any>, c: Record<string, any>) {\n  Object.setPrototypeOf(obj, c);\n}\n\nexport const DefaultArcAttribute: Required<IArcGraphicAttribute> = {\n  ...DefaultAttribute,\n  startAngle: 0,\n  endAngle: pi2,\n  innerRadius: 0,\n  outerRadius: 1,\n  cornerRadius: 0,\n  padRadius: 0,\n  padAngle: 0,\n  cap: false,\n  forceShowCap: false\n};\n\nexport const DefaultAreaAttribute: Required<IAreaGraphicAttribute> = {\n  ...DefaultAttribute,\n  ...DefaultConnectAttribute,\n  points: [],\n  segments: [],\n  curveType: 'linear',\n  clipRange: 1\n};\n\nexport const DefaultCircleAttribute: Required<ICircleGraphicAttribute> = {\n  ...DefaultAttribute,\n  radius: 1,\n  startAngle: 0,\n  endAngle: pi2\n};\n\nexport const DefaultGroupAttribute: Required<IGroupGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  cornerRadius: 0,\n  path: [],\n  clip: false,\n  visibleAll: true,\n  display: 'relative',\n  flexDirection: 'row',\n  flexWrap: 'wrap',\n  justifyContent: 'flex-start',\n  alignItems: 'flex-start',\n  alignContent: 'flex-start'\n};\n\nexport const DefaultGlyphAttribute: Required<IGlyphGraphicAttribute> = {\n  ...DefaultAttribute,\n  path: '',\n  width: 0,\n  height: 0,\n  cornerRadius: 0,\n  clip: false\n};\n\nexport const DefaultLineAttribute: Required<ILineGraphicAttribute> = {\n  ...DefaultAttribute,\n  ...DefaultConnectAttribute,\n  points: [],\n  segments: [],\n  curveType: 'linear',\n  clipRange: 1,\n  clipRangeByDimension: 'default'\n};\n\nexport const DefaultPathAttribute: Required<IPathGraphicAttribute> = {\n  ...DefaultAttribute,\n  path: new CustomPath2D(),\n  customPath: () => {\n    console.warn('空函数');\n  }\n};\n\nexport const DefaultPolygonAttribute: Required<IPolygonGraphicAttribute> = {\n  ...DefaultAttribute,\n  points: [],\n  cornerRadius: 0\n};\n\nexport const DefaultRectAttribute: Required<IRectGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  strokeBoundsBuffer: 0,\n  cornerRadius: 0\n};\n\nexport const DefaultRect3dAttribute: Required<IRect3dGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  cornerRadius: 0,\n  length: 0\n};\n\nexport const DefaultSymbolAttribute: Required<ISymbolGraphicAttribute> = {\n  ...DefaultAttribute,\n  symbolType: 'circle',\n  size: 10, // 外接**正方形**的边长\n  keepDirIn3d: true\n};\n\nexport const DefaultTextAttribute: Required<ITextGraphicAttribute> = {\n  ...DefaultAttribute,\n  ...DefaultTextStyle,\n  strokeBoundsBuffer: 0,\n  keepDirIn3d: true\n};\n\nexport const DefaultRichTextAttribute: Required<IRichTextGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 300,\n  height: 300,\n  ellipsis: true,\n  wordBreak: 'break-word' as RichTextWordBreak,\n  verticalDirection: 'top' as RichTextVerticalDirection,\n  textAlign: 'left' as RichTextGlobalAlignType,\n  textBaseline: 'top' as RichTextGlobalBaselineType,\n  layoutDirection: 'horizontal',\n  textConfig: [],\n  maxHeight: undefined,\n  maxWidth: undefined,\n  singleLine: false\n};\n\nexport const DefaultImageAttribute: Required<IImageGraphicAttribute> = {\n  repeatX: 'no-repeat',\n  repeatY: 'no-repeat',\n  image: '',\n  width: 0,\n  height: 0,\n  ...DefaultAttribute,\n  fill: true\n};\n\nexport const DefaultRichTextIconAttribute: Required<IRichTextIconGraphicAttribute> = {\n  ...DefaultImageAttribute,\n  backgroundShowMode: 'never',\n  backgroundWidth: 0,\n  backgroundHeight: 0,\n  textAlign: 'left',\n  textBaseline: 'middle',\n  direction: 'horizontal',\n  margin: 0,\n  id: '',\n\n  width: 20,\n  height: 20,\n  backgroundFill: 'rgba(101, 117, 168, 0.1)',\n  backgroundFillOpacity: 1,\n  backgroundStroke: false,\n  backgroundStrokeOpacity: 1,\n  backgroundRadius: 4,\n  opacity: 1\n};\n"]}
+{"version":3,"sources":["../../src/graphic/config.ts"],"names":[],"mappings":"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","file":"config.js","sourcesContent":["// 存放公共属性\nimport { Matrix, pi2 } from '@visactor/vutils';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport type {\n  IArcGraphicAttribute,\n  IAreaGraphicAttribute,\n  IGraphicAttribute,\n  ICircleGraphicAttribute,\n  IFillStyle,\n  IGlyphGraphicAttribute,\n  IGroupGraphicAttribute,\n  IImageGraphicAttribute,\n  ILineGraphicAttribute,\n  IPathGraphicAttribute,\n  IPolygonGraphicAttribute,\n  IRect3dGraphicAttribute,\n  IRectGraphicAttribute,\n  IStrokeStyle,\n  IGraphicStyle,\n  ISymbolGraphicAttribute,\n  ITextAttribute,\n  ITextGraphicAttribute,\n  IRichTextGraphicAttribute,\n  ITransform,\n  RichTextWordBreak,\n  RichTextVerticalDirection,\n  RichTextGlobalAlignType,\n  RichTextGlobalBaselineType,\n  IRichTextIconGraphicAttribute,\n  IConnectedStyle,\n  ILayout\n} from '../interface';\n\nexport const DefaultLayout: ILayout = {\n  alignSelf: 'auto'\n};\n\nexport const DefaultTransform: ITransform = {\n  x: 0,\n  y: 0,\n  z: 0,\n  dx: 0,\n  dy: 0,\n  dz: 0,\n  scrollX: 0,\n  scrollY: 0,\n  scaleX: 1,\n  scaleY: 1,\n  scaleZ: 1,\n  angle: 0,\n  alpha: 0,\n  beta: 0,\n  anchor: [0, 0],\n  anchor3d: [0, 0],\n  postMatrix: new Matrix()\n};\n\nexport const DefaultFillStyle: IFillStyle = {\n  fillOpacity: 1,\n  fill: false,\n  shadowBlur: 0,\n  shadowColor: 'black',\n  shadowOffsetX: 0,\n  shadowOffsetY: 0\n};\n\nconst commonStroke: Omit<IStrokeStyle, 'outerBorder' | 'innerBorder'> = {\n  strokeOpacity: 1,\n  lineDash: [],\n  lineDashOffset: 0,\n  lineWidth: 1,\n  lineCap: 'butt',\n  lineJoin: 'miter',\n  miterLimit: 10,\n  strokeBoundsBuffer: 2,\n  stroke: false\n};\n\nexport const DefaultStrokeStyle: IStrokeStyle = {\n  outerBorder: { ...commonStroke, distance: 0 },\n  innerBorder: { ...commonStroke, distance: 0 },\n  ...commonStroke\n};\n\nexport const DefaultTextStyle: Required<ITextAttribute> = {\n  text: '',\n  maxLineWidth: Infinity,\n  textAlign: 'left',\n  textBaseline: 'alphabetic',\n  fontSize: 16,\n  // @ts-ignore\n  fontFamily: `PingFang SC,Microsoft Yahei,system-ui,-apple-system,segoe ui,\n    Roboto,Helvetica,Arial,sans-serif, apple color emoji,segoe ui emoji,segoe ui symbol`,\n  fontWeight: '',\n  ellipsis: '…',\n  fontVariant: '',\n  fontStyle: '',\n  lineHeight: undefined,\n  underline: 0,\n  lineThrough: 0,\n  scaleIn3d: false,\n  direction: 'horizontal',\n  wordBreak: 'break-all'\n};\n\nexport const DefaultStyle: IGraphicStyle = {\n  opacity: 1,\n  background: null,\n  texture: null,\n  textureColor: 'black',\n  textureSize: 10,\n  texturePadding: 2,\n  backgroundMode: 0,\n  blur: 0,\n  cursor: null,\n  html: null,\n  ...DefaultFillStyle,\n  ...DefaultStrokeStyle,\n  ...DefaultLayout\n};\n\nexport const DefaultConnectAttribute: Required<IConnectedStyle> = {\n  connectedType: 'none',\n  // connectedStyle: {\n  //   stroke: DefaultStrokeStyle.stroke,\n  //   strokeOpacity: DefaultStrokeStyle.strokeOpacity,\n  //   lineDash: DefaultStrokeStyle.lineDash,\n  //   lineDashOffset: DefaultStrokeStyle.lineDashOffset,\n  //   lineCap: DefaultStrokeStyle.lineCap,\n  //   lineJoin: DefaultStrokeStyle.lineJoin,\n  //   lineWidth: DefaultStrokeStyle.lineWidth,\n  //   fill: DefaultFillStyle.fill,\n  //   fillOpacity: DefaultFillStyle.fillOpacity\n  // },\n  connectedStyle: {}, // 默认全都继承父属性\n  connectedX: NaN,\n  connectedY: NaN\n} as IConnectedStyle;\n\nexport const DefaultAttribute: Required<IGraphicAttribute> = {\n  strokeSeg: null,\n  pickable: true,\n  childrenPickable: true,\n  visible: true,\n  zIndex: 0,\n  layout: null,\n  boundsPadding: 0,\n  pickMode: 'accurate',\n  customPickShape: null,\n  boundsMode: 'accurate',\n  keepDirIn3d: true,\n  ...DefaultStyle,\n  ...DefaultTransform\n};\n\nexport function addAttributeToPrototype(obj: Record<string, any>, c: any, keys: string[]) {\n  keys.forEach(key => {\n    c.prototype[key] = obj[key];\n  });\n}\nexport function rewriteProto(obj: Record<string, any>, c: Record<string, any>) {\n  Object.setPrototypeOf(obj, c);\n}\n\nexport const DefaultArcAttribute: Required<IArcGraphicAttribute> = {\n  ...DefaultAttribute,\n  startAngle: 0,\n  endAngle: pi2,\n  innerRadius: 0,\n  outerRadius: 1,\n  cornerRadius: 0,\n  padRadius: 0,\n  padAngle: 0,\n  cap: false,\n  forceShowCap: false\n};\n\nexport const DefaultAreaAttribute: Required<IAreaGraphicAttribute> = {\n  ...DefaultAttribute,\n  ...DefaultConnectAttribute,\n  points: [],\n  segments: [],\n  curveType: 'linear',\n  clipRange: 1\n};\n\nexport const DefaultCircleAttribute: Required<ICircleGraphicAttribute> = {\n  ...DefaultAttribute,\n  radius: 1,\n  startAngle: 0,\n  endAngle: pi2\n};\n\nexport const DefaultGroupAttribute: Required<IGroupGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  cornerRadius: 0,\n  path: [],\n  clip: false,\n  visibleAll: true,\n  display: 'relative',\n  flexDirection: 'row',\n  flexWrap: 'wrap',\n  justifyContent: 'flex-start',\n  alignItems: 'flex-start',\n  alignContent: 'flex-start'\n};\n\nexport const DefaultGlyphAttribute: Required<IGlyphGraphicAttribute> = {\n  ...DefaultAttribute,\n  path: '',\n  width: 0,\n  height: 0,\n  cornerRadius: 0,\n  clip: false\n};\n\nexport const DefaultLineAttribute: Required<ILineGraphicAttribute> = {\n  ...DefaultAttribute,\n  ...DefaultConnectAttribute,\n  points: [],\n  segments: [],\n  curveType: 'linear',\n  clipRange: 1,\n  clipRangeByDimension: 'default'\n};\n\nexport const DefaultPathAttribute: Required<IPathGraphicAttribute> = {\n  ...DefaultAttribute,\n  path: new CustomPath2D(),\n  customPath: () => {\n    console.warn('空函数');\n  }\n};\n\nexport const DefaultPolygonAttribute: Required<IPolygonGraphicAttribute> = {\n  ...DefaultAttribute,\n  points: [],\n  cornerRadius: 0\n};\n\nexport const DefaultRectAttribute: Required<IRectGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  strokeBoundsBuffer: 0,\n  cornerRadius: 0\n};\n\nexport const DefaultRect3dAttribute: Required<IRect3dGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 0,\n  height: 0,\n  cornerRadius: 0,\n  length: 0\n};\n\nexport const DefaultSymbolAttribute: Required<ISymbolGraphicAttribute> = {\n  ...DefaultAttribute,\n  symbolType: 'circle',\n  size: 10, // 外接**正方形**的边长\n  keepDirIn3d: true\n};\n\nexport const DefaultTextAttribute: Required<ITextGraphicAttribute> = {\n  ...DefaultAttribute,\n  ...DefaultTextStyle,\n  strokeBoundsBuffer: 0,\n  keepDirIn3d: true\n};\n\nexport const DefaultRichTextAttribute: Required<IRichTextGraphicAttribute> = {\n  ...DefaultAttribute,\n  width: 300,\n  height: 300,\n  ellipsis: true,\n  wordBreak: 'break-word' as RichTextWordBreak,\n  verticalDirection: 'top' as RichTextVerticalDirection,\n  textAlign: 'left' as RichTextGlobalAlignType,\n  textBaseline: 'top' as RichTextGlobalBaselineType,\n  layoutDirection: 'horizontal',\n  textConfig: [],\n  maxHeight: undefined,\n  maxWidth: undefined,\n  singleLine: false\n};\n\nexport const DefaultImageAttribute: Required<IImageGraphicAttribute> = {\n  repeatX: 'no-repeat',\n  repeatY: 'no-repeat',\n  image: '',\n  width: 0,\n  height: 0,\n  ...DefaultAttribute,\n  fill: true\n};\n\nexport const DefaultRichTextIconAttribute: Required<IRichTextIconGraphicAttribute> = {\n  ...DefaultImageAttribute,\n  backgroundShowMode: 'never',\n  backgroundWidth: 0,\n  backgroundHeight: 0,\n  textAlign: 'left',\n  textBaseline: 'middle',\n  direction: 'horizontal',\n  margin: 0,\n  id: '',\n\n  width: 20,\n  height: 20,\n  backgroundFill: 'rgba(101, 117, 168, 0.1)',\n  backgroundFillOpacity: 1,\n  backgroundStroke: false,\n  backgroundStrokeOpacity: 1,\n  backgroundRadius: 4,\n  opacity: 1\n};\n"]}

package/es/graphic/constants.d.ts

@@ -16,3 +16,25 @@ export declare const SYMBOL_NUMBER_TYPE: number;
 export declare const TEXT_NUMBER_TYPE: number;
 export declare const GraphicService: unique symbol;
 export declare const GraphicCreator: unique symbol;
+export declare const SVG_ATTRIBUTE_MAP: {
+    'stroke-linecap': string;
+    'stroke-linejoin': string;
+    'stroke-dasharray': string;
+    'stroke-dashoffset': string;
+    'stroke-width': string;
+    'fill-opacity': string;
+    'stroke-opacity': string;
+};
+export declare const SVG_ATTRIBUTE_MAP_KEYS: string[];
+export declare const SVG_PARSE_ATTRIBUTE_MAP: {
+    '@_stroke-linecap': string;
+    '@_stroke-linejoin': string;
+    '@_stroke-dasharray': string;
+    '@_stroke-dashoffset': string;
+    '@_stroke-width': string;
+    '@_fill-opacity': string;
+    '@_stroke-opacity': string;
+    '@_stroke': string;
+    '@_fill': string;
+};
+export declare const SVG_PARSE_ATTRIBUTE_MAP_KEYS: string[];

package/es/graphic/constants.js

@@ -35,4 +35,30 @@ export const TEXT_NUMBER_TYPE = genNumberType();
 export const GraphicService = Symbol.for("GraphicService");
 
 export const GraphicCreator = Symbol.for("GraphicCreator");
+
+export const SVG_ATTRIBUTE_MAP = {
+    "stroke-linecap": "lineCap",
+    "stroke-linejoin": "lineJoin",
+    "stroke-dasharray": "lineDash",
+    "stroke-dashoffset": "lineDashOffset",
+    "stroke-width": "lineWidth",
+    "fill-opacity": "fillOpacity",
+    "stroke-opacity": "strokeOpacity"
+};
+
+export const SVG_ATTRIBUTE_MAP_KEYS = Object.keys(SVG_ATTRIBUTE_MAP);
+
+export const SVG_PARSE_ATTRIBUTE_MAP = {
+    "@_stroke-linecap": "lineCap",
+    "@_stroke-linejoin": "lineJoin",
+    "@_stroke-dasharray": "lineDash",
+    "@_stroke-dashoffset": "lineDashOffset",
+    "@_stroke-width": "lineWidth",
+    "@_fill-opacity": "fillOpacity",
+    "@_stroke-opacity": "strokeOpacity",
+    "@_stroke": "stroke",
+    "@_fill": "fill"
+};
+
+export const SVG_PARSE_ATTRIBUTE_MAP_KEYS = Object.keys(SVG_PARSE_ATTRIBUTE_MAP);
 //# sourceMappingURL=constants.js.map

package/es/graphic/constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/graphic/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,EAAE,CAAC;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;AAClD,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG,aAAa,EAAE,CAAC;AACnD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,EAAE,CAAC;AACrD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;AAClD,MAAM,CAAC,MAAM,oBAAoB,GAAG,aAAa,EAAE,CAAC;AACpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;AAClD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAEhD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC3D,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC","file":"constants.js","sourcesContent":["import { genNumberType } from './tools';\n\nexport const ARC_NUMBER_TYPE = genNumberType();\nexport const ARC3D_NUMBER_TYPE = genNumberType();\nexport const AREA_NUMBER_TYPE = genNumberType();\nexport const CIRCLE_NUMBER_TYPE = genNumberType();\nexport const GLYPH_NUMBER_TYPE = genNumberType();\nexport const GROUP_NUMBER_TYPE = genNumberType();\nexport const IMAGE_NUMBER_TYPE = genNumberType();\nexport const LINE_NUMBER_TYPE = genNumberType();\nexport const PATH_NUMBER_TYPE = genNumberType();\nexport const POLYGON_NUMBER_TYPE = genNumberType();\nexport const PYRAMID3D_NUMBER_TYPE = genNumberType();\nexport const RECT_NUMBER_TYPE = genNumberType();\nexport const RECT3D_NUMBER_TYPE = genNumberType();\nexport const RICHTEXT_NUMBER_TYPE = genNumberType();\nexport const SYMBOL_NUMBER_TYPE = genNumberType();\nexport const TEXT_NUMBER_TYPE = genNumberType();\n\nexport const GraphicService = Symbol.for('GraphicService');\nexport const GraphicCreator = Symbol.for('GraphicCreator');\n"]}
+{"version":3,"sources":["../../src/graphic/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,EAAE,CAAC;AAC/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;AAClD,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAC;AACjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG,aAAa,EAAE,CAAC;AACnD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,EAAE,CAAC;AACrD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;AAClD,MAAM,CAAC,MAAM,oBAAoB,GAAG,aAAa,EAAE,CAAC;AACpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;AAClD,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;AAEhD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAC3D,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,gBAAgB,EAAE,SAAS;IAC3B,iBAAiB,EAAE,UAAU;IAC7B,kBAAkB,EAAE,UAAU;IAC9B,mBAAmB,EAAE,gBAAgB;IACrC,cAAc,EAAE,WAAW;IAC3B,cAAc,EAAE,aAAa;IAC7B,gBAAgB,EAAE,eAAe;CAClC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;AAErE,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,kBAAkB,EAAE,SAAS;IAC7B,mBAAmB,EAAE,UAAU;IAC/B,oBAAoB,EAAE,UAAU;IAChC,qBAAqB,EAAE,gBAAgB;IACvC,gBAAgB,EAAE,WAAW;IAC7B,gBAAgB,EAAE,aAAa;IAC/B,kBAAkB,EAAE,eAAe;IACnC,UAAU,EAAE,QAAQ;IACpB,QAAQ,EAAE,MAAM;CACjB,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC","file":"constants.js","sourcesContent":["import { genNumberType } from './tools';\n\nexport const ARC_NUMBER_TYPE = genNumberType();\nexport const ARC3D_NUMBER_TYPE = genNumberType();\nexport const AREA_NUMBER_TYPE = genNumberType();\nexport const CIRCLE_NUMBER_TYPE = genNumberType();\nexport const GLYPH_NUMBER_TYPE = genNumberType();\nexport const GROUP_NUMBER_TYPE = genNumberType();\nexport const IMAGE_NUMBER_TYPE = genNumberType();\nexport const LINE_NUMBER_TYPE = genNumberType();\nexport const PATH_NUMBER_TYPE = genNumberType();\nexport const POLYGON_NUMBER_TYPE = genNumberType();\nexport const PYRAMID3D_NUMBER_TYPE = genNumberType();\nexport const RECT_NUMBER_TYPE = genNumberType();\nexport const RECT3D_NUMBER_TYPE = genNumberType();\nexport const RICHTEXT_NUMBER_TYPE = genNumberType();\nexport const SYMBOL_NUMBER_TYPE = genNumberType();\nexport const TEXT_NUMBER_TYPE = genNumberType();\n\nexport const GraphicService = Symbol.for('GraphicService');\nexport const GraphicCreator = Symbol.for('GraphicCreator');\n\nexport const SVG_ATTRIBUTE_MAP = {\n  'stroke-linecap': 'lineCap',\n  'stroke-linejoin': 'lineJoin',\n  'stroke-dasharray': 'lineDash',\n  'stroke-dashoffset': 'lineDashOffset',\n  'stroke-width': 'lineWidth',\n  'fill-opacity': 'fillOpacity',\n  'stroke-opacity': 'strokeOpacity'\n};\n\nexport const SVG_ATTRIBUTE_MAP_KEYS = Object.keys(SVG_ATTRIBUTE_MAP);\n\nexport const SVG_PARSE_ATTRIBUTE_MAP = {\n  '@_stroke-linecap': 'lineCap',\n  '@_stroke-linejoin': 'lineJoin',\n  '@_stroke-dasharray': 'lineDash',\n  '@_stroke-dashoffset': 'lineDashOffset',\n  '@_stroke-width': 'lineWidth',\n  '@_fill-opacity': 'fillOpacity',\n  '@_stroke-opacity': 'strokeOpacity',\n  '@_stroke': 'stroke',\n  '@_fill': 'fill'\n};\n\nexport const SVG_PARSE_ATTRIBUTE_MAP_KEYS = Object.keys(SVG_PARSE_ATTRIBUTE_MAP);\n"]}

package/es/graphic/symbol.d.ts

@@ -1,4 +1,5 @@
-import type { AABBBounds, OBBBounds } from '@visactor/vutils';
+import type { OBBBounds } from '@visactor/vutils';
+import { AABBBounds } from '@visactor/vutils';
 import type { ISymbol, ISymbolClass, ISymbolGraphicAttribute } from '../interface';
 import { Graphic } from './graphic';
 import { CustomPath2D } from '../common/custom-path2d';

package/es/graphic/symbol.js

@@ -1,3 +1,5 @@
+import { AABBBounds } from "@visactor/vutils";
+
 import { isArray, max } from "@visactor/vutils";
 
 import { builtinSymbolsMap, CustomSymbolClass } from "./builtin-symbol";
@@ -12,7 +14,9 @@ import { application } from "../application";
 
 import { CustomPath2D } from "../common/custom-path2d";
 
-import { SYMBOL_NUMBER_TYPE } from "./constants";
+import { SVG_PARSE_ATTRIBUTE_MAP, SVG_PARSE_ATTRIBUTE_MAP_KEYS, SYMBOL_NUMBER_TYPE } from "./constants";
+
+import { XMLValidator, XMLParser } from "fast-xml-parser";
 
 const SYMBOL_UPDATE_TAG_KEY = [ "symbolType", "size", ...GRAPHIC_UPDATE_TAG_KEY ];
 
@@ -39,6 +43,29 @@ export class Symbol extends Graphic {
         if (path) return this._parsedPath = path, path;
         if (path = Symbol.userSymbolMap[symbolType], path) return this._parsedPath = path, 
         path;
+        if (!0 === XMLValidator.validate(symbolType, {
+            allowBooleanAttributes: !0
+        })) {
+            const parser = new XMLParser({
+                ignoreAttributes: !1
+            }), {svg: svg} = parser.parse(symbolType);
+            if (!svg) return null;
+            const path = isArray(svg.path) ? svg.path : [ svg.path ], b = new AABBBounds, cacheList = [];
+            path.forEach((item => {
+                const cache = (new CustomPath2D).fromString(item["@_d"]), attribute = {
+                    fill: "black"
+                };
+                SVG_PARSE_ATTRIBUTE_MAP_KEYS.forEach((k => {
+                    item[k] && (attribute[SVG_PARSE_ATTRIBUTE_MAP[k]] = item[k]);
+                })), cacheList.push({
+                    path: cache,
+                    attribute: attribute
+                }), b.union(cache.bounds);
+            }));
+            const width = b.width(), height = b.height(), scale = 1 / max(width, height);
+            return cacheList.forEach((cache => cache.path.transform(0, 0, scale, scale))), this._parsedPath = new CustomSymbolClass(symbolType, cacheList, !0), 
+            Symbol.userSymbolMap[symbolType] = this._parsedPath, this._parsedPath;
+        }
         const cache = (new CustomPath2D).fromString(symbolType), width = cache.bounds.width(), height = cache.bounds.height(), scale = 1 / max(width, height);
         return cache.transform(0, 0, scale, scale), this._parsedPath = new CustomSymbolClass(symbolType, cache), 
         Symbol.userSymbolMap[symbolType] = this._parsedPath, this._parsedPath;

package/es/graphic/symbol.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/graphic/symbol.ts"],"names":[],"mappings":"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","file":"symbol.js","sourcesContent":["import type { AABBBounds, OBBBounds } from '@visactor/vutils';\nimport { isArray, max } from '@visactor/vutils';\nimport type { ISymbol, ISymbolClass, ISymbolGraphicAttribute } from '../interface';\nimport { builtinSymbolsMap, CustomSymbolClass } from './builtin-symbol';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY } from './graphic';\nimport { parsePadding } from '../common/utils';\nimport { getTheme } from './theme';\nimport { application } from '../application';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport { SYMBOL_NUMBER_TYPE } from './constants';\n\nconst SYMBOL_UPDATE_TAG_KEY = ['symbolType', 'size', ...GRAPHIC_UPDATE_TAG_KEY];\n\n/**\n * symbol\n */\nexport class Symbol extends Graphic<ISymbolGraphicAttribute> implements ISymbol {\n  type: 'symbol' = 'symbol';\n\n  static userSymbolMap: Record<string, ISymbolClass> = {};\n\n  constructor(params: ISymbolGraphicAttribute = { symbolType: 'circle' }) {\n    super(params);\n    this.numberType = SYMBOL_NUMBER_TYPE;\n  }\n\n  protected _parsedPath?: ISymbolClass;\n\n  getParsedPath(): ISymbolClass {\n    if (this.shouldUpdateShape()) {\n      this.doUpdateParsedPath();\n      this.clearUpdateShapeTag();\n    }\n    return this._parsedPath as ISymbolClass;\n  }\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  private _isValid(): boolean {\n    const { size } = this.attribute;\n    return isArray(size) ? size.length === 2 && size.every(this._validNumber) : this._validNumber(size);\n  }\n\n  protected doUpdateParsedPath(): ISymbolClass {\n    const symbolTheme = getTheme(this).symbol;\n    // 查找内置symbol\n    const { symbolType = symbolTheme.symbolType } = this.attribute;\n    let path = builtinSymbolsMap[symbolType];\n    if (path) {\n      this._parsedPath = path;\n      return path;\n    }\n    path = Symbol.userSymbolMap[symbolType];\n    if (path) {\n      this._parsedPath = path;\n      return path;\n    }\n    const cache = new CustomPath2D().fromString(symbolType);\n    const width = cache.bounds.width();\n    const height = cache.bounds.height();\n    // 规范化到1\n    const maxWH = max(width, height);\n    const scale = 1 / maxWH;\n    cache.transform(0, 0, scale, scale);\n    this._parsedPath = new CustomSymbolClass(symbolType, cache);\n    Symbol.userSymbolMap[symbolType] = this._parsedPath;\n    return this._parsedPath;\n  }\n\n  protected doUpdateAABBBounds(full?: boolean): AABBBounds {\n    const symbolTheme = getTheme(this).symbol;\n    this._AABBBounds.setValue(Infinity, Infinity, -Infinity, -Infinity);\n    const attribute = this.attribute;\n    const bounds = application.graphicService.updateSymbolAABBBounds(\n      attribute,\n      getTheme(this).symbol,\n      this._AABBBounds,\n      full,\n      this\n    );\n\n    const { boundsPadding = symbolTheme.boundsPadding } = attribute;\n    const paddingArray = parsePadding(boundsPadding);\n    if (paddingArray) {\n      (bounds as AABBBounds).expand(paddingArray);\n    }\n\n    this.clearUpdateBoundTag();\n    return bounds as AABBBounds;\n  }\n\n  protected tryUpdateOBBBounds(): OBBBounds {\n    throw new Error('暂不支持');\n  }\n\n  getDefaultAttribute(name: string) {\n    const symbolTheme = getTheme(this).symbol;\n    return symbolTheme[name];\n  }\n\n  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < SYMBOL_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = SYMBOL_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return false;\n  }\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < SYMBOL_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = SYMBOL_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  toCustomPath() {\n    const symbolInstance = this.getParsedPath();\n    const size = this.attribute.size;\n    const x = 0;\n    const y = 0;\n    const formattedSize = isArray(size) ? size : [size, size];\n\n    return symbolInstance.path\n      ? new CustomPath2D().fromCustomPath2D(symbolInstance.path, x, y, formattedSize[0], formattedSize[1])\n      : new CustomPath2D().fromString(symbolInstance.pathStr, x, y, formattedSize[0], formattedSize[1]);\n  }\n\n  clone() {\n    return new Symbol({ ...this.attribute });\n  }\n}\n\n// addAttributeToPrototype(DefaultSymbolStyle, Symbol, PURE_STYLE_KEY);\n"]}
+{"version":3,"sources":["../../src/graphic/symbol.ts"],"names":[],"mappings":"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","file":"symbol.js","sourcesContent":["import type { OBBBounds } from '@visactor/vutils';\nimport { AABBBounds } from '@visactor/vutils';\nimport { isArray, max } from '@visactor/vutils';\nimport type { ISymbol, ISymbolClass, ISymbolGraphicAttribute } from '../interface';\nimport { builtinSymbolsMap, CustomSymbolClass } from './builtin-symbol';\nimport { Graphic, GRAPHIC_UPDATE_TAG_KEY } from './graphic';\nimport { parsePadding } from '../common/utils';\nimport { getTheme } from './theme';\nimport { application } from '../application';\nimport { CustomPath2D } from '../common/custom-path2d';\nimport { SVG_PARSE_ATTRIBUTE_MAP, SVG_PARSE_ATTRIBUTE_MAP_KEYS, SYMBOL_NUMBER_TYPE } from './constants';\nimport { XMLValidator, XMLParser } from 'fast-xml-parser';\n\nconst SYMBOL_UPDATE_TAG_KEY = ['symbolType', 'size', ...GRAPHIC_UPDATE_TAG_KEY];\n\n/**\n * symbol\n */\nexport class Symbol extends Graphic<ISymbolGraphicAttribute> implements ISymbol {\n  type: 'symbol' = 'symbol';\n\n  static userSymbolMap: Record<string, ISymbolClass> = {};\n\n  constructor(params: ISymbolGraphicAttribute = { symbolType: 'circle' }) {\n    super(params);\n    this.numberType = SYMBOL_NUMBER_TYPE;\n  }\n\n  protected _parsedPath?: ISymbolClass;\n\n  getParsedPath(): ISymbolClass {\n    if (this.shouldUpdateShape()) {\n      this.doUpdateParsedPath();\n      this.clearUpdateShapeTag();\n    }\n    return this._parsedPath as ISymbolClass;\n  }\n\n  isValid(): boolean {\n    return super.isValid() && this._isValid();\n  }\n  private _isValid(): boolean {\n    const { size } = this.attribute;\n    return isArray(size) ? size.length === 2 && size.every(this._validNumber) : this._validNumber(size);\n  }\n\n  protected doUpdateParsedPath(): ISymbolClass {\n    const symbolTheme = getTheme(this).symbol;\n    // 查找内置symbol\n    const { symbolType = symbolTheme.symbolType } = this.attribute;\n    let path = builtinSymbolsMap[symbolType];\n    if (path) {\n      this._parsedPath = path;\n      return path;\n    }\n    path = Symbol.userSymbolMap[symbolType];\n    if (path) {\n      this._parsedPath = path;\n      return path;\n    }\n\n    // 判断是否是svg\n    const isSvg = XMLValidator.validate(symbolType, {\n      allowBooleanAttributes: true\n    });\n    if (isSvg === true) {\n      const parser = new XMLParser({ ignoreAttributes: false });\n      const { svg } = parser.parse(symbolType);\n      if (!svg) {\n        return null;\n      }\n      const path = isArray(svg.path) ? svg.path : [svg.path];\n      const b = new AABBBounds();\n      const cacheList: { path: CustomPath2D; attribute: Record<string, any> }[] = [];\n      path.forEach((item: any) => {\n        const cache = new CustomPath2D().fromString(item['@_d']);\n        const attribute = {\n          fill: 'black'\n        };\n        SVG_PARSE_ATTRIBUTE_MAP_KEYS.forEach(k => {\n          if (item[k]) {\n            attribute[SVG_PARSE_ATTRIBUTE_MAP[k]] = item[k];\n          }\n        });\n        // 查找\n        cacheList.push({\n          path: cache,\n          attribute\n        });\n        b.union(cache.bounds);\n      });\n      const width = b.width();\n      const height = b.height();\n      // 规范化到1\n      const maxWH = max(width, height);\n      const scale = 1 / maxWH;\n      cacheList.forEach(cache => cache.path.transform(0, 0, scale, scale));\n\n      this._parsedPath = new CustomSymbolClass(symbolType, cacheList, true);\n      Symbol.userSymbolMap[symbolType] = this._parsedPath;\n      return this._parsedPath;\n    }\n\n    const cache = new CustomPath2D().fromString(symbolType);\n    const width = cache.bounds.width();\n    const height = cache.bounds.height();\n    // 规范化到1\n    const maxWH = max(width, height);\n    const scale = 1 / maxWH;\n    cache.transform(0, 0, scale, scale);\n    this._parsedPath = new CustomSymbolClass(symbolType, cache);\n    Symbol.userSymbolMap[symbolType] = this._parsedPath;\n    return this._parsedPath;\n  }\n\n  protected doUpdateAABBBounds(full?: boolean): AABBBounds {\n    const symbolTheme = getTheme(this).symbol;\n    this._AABBBounds.setValue(Infinity, Infinity, -Infinity, -Infinity);\n    const attribute = this.attribute;\n    const bounds = application.graphicService.updateSymbolAABBBounds(\n      attribute,\n      getTheme(this).symbol,\n      this._AABBBounds,\n      full,\n      this\n    );\n\n    const { boundsPadding = symbolTheme.boundsPadding } = attribute;\n    const paddingArray = parsePadding(boundsPadding);\n    if (paddingArray) {\n      (bounds as AABBBounds).expand(paddingArray);\n    }\n\n    this.clearUpdateBoundTag();\n    return bounds as AABBBounds;\n  }\n\n  protected tryUpdateOBBBounds(): OBBBounds {\n    throw new Error('暂不支持');\n  }\n\n  getDefaultAttribute(name: string) {\n    const symbolTheme = getTheme(this).symbol;\n    return symbolTheme[name];\n  }\n\n  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < SYMBOL_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = SYMBOL_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return false;\n  }\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < SYMBOL_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = SYMBOL_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return false;\n  }\n\n  toCustomPath() {\n    const symbolInstance = this.getParsedPath();\n    const size = this.attribute.size;\n    const x = 0;\n    const y = 0;\n    const formattedSize = isArray(size) ? size : [size, size];\n\n    return symbolInstance.path\n      ? new CustomPath2D().fromCustomPath2D(symbolInstance.path, x, y, formattedSize[0], formattedSize[1])\n      : new CustomPath2D().fromString(symbolInstance.pathStr, x, y, formattedSize[0], formattedSize[1]);\n  }\n\n  clone() {\n    return new Symbol({ ...this.attribute });\n  }\n}\n\n// addAttributeToPrototype(DefaultSymbolStyle, Symbol, PURE_STYLE_KEY);\n"]}

package/es/graphic/wrap-text.js

@@ -31,7 +31,6 @@ export class WrapText extends Text {
         lineClamp && (lineCountLimit = Math.min(lineCountLimit, lineClamp)), "number" == typeof maxLineWidth && maxLineWidth !== 1 / 0) {
             if (maxLineWidth > 0) for (let i = 0; i < lines.length; i++) {
                 const str = lines[i];
-                let needCut = !0;
                 if (i === lineCountLimit - 1) {
                     const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);
                     linesLayout.push({
@@ -41,17 +40,14 @@ export class WrapText extends Text {
                     break;
                 }
                 const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth);
-                if ("" !== str && "" === clip.str) {
-                    if (ellipsis) {
-                        const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);
-                        clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
-                    } else clip.str = "", clip.width = 0;
-                    needCut = !1;
-                }
+                if ("" !== str && "" === clip.str) if (ellipsis) {
+                    const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);
+                    clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
+                } else clip.str = "", clip.width = 0;
                 if (linesLayout.push({
                     str: clip.str,
                     width: clip.width
-                }), clip.str.length === str.length) ; else if (needCut) {
+                }), clip.str.length === str.length) ; else {
                     const newStr = str.substring(clip.str.length);
                     lines.splice(i + 1, 0, newStr);
                 }

package/es/graphic/wrap-text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/graphic/wrap-text.ts"],"names":[],"mappings":"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","file":"wrap-text.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { CanvasTextLayout } from '../core/contributions/textMeasure/layout';\nimport type { IWrapTextGraphicAttribute, LayoutItemType } from '../interface';\nimport { application } from '../application';\nimport { Text } from './text';\nimport { getTheme } from './theme';\n\nconst WRAP_TEXT_UPDATE_TAG_KEY = ['heightLimit', 'lineClamp'];\n\n/* WrapText功能\n * 1. 按照宽度限制自动折行或显示省略号(maxLineWidth)\n * 2. 高度限制控制显示内容及省略号(heightLimit)\n * 3. 按照行数限制显示内容及省略号(lineClamp)\n */\nexport class WrapText extends Text {\n  declare attribute: IWrapTextGraphicAttribute;\n\n  protected _isValid(): boolean {\n    const { text } = this.attribute;\n    if (isArray(text)) {\n      return !(text as any[]).every((t: any) => t == null || t === '');\n    }\n    return text != null && text !== '';\n  }\n\n  /**\n   * 计算多行文字的bounds，缓存每行文字的布局位置\n   * 自动折行params.text是数组，因此只重新updateMultilineAABBBounds\n   * @param text\n   */\n  updateMultilineAABBBounds(text: (number | string)[]) {\n    const textTheme = getTheme(this).text;\n    const {\n      fontFamily = textTheme.fontFamily,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      lineHeight = this.attribute.lineHeight || this.attribute.fontSize || textTheme.fontSize,\n      ellipsis = textTheme.ellipsis,\n      maxLineWidth,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth,\n      // widthLimit,\n      heightLimit = 0,\n      lineClamp\n    } = this.attribute;\n    const buf = 2;\n    if (!this.shouldUpdateShape() && this.cache?.layoutData) {\n      const bbox = this.cache.layoutData.bbox;\n      this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    const textMeasure = application.graphicUtil.textMeasure;\n    const layoutObj = new CanvasTextLayout(fontFamily, { fontSize }, textMeasure as any) as any;\n\n    // layoutObj内逻辑\n    const lines = text.map(l => l.toString()) as string[];\n    const linesLayout: LayoutItemType[] = [];\n    const bboxWH: [number, number] = [0, 0];\n\n    let lineCountLimit = Infinity;\n    if (heightLimit > 0) {\n      lineCountLimit = Math.max(Math.floor(heightLimit / lineHeight), 1);\n    }\n    if (lineClamp) {\n      // 处理行数限制\n      lineCountLimit = Math.min(lineCountLimit, lineClamp);\n    }\n\n    if (typeof maxLineWidth === 'number' && maxLineWidth !== Infinity) {\n      // widthLimit > 0\n      if (maxLineWidth > 0) {\n        for (let i = 0; i < lines.length; i++) {\n          const str = lines[i] as string;\n          let needCut = true;\n          // // 测量当前行宽度\n          // width = Math.min(\n          //   layoutObj.textMeasure.measureTextWidth(str, layoutObj.textOptions),\n          //   maxLineWidth\n          // );\n\n          // 判断是否超过高度限制\n          if (i === lineCountLimit - 1) {\n            // 当前行为最后一行\n            const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);\n            linesLayout.push({\n              str: clip.str,\n              width: clip.width\n            });\n            break; // 不处理后续行\n          }\n\n          // 测量截断位置\n          const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth);\n          if (str !== '' && clip.str === '') {\n            if (ellipsis) {\n              const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(\n                str,\n                layoutObj.textOptions,\n                maxLineWidth,\n                ellipsis\n              );\n              clip.str = clipEllipsis.str ?? '';\n              clip.width = clipEllipsis.width ?? 0;\n            } else {\n              // 宽度限制不足一个字符，不显示\n              clip.str = '';\n              clip.width = 0;\n            }\n            needCut = false;\n          }\n\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          if (clip.str.length === str.length) {\n            // 不需要截断\n          } else if (needCut) {\n            const newStr = str.substring(clip.str.length);\n            lines.splice(i + 1, 0, newStr);\n          }\n        }\n      }\n      // bboxWH[0] = maxLineWidth;\n      let maxWidth = 0;\n      linesLayout.forEach(layout => {\n        maxWidth = Math.max(maxWidth, layout.width);\n      });\n      bboxWH[0] = maxWidth;\n    } else {\n      // 使用所有行中最长的作为lineWidth\n      let lineWidth = 0;\n      let width: number;\n      let text: string;\n      for (let i = 0, len = lines.length; i < len; i++) {\n        // 判断是否超过高度限制\n        if (i === lineCountLimit - 1) {\n          // 当前行为最后一行\n          const clip = layoutObj.textMeasure.clipTextWithSuffix(\n            lines[i],\n            layoutObj.textOptions,\n            maxLineWidth,\n            ellipsis\n          );\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          lineWidth = Math.max(lineWidth, clip.width);\n          break; // 不处理后续行\n        }\n\n        text = lines[i] as string;\n        width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions);\n        lineWidth = Math.max(lineWidth, width);\n        linesLayout.push({ str: text, width });\n      }\n      bboxWH[0] = lineWidth;\n    }\n    bboxWH[1] = linesLayout.length * (lineHeight + buf);\n\n    const bbox = {\n      xOffset: 0,\n      yOffset: 0,\n      width: bboxWH[0],\n      height: bboxWH[1]\n    };\n\n    layoutObj.LayoutBBox(bbox, textAlign, textBaseline as any);\n\n    const layoutData = layoutObj.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline as any, lineHeight);\n\n    // const layoutData = layoutObj.GetLayoutByLines(\n    //   text,\n    //   textAlign,\n    //   textBaseline as any,\n    //   lineHeight,\n    //   ellipsis === true ? (DefaultTextAttribute.ellipsis as string) : ellipsis || undefined,\n    //   maxLineWidth\n    // );\n    // const { bbox } = layoutData;\n    this.cache.layoutData = layoutData;\n    this.clearUpdateShapeTag();\n    this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return super.needUpdateTags(keys);\n  }\n\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return super.needUpdateTag(key);\n  }\n}\n"]}
+{"version":3,"sources":["../../src/graphic/wrap-text.ts"],"names":[],"mappings":"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","file":"wrap-text.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { CanvasTextLayout } from '../core/contributions/textMeasure/layout';\nimport type { IWrapTextGraphicAttribute, LayoutItemType } from '../interface';\nimport { application } from '../application';\nimport { Text } from './text';\nimport { getTheme } from './theme';\n\nconst WRAP_TEXT_UPDATE_TAG_KEY = ['heightLimit', 'lineClamp'];\n\n/* WrapText功能\n * 1. 按照宽度限制自动折行或显示省略号(maxLineWidth)\n * 2. 高度限制控制显示内容及省略号(heightLimit)\n * 3. 按照行数限制显示内容及省略号(lineClamp)\n */\nexport class WrapText extends Text {\n  declare attribute: IWrapTextGraphicAttribute;\n\n  protected _isValid(): boolean {\n    const { text } = this.attribute;\n    if (isArray(text)) {\n      return !(text as any[]).every((t: any) => t == null || t === '');\n    }\n    return text != null && text !== '';\n  }\n\n  /**\n   * 计算多行文字的bounds，缓存每行文字的布局位置\n   * 自动折行params.text是数组，因此只重新updateMultilineAABBBounds\n   * @param text\n   */\n  updateMultilineAABBBounds(text: (number | string)[]) {\n    const textTheme = getTheme(this).text;\n    const {\n      fontFamily = textTheme.fontFamily,\n      textAlign = textTheme.textAlign,\n      textBaseline = textTheme.textBaseline,\n      fontSize = textTheme.fontSize,\n      lineHeight = this.attribute.lineHeight || this.attribute.fontSize || textTheme.fontSize,\n      ellipsis = textTheme.ellipsis,\n      maxLineWidth,\n      stroke = textTheme.stroke,\n      lineWidth = textTheme.lineWidth,\n      // widthLimit,\n      heightLimit = 0,\n      lineClamp\n    } = this.attribute;\n    const buf = 2;\n    if (!this.shouldUpdateShape() && this.cache?.layoutData) {\n      const bbox = this.cache.layoutData.bbox;\n      this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n      if (stroke) {\n        this._AABBBounds.expand(lineWidth / 2);\n      }\n      return this._AABBBounds;\n    }\n\n    const textMeasure = application.graphicUtil.textMeasure;\n    const layoutObj = new CanvasTextLayout(fontFamily, { fontSize }, textMeasure as any) as any;\n\n    // layoutObj内逻辑\n    const lines = text.map(l => l.toString()) as string[];\n    const linesLayout: LayoutItemType[] = [];\n    const bboxWH: [number, number] = [0, 0];\n\n    let lineCountLimit = Infinity;\n    if (heightLimit > 0) {\n      lineCountLimit = Math.max(Math.floor(heightLimit / lineHeight), 1);\n    }\n    if (lineClamp) {\n      // 处理行数限制\n      lineCountLimit = Math.min(lineCountLimit, lineClamp);\n    }\n\n    if (typeof maxLineWidth === 'number' && maxLineWidth !== Infinity) {\n      // widthLimit > 0\n      if (maxLineWidth > 0) {\n        for (let i = 0; i < lines.length; i++) {\n          const str = lines[i] as string;\n          // // 测量当前行宽度\n          // width = Math.min(\n          //   layoutObj.textMeasure.measureTextWidth(str, layoutObj.textOptions),\n          //   maxLineWidth\n          // );\n\n          // 判断是否超过高度限制\n          if (i === lineCountLimit - 1) {\n            // 当前行为最后一行\n            const clip = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);\n            linesLayout.push({\n              str: clip.str,\n              width: clip.width\n            });\n            break; // 不处理后续行\n          }\n\n          // 测量截断位置\n          const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth);\n          if (str !== '' && clip.str === '') {\n            if (ellipsis) {\n              const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(\n                str,\n                layoutObj.textOptions,\n                maxLineWidth,\n                ellipsis\n              );\n              clip.str = clipEllipsis.str ?? '';\n              clip.width = clipEllipsis.width ?? 0;\n            } else {\n              // 宽度限制不足一个字符，不显示\n              clip.str = '';\n              clip.width = 0;\n            }\n          }\n\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          if (clip.str.length === str.length) {\n            // 不需要截断\n          } else {\n            const newStr = str.substring(clip.str.length);\n            lines.splice(i + 1, 0, newStr);\n          }\n        }\n      }\n      // bboxWH[0] = maxLineWidth;\n      let maxWidth = 0;\n      linesLayout.forEach(layout => {\n        maxWidth = Math.max(maxWidth, layout.width);\n      });\n      bboxWH[0] = maxWidth;\n    } else {\n      // 使用所有行中最长的作为lineWidth\n      let lineWidth = 0;\n      let width: number;\n      let text: string;\n      for (let i = 0, len = lines.length; i < len; i++) {\n        // 判断是否超过高度限制\n        if (i === lineCountLimit - 1) {\n          // 当前行为最后一行\n          const clip = layoutObj.textMeasure.clipTextWithSuffix(\n            lines[i],\n            layoutObj.textOptions,\n            maxLineWidth,\n            ellipsis\n          );\n          linesLayout.push({\n            str: clip.str,\n            width: clip.width\n          });\n          lineWidth = Math.max(lineWidth, clip.width);\n          break; // 不处理后续行\n        }\n\n        text = lines[i] as string;\n        width = layoutObj.textMeasure.measureTextWidth(text, layoutObj.textOptions);\n        lineWidth = Math.max(lineWidth, width);\n        linesLayout.push({ str: text, width });\n      }\n      bboxWH[0] = lineWidth;\n    }\n    bboxWH[1] = linesLayout.length * (lineHeight + buf);\n\n    const bbox = {\n      xOffset: 0,\n      yOffset: 0,\n      width: bboxWH[0],\n      height: bboxWH[1]\n    };\n\n    layoutObj.LayoutBBox(bbox, textAlign, textBaseline as any);\n\n    const layoutData = layoutObj.layoutWithBBox(bbox, linesLayout, textAlign, textBaseline as any, lineHeight);\n\n    // const layoutData = layoutObj.GetLayoutByLines(\n    //   text,\n    //   textAlign,\n    //   textBaseline as any,\n    //   lineHeight,\n    //   ellipsis === true ? (DefaultTextAttribute.ellipsis as string) : ellipsis || undefined,\n    //   maxLineWidth\n    // );\n    // const { bbox } = layoutData;\n    this.cache.layoutData = layoutData;\n    this.clearUpdateShapeTag();\n    this._AABBBounds.set(bbox.xOffset, bbox.yOffset, bbox.xOffset + bbox.width, bbox.yOffset + bbox.height);\n\n    if (stroke) {\n      this._AABBBounds.expand(lineWidth / 2);\n    }\n\n    return this._AABBBounds;\n  }\n\n  needUpdateTags(keys: string[]): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (keys.indexOf(attrKey) !== -1) {\n        return true;\n      }\n    }\n    return super.needUpdateTags(keys);\n  }\n\n  needUpdateTag(key: string): boolean {\n    for (let i = 0; i < WRAP_TEXT_UPDATE_TAG_KEY.length; i++) {\n      const attrKey = WRAP_TEXT_UPDATE_TAG_KEY[i];\n      if (key === attrKey) {\n        return true;\n      }\n    }\n    return super.needUpdateTag(key);\n  }\n}\n"]}

package/es/index.d.ts

@@ -1,6 +1,6 @@
 import 'core-js/proposals/reflect-metadata';
 import './modules';
-export declare const version = "0.14.3";
+export declare const version = "0.15.0-alpha.0";
 export * from './container';
 export * from './core/global';
 export * from './graphic';
@@ -40,3 +40,4 @@ export * from './common/generator';
 export * from './plugins/constants';
 export * from './animate/default-ticker';
 export { wrapCanvas, wrapContext } from './canvas/util';
+export * from './jsx';

package/es/index.js

@@ -2,7 +2,7 @@ import "core-js/proposals/reflect-metadata";
 
 import "./modules";
 
-export const version = "0.14.3";
+export const version = "0.15.0-alpha.0";
 
 export * from "./container";
 
@@ -81,4 +81,6 @@ export * from "./plugins/constants";
 export * from "./animate/default-ticker";
 
 export { wrapCanvas, wrapContext } from "./canvas/util";
+
+export * from "./jsx";
 //# sourceMappingURL=index.js.map

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,oCAAoC,CAAC;AAC5C,OAAO,WAAW,CAAC;AAGnB,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC;AAEhC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,2CAA2C,CAAC;AAC1D,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,0BAA0B,CAAC;AAGzC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC","file":"index.js","sourcesContent":["import 'core-js/proposals/reflect-metadata';\nimport './modules';\n\n// 导出版本号\nexport const version = \"0.14.3\";\n\nexport * from './container';\nexport * from './core/global';\nexport * from './graphic';\nexport * from './modules';\nexport * from './create';\nexport * from './event';\nexport * from './interface';\nexport * from './render';\nexport * from './render/contributions/render/base-render';\nexport * from './canvas';\nexport * from './core';\nexport * from './picker';\nexport * from './kits';\nexport * from './animate';\nexport * from './resource-loader/loader';\n\n/* export common */\nexport * from './common/text';\nexport * from './common/bezier-utils';\nexport * from './common/bounds-context';\nexport * from './common/seg-context';\nexport * from './common/custom-path2d';\nexport * from './common/segment';\nexport * from './common/canvas-utils';\nexport * from './common/contribution-provider';\nexport * from './common/generator';\nexport * from './common/utils';\nexport * from './common/shape/arc';\nexport * from './common/shape/rect';\n\nexport * from './common/path-svg';\nexport * from './common/render-curve';\nexport * from './common/render-area';\nexport * from './common/render-command-list';\nexport * from './common/sort';\nexport * from './common/morphing-utils';\nexport * from './common/split-path';\nexport * from './common/enums';\nexport * from './common/generator';\nexport * from './plugins/constants';\n\nexport * from './animate/default-ticker';\nexport { wrapCanvas, wrapContext } from './canvas/util';\n"]}
+{"version":3,"sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,oCAAoC,CAAC;AAC5C,OAAO,WAAW,CAAC;AAGnB,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAExC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,2CAA2C,CAAC;AAC1D,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,0BAA0B,CAAC;AAGzC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACxD,cAAc,OAAO,CAAC","file":"index.js","sourcesContent":["import 'core-js/proposals/reflect-metadata';\nimport './modules';\n\n// 导出版本号\nexport const version = \"0.15.0-alpha.0\";\n\nexport * from './container';\nexport * from './core/global';\nexport * from './graphic';\nexport * from './modules';\nexport * from './create';\nexport * from './event';\nexport * from './interface';\nexport * from './render';\nexport * from './render/contributions/render/base-render';\nexport * from './canvas';\nexport * from './core';\nexport * from './picker';\nexport * from './kits';\nexport * from './animate';\nexport * from './resource-loader/loader';\n\n/* export common */\nexport * from './common/text';\nexport * from './common/bezier-utils';\nexport * from './common/bounds-context';\nexport * from './common/seg-context';\nexport * from './common/custom-path2d';\nexport * from './common/segment';\nexport * from './common/canvas-utils';\nexport * from './common/contribution-provider';\nexport * from './common/generator';\nexport * from './common/utils';\nexport * from './common/shape/arc';\nexport * from './common/shape/rect';\n\nexport * from './common/path-svg';\nexport * from './common/render-curve';\nexport * from './common/render-area';\nexport * from './common/render-command-list';\nexport * from './common/sort';\nexport * from './common/morphing-utils';\nexport * from './common/split-path';\nexport * from './common/enums';\nexport * from './common/generator';\nexport * from './plugins/constants';\n\nexport * from './animate/default-ticker';\nexport { wrapCanvas, wrapContext } from './canvas/util';\nexport * from './jsx';\n"]}

package/es/interface/global.d.ts

@@ -1,4 +1,4 @@
-import type { Dict, IPointLike } from '@visactor/vutils';
+import type { Dict, IAABBBoundsLike, IPointLike } from '@visactor/vutils';
 import type { ICanvasLike } from './canvas';
 import type { IEventElement } from './common';
 import type { IContribution } from './contribution';
@@ -25,6 +25,9 @@ export interface IEnvContribution extends IContribution<IGlobal>, Omit<IEventEle
     createCanvas: (params: ICreateCanvasParams) => ICanvasLike | any;
     createOffscreenCanvas: (params: ICreateCanvasParams) => ICanvasLike | any;
     releaseCanvas: (canvas: ICanvasLike | string | any) => void;
+    getNativeAABBBounds: (dom: string | HTMLElement | any) => IAABBBoundsLike;
+    removeDom: (dom: HTMLElement) => boolean;
+    createDom: (params: CreateDOMParamsType) => HTMLElement | null;
     getDynamicCanvasCount: () => number;
     getStaticCanvasCount: () => number;
     getDevicePixelRatio: () => number;
@@ -78,6 +81,13 @@ export interface IEnvParamsMap {
     readonly lynx: any;
     readonly wx: any;
 }
+export type CreateDOMParamsType = {
+    tagName?: string;
+    width?: number;
+    height?: number;
+    style?: string | Record<string, any>;
+    parent?: string | HTMLElement;
+};
 export interface IGlobal extends Omit<IEventElement, 'on' | 'off' | 'once' | 'emit' | 'removeAllListeners'> {
     env: EnvType;
     devicePixelRatio: number;
@@ -126,4 +136,6 @@ export interface IGlobal extends Omit<IEventElement, 'on' | 'off' | 'once' | 'em
         loadState: 'success' | 'fail';
         data: Blob | null;
     }>;
+    removeDom: (dom: HTMLElement) => boolean;
+    createDom: (params: CreateDOMParamsType) => HTMLElement | null;
 }

package/es/interface/global.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/global.ts"],"names":[],"mappings":"","file":"global.js","sourcesContent":["import type { Dict, IPointLike } from '@visactor/vutils';\nimport type { ICanvasLike } from './canvas';\nimport type { IEventElement } from './common';\nimport type { IContribution } from './contribution';\nimport type { ISyncHook } from './sync-hook';\n\nexport interface ILoader {\n  loadImage: (url: string) => HTMLImageElement | ImageData;\n  loadJson: (url: string) => JSON;\n}\n\n// 环境定义\nexport type EnvType = 'browser' | 'feishu' | 'tt' | 'taro' | 'node' | 'native' | 'lynx' | 'wx';\n\n// 创建canvas需要的参数\nexport interface ICreateCanvasParams {\n  id?: string;\n  // 像素宽\n  width?: number;\n  // 像素高\n  height?: number;\n  dpr?: number;\n}\n\nexport interface ILoader {\n  loadImage: (url: string) => HTMLImageElement | ImageData;\n  loadJson: (url: string) => JSON;\n}\n\nexport interface IEnvContribution\n  extends IContribution<IGlobal>,\n    Omit<IEventElement, 'on' | 'off' | 'once' | 'emit' | 'removeAllListeners'> {\n  // 当前代码所运行的环境\n  type: EnvType;\n\n  // 是否支持事件\n  // node环境不需要事件\n  supportEvent: boolean;\n\n  // 开始配置环境，相当于init\n  configure: (global: IGlobal, ...p: any) => void;\n\n  // 创建销毁\n  createCanvas: (params: ICreateCanvasParams) => ICanvasLike | any;\n  createOffscreenCanvas: (params: ICreateCanvasParams) => ICanvasLike | any;\n  releaseCanvas: (canvas: ICanvasLike | string | any) => void;\n\n  /**\n   * 获取动态canvas的数量，offscreenCanvas或者framebuffer\n   */\n  getDynamicCanvasCount: () => number;\n\n  /**\n   * 获取静态canvas的数量，纯粹canvas\n   */\n  getStaticCanvasCount: () => number;\n\n  // 设备信息\n  getDevicePixelRatio: () => number;\n\n  // 通用接口\n  getRequestAnimationFrame: () => (callback: FrameRequestCallback) => number;\n  getCancelAnimationFrame: () => (h: number) => void;\n\n  // DOM接口\n  getElementById?: (str: string) => HTMLElement | null;\n  getRootElement?: () => HTMLElement | null;\n  /**\n   * get document instance\n   */\n  getDocument?: () => Document | null;\n  /**\n   * whether supports TouchEvent.\n   */\n  supportsTouchEvents: boolean;\n  /**\n   * whether supports PointerEvent.\n   */\n  supportsPointerEvents: boolean;\n  /**\n   * whether supports MouseEvent.\n   */\n  supportsMouseEvents: boolean;\n  /**\n   * Whether to allow setting the cursor style\n   */\n  applyStyles?: boolean;\n\n  /**\n   * 将窗口坐标转换为画布坐标，小程序/小组件环境需要兼容\n   */\n  mapToCanvasPoint?: (event: any, domElement?: any) => IPointLike | null;\n\n  loadImage: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }>;\n  loadSvg: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }>;\n  loadJson: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: Record<string, unknown> | null;\n  }>;\n  loadArrayBuffer: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: ArrayBuffer | null;\n  }>;\n  loadBlob: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: Blob | null;\n  }>;\n}\n\nexport type IMiniAppEnvParams = {\n  /** dom 容器对象 */\n  domref?: Dict<any>;\n  /**\n   * 强行设置env，如果env重复设置也设置\n   */\n  force?: boolean;\n  /**\n   * 可用的canvas列表\n   */\n  canvasIdLists?: (string | number)[];\n  /**\n   * 表示可以自由使用的canvas索引\n   */\n  freeCanvasIdx?: string | number;\n  /** taro 环境使用 */\n  taro?: any;\n  pixelRatio?: number;\n  [key: string]: any;\n};\n\nexport interface IEnvParamsMap {\n  readonly taro: IMiniAppEnvParams;\n  readonly feishu: IMiniAppEnvParams;\n  readonly tt: IMiniAppEnvParams;\n  readonly browser: any;\n  readonly node: any;\n  readonly native: any;\n  readonly lynx: any;\n  readonly wx: any;\n}\nexport interface IGlobal extends Omit<IEventElement, 'on' | 'off' | 'once' | 'emit' | 'removeAllListeners'> {\n  // 当前代码所运行的环境\n  env: EnvType;\n\n  // 设备的dpr\n  devicePixelRatio: number;\n\n  // 当设置env的时候被调用\n  hooks: {\n    onSetEnv: ISyncHook<[EnvType | undefined, EnvType, IGlobal]>;\n  };\n\n  // 设置env的时候传入的参数\n  // node环境需要传入整个node-canvas包\n  // 小程序环境需要传入小程序要用到的参数\n  envParams?: any;\n\n  // 是否支持事件\n  // node环境不需要事件\n  supportEvent: boolean;\n\n  setEnv: (env: EnvType, params?: IEnvParamsMap[EnvType]) => void;\n  setActiveEnvContribution: (contribution: IEnvContribution) => void;\n  createCanvas: (params: ICreateCanvasParams) => HTMLCanvasElement | any;\n  createOffscreenCanvas: (params: ICreateCanvasParams) => HTMLCanvasElement | any;\n  releaseCanvas: (canvas: HTMLCanvasElement | string | any) => void;\n\n  /**\n   * 获取环境中最大动态canvas的数量，offscreenCanvas或者framebuffer\n   */\n  getDynamicCanvasCount: () => number;\n\n  isChrome: () => boolean;\n  isSafari: () => boolean;\n\n  /**\n   * 获取环境中最大静态canvas的数量，纯粹canvas\n   */\n  getStaticCanvasCount: () => number;\n\n  /* 浏览器环境 - dom tree */\n  getElementById: (str: string) => HTMLElement | null;\n  getRootElement: () => HTMLElement | null;\n  /**\n   * get document instance\n   */\n  getDocument: () => Document | null;\n  /**\n   * whether supports TouchEvent.\n   */\n  supportsTouchEvents: boolean;\n  /**\n   * whether supports PointerEvent.\n   */\n  supportsPointerEvents: boolean;\n  /**\n   * whether supports MouseEvent.\n   */\n  supportsMouseEvents: boolean;\n  /**\n   * Whether to allow setting the cursor style\n   */\n  applyStyles?: boolean;\n  /**\n   * 测量文字的方法\n   */\n  measureTextMethod: 'native' | 'simple' | 'quick';\n\n  getRequestAnimationFrame: () => null | ((callback: FrameRequestCallback) => number);\n  getCancelAnimationFrame: () => null | ((h: number) => void);\n\n  /**\n   * 将窗口坐标转换为画布坐标，小程序/小组件环境需要兼容\n   */\n  mapToCanvasPoint: (nativeEvent: any, domElement?: any) => IPointLike | null;\n\n  loadImage: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }>;\n  loadSvg: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }>;\n  loadJson: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: Record<string, unknown> | null;\n  }>;\n  loadArrayBuffer: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: ArrayBuffer | null;\n  }>;\n  loadBlob: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: Blob | null;\n  }>;\n}\n"]}
+{"version":3,"sources":["../../src/interface/global.ts"],"names":[],"mappings":"","file":"global.js","sourcesContent":["import type { Dict, IAABBBoundsLike, IPointLike } from '@visactor/vutils';\nimport type { ICanvasLike } from './canvas';\nimport type { IEventElement } from './common';\nimport type { IContribution } from './contribution';\nimport type { ISyncHook } from './sync-hook';\n\nexport interface ILoader {\n  loadImage: (url: string) => HTMLImageElement | ImageData;\n  loadJson: (url: string) => JSON;\n}\n\n// 环境定义\nexport type EnvType = 'browser' | 'feishu' | 'tt' | 'taro' | 'node' | 'native' | 'lynx' | 'wx';\n\n// 创建canvas需要的参数\nexport interface ICreateCanvasParams {\n  id?: string;\n  // 像素宽\n  width?: number;\n  // 像素高\n  height?: number;\n  dpr?: number;\n}\n\nexport interface ILoader {\n  loadImage: (url: string) => HTMLImageElement | ImageData;\n  loadJson: (url: string) => JSON;\n}\n\nexport interface IEnvContribution\n  extends IContribution<IGlobal>,\n    Omit<IEventElement, 'on' | 'off' | 'once' | 'emit' | 'removeAllListeners'> {\n  // 当前代码所运行的环境\n  type: EnvType;\n\n  // 是否支持事件\n  // node环境不需要事件\n  supportEvent: boolean;\n\n  // 开始配置环境，相当于init\n  configure: (global: IGlobal, ...p: any) => void;\n\n  // 创建销毁\n  createCanvas: (params: ICreateCanvasParams) => ICanvasLike | any;\n  createOffscreenCanvas: (params: ICreateCanvasParams) => ICanvasLike | any;\n  releaseCanvas: (canvas: ICanvasLike | string | any) => void;\n\n  getNativeAABBBounds: (dom: string | HTMLElement | any) => IAABBBoundsLike;\n  removeDom: (dom: HTMLElement) => boolean;\n  createDom: (params: CreateDOMParamsType) => HTMLElement | null;\n\n  /**\n   * 获取动态canvas的数量，offscreenCanvas或者framebuffer\n   */\n  getDynamicCanvasCount: () => number;\n\n  /**\n   * 获取静态canvas的数量，纯粹canvas\n   */\n  getStaticCanvasCount: () => number;\n\n  // 设备信息\n  getDevicePixelRatio: () => number;\n\n  // 通用接口\n  getRequestAnimationFrame: () => (callback: FrameRequestCallback) => number;\n  getCancelAnimationFrame: () => (h: number) => void;\n\n  // DOM接口\n  getElementById?: (str: string) => HTMLElement | null;\n  getRootElement?: () => HTMLElement | null;\n  /**\n   * get document instance\n   */\n  getDocument?: () => Document | null;\n  /**\n   * whether supports TouchEvent.\n   */\n  supportsTouchEvents: boolean;\n  /**\n   * whether supports PointerEvent.\n   */\n  supportsPointerEvents: boolean;\n  /**\n   * whether supports MouseEvent.\n   */\n  supportsMouseEvents: boolean;\n  /**\n   * Whether to allow setting the cursor style\n   */\n  applyStyles?: boolean;\n\n  /**\n   * 将窗口坐标转换为画布坐标，小程序/小组件环境需要兼容\n   */\n  mapToCanvasPoint?: (event: any, domElement?: any) => IPointLike | null;\n\n  loadImage: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }>;\n  loadSvg: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }>;\n  loadJson: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: Record<string, unknown> | null;\n  }>;\n  loadArrayBuffer: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: ArrayBuffer | null;\n  }>;\n  loadBlob: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: Blob | null;\n  }>;\n}\n\nexport type IMiniAppEnvParams = {\n  /** dom 容器对象 */\n  domref?: Dict<any>;\n  /**\n   * 强行设置env，如果env重复设置也设置\n   */\n  force?: boolean;\n  /**\n   * 可用的canvas列表\n   */\n  canvasIdLists?: (string | number)[];\n  /**\n   * 表示可以自由使用的canvas索引\n   */\n  freeCanvasIdx?: string | number;\n  /** taro 环境使用 */\n  taro?: any;\n  pixelRatio?: number;\n  [key: string]: any;\n};\n\nexport interface IEnvParamsMap {\n  readonly taro: IMiniAppEnvParams;\n  readonly feishu: IMiniAppEnvParams;\n  readonly tt: IMiniAppEnvParams;\n  readonly browser: any;\n  readonly node: any;\n  readonly native: any;\n  readonly lynx: any;\n  readonly wx: any;\n}\n\nexport type CreateDOMParamsType = {\n  tagName?: string;\n  width?: number;\n  height?: number;\n  style?: string | Record<string, any>;\n  parent?: string | HTMLElement;\n};\nexport interface IGlobal extends Omit<IEventElement, 'on' | 'off' | 'once' | 'emit' | 'removeAllListeners'> {\n  // 当前代码所运行的环境\n  env: EnvType;\n\n  // 设备的dpr\n  devicePixelRatio: number;\n\n  // 当设置env的时候被调用\n  hooks: {\n    onSetEnv: ISyncHook<[EnvType | undefined, EnvType, IGlobal]>;\n  };\n\n  // 设置env的时候传入的参数\n  // node环境需要传入整个node-canvas包\n  // 小程序环境需要传入小程序要用到的参数\n  envParams?: any;\n\n  // 是否支持事件\n  // node环境不需要事件\n  supportEvent: boolean;\n\n  setEnv: (env: EnvType, params?: IEnvParamsMap[EnvType]) => void;\n  setActiveEnvContribution: (contribution: IEnvContribution) => void;\n  createCanvas: (params: ICreateCanvasParams) => HTMLCanvasElement | any;\n  createOffscreenCanvas: (params: ICreateCanvasParams) => HTMLCanvasElement | any;\n  releaseCanvas: (canvas: HTMLCanvasElement | string | any) => void;\n\n  /**\n   * 获取环境中最大动态canvas的数量，offscreenCanvas或者framebuffer\n   */\n  getDynamicCanvasCount: () => number;\n\n  isChrome: () => boolean;\n  isSafari: () => boolean;\n\n  /**\n   * 获取环境中最大静态canvas的数量，纯粹canvas\n   */\n  getStaticCanvasCount: () => number;\n\n  /* 浏览器环境 - dom tree */\n  getElementById: (str: string) => HTMLElement | null;\n  getRootElement: () => HTMLElement | null;\n  /**\n   * get document instance\n   */\n  getDocument: () => Document | null;\n  /**\n   * whether supports TouchEvent.\n   */\n  supportsTouchEvents: boolean;\n  /**\n   * whether supports PointerEvent.\n   */\n  supportsPointerEvents: boolean;\n  /**\n   * whether supports MouseEvent.\n   */\n  supportsMouseEvents: boolean;\n  /**\n   * Whether to allow setting the cursor style\n   */\n  applyStyles?: boolean;\n  /**\n   * 测量文字的方法\n   */\n  measureTextMethod: 'native' | 'simple' | 'quick';\n\n  getRequestAnimationFrame: () => null | ((callback: FrameRequestCallback) => number);\n  getCancelAnimationFrame: () => null | ((h: number) => void);\n\n  /**\n   * 将窗口坐标转换为画布坐标，小程序/小组件环境需要兼容\n   */\n  mapToCanvasPoint: (nativeEvent: any, domElement?: any) => IPointLike | null;\n\n  loadImage: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }>;\n  loadSvg: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: HTMLImageElement | ImageData | null;\n  }>;\n  loadJson: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: Record<string, unknown> | null;\n  }>;\n  loadArrayBuffer: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: ArrayBuffer | null;\n  }>;\n  loadBlob: (url: string) => Promise<{\n    loadState: 'success' | 'fail';\n    data: Blob | null;\n  }>;\n\n  removeDom: (dom: HTMLElement) => boolean;\n  createDom: (params: CreateDOMParamsType) => HTMLElement | null;\n}\n"]}

package/es/interface/graphic/symbol.d.ts

@@ -14,8 +14,9 @@ export interface ISymbolClass {
     type: SymbolType | string;
     path?: ICustomPath2D;
     pathStr: string;
-    draw: (ctx: IPath2D, size: number | [number, number], x: number, y: number, z?: number) => boolean;
-    drawOffset: (ctx: IPath2D, size: number | [number, number], x: number, y: number, offset: number, z?: number) => boolean;
+    isSvg?: boolean;
+    draw: (ctx: IPath2D, size: number | [number, number], x: number, y: number, z?: number, cb?: (p: ICustomPath2D, a: any) => void) => boolean;
+    drawOffset: (ctx: IPath2D, size: number | [number, number], x: number, y: number, offset: number, z?: number, cb?: (p: ICustomPath2D, a: any) => void) => boolean;
     drawToSvgPath?: (size: number | [number, number], x: number, y: number, z?: number) => string;
     bounds: (size: number | [number, number], bounds: IBounds) => void;
 }

package/es/interface/graphic/symbol.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/graphic/symbol.ts"],"names":[],"mappings":"","file":"symbol.js","sourcesContent":["import type { IBounds } from '@visactor/vutils';\nimport type { IGraphicAttribute, IGraphic } from '../graphic';\nimport type { ICustomPath2D, IPath2D } from '../path';\n\nexport type ISymbolAttribute = {\n  symbolType: SymbolType;\n  size: number | [number, number];\n};\n\nexport type ISymbolGraphicAttribute = Partial<IGraphicAttribute> & Partial<ISymbolAttribute>;\n\nexport interface ISymbol extends IGraphic<ISymbolGraphicAttribute> {\n  getParsedPath: () => ISymbolClass;\n}\n\nexport type SymbolType =\n  | 'circle'\n  | 'cross'\n  | 'diamond'\n  | 'square'\n  | 'arrow'\n  | 'arrow2Left'\n  | 'arrow2Right'\n  | 'wedge'\n  | 'thinTriangle'\n  | 'triangle'\n  | 'triangleUp'\n  | 'triangleDown'\n  | 'triangleRight'\n  | 'triangleLeft'\n  | 'stroke'\n  | 'star'\n  | 'wye'\n  | 'rect'\n  | string;\n\nexport interface ISymbolClass {\n  type: SymbolType | string;\n  path?: ICustomPath2D;\n  pathStr: string;\n\n  // 返回true表示内部已经调用closePath，返回false表示没有调用closePath，外部需要调用closePath\n  draw: (ctx: IPath2D, size: number | [number, number], x: number, y: number, z?: number) => boolean;\n  drawOffset: (\n    ctx: IPath2D,\n    size: number | [number, number],\n    x: number,\n    y: number,\n    offset: number,\n    z?: number\n  ) => boolean;\n\n  drawToSvgPath?: (size: number | [number, number], x: number, y: number, z?: number) => string;\n\n  bounds: (size: number | [number, number], bounds: IBounds) => void;\n}\n"]}
+{"version":3,"sources":["../../src/interface/graphic/symbol.ts"],"names":[],"mappings":"","file":"symbol.js","sourcesContent":["import type { IBounds } from '@visactor/vutils';\nimport type { IGraphicAttribute, IGraphic } from '../graphic';\nimport type { ICustomPath2D, IPath2D } from '../path';\n\nexport type ISymbolAttribute = {\n  symbolType: SymbolType;\n  size: number | [number, number];\n};\n\nexport type ISymbolGraphicAttribute = Partial<IGraphicAttribute> & Partial<ISymbolAttribute>;\n\nexport interface ISymbol extends IGraphic<ISymbolGraphicAttribute> {\n  getParsedPath: () => ISymbolClass;\n}\n\nexport type SymbolType =\n  | 'circle'\n  | 'cross'\n  | 'diamond'\n  | 'square'\n  | 'arrow'\n  | 'arrow2Left'\n  | 'arrow2Right'\n  | 'wedge'\n  | 'thinTriangle'\n  | 'triangle'\n  | 'triangleUp'\n  | 'triangleDown'\n  | 'triangleRight'\n  | 'triangleLeft'\n  | 'stroke'\n  | 'star'\n  | 'wye'\n  | 'rect'\n  | string;\n\nexport interface ISymbolClass {\n  type: SymbolType | string;\n  path?: ICustomPath2D;\n  pathStr: string;\n  isSvg?: boolean;\n\n  // 返回true表示内部已经调用closePath，返回false表示没有调用closePath，外部需要调用closePath\n  draw: (\n    ctx: IPath2D,\n    size: number | [number, number],\n    x: number,\n    y: number,\n    z?: number,\n    cb?: (p: ICustomPath2D, a: any) => void\n  ) => boolean;\n  drawOffset: (\n    ctx: IPath2D,\n    size: number | [number, number],\n    x: number,\n    y: number,\n    offset: number,\n    z?: number,\n    cb?: (p: ICustomPath2D, a: any) => void\n  ) => boolean;\n\n  drawToSvgPath?: (size: number | [number, number], x: number, y: number, z?: number) => string;\n\n  bounds: (size: number | [number, number], bounds: IBounds) => void;\n}\n"]}

package/es/interface/graphic.d.ts

@@ -92,6 +92,15 @@ export type IGraphicStyle = IFillStyle & IStrokeStyle & {
     texturePadding: number;
     blur: number;
     cursor: Cursor | null;
+    html: {
+        dom: string | HTMLElement;
+        container: string | HTMLElement | null;
+        width: number;
+        height: number;
+        style: string | Record<string, any>;
+        visible?: boolean;
+        anchorType?: 'position' | 'boundsLeftTop';
+    } | null;
 };
 export type IGraphicAttribute = IGraphicStyle & ITransform & {
     strokeSeg: IStrokeSeg | null;
@@ -138,6 +147,11 @@ export interface IGraphic<T extends Partial<IGraphicAttribute> = Partial<IGraphi
     shadowRoot?: IShadowRoot;
     glyphHost?: IGraphic<IGlyphGraphicAttribute>;
     backgroundImg?: boolean;
+    bindDom?: Map<string | HTMLElement, {
+        container: HTMLElement | string;
+        dom: HTMLElement;
+        wrapGroup: HTMLDivElement;
+    }>;
     valid: boolean;
     parent: IGroup | null;
     isContainer?: boolean;