@visactor/vrender 0.10.2 → 0.11.0-alpha.1

package/cjs/interface/graphic/glyph.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/graphic/glyph.ts"],"names":[],"mappings":"","file":"glyph.js","sourcesContent":["import type { IGraphicAttribute, IGraphic } from '../graphic';\nimport type { ICustomPath2D } from '../path';\n\n// glyph是一种图元，这种图元组合了各种其他图元\n// 1. 相对于group来说glyph不包含childrenPickable\n// 2. glyph不支持布局\n// 3. glyph不支持clip\n\nexport type IGlyphAttribute = {\n  path: string | ICustomPath2D;\n  width: number;\n  height: number;\n  borderRadius: number | number[];\n  clip: boolean;\n};\n\nexport type IGlyphGraphicAttribute = Partial<IGraphicAttribute> & Partial<IGlyphAttribute>;\n\nexport interface IGlyph<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>>\n  extends IGraphic<IGlyphGraphicAttribute> {\n  glyphStates?: Record<\n    string,\n    {\n      attributes: IGlyphGraphicAttribute;\n      subAttributes: T[];\n    }\n  >;\n  glyphStateProxy?: (\n    stateName: string,\n    targetStates?: string[]\n  ) => {\n    attributes: IGlyphGraphicAttribute;\n    subAttributes: T[];\n  };\n\n  setSubGraphic: (subGraphic: IGraphic[]) => void;\n\n  getSubGraphic: () => IGraphic[];\n\n  onInit: (cb: (g: this) => void) => void;\n\n  onUpdate: (cb: (g: this) => void) => void;\n}\n"]}
+{"version":3,"sources":["../../src/interface/graphic/glyph.ts"],"names":[],"mappings":"","file":"glyph.js","sourcesContent":["import type { IGraphicAttribute, IGraphic } from '../graphic';\nimport type { ICustomPath2D } from '../path';\n\n// glyph是一种图元，这种图元组合了各种其他图元\n// 1. 相对于group来说glyph不包含childrenPickable\n// 2. glyph不支持布局\n// 3. glyph不支持clip\n\nexport type IGlyphAttribute = {\n  path: string | ICustomPath2D;\n  width: number;\n  height: number;\n  cornerRadius: number | number[];\n  clip: boolean;\n};\n\nexport type IGlyphGraphicAttribute = Partial<IGraphicAttribute> & Partial<IGlyphAttribute>;\n\nexport interface IGlyph<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>>\n  extends IGraphic<IGlyphGraphicAttribute> {\n  glyphStates?: Record<\n    string,\n    {\n      attributes: IGlyphGraphicAttribute;\n      subAttributes: T[];\n    }\n  >;\n  glyphStateProxy?: (\n    stateName: string,\n    targetStates?: string[]\n  ) => {\n    attributes: IGlyphGraphicAttribute;\n    subAttributes: T[];\n  };\n\n  setSubGraphic: (subGraphic: IGraphic[]) => void;\n\n  getSubGraphic: () => IGraphic[];\n\n  onInit: (cb: (g: this) => void) => void;\n\n  onUpdate: (cb: (g: this) => void) => void;\n}\n"]}

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

@@ -5,7 +5,7 @@ export type IGroupAttribute = {
     path: IGraphic[];
     width: number;
     height: number;
-    borderRadius: number | number[];
+    cornerRadius: number | number[];
     clip: boolean;
     visibleAll: boolean;
 };

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/graphic/group.ts"],"names":[],"mappings":"","file":"group.js","sourcesContent":["import type { ITheme, IThemeSpec } from './theme';\nimport type { GraphicAttributeMap, INode } from '../../interface';\nimport type { IGraphicAttribute, IGraphic } from '../graphic';\n\nexport type IGroupAttribute = {\n  path: IGraphic[];\n  width: number;\n  height: number;\n  borderRadius: number | number[];\n  clip: boolean;\n  visibleAll: boolean;\n};\n\nexport type IGroupGraphicAttribute = Partial<IGraphicAttribute> & Partial<IGroupAttribute>;\n\nexport interface IGroup extends IGraphic<IGroupGraphicAttribute> {\n  childrenPickable?: boolean; // 子元素是否可以被pick\n\n  theme?: ITheme;\n\n  createTheme: () => void;\n  hideAll: () => void;\n  showAll: () => void;\n\n  setTheme: (t: IThemeSpec) => void;\n\n  incrementalAppendChild: (node: INode, highPerformance?: boolean) => INode | null;\n  incrementalClearChild: () => void;\n\n  createOrUpdateChild: <T extends keyof GraphicAttributeMap>(\n    graphicName: string,\n    attributes: GraphicAttributeMap[T],\n    graphicType: T\n  ) => INode;\n}\n"]}
+{"version":3,"sources":["../../src/interface/graphic/group.ts"],"names":[],"mappings":"","file":"group.js","sourcesContent":["import type { ITheme, IThemeSpec } from './theme';\nimport type { GraphicAttributeMap, INode } from '../../interface';\nimport type { IGraphicAttribute, IGraphic } from '../graphic';\n\nexport type IGroupAttribute = {\n  path: IGraphic[];\n  width: number;\n  height: number;\n  cornerRadius: number | number[];\n  clip: boolean;\n  visibleAll: boolean;\n};\n\nexport type IGroupGraphicAttribute = Partial<IGraphicAttribute> & Partial<IGroupAttribute>;\n\nexport interface IGroup extends IGraphic<IGroupGraphicAttribute> {\n  childrenPickable?: boolean; // 子元素是否可以被pick\n\n  theme?: ITheme;\n\n  createTheme: () => void;\n  hideAll: () => void;\n  showAll: () => void;\n\n  setTheme: (t: IThemeSpec) => void;\n\n  incrementalAppendChild: (node: INode, highPerformance?: boolean) => INode | null;\n  incrementalClearChild: () => void;\n\n  createOrUpdateChild: <T extends keyof GraphicAttributeMap>(\n    graphicName: string,\n    attributes: GraphicAttributeMap[T],\n    graphicType: T\n  ) => INode;\n}\n"]}

package/cjs/interface/graphic/polygon.d.ts

@@ -2,7 +2,7 @@ import type { IPointLike } from '@visactor/vutils';
 import type { IGraphicAttribute, IGraphic } from '../graphic';
 export type IPolygonAttribute = {
     points: IPointLike[];
-    borderRadius?: number | number[];
+    cornerRadius?: number | number[];
 };
 export type IPolygonGraphicAttribute = Partial<IGraphicAttribute> & Partial<IPolygonAttribute>;
 export type IPolygon = IGraphic<IPolygonGraphicAttribute>;

package/cjs/interface/graphic/polygon.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/graphic/polygon.ts"],"names":[],"mappings":"","file":"polygon.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport type { IGraphicAttribute, IGraphic } from '../graphic';\n\nexport type IPolygonAttribute = {\n  // ? 不需要x2/y2\n  points: IPointLike[];\n  borderRadius?: number | number[];\n};\n\nexport type IPolygonGraphicAttribute = Partial<IGraphicAttribute> & Partial<IPolygonAttribute>;\n\nexport type IPolygon = IGraphic<IPolygonGraphicAttribute>;\n"]}
+{"version":3,"sources":["../../src/interface/graphic/polygon.ts"],"names":[],"mappings":"","file":"polygon.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport type { IGraphicAttribute, IGraphic } from '../graphic';\n\nexport type IPolygonAttribute = {\n  // ? 不需要x2/y2\n  points: IPointLike[];\n  cornerRadius?: number | number[];\n};\n\nexport type IPolygonGraphicAttribute = Partial<IGraphicAttribute> & Partial<IPolygonAttribute>;\n\nexport type IPolygon = IGraphic<IPolygonGraphicAttribute>;\n"]}

package/cjs/interface/graphic/rect.d.ts

@@ -3,7 +3,7 @@ import type { IGraphicAttribute, IGraphic } from '../graphic';
 export type IRectAttribute = {
     width: number;
     height: number;
-    borderRadius: number | number[];
+    cornerRadius: number | number[];
 };
 export type IRectGraphicAttribute = Partial<IGraphicAttribute> & Partial<IRectAttribute>;
 export interface IRect extends IGraphic<IRectGraphicAttribute> {

package/cjs/interface/graphic/rect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/graphic/rect.ts"],"names":[],"mappings":"","file":"rect.js","sourcesContent":["import type { ICustomPath2D } from '../../interface';\nimport type { IGraphicAttribute, IGraphic } from '../graphic';\n\nexport type IRectAttribute = {\n  width: number;\n  height: number;\n  borderRadius: number | number[];\n};\n\nexport type IRectGraphicAttribute = Partial<IGraphicAttribute> & Partial<IRectAttribute>;\n\nexport interface IRect extends IGraphic<IRectGraphicAttribute> {\n  cache?: ICustomPath2D;\n}\n"]}
+{"version":3,"sources":["../../src/interface/graphic/rect.ts"],"names":[],"mappings":"","file":"rect.js","sourcesContent":["import type { ICustomPath2D } from '../../interface';\nimport type { IGraphicAttribute, IGraphic } from '../graphic';\n\nexport type IRectAttribute = {\n  width: number;\n  height: number;\n  cornerRadius: number | number[];\n};\n\nexport type IRectGraphicAttribute = Partial<IGraphicAttribute> & Partial<IRectAttribute>;\n\nexport interface IRect extends IGraphic<IRectGraphicAttribute> {\n  cache?: ICustomPath2D;\n}\n"]}

package/cjs/interface/stage.d.ts

@@ -26,13 +26,13 @@ export interface IStageParams {
     title: string;
     autoRender: boolean;
     disableDirtyBounds: boolean;
-    enableView3dTransform: boolean;
     beforeRender: (stage: IStage) => void;
     afterRender: (stage: IStage) => void;
     renderStyle?: string;
     ticker?: ITicker;
 }
 export interface IOption3D {
+    enableView3dTransform?: boolean;
     alpha?: number;
     beta?: number;
     gama?: number;

package/cjs/interface/stage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/interface/stage.ts"],"names":[],"mappings":"","file":"stage.js","sourcesContent":["import { INode } from './node-tree';\nimport { ILayer } from './layer';\nimport { IGraphic } from './graphic';\nimport { IGroup } from './graphic/group';\nimport { IColor } from './color';\nimport { IBounds, IBoundsLike, IMatrix, IMatrixLike, IPointLike } from '@visactor/vutils';\nimport { SyncHook } from '../tapable';\nimport { IWindow } from '../core';\nimport { IDrawContext, IRenderService } from '../render';\nimport { ICamera } from './camera';\nimport { vec3 } from './matrix';\nimport { IDirectionLight } from './light';\nimport { ITicker } from '../animate';\nimport { IPluginService } from '../plugins/plugin-service';\nimport { IPickerService } from '../picker';\n\nexport type IExportType = 'canvas' | 'imageData';\n\nexport interface IStageParams {\n  // x: number;\n  // y: number;\n  // // 视口的宽高\n  // viewWidth: number;\n  // viewHeight: number;\n\n  // 视口的宽高\n  viewBox: IBoundsLike;\n  // 总的宽高\n  width: number;\n  height: number;\n  dpr: number;\n  // stage的背景\n  background: string | IColor;\n  // 外部的canvas\n  canvas: string | HTMLCanvasElement;\n  // canvas的container容器，如果不传入canvas，那就会在容器中创建canvas\n  container: string | HTMLElement;\n  // 是否是受控制的canvas，如果不是的话，不会进行resize等操作，也不会修改canvas的样式\n  canvasControled: boolean;\n  title: string;\n  autoRender: boolean;\n  disableDirtyBounds: boolean;\n  enableView3dTransform: boolean; // 是否开启view3d自动旋转\n  // 绘制之前的钩子函数\n  beforeRender: (stage: IStage) => void;\n  // 绘制之后的钩子函数\n  afterRender: (stage: IStage) => void;\n  renderStyle?: string;\n  ticker?: ITicker;\n}\n\nexport interface IOption3D {\n  alpha?: number; // x轴的转角\n  beta?: number; // y轴的转角\n  gama?: number; // z轴的转角\n  center?: IPointLike; // 中心位置\n  fieldRatio?: number; // 透视的视域缩放比例\n  fieldDepth?: number;\n  light?: {\n    dir?: vec3;\n    color?: string;\n    ambient?: number;\n  };\n  // 配置相机后，alpha、beta、gamma配置会失效\n  camera?: any; // 相机配置\n}\n\n// TODO 命名方式\nexport interface IStage extends INode {\n  stage?: IStage;\n  parent: IStage | null;\n  // rootNode: IStage;\n  x: number;\n  y: number;\n\n  window: IWindow;\n\n  width: number;\n  height: number;\n  viewWidth: number;\n  viewHeight: number;\n  defaultLayer: ILayer;\n  dirtyBounds: IBounds | null;\n\n  autoRender: boolean;\n  renderCount: number;\n\n  hooks: {\n    beforeRender: SyncHook<[IStage]>;\n    afterRender: SyncHook<[IStage]>;\n  };\n\n  renderService: IRenderService;\n\n  option3d?: IOption3D;\n\n  set3dOptions: (options: IOption3D) => void;\n  light?: IDirectionLight;\n  camera?: ICamera;\n\n  dpr: number;\n\n  viewBox: IBoundsLike;\n  background: string | IColor;\n  ticker: ITicker;\n  increaseAutoRender: boolean;\n  readonly pickerService: IPickerService;\n  readonly pluginService: IPluginService;\n  // 如果传入CanvasId，如果存在相同Id，说明这两个图层使用相同的Canvas绘制\n  // 但需要注意的是依然是两个图层（用于解决Table嵌入ChartSpace不影响Table的绘制）\n  createLayer: (canvasId?: string) => ILayer;\n  sortLayer: (cb: (layer: ILayer) => number) => void;\n  removeLayer: (layerId: number) => ILayer | false;\n\n  render: (layers?: ILayer[], params?: Partial<IDrawContext>) => void;\n  renderNextFrame: (layers?: ILayer[]) => void;\n\n  // 画布操作\n  resize: (w: number, h: number, rerender?: boolean) => void;\n  resizeWindow: (w: number, h: number, rerender?: boolean) => void;\n  resizeView: (w: number, h: number, rerender?: boolean) => void;\n  setViewBox:\n    | ((viewBox: IBoundsLike, rerender: boolean) => void)\n    | ((x: number, y: number, w: number, h: number, rerender: boolean) => void)\n    | ((x: number | IBoundsLike, y: number | boolean, w?: number, h?: number, rerender?: boolean) => void);\n  setDpr: (dpr: number) => void;\n  setOrigin: (x: number, y: number) => void;\n  export: (type: IExportType) => HTMLCanvasElement | ImageData;\n  pick: (x: number, y: number) => { graphic: IGraphic | null; group: IGroup | null } | false;\n\n  // 动画相关\n  startAnimate: (t: number) => void;\n  setToFrame: (t: number) => void;\n  dirty: (b: IBounds, matrix?: IMatrix) => void;\n  // 考虑操作回放\n\n  renderTo: (window: IWindow, params: { x: number; y: number; width: number; height: number }) => void;\n\n  renderToNewWindow: (fullImage?: boolean) => IWindow;\n\n  toCanvas: (fullImage?: boolean) => HTMLCanvasElement | null;\n\n  setBeforeRender: (cb: (stage: IStage) => void) => void;\n\n  setAfterRender: (cb: (stage: IStage) => void) => void;\n\n  afterNextRender: (cb: (stage: IStage) => void) => void;\n  enableAutoRender: () => void;\n  disableAutoRender: () => void;\n  enableIncrementalAutoRender: () => void;\n  disableIncrementalAutoRender: () => void;\n  enableDirtyBounds: () => void;\n  disableDirtyBounds: () => void;\n  enableView3dTransform: () => void;\n  disableView3dTranform: () => void;\n  clearViewBox: (color?: string) => void;\n  release: () => void;\n  setStage: (stage?: IStage) => void;\n\n  setCursor: (mode?: string) => void;\n}\n\nexport declare function combineStage(srages: IStage[], params: { canvas: string | HTMLCanvasElement }): IStage;\n"]}
+{"version":3,"sources":["../../src/interface/stage.ts"],"names":[],"mappings":"","file":"stage.js","sourcesContent":["import { INode } from './node-tree';\nimport { ILayer } from './layer';\nimport { IGraphic } from './graphic';\nimport { IGroup } from './graphic/group';\nimport { IColor } from './color';\nimport { IBounds, IBoundsLike, IMatrix, IMatrixLike, IPointLike } from '@visactor/vutils';\nimport { SyncHook } from '../tapable';\nimport { IWindow } from '../core';\nimport { IDrawContext, IRenderService } from '../render';\nimport { ICamera } from './camera';\nimport { vec3 } from './matrix';\nimport { IDirectionLight } from './light';\nimport { ITicker } from '../animate';\nimport { IPluginService } from '../plugins/plugin-service';\nimport { IPickerService } from '../picker';\n\nexport type IExportType = 'canvas' | 'imageData';\n\nexport interface IStageParams {\n  // x: number;\n  // y: number;\n  // // 视口的宽高\n  // viewWidth: number;\n  // viewHeight: number;\n\n  // 视口的宽高\n  viewBox: IBoundsLike;\n  // 总的宽高\n  width: number;\n  height: number;\n  dpr: number;\n  // stage的背景\n  background: string | IColor;\n  // 外部的canvas\n  canvas: string | HTMLCanvasElement;\n  // canvas的container容器，如果不传入canvas，那就会在容器中创建canvas\n  container: string | HTMLElement;\n  // 是否是受控制的canvas，如果不是的话，不会进行resize等操作，也不会修改canvas的样式\n  canvasControled: boolean;\n  title: string;\n  autoRender: boolean;\n  disableDirtyBounds: boolean;\n  // 绘制之前的钩子函数\n  beforeRender: (stage: IStage) => void;\n  // 绘制之后的钩子函数\n  afterRender: (stage: IStage) => void;\n  renderStyle?: string;\n  ticker?: ITicker;\n}\n\nexport interface IOption3D {\n  enableView3dTransform?: boolean; // 是否开启view3d自动旋转\n  alpha?: number; // x轴的转角\n  beta?: number; // y轴的转角\n  gama?: number; // z轴的转角\n  center?: IPointLike; // 中心位置\n  fieldRatio?: number; // 透视的视域缩放比例\n  fieldDepth?: number;\n  light?: {\n    dir?: vec3;\n    color?: string;\n    ambient?: number;\n  };\n  // 配置相机后，alpha、beta、gamma配置会失效\n  camera?: any; // 相机配置\n}\n\n// TODO 命名方式\nexport interface IStage extends INode {\n  stage?: IStage;\n  parent: IStage | null;\n  // rootNode: IStage;\n  x: number;\n  y: number;\n\n  window: IWindow;\n\n  width: number;\n  height: number;\n  viewWidth: number;\n  viewHeight: number;\n  defaultLayer: ILayer;\n  dirtyBounds: IBounds | null;\n\n  autoRender: boolean;\n  renderCount: number;\n\n  hooks: {\n    beforeRender: SyncHook<[IStage]>;\n    afterRender: SyncHook<[IStage]>;\n  };\n\n  renderService: IRenderService;\n\n  option3d?: IOption3D;\n\n  set3dOptions: (options: IOption3D) => void;\n  light?: IDirectionLight;\n  camera?: ICamera;\n\n  dpr: number;\n\n  viewBox: IBoundsLike;\n  background: string | IColor;\n  ticker: ITicker;\n  increaseAutoRender: boolean;\n  readonly pickerService: IPickerService;\n  readonly pluginService: IPluginService;\n  // 如果传入CanvasId，如果存在相同Id，说明这两个图层使用相同的Canvas绘制\n  // 但需要注意的是依然是两个图层（用于解决Table嵌入ChartSpace不影响Table的绘制）\n  createLayer: (canvasId?: string) => ILayer;\n  sortLayer: (cb: (layer: ILayer) => number) => void;\n  removeLayer: (layerId: number) => ILayer | false;\n\n  render: (layers?: ILayer[], params?: Partial<IDrawContext>) => void;\n  renderNextFrame: (layers?: ILayer[]) => void;\n\n  // 画布操作\n  resize: (w: number, h: number, rerender?: boolean) => void;\n  resizeWindow: (w: number, h: number, rerender?: boolean) => void;\n  resizeView: (w: number, h: number, rerender?: boolean) => void;\n  setViewBox:\n    | ((viewBox: IBoundsLike, rerender: boolean) => void)\n    | ((x: number, y: number, w: number, h: number, rerender: boolean) => void)\n    | ((x: number | IBoundsLike, y: number | boolean, w?: number, h?: number, rerender?: boolean) => void);\n  setDpr: (dpr: number) => void;\n  setOrigin: (x: number, y: number) => void;\n  export: (type: IExportType) => HTMLCanvasElement | ImageData;\n  pick: (x: number, y: number) => { graphic: IGraphic | null; group: IGroup | null } | false;\n\n  // 动画相关\n  startAnimate: (t: number) => void;\n  setToFrame: (t: number) => void;\n  dirty: (b: IBounds, matrix?: IMatrix) => void;\n  // 考虑操作回放\n\n  renderTo: (window: IWindow, params: { x: number; y: number; width: number; height: number }) => void;\n\n  renderToNewWindow: (fullImage?: boolean) => IWindow;\n\n  toCanvas: (fullImage?: boolean) => HTMLCanvasElement | null;\n\n  setBeforeRender: (cb: (stage: IStage) => void) => void;\n\n  setAfterRender: (cb: (stage: IStage) => void) => void;\n\n  afterNextRender: (cb: (stage: IStage) => void) => void;\n  enableAutoRender: () => void;\n  disableAutoRender: () => void;\n  enableIncrementalAutoRender: () => void;\n  disableIncrementalAutoRender: () => void;\n  enableDirtyBounds: () => void;\n  disableDirtyBounds: () => void;\n  enableView3dTransform: () => void;\n  disableView3dTranform: () => void;\n  clearViewBox: (color?: string) => void;\n  release: () => void;\n  setStage: (stage?: IStage) => void;\n\n  setCursor: (mode?: string) => void;\n}\n\nexport declare function combineStage(srages: IStage[], params: { canvas: string | HTMLCanvasElement }): IStage;\n"]}

package/cjs/picker/contributions/canvas-picker/rect-picker.js

@@ -27,7 +27,7 @@ let DefaultCanvasRectPicker = class {
         if ("imprecise" === rect.attribute.pickMode) return !0;
         const {pickContext: pickContext} = null != params ? params : {};
         if (!pickContext) return !1;
-        const rectAttribute = (0, graphic_1.getTheme)(rect).rect, {borderRadius: borderRadius = rectAttribute.borderRadius} = rect.attribute;
+        const rectAttribute = (0, graphic_1.getTheme)(rect).rect, {cornerRadius: cornerRadius = rectAttribute.cornerRadius} = rect.attribute;
         let {x: x = rectAttribute.x, y: y = rectAttribute.y} = rect.attribute;
         pickContext.highPerformanceSave();
         let onlyTranslate = !0;
@@ -36,8 +36,8 @@ let DefaultCanvasRectPicker = class {
             x += point.x, y += point.y, pickContext.setTransformForCurrent();
         } else x = 0, y = 0, onlyTranslate = !1, pickContext.transformFromMatrix(rect.transMatrix, !0);
         let picked = !0;
-        if (!onlyTranslate || (0, vutils_1.isNumber)(borderRadius, !0) && 0 !== borderRadius || (0, 
-        vutils_1.isArray)(borderRadius) && borderRadius.some((num => 0 !== num))) picked = !1, 
+        if (!onlyTranslate || (0, vutils_1.isNumber)(cornerRadius, !0) && 0 !== cornerRadius || (0, 
+        vutils_1.isArray)(cornerRadius) && cornerRadius.some((num => 0 !== num))) picked = !1, 
         this.canvasRenderer.drawShape(rect, pickContext, x, y, {}, null, ((context, rectAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), 
         picked)), ((context, rectAttribute, themeAttribute) => {
             if (picked) return !0;

package/cjs/picker/contributions/canvas-picker/rect-picker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/canvas-picker/rect-picker.ts"],"names":[],"mappings":"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","file":"rect-picker.js","sourcesContent":["import { isArray, isNumber, IPoint, AABBBounds } from '@visactor/vutils';\nimport { getScaledStroke } from '../../../common/canvas-utils';\nimport { inject, injectable } from 'inversify';\nimport { getTheme } from '../../../graphic';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IRect, IThemeAttribute } from '../../../interface';\nimport { IGraphicRender, RectRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { RECT_NUMBER_TYPE } from '../../../graphic/constants';\n\nconst _bounds = new AABBBounds();\n\n@injectable()\nexport class DefaultCanvasRectPicker implements IGraphicPicker {\n  type: string = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n\n  constructor(@inject(RectRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(rect: IRect, point: IPoint, params?: IPickParams): boolean {\n    if (!rect.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (rect.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    const rectAttribute = getTheme(rect).rect;\n    const { borderRadius = rectAttribute.borderRadius } = rect.attribute;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n\n    pickContext.highPerformanceSave();\n    let onlyTranslate = true;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      onlyTranslate = false;\n      pickContext.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const point = rect.getOffsetXY(rectAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    let picked = true;\n    // 处理圆角情况，无圆角直接使用bounds判断结果\n    if (\n      !onlyTranslate ||\n      (isNumber(borderRadius, true) && borderRadius !== 0) ||\n      (isArray(borderRadius) && (<number[]>borderRadius).some(num => num !== 0))\n    ) {\n      // 详细形状判断\n      picked = false;\n      this.canvasRenderer.drawShape(\n        rect,\n        pickContext,\n        x,\n        y,\n        {} as any,\n        null,\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          picked = context.isPointInPath(point.x, point.y);\n          return picked;\n        },\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;\n          pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr);\n          picked = context.isPointInStroke(point.x, point.y);\n          return picked;\n        }\n      );\n    } else if (picked) {\n      // 如果只有描边那需要测试描边\n      const {\n        fill = rectAttribute.fill,\n        stroke = rectAttribute.stroke,\n        lineWidth = rectAttribute.lineWidth\n      } = rect.attribute;\n      if (fill) {\n        picked = true;\n      } else if (stroke) {\n        const bounds = rect.AABBBounds;\n        _bounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2);\n        _bounds.expand(-lineWidth / 2);\n        picked = !_bounds.containsPoint(point);\n      }\n    }\n\n    pickContext.highPerformanceRestore();\n    return picked; // 无圆角形状判断通过\n  }\n}\n"]}
+{"version":3,"sources":["../../src/picker/contributions/canvas-picker/rect-picker.ts"],"names":[],"mappings":"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","file":"rect-picker.js","sourcesContent":["import { isArray, isNumber, IPoint, AABBBounds } from '@visactor/vutils';\nimport { getScaledStroke } from '../../../common/canvas-utils';\nimport { inject, injectable } from 'inversify';\nimport { getTheme } from '../../../graphic';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IRect, IThemeAttribute } from '../../../interface';\nimport { IGraphicRender, RectRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { RECT_NUMBER_TYPE } from '../../../graphic/constants';\n\nconst _bounds = new AABBBounds();\n\n@injectable()\nexport class DefaultCanvasRectPicker implements IGraphicPicker {\n  type: string = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n\n  constructor(@inject(RectRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(rect: IRect, point: IPoint, params?: IPickParams): boolean {\n    if (!rect.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (rect.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    const rectAttribute = getTheme(rect).rect;\n    const { cornerRadius = rectAttribute.cornerRadius } = rect.attribute;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n\n    pickContext.highPerformanceSave();\n    let onlyTranslate = true;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      onlyTranslate = false;\n      pickContext.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const point = rect.getOffsetXY(rectAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    let picked = true;\n    // 处理圆角情况，无圆角直接使用bounds判断结果\n    if (\n      !onlyTranslate ||\n      (isNumber(cornerRadius, true) && cornerRadius !== 0) ||\n      (isArray(cornerRadius) && (<number[]>cornerRadius).some(num => num !== 0))\n    ) {\n      // 详细形状判断\n      picked = false;\n      this.canvasRenderer.drawShape(\n        rect,\n        pickContext,\n        x,\n        y,\n        {} as any,\n        null,\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          picked = context.isPointInPath(point.x, point.y);\n          return picked;\n        },\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;\n          pickContext.lineWidth = getScaledStroke(pickContext, lineWidth, pickContext.dpr);\n          picked = context.isPointInStroke(point.x, point.y);\n          return picked;\n        }\n      );\n    } else if (picked) {\n      // 如果只有描边那需要测试描边\n      const {\n        fill = rectAttribute.fill,\n        stroke = rectAttribute.stroke,\n        lineWidth = rectAttribute.lineWidth\n      } = rect.attribute;\n      if (fill) {\n        picked = true;\n      } else if (stroke) {\n        const bounds = rect.AABBBounds;\n        _bounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2);\n        _bounds.expand(-lineWidth / 2);\n        picked = !_bounds.containsPoint(point);\n      }\n    }\n\n    pickContext.highPerformanceRestore();\n    return picked; // 无圆角形状判断通过\n  }\n}\n"]}

package/cjs/picker/contributions/math-picker/rect-picker.js

@@ -27,7 +27,7 @@ let DefaultMathRectPicker = class {
         if ("imprecise" === rect.attribute.pickMode) return !0;
         const {pickContext: pickContext} = null != params ? params : {};
         if (!pickContext) return !1;
-        const rectAttribute = (0, theme_1.getTheme)(rect).rect, {borderRadius: borderRadius = rectAttribute.borderRadius} = rect.attribute;
+        const rectAttribute = (0, theme_1.getTheme)(rect).rect, {cornerRadius: cornerRadius = rectAttribute.cornerRadius} = rect.attribute;
         let {x: x = rectAttribute.x, y: y = rectAttribute.y} = rect.attribute;
         pickContext.highPerformanceSave();
         let onlyTranslate = !0;
@@ -36,8 +36,8 @@ let DefaultMathRectPicker = class {
             x += point.x, y += point.y, pickContext.setTransformForCurrent();
         } else x = 0, y = 0, onlyTranslate = !1, pickContext.transformFromMatrix(rect.transMatrix, !0);
         let picked = !0;
-        if (!onlyTranslate || (0, vutils_1.isNumber)(borderRadius, !0) && 0 !== borderRadius || (0, 
-        vutils_1.isArray)(borderRadius) && borderRadius.some((num => 0 !== num))) picked = !1, 
+        if (!onlyTranslate || (0, vutils_1.isNumber)(cornerRadius, !0) && 0 !== cornerRadius || (0, 
+        vutils_1.isArray)(cornerRadius) && cornerRadius.some((num => 0 !== num))) picked = !1, 
         this.canvasRenderer.drawShape(rect, pickContext, x, y, {}, null, ((context, rectAttribute, themeAttribute) => !!picked || (picked = context.isPointInPath(point.x, point.y), 
         picked)), ((context, rectAttribute, themeAttribute) => {
             if (picked) return !0;

package/cjs/picker/contributions/math-picker/rect-picker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/picker/contributions/math-picker/rect-picker.ts"],"names":[],"mappings":"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","file":"rect-picker.js","sourcesContent":["import { isArray, isNumber, IPoint, AABBBounds } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IRect, IThemeAttribute } from '../../../interface';\nimport { IGraphicRender, RectRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { RECT_NUMBER_TYPE } from '../../../graphic/constants';\n\nconst _bounds = new AABBBounds();\n\n@injectable()\nexport class DefaultMathRectPicker implements IGraphicPicker {\n  type: string = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n\n  constructor(@inject(RectRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(rect: IRect, point: IPoint, params?: IPickParams): boolean {\n    if (!rect.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (rect.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    const rectAttribute = getTheme(rect).rect;\n    const { borderRadius = rectAttribute.borderRadius } = rect.attribute;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n\n    pickContext.highPerformanceSave();\n    let onlyTranslate = true;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      onlyTranslate = false;\n      pickContext.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const point = rect.getOffsetXY(rectAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    let picked = true;\n    // 处理圆角情况，无圆角直接使用bounds判断结果\n    if (\n      !onlyTranslate ||\n      (isNumber(borderRadius, true) && borderRadius !== 0) ||\n      (isArray(borderRadius) && (<number[]>borderRadius).some(num => num !== 0))\n    ) {\n      // 详细形状判断\n      picked = false;\n      this.canvasRenderer.drawShape(\n        rect,\n        pickContext,\n        x,\n        y,\n        {} as any,\n        null,\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          picked = context.isPointInPath(point.x, point.y);\n          return picked;\n        },\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;\n          pickContext.lineWidth = lineWidth;\n          picked = context.isPointInStroke(point.x, point.y);\n          return picked;\n        }\n      );\n    } else if (picked) {\n      // 如果只有描边那需要测试描边\n      const {\n        fill = rectAttribute.fill,\n        stroke = rectAttribute.stroke,\n        lineWidth = rectAttribute.lineWidth\n      } = rect.attribute;\n      if (fill) {\n        picked = true;\n      } else if (stroke) {\n        const bounds = rect.AABBBounds;\n        _bounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2);\n        _bounds.expand(-lineWidth / 2);\n        picked = !_bounds.containsPoint(point);\n      }\n    }\n\n    pickContext.highPerformanceRestore();\n    return picked; // 无圆角形状判断通过\n  }\n}\n"]}
+{"version":3,"sources":["../../src/picker/contributions/math-picker/rect-picker.ts"],"names":[],"mappings":"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","file":"rect-picker.js","sourcesContent":["import { isArray, isNumber, IPoint, AABBBounds } from '@visactor/vutils';\nimport { inject, injectable } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IRect, IThemeAttribute } from '../../../interface';\nimport { IGraphicRender, RectRender } from '../../../render';\nimport { IGraphicPicker, IPickParams } from '../../picker-service';\nimport { RECT_NUMBER_TYPE } from '../../../graphic/constants';\n\nconst _bounds = new AABBBounds();\n\n@injectable()\nexport class DefaultMathRectPicker implements IGraphicPicker {\n  type: string = 'rect';\n  numberType: number = RECT_NUMBER_TYPE;\n\n  constructor(@inject(RectRender) public readonly canvasRenderer: IGraphicRender) {}\n\n  contains(rect: IRect, point: IPoint, params?: IPickParams): boolean {\n    if (!rect.AABBBounds.containsPoint(point)) {\n      return false;\n    }\n    if (rect.attribute.pickMode === 'imprecise') {\n      return true;\n    }\n\n    const { pickContext } = params ?? {};\n    if (!pickContext) {\n      return false;\n    }\n\n    // const { rectAttribute } = graphicService.themeService.getCurrentTheme();\n    const rectAttribute = getTheme(rect).rect;\n    const { cornerRadius = rectAttribute.cornerRadius } = rect.attribute;\n    let { x = rectAttribute.x, y = rectAttribute.y } = rect.attribute;\n\n    pickContext.highPerformanceSave();\n    let onlyTranslate = true;\n    if (!rect.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      onlyTranslate = false;\n      pickContext.transformFromMatrix(rect.transMatrix, true);\n    } else {\n      const point = rect.getOffsetXY(rectAttribute);\n      x += point.x;\n      y += point.y;\n      // 当前context有rotate/scale，重置matrix\n      pickContext.setTransformForCurrent();\n    }\n\n    let picked = true;\n    // 处理圆角情况，无圆角直接使用bounds判断结果\n    if (\n      !onlyTranslate ||\n      (isNumber(cornerRadius, true) && cornerRadius !== 0) ||\n      (isArray(cornerRadius) && (<number[]>cornerRadius).some(num => num !== 0))\n    ) {\n      // 详细形状判断\n      picked = false;\n      this.canvasRenderer.drawShape(\n        rect,\n        pickContext,\n        x,\n        y,\n        {} as any,\n        null,\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          picked = context.isPointInPath(point.x, point.y);\n          return picked;\n        },\n        (\n          context: IContext2d,\n          rectAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n          themeAttribute: IThemeAttribute\n        ) => {\n          // 选中后面就不需要再走逻辑了\n          if (picked) {\n            return true;\n          }\n          const lineWidth = rectAttribute.lineWidth || themeAttribute.lineWidth;\n          pickContext.lineWidth = lineWidth;\n          picked = context.isPointInStroke(point.x, point.y);\n          return picked;\n        }\n      );\n    } else if (picked) {\n      // 如果只有描边那需要测试描边\n      const {\n        fill = rectAttribute.fill,\n        stroke = rectAttribute.stroke,\n        lineWidth = rectAttribute.lineWidth\n      } = rect.attribute;\n      if (fill) {\n        picked = true;\n      } else if (stroke) {\n        const bounds = rect.AABBBounds;\n        _bounds.setValue(bounds.x1, bounds.y1, bounds.x2, bounds.y2);\n        _bounds.expand(-lineWidth / 2);\n        picked = !_bounds.containsPoint(point);\n      }\n    }\n\n    pickContext.highPerformanceRestore();\n    return picked; // 无圆角形状判断通过\n  }\n}\n"]}

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

@@ -20,13 +20,13 @@ let DefaultRectRenderContribution = class {
         this.useStyle = !0, this.order = 0;
     }
     drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, fillCb, strokeCb) {
-        const {width: width = rectAttribute.width, height: height = rectAttribute.height, borderRadius: borderRadius = rectAttribute.borderRadius, opacity: opacity = rectAttribute.opacity, outerBorder: outerBorder, innerBorder: innerBorder} = rect.attribute;
+        const {width: width = rectAttribute.width, height: height = rectAttribute.height, cornerRadius: cornerRadius = rectAttribute.cornerRadius, opacity: opacity = rectAttribute.opacity, outerBorder: outerBorder, innerBorder: innerBorder} = rect.attribute;
         if (outerBorder) {
             const {distance: distance = rectAttribute.outerBorder.distance} = outerBorder, d = (0, 
             canvas_utils_1.getScaledStroke)(context, distance, context.dpr), nextX = x - d, nextY = y - d, dw = 2 * d;
-            if (0 === borderRadius || (0, vutils_1.isArray)(borderRadius) && borderRadius.every((num => 0 === num)) ? (context.beginPath(), 
+            if (0 === cornerRadius || (0, vutils_1.isArray)(cornerRadius) && cornerRadius.every((num => 0 === num)) ? (context.beginPath(), 
             context.rect(nextX, nextY, width + dw, height + dw)) : (context.beginPath(), (0, 
-            rect_1.createRectPath)(context, nextX, nextY, width + dw, height + dw, borderRadius)), 
+            rect_1.createRectPath)(context, nextX, nextY, width + dw, height + dw, cornerRadius)), 
             context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute), 
             strokeCb) strokeCb(context, outerBorder, rectAttribute.outerBorder); else if (sVisible) {
                 const lastOpacity = rectAttribute.outerBorder.opacity;
@@ -37,9 +37,9 @@ let DefaultRectRenderContribution = class {
         if (innerBorder) {
             const {distance: distance = rectAttribute.innerBorder.distance} = innerBorder, d = (0, 
             canvas_utils_1.getScaledStroke)(context, distance, context.dpr), nextX = x + d, nextY = y + d, dw = 2 * d;
-            if (0 === borderRadius || (0, vutils_1.isArray)(borderRadius) && borderRadius.every((num => 0 === num)) ? (context.beginPath(), 
+            if (0 === cornerRadius || (0, vutils_1.isArray)(cornerRadius) && cornerRadius.every((num => 0 === num)) ? (context.beginPath(), 
             context.rect(nextX, nextY, width - dw, height - dw)) : (context.beginPath(), (0, 
-            rect_1.createRectPath)(context, nextX, nextY, width - dw, height - dw, borderRadius)), 
+            rect_1.createRectPath)(context, nextX, nextY, width - dw, height - dw, cornerRadius)), 
             context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute), 
             strokeCb) strokeCb(context, innerBorder, rectAttribute.innerBorder); else if (sVisible) {
                 const lastOpacity = rectAttribute.innerBorder.opacity;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { injectable } from 'inversify';\nimport {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IRect,\n  IRectGraphicAttribute,\n  IThemeAttribute\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  BaseRenderContributionTime,\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseTextureRenderContribution,\n  IBaseRenderContribution\n} from './base-contribution-render';\nimport { createRectPath } from '../../../../common/shape/rect';\n\nexport const RectRenderContribution = Symbol.for('RectRenderContribution');\n\nexport interface IRectRenderContribution extends IBaseRenderContribution {\n  drawShape: (\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) => void;\n}\n\n@injectable()\nexport class DefaultRectRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const {\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      borderRadius = rectAttribute.borderRadius,\n      opacity = rectAttribute.opacity,\n      outerBorder,\n      innerBorder\n    } = rect.attribute;\n\n    if (outerBorder) {\n      const { distance = rectAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x - d;\n      const nextY = y - d;\n      const dw = d * 2;\n      if (borderRadius === 0 || (isArray(borderRadius) && (<number[]>borderRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width + dw, height + dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width + dw, height + dw, borderRadius);\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, rectAttribute.outerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.outerBorder as any).opacity;\n        (rectAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(rect, outerBorder, x, y, rectAttribute.outerBorder as any);\n        (rectAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (innerBorder) {\n      const { distance = rectAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x + d;\n      const nextY = y + d;\n      const dw = d * 2;\n      if (borderRadius === 0 || (isArray(borderRadius) && (<number[]>borderRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width - dw, height - dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width - dw, height - dw, borderRadius);\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, rectAttribute.innerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.innerBorder as any).opacity;\n        (rectAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(rect, innerBorder, x, y, rectAttribute.innerBorder as any);\n        (rectAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\n@injectable()\nexport class DefaultRectBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements IRectRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n}\n\n@injectable()\nexport class DefaultRectTextureRenderContribution\n  extends DefaultBaseTextureRenderContribution\n  implements IRectRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n}\n\n@injectable()\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    group: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IRectGraphicAttribute>,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const { stroke = groupAttribute.stroke } = group.attribute as any;\n\n    // 数组且存在为false的项目，那就不绘制\n    if (Array.isArray(stroke) && stroke.some(s => s === false)) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class SplitRectAfterRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IRectGraphicAttribute>,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const {\n      width = groupAttribute.width,\n      height = groupAttribute.height,\n      stroke = groupAttribute.stroke\n    } = rect.attribute as any;\n\n    // 不是数组\n    if (!(Array.isArray(stroke) && stroke.some(s => s === false))) {\n      return;\n    }\n\n    context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute);\n    // 单独处理每条边界，目前不考虑圆角\n    context.beginPath();\n    context.moveTo(x, y);\n    // top\n    if (stroke[0]) {\n      context.lineTo(x + width, y);\n    } else {\n      context.moveTo(x + width, y);\n    }\n    // right\n    if (stroke[1]) {\n      context.lineTo(x + width, y + height);\n    } else {\n      context.moveTo(x + width, y + height);\n    }\n    // bottom\n    if (stroke[2]) {\n      context.lineTo(x, y + height);\n    } else {\n      context.moveTo(x, y + height);\n    }\n    // left\n    if (stroke[3]) {\n      // 没有close path是，起点和终点不连续，需要调整y保证不出现缺口\n      const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;\n      context.lineTo(x, adjustY);\n    } else {\n      context.moveTo(x, y);\n    }\n\n    context.stroke();\n  }\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { injectable } from 'inversify';\nimport {\n  IGraphicAttribute,\n  IContext2d,\n  IMarkAttribute,\n  IRect,\n  IRectGraphicAttribute,\n  IThemeAttribute\n} from '../../../../interface';\nimport { getScaledStroke } from '../../../../common/canvas-utils';\nimport {\n  BaseRenderContributionTime,\n  DefaultBaseBackgroundRenderContribution,\n  DefaultBaseTextureRenderContribution,\n  IBaseRenderContribution\n} from './base-contribution-render';\nimport { createRectPath } from '../../../../common/shape/rect';\n\nexport const RectRenderContribution = Symbol.for('RectRenderContribution');\n\nexport interface IRectRenderContribution extends IBaseRenderContribution {\n  drawShape: (\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) => void;\n}\n\n@injectable()\nexport class DefaultRectRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const {\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      cornerRadius = rectAttribute.cornerRadius,\n      opacity = rectAttribute.opacity,\n      outerBorder,\n      innerBorder\n    } = rect.attribute;\n\n    if (outerBorder) {\n      const { distance = rectAttribute.outerBorder.distance } = outerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x - d;\n      const nextY = y - d;\n      const dw = d * 2;\n      if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width + dw, height + dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width + dw, height + dw, cornerRadius);\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, outerBorder, rectAttribute.outerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.outerBorder as any).opacity;\n        (rectAttribute.outerBorder as any).opacity = opacity;\n        context.setStrokeStyle(rect, outerBorder, x, y, rectAttribute.outerBorder as any);\n        (rectAttribute.outerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n\n    if (innerBorder) {\n      const { distance = rectAttribute.innerBorder.distance } = innerBorder;\n      const d = getScaledStroke(context, distance as number, context.dpr);\n      const nextX = x + d;\n      const nextY = y + d;\n      const dw = d * 2;\n      if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n        // 不需要处理圆角\n        context.beginPath();\n        context.rect(nextX, nextY, width - dw, height - dw);\n      } else {\n        context.beginPath();\n\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, nextX, nextY, width - dw, height - dw, cornerRadius);\n      }\n\n      // shadow\n      context.setShadowStyle && context.setShadowStyle(rect, rect.attribute, rectAttribute);\n\n      if (strokeCb) {\n        strokeCb(context, innerBorder, rectAttribute.innerBorder);\n      } else if (sVisible) {\n        // 存在stroke\n        const lastOpacity = (rectAttribute.innerBorder as any).opacity;\n        (rectAttribute.innerBorder as any).opacity = opacity;\n        context.setStrokeStyle(rect, innerBorder, x, y, rectAttribute.innerBorder as any);\n        (rectAttribute.innerBorder as any).opacity = lastOpacity;\n        context.stroke();\n      }\n    }\n  }\n}\n\n@injectable()\nexport class DefaultRectBackgroundRenderContribution\n  extends DefaultBaseBackgroundRenderContribution\n  implements IRectRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n}\n\n@injectable()\nexport class DefaultRectTextureRenderContribution\n  extends DefaultBaseTextureRenderContribution\n  implements IRectRenderContribution\n{\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n}\n\n@injectable()\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    group: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IRectGraphicAttribute>,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const { stroke = groupAttribute.stroke } = group.attribute as any;\n\n    // 数组且存在为false的项目，那就不绘制\n    if (Array.isArray(stroke) && stroke.some(s => s === false)) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class SplitRectAfterRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IRectGraphicAttribute>,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const {\n      width = groupAttribute.width,\n      height = groupAttribute.height,\n      stroke = groupAttribute.stroke\n    } = rect.attribute as any;\n\n    // 不是数组\n    if (!(Array.isArray(stroke) && stroke.some(s => s === false))) {\n      return;\n    }\n\n    context.setStrokeStyle(rect, rect.attribute, x, y, groupAttribute);\n    // 单独处理每条边界，目前不考虑圆角\n    context.beginPath();\n    context.moveTo(x, y);\n    // top\n    if (stroke[0]) {\n      context.lineTo(x + width, y);\n    } else {\n      context.moveTo(x + width, y);\n    }\n    // right\n    if (stroke[1]) {\n      context.lineTo(x + width, y + height);\n    } else {\n      context.moveTo(x + width, y + height);\n    }\n    // bottom\n    if (stroke[2]) {\n      context.lineTo(x, y + height);\n    } else {\n      context.moveTo(x, y + height);\n    }\n    // left\n    if (stroke[3]) {\n      // 没有close path是，起点和终点不连续，需要调整y保证不出现缺口\n      const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;\n      context.lineTo(x, adjustY);\n    } else {\n      context.moveTo(x, y);\n    }\n\n    context.stroke();\n  }\n}\n"]}

package/cjs/render/contributions/render/group-render.js

@@ -23,7 +23,7 @@ let DefaultCanvasGroupRender = class {
         this.groupRenderContribitions = groupRenderContribitions, this.numberType = constants_1.GROUP_NUMBER_TYPE;
     }
     drawShape(group, context, x, y, drawContext, params, fillCb, strokeCb) {
-        const groupAttribute = (0, graphic_1.getTheme)(group, null == params ? void 0 : params.theme).group, {fill: fill = groupAttribute.fill, background: background, stroke: stroke = groupAttribute.stroke, opacity: opacity = groupAttribute.opacity, width: width = groupAttribute.width, height: height = groupAttribute.height, clip: clip = groupAttribute.clip, fillOpacity: fillOpacity = groupAttribute.fillOpacity, strokeOpacity: strokeOpacity = groupAttribute.strokeOpacity, borderRadius: borderRadius = groupAttribute.borderRadius, path: path = groupAttribute.path, lineWidth: lineWidth = groupAttribute.lineWidth, visible: visible = groupAttribute.visible} = group.attribute, fVisible = (0, 
+        const groupAttribute = (0, graphic_1.getTheme)(group, null == params ? void 0 : params.theme).group, {fill: fill = groupAttribute.fill, background: background, stroke: stroke = groupAttribute.stroke, opacity: opacity = groupAttribute.opacity, width: width = groupAttribute.width, height: height = groupAttribute.height, clip: clip = groupAttribute.clip, fillOpacity: fillOpacity = groupAttribute.fillOpacity, strokeOpacity: strokeOpacity = groupAttribute.strokeOpacity, cornerRadius: cornerRadius = groupAttribute.cornerRadius, path: path = groupAttribute.path, lineWidth: lineWidth = groupAttribute.lineWidth, visible: visible = groupAttribute.visible} = group.attribute, fVisible = (0, 
         utils_1.rectFillVisible)(opacity, fillOpacity, width, height), sVisible = (0, utils_1.rectStrokeVisible)(opacity, strokeOpacity, width, height), doFill = (0, 
         utils_1.runFill)(fill), doStroke = (0, utils_1.runStroke)(stroke, lineWidth);
         if (!group.valid || !visible) return;
@@ -37,8 +37,8 @@ let DefaultCanvasGroupRender = class {
             path.forEach((g => {
                 drawContext.drawContribution.getRenderContribution(g).draw(g, drawContext.renderService, drawContext, params);
             })), context.disableFill = disableFill, context.disableStroke = disableStroke, context.disableBeginPath = disableBeginPath;
-        } else 0 === borderRadius || (0, vutils_1.isArray)(borderRadius) && borderRadius.every((num => 0 === num)) ? (context.beginPath(), 
-        context.rect(x, y, width, height)) : (context.beginPath(), (0, rect_1.createRectPath)(context, x, y, width, height, borderRadius));
+        } else 0 === cornerRadius || (0, vutils_1.isArray)(cornerRadius) && cornerRadius.every((num => 0 === num)) ? (context.beginPath(), 
+        context.rect(x, y, width, height)) : (context.beginPath(), (0, rect_1.createRectPath)(context, x, y, width, height, cornerRadius));
         this._groupRenderContribitions || (this._groupRenderContribitions = this.groupRenderContribitions.getContributions() || []);
         const doFillOrStroke = {
             doFill: doFill,

package/cjs/render/contributions/render/group-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/group-render.ts"],"names":[],"mappings":"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","file":"group-render.js","sourcesContent":["import { inject, injectable, named } from 'inversify';\nimport { IGraphicAttribute, IContext2d, IGroup, IMarkAttribute, IThemeAttribute, mat4 } from '../../../interface';\nimport { getModelMatrix, getTheme, multiplyMat4Mat4 } from '../../../graphic';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { isArray } from '@visactor/vutils';\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { createRectPath } from '../../../common/shape/rect';\nimport { rectFillVisible, rectStrokeVisible, runFill, runStroke } from './utils';\nimport { GroupRenderContribution, IGroupRenderContribution } from './contributions/group-contribution-render';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { GROUP_NUMBER_TYPE } from '../../../graphic/constants';\n\n@injectable()\nexport class DefaultCanvasGroupRender implements IGraphicRender {\n  type: 'group';\n  numberType: number = GROUP_NUMBER_TYPE;\n\n  _groupRenderContribitions: IGroupRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(GroupRenderContribution)\n    protected readonly groupRenderContribitions: ContributionProvider<IGroupRenderContribution>\n  ) {}\n\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const groupAttribute = graphicService.themeService.getCurrentTheme().groupAttribute;\n    const groupAttribute = getTheme(group, params?.theme).group;\n    const {\n      fill = groupAttribute.fill,\n      background,\n      stroke = groupAttribute.stroke,\n      opacity = groupAttribute.opacity,\n      width = groupAttribute.width,\n      height = groupAttribute.height,\n      clip = groupAttribute.clip,\n      fillOpacity = groupAttribute.fillOpacity,\n      strokeOpacity = groupAttribute.strokeOpacity,\n      borderRadius = groupAttribute.borderRadius,\n      path = groupAttribute.path,\n      lineWidth = groupAttribute.lineWidth,\n      visible = groupAttribute.visible\n    } = group.attribute;\n\n    // 不绘制或者透明\n    const fVisible = rectFillVisible(opacity, fillOpacity, width, height);\n    const sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(group.valid && visible)) {\n      return;\n    }\n\n    if (!clip) {\n      if (!(doFill || doStroke || background)) {\n        return;\n      }\n\n      // 如果存在fillCb和strokeCb，那就不直接跳过\n      if (!(fVisible || sVisible || fillCb || strokeCb || background)) {\n        return;\n      }\n    }\n\n    if (path && path.length && drawContext.drawContribution) {\n      // 禁用fill和stroke\n      const disableFill = context.disableFill;\n      const disableStroke = context.disableStroke;\n      const disableBeginPath = context.disableBeginPath;\n      context.disableFill = true;\n      context.disableStroke = true;\n      context.disableBeginPath = true;\n      path.forEach(g => {\n        const rc = drawContext.drawContribution.getRenderContribution(g);\n        rc.draw(g, drawContext.renderService, drawContext, params);\n      });\n      context.disableFill = disableFill;\n      context.disableStroke = disableStroke;\n      context.disableBeginPath = disableBeginPath;\n    } else if (borderRadius === 0 || (isArray(borderRadius) && (<number[]>borderRadius).every(num => num === 0))) {\n      // 不需要处理圆角\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else {\n      context.beginPath();\n      // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n      createRectPath(context, x, y, width, height, borderRadius);\n    }\n\n    if (!this._groupRenderContribitions) {\n      this._groupRenderContribitions = this.groupRenderContribitions.getContributions() || [];\n    }\n\n    const doFillOrStroke = {\n      doFill,\n      doStroke\n    };\n\n    this._groupRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(group, group.attribute, x, y, groupAttribute);\n        c.drawShape(\n          group,\n          context,\n          x,\n          y,\n          doFill,\n          doStroke,\n          fVisible,\n          sVisible,\n          groupAttribute,\n          fillCb,\n          strokeCb,\n          doFillOrStroke\n        );\n      }\n    });\n\n    // beforeFillStroke contribition可以操作clip范围\n    if (clip) {\n      context.clip();\n    }\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(group, group.attribute, groupAttribute);\n\n    if (doFillOrStroke.doFill) {\n      if (fillCb) {\n        fillCb(context, group.attribute, groupAttribute);\n      } else if (fVisible) {\n        context.setCommonStyle(group, group.attribute, x, y, groupAttribute);\n        context.fill();\n      }\n    }\n    if (doFillOrStroke.doStroke) {\n      if (strokeCb) {\n        strokeCb(context, group.attribute, groupAttribute);\n      } else if (sVisible) {\n        context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n        context.stroke();\n      }\n    }\n\n    this._groupRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        // c.useStyle && context.setCommonStyle(group, group.attribute, x, y, groupAttribute);\n        c.drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(group: IGroup, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    // debugger;\n    const { clip } = group.attribute;\n    if (clip) {\n      context.save();\n    } else {\n      context.highPerformanceSave();\n    }\n\n    const groupAttribute = getTheme(group, params?.theme).group;\n\n    // const lastMatrix = context.modelMatrix;\n    // if (context.camera) {\n    //   const m = group.transMatrix;\n    //   const matrix = createMat4();\n    //   mat3Tomat4(matrix, m);\n    //   const lastModelMatrix = context.modelMatrix;\n    //   if (lastModelMatrix) {\n    //     if (matrix) {\n    //       const m = createMat4();\n    //       context.modelMatrix = multiplyMat4Mat4(m, lastModelMatrix, matrix);\n    //     }\n    //   } else {\n    //     context.modelMatrix = matrix;\n    //   }\n    // } else {\n    //   // group直接transform\n    //   context.transformFromMatrix(group.transMatrix, true);\n    // }\n    const lastModelMatrix = context.modelMatrix;\n    const camera = context.camera;\n    if (camera) {\n      const nextModelMatrix = mat4Allocate.allocate();\n      // 计算模型矩阵\n      const modelMatrix = mat4Allocate.allocate();\n      getModelMatrix(modelMatrix, group, groupAttribute);\n      if (lastModelMatrix) {\n        multiplyMat4Mat4(nextModelMatrix, lastModelMatrix, modelMatrix);\n      } else {\n        multiplyMat4Mat4(nextModelMatrix, nextModelMatrix, modelMatrix);\n      }\n      context.modelMatrix = nextModelMatrix;\n      mat4Allocate.free(modelMatrix);\n      context.setTransform(1, 0, 0, 1, 0, 0, true);\n    } else {\n      // group直接transform\n      context.transformFromMatrix(group.transMatrix, true);\n    }\n\n    context.beginPath();\n    // 如果跳过绘制，那就不绘制\n    if (params.skipDraw) {\n      this.drawShape(\n        group,\n        context,\n        0,\n        0,\n        drawContext,\n        params,\n        () => false,\n        () => false\n      );\n    } else {\n      this.drawShape(group, context, 0, 0, drawContext);\n    }\n\n    // 绘制子元素的时候要添加scroll\n    const { scrollX = groupAttribute.scrollX, scrollY = groupAttribute.scrollY } = group.attribute;\n    if (scrollX || scrollY) {\n      context.translate(scrollX, scrollY);\n    }\n    let p: any;\n    if (params && params.drawingCb) {\n      p = params.drawingCb();\n    }\n\n    if (context.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(context.modelMatrix);\n    }\n    context.modelMatrix = lastModelMatrix;\n\n    if (p && p.then) {\n      p.then(() => {\n        if (clip) {\n          context.restore();\n        } else {\n          context.highPerformanceRestore();\n        }\n      });\n    } else {\n      if (clip) {\n        context.restore();\n      } else {\n        context.highPerformanceRestore();\n      }\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/group-render.ts"],"names":[],"mappings":"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","file":"group-render.js","sourcesContent":["import { inject, injectable, named } from 'inversify';\nimport { IGraphicAttribute, IContext2d, IGroup, IMarkAttribute, IThemeAttribute, mat4 } from '../../../interface';\nimport { getModelMatrix, getTheme, multiplyMat4Mat4 } from '../../../graphic';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { isArray } from '@visactor/vutils';\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { createRectPath } from '../../../common/shape/rect';\nimport { rectFillVisible, rectStrokeVisible, runFill, runStroke } from './utils';\nimport { GroupRenderContribution, IGroupRenderContribution } from './contributions/group-contribution-render';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\nimport { mat4Allocate } from '../../../allocator/matrix-allocate';\nimport { GROUP_NUMBER_TYPE } from '../../../graphic/constants';\n\n@injectable()\nexport class DefaultCanvasGroupRender implements IGraphicRender {\n  type: 'group';\n  numberType: number = GROUP_NUMBER_TYPE;\n\n  _groupRenderContribitions: IGroupRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(GroupRenderContribution)\n    protected readonly groupRenderContribitions: ContributionProvider<IGroupRenderContribution>\n  ) {}\n\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const groupAttribute = graphicService.themeService.getCurrentTheme().groupAttribute;\n    const groupAttribute = getTheme(group, params?.theme).group;\n    const {\n      fill = groupAttribute.fill,\n      background,\n      stroke = groupAttribute.stroke,\n      opacity = groupAttribute.opacity,\n      width = groupAttribute.width,\n      height = groupAttribute.height,\n      clip = groupAttribute.clip,\n      fillOpacity = groupAttribute.fillOpacity,\n      strokeOpacity = groupAttribute.strokeOpacity,\n      cornerRadius = groupAttribute.cornerRadius,\n      path = groupAttribute.path,\n      lineWidth = groupAttribute.lineWidth,\n      visible = groupAttribute.visible\n    } = group.attribute;\n\n    // 不绘制或者透明\n    const fVisible = rectFillVisible(opacity, fillOpacity, width, height);\n    const sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(group.valid && visible)) {\n      return;\n    }\n\n    if (!clip) {\n      if (!(doFill || doStroke || background)) {\n        return;\n      }\n\n      // 如果存在fillCb和strokeCb，那就不直接跳过\n      if (!(fVisible || sVisible || fillCb || strokeCb || background)) {\n        return;\n      }\n    }\n\n    if (path && path.length && drawContext.drawContribution) {\n      // 禁用fill和stroke\n      const disableFill = context.disableFill;\n      const disableStroke = context.disableStroke;\n      const disableBeginPath = context.disableBeginPath;\n      context.disableFill = true;\n      context.disableStroke = true;\n      context.disableBeginPath = true;\n      path.forEach(g => {\n        const rc = drawContext.drawContribution.getRenderContribution(g);\n        rc.draw(g, drawContext.renderService, drawContext, params);\n      });\n      context.disableFill = disableFill;\n      context.disableStroke = disableStroke;\n      context.disableBeginPath = disableBeginPath;\n    } else if (cornerRadius === 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n      // 不需要处理圆角\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else {\n      context.beginPath();\n      // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n      createRectPath(context, x, y, width, height, cornerRadius);\n    }\n\n    if (!this._groupRenderContribitions) {\n      this._groupRenderContribitions = this.groupRenderContribitions.getContributions() || [];\n    }\n\n    const doFillOrStroke = {\n      doFill,\n      doStroke\n    };\n\n    this._groupRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(group, group.attribute, x, y, groupAttribute);\n        c.drawShape(\n          group,\n          context,\n          x,\n          y,\n          doFill,\n          doStroke,\n          fVisible,\n          sVisible,\n          groupAttribute,\n          fillCb,\n          strokeCb,\n          doFillOrStroke\n        );\n      }\n    });\n\n    // beforeFillStroke contribition可以操作clip范围\n    if (clip) {\n      context.clip();\n    }\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(group, group.attribute, groupAttribute);\n\n    if (doFillOrStroke.doFill) {\n      if (fillCb) {\n        fillCb(context, group.attribute, groupAttribute);\n      } else if (fVisible) {\n        context.setCommonStyle(group, group.attribute, x, y, groupAttribute);\n        context.fill();\n      }\n    }\n    if (doFillOrStroke.doStroke) {\n      if (strokeCb) {\n        strokeCb(context, group.attribute, groupAttribute);\n      } else if (sVisible) {\n        context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n        context.stroke();\n      }\n    }\n\n    this._groupRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        // c.useStyle && context.setCommonStyle(group, group.attribute, x, y, groupAttribute);\n        c.drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(group: IGroup, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n    // debugger;\n    const { clip } = group.attribute;\n    if (clip) {\n      context.save();\n    } else {\n      context.highPerformanceSave();\n    }\n\n    const groupAttribute = getTheme(group, params?.theme).group;\n\n    // const lastMatrix = context.modelMatrix;\n    // if (context.camera) {\n    //   const m = group.transMatrix;\n    //   const matrix = createMat4();\n    //   mat3Tomat4(matrix, m);\n    //   const lastModelMatrix = context.modelMatrix;\n    //   if (lastModelMatrix) {\n    //     if (matrix) {\n    //       const m = createMat4();\n    //       context.modelMatrix = multiplyMat4Mat4(m, lastModelMatrix, matrix);\n    //     }\n    //   } else {\n    //     context.modelMatrix = matrix;\n    //   }\n    // } else {\n    //   // group直接transform\n    //   context.transformFromMatrix(group.transMatrix, true);\n    // }\n    const lastModelMatrix = context.modelMatrix;\n    const camera = context.camera;\n    if (camera) {\n      const nextModelMatrix = mat4Allocate.allocate();\n      // 计算模型矩阵\n      const modelMatrix = mat4Allocate.allocate();\n      getModelMatrix(modelMatrix, group, groupAttribute);\n      if (lastModelMatrix) {\n        multiplyMat4Mat4(nextModelMatrix, lastModelMatrix, modelMatrix);\n      } else {\n        multiplyMat4Mat4(nextModelMatrix, nextModelMatrix, modelMatrix);\n      }\n      context.modelMatrix = nextModelMatrix;\n      mat4Allocate.free(modelMatrix);\n      context.setTransform(1, 0, 0, 1, 0, 0, true);\n    } else {\n      // group直接transform\n      context.transformFromMatrix(group.transMatrix, true);\n    }\n\n    context.beginPath();\n    // 如果跳过绘制，那就不绘制\n    if (params.skipDraw) {\n      this.drawShape(\n        group,\n        context,\n        0,\n        0,\n        drawContext,\n        params,\n        () => false,\n        () => false\n      );\n    } else {\n      this.drawShape(group, context, 0, 0, drawContext);\n    }\n\n    // 绘制子元素的时候要添加scroll\n    const { scrollX = groupAttribute.scrollX, scrollY = groupAttribute.scrollY } = group.attribute;\n    if (scrollX || scrollY) {\n      context.translate(scrollX, scrollY);\n    }\n    let p: any;\n    if (params && params.drawingCb) {\n      p = params.drawingCb();\n    }\n\n    if (context.modelMatrix !== lastModelMatrix) {\n      mat4Allocate.free(context.modelMatrix);\n    }\n    context.modelMatrix = lastModelMatrix;\n\n    if (p && p.then) {\n      p.then(() => {\n        if (clip) {\n          context.restore();\n        } else {\n          context.highPerformanceRestore();\n        }\n      });\n    } else {\n      if (clip) {\n        context.restore();\n      } else {\n        context.highPerformanceRestore();\n      }\n    }\n  }\n}\n"]}

package/cjs/render/contributions/render/polygon-render.js

@@ -23,13 +23,13 @@ let DefaultCanvasPolygonRender = class {
         this.polygonRenderContribitions = polygonRenderContribitions, this.numberType = constants_1.POLYGON_NUMBER_TYPE;
     }
     drawShape(polygon, context, x, y, drawContext, params, fillCb, strokeCb) {
-        const polygonAttribute = (0, theme_1.getTheme)(polygon, null == params ? void 0 : params.theme).polygon, {points: points = polygonAttribute.points, fill: fill = polygonAttribute.fill, stroke: stroke = polygonAttribute.stroke, borderRadius: borderRadius = polygonAttribute.borderRadius, fillOpacity: fillOpacity = polygonAttribute.fillOpacity, background: background, strokeOpacity: strokeOpacity = polygonAttribute.strokeOpacity, lineWidth: lineWidth = polygonAttribute.lineWidth, opacity: opacity = polygonAttribute.opacity, visible: visible = polygonAttribute.visible} = polygon.attribute, fVisible = (0, 
+        const polygonAttribute = (0, theme_1.getTheme)(polygon, null == params ? void 0 : params.theme).polygon, {points: points = polygonAttribute.points, fill: fill = polygonAttribute.fill, stroke: stroke = polygonAttribute.stroke, cornerRadius: cornerRadius = polygonAttribute.cornerRadius, fillOpacity: fillOpacity = polygonAttribute.fillOpacity, background: background, strokeOpacity: strokeOpacity = polygonAttribute.strokeOpacity, lineWidth: lineWidth = polygonAttribute.lineWidth, opacity: opacity = polygonAttribute.opacity, visible: visible = polygonAttribute.visible} = polygon.attribute, fVisible = (0, 
         utils_1.fillVisible)(opacity, fillOpacity), sVisible = (0, utils_1.strokeVisible)(opacity, strokeOpacity), doFill = (0, 
         utils_1.runFill)(fill), doStroke = (0, utils_1.runStroke)(stroke, lineWidth);
         polygon.valid && visible && (doFill || doStroke || background) && (fVisible || sVisible || fillCb || strokeCb || background) && (context.beginPath(), 
-        borderRadius <= 0 || (0, vutils_1.isArray)(borderRadius) && borderRadius.every((num => 0 === num)) ? (0, 
+        cornerRadius <= 0 || (0, vutils_1.isArray)(cornerRadius) && cornerRadius.every((num => 0 === num)) ? (0, 
         polygon_1.drawPolygon)(context.camera ? context : context.nativeContext, points, x, y) : (0, 
-        polygon_1.drawRoundedPolygon)(context.camera ? context : context.nativeContext, points, x, y, borderRadius), 
+        polygon_1.drawRoundedPolygon)(context.camera ? context : context.nativeContext, points, x, y, cornerRadius), 
         context.closePath(), this._polygonRenderContribitions || (this._polygonRenderContribitions = this.polygonRenderContribitions.getContributions() || [], 
         this._polygonRenderContribitions.sort(((a, b) => b.order - a.order))), this._polygonRenderContribitions.forEach((c => {
             c.time === base_contribution_render_1.BaseRenderContributionTime.beforeFillStroke && c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, fillCb, strokeCb);

package/cjs/render/contributions/render/polygon-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/render/contributions/render/polygon-render.ts"],"names":[],"mappings":"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","file":"polygon-render.js","sourcesContent":["import { isArray, isNumber } from '@visactor/vutils';\nimport { inject, injectable, named } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { POLYGON_NUMBER_TYPE } from '../../../graphic/constants';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IPolygon, IThemeAttribute } from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { drawPolygon, drawRoundedPolygon } from '../../../common/polygon';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { IPolygonRenderContribution, PolygonRenderContribution } from './contributions/polygon-contribution-render';\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\n\n@injectable()\nexport class DefaultCanvasPolygonRender implements IGraphicRender {\n  type: 'polygon';\n  numberType: number = POLYGON_NUMBER_TYPE;\n\n  protected _polygonRenderContribitions: IPolygonRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(PolygonRenderContribution)\n    protected readonly polygonRenderContribitions: ContributionProvider<IPolygonRenderContribution>\n  ) {}\n\n  drawShape(\n    polygon: IPolygon,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const polygonAttribute = graphicService.themeService.getCurrentTheme().polygonAttribute;\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    const {\n      points = polygonAttribute.points,\n      fill = polygonAttribute.fill,\n      stroke = polygonAttribute.stroke,\n      borderRadius = polygonAttribute.borderRadius,\n      fillOpacity = polygonAttribute.fillOpacity,\n      background,\n      strokeOpacity = polygonAttribute.strokeOpacity,\n      lineWidth = polygonAttribute.lineWidth,\n      opacity = polygonAttribute.opacity,\n      visible = polygonAttribute.visible\n    } = polygon.attribute;\n\n    // 不绘制或者透明\n    const fVisible = fillVisible(opacity, fillOpacity);\n    const sVisible = strokeVisible(opacity, strokeOpacity);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(polygon.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke || background)) {\n      return;\n    }\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb || background)) {\n      return;\n    }\n    context.beginPath();\n\n    if ((borderRadius as number) <= 0 || (isArray(borderRadius) && (<number[]>borderRadius).every(num => num === 0))) {\n      drawPolygon(context.camera ? context : context.nativeContext, points, x, y);\n    } else {\n      // FIXME: type\n      drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, borderRadius);\n    }\n    // polygon 默认闭合\n    context.closePath();\n\n    if (!this._polygonRenderContribitions) {\n      this._polygonRenderContribitions = this.polygonRenderContribitions.getContributions() || [];\n      this._polygonRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n    this._polygonRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, fillCb, strokeCb);\n      }\n    });\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(polygon, polygon.attribute, polygonAttribute);\n\n    if (doFill) {\n      if (fillCb) {\n        fillCb(context, polygon.attribute, polygonAttribute);\n      } else if (fillOpacity) {\n        // 存在fill\n        context.setCommonStyle(polygon, polygon.attribute, x, y, polygonAttribute);\n        context.fill();\n      }\n    }\n    if (doStroke) {\n      if (strokeCb) {\n        strokeCb(context, polygon.attribute, polygonAttribute);\n      } else if (strokeOpacity) {\n        // 存在stroke\n        context.setStrokeStyle(polygon, polygon.attribute, x, y, polygonAttribute);\n        context.stroke();\n      }\n    }\n\n    this._polygonRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(polygon: IPolygon, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const polygonAttribute = graphicService.themeService.getCurrentTheme().polygonAttribute;\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    let { x = polygonAttribute.x, y = polygonAttribute.y } = polygon.attribute;\n\n    if (!polygon.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(polygon.transMatrix, true);\n    } else {\n      const point = polygon.getOffsetXY(polygonAttribute);\n      x += point.x;\n      y += point.y;\n      context.setTransformForCurrent();\n    }\n    if (drawPathProxy(polygon, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(polygon, context, x, y, drawContext, params);\n\n    context.highPerformanceRestore();\n  }\n}\n"]}
+{"version":3,"sources":["../../src/render/contributions/render/polygon-render.ts"],"names":[],"mappings":"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","file":"polygon-render.js","sourcesContent":["import { isArray, isNumber } from '@visactor/vutils';\nimport { inject, injectable, named } from 'inversify';\nimport { getTheme } from '../../../graphic/theme';\nimport { POLYGON_NUMBER_TYPE } from '../../../graphic/constants';\nimport { IGraphicAttribute, IContext2d, IMarkAttribute, IPolygon, IThemeAttribute } from '../../../interface';\nimport { IDrawContext, IRenderService } from '../../render-service';\nimport { IGraphicRender, IGraphicRenderDrawParams } from './graphic-render';\nimport { drawPolygon, drawRoundedPolygon } from '../../../common/polygon';\nimport { drawPathProxy, fillVisible, runFill, runStroke, strokeVisible } from './utils';\nimport { IPolygonRenderContribution, PolygonRenderContribution } from './contributions/polygon-contribution-render';\nimport { ContributionProvider } from '../../../common/contribution-provider';\nimport { BaseRenderContributionTime } from './contributions/base-contribution-render';\n\n@injectable()\nexport class DefaultCanvasPolygonRender implements IGraphicRender {\n  type: 'polygon';\n  numberType: number = POLYGON_NUMBER_TYPE;\n\n  protected _polygonRenderContribitions: IPolygonRenderContribution[];\n\n  constructor(\n    @inject(ContributionProvider)\n    @named(PolygonRenderContribution)\n    protected readonly polygonRenderContribitions: ContributionProvider<IPolygonRenderContribution>\n  ) {}\n\n  drawShape(\n    polygon: IPolygon,\n    context: IContext2d,\n    x: number,\n    y: number,\n    drawContext: IDrawContext,\n    params?: IGraphicRenderDrawParams,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const polygonAttribute = graphicService.themeService.getCurrentTheme().polygonAttribute;\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    const {\n      points = polygonAttribute.points,\n      fill = polygonAttribute.fill,\n      stroke = polygonAttribute.stroke,\n      cornerRadius = polygonAttribute.cornerRadius,\n      fillOpacity = polygonAttribute.fillOpacity,\n      background,\n      strokeOpacity = polygonAttribute.strokeOpacity,\n      lineWidth = polygonAttribute.lineWidth,\n      opacity = polygonAttribute.opacity,\n      visible = polygonAttribute.visible\n    } = polygon.attribute;\n\n    // 不绘制或者透明\n    const fVisible = fillVisible(opacity, fillOpacity);\n    const sVisible = strokeVisible(opacity, strokeOpacity);\n    const doFill = runFill(fill);\n    const doStroke = runStroke(stroke, lineWidth);\n\n    if (!(polygon.valid && visible)) {\n      return;\n    }\n\n    if (!(doFill || doStroke || background)) {\n      return;\n    }\n    // 如果存在fillCb和strokeCb，那就不直接跳过\n    if (!(fVisible || sVisible || fillCb || strokeCb || background)) {\n      return;\n    }\n    context.beginPath();\n\n    if ((cornerRadius as number) <= 0 || (isArray(cornerRadius) && (<number[]>cornerRadius).every(num => num === 0))) {\n      drawPolygon(context.camera ? context : context.nativeContext, points, x, y);\n    } else {\n      // FIXME: type\n      drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, cornerRadius);\n    }\n    // polygon 默认闭合\n    context.closePath();\n\n    if (!this._polygonRenderContribitions) {\n      this._polygonRenderContribitions = this.polygonRenderContribitions.getContributions() || [];\n      this._polygonRenderContribitions.sort((a, b) => b.order - a.order);\n    }\n    this._polygonRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.beforeFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, fillCb, strokeCb);\n      }\n    });\n\n    // shadow\n    context.setShadowStyle && context.setShadowStyle(polygon, polygon.attribute, polygonAttribute);\n\n    if (doFill) {\n      if (fillCb) {\n        fillCb(context, polygon.attribute, polygonAttribute);\n      } else if (fillOpacity) {\n        // 存在fill\n        context.setCommonStyle(polygon, polygon.attribute, x, y, polygonAttribute);\n        context.fill();\n      }\n    }\n    if (doStroke) {\n      if (strokeCb) {\n        strokeCb(context, polygon.attribute, polygonAttribute);\n      } else if (strokeOpacity) {\n        // 存在stroke\n        context.setStrokeStyle(polygon, polygon.attribute, x, y, polygonAttribute);\n        context.stroke();\n      }\n    }\n\n    this._polygonRenderContribitions.forEach(c => {\n      if (c.time === BaseRenderContributionTime.afterFillStroke) {\n        // c.useStyle && context.setCommonStyle(rect, rect.attribute, x, y, rectAttribute);\n        c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, fillCb, strokeCb);\n      }\n    });\n  }\n\n  draw(polygon: IPolygon, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n    const { context } = drawContext;\n    if (!context) {\n      return;\n    }\n\n    context.highPerformanceSave();\n\n    // const polygonAttribute = graphicService.themeService.getCurrentTheme().polygonAttribute;\n    const polygonAttribute = getTheme(polygon, params?.theme).polygon;\n    let { x = polygonAttribute.x, y = polygonAttribute.y } = polygon.attribute;\n\n    if (!polygon.transMatrix.onlyTranslate()) {\n      // 性能较差\n      x = 0;\n      y = 0;\n      context.transformFromMatrix(polygon.transMatrix, true);\n    } else {\n      const point = polygon.getOffsetXY(polygonAttribute);\n      x += point.x;\n      y += point.y;\n      context.setTransformForCurrent();\n    }\n    if (drawPathProxy(polygon, context, x, y, drawContext, params)) {\n      context.highPerformanceRestore();\n      return;\n    }\n\n    this.drawShape(polygon, context, x, y, drawContext, params);\n\n    context.highPerformanceRestore();\n  }\n}\n"]}

package/cjs/render/contributions/render/rect-render.js

@@ -23,14 +23,14 @@ let DefaultCanvasRectRender = class {
         this.rectRenderContribitions = rectRenderContribitions, this.type = "rect", this.numberType = constants_1.RECT_NUMBER_TYPE;
     }
     drawShape(rect, context, x, y, drawContext, params, fillCb, strokeCb) {
-        const rectAttribute = (0, theme_1.getTheme)(rect, null == params ? void 0 : params.theme).rect, {fill: fill = rectAttribute.fill, background: background, stroke: stroke = rectAttribute.stroke, width: width = rectAttribute.width, height: height = rectAttribute.height, borderRadius: borderRadius = rectAttribute.borderRadius, opacity: opacity = rectAttribute.opacity, fillOpacity: fillOpacity = rectAttribute.fillOpacity, lineWidth: lineWidth = rectAttribute.lineWidth, strokeOpacity: strokeOpacity = rectAttribute.strokeOpacity, visible: visible = rectAttribute.visible} = rect.attribute, fVisible = (0, 
+        const rectAttribute = (0, theme_1.getTheme)(rect, null == params ? void 0 : params.theme).rect, {fill: fill = rectAttribute.fill, background: background, stroke: stroke = rectAttribute.stroke, width: width = rectAttribute.width, height: height = rectAttribute.height, cornerRadius: cornerRadius = rectAttribute.cornerRadius, opacity: opacity = rectAttribute.opacity, fillOpacity: fillOpacity = rectAttribute.fillOpacity, lineWidth: lineWidth = rectAttribute.lineWidth, strokeOpacity: strokeOpacity = rectAttribute.strokeOpacity, visible: visible = rectAttribute.visible} = rect.attribute, fVisible = (0, 
         utils_1.rectFillVisible)(opacity, fillOpacity, width, height), sVisible = (0, utils_1.rectStrokeVisible)(opacity, strokeOpacity, width, height), doFill = (0, 
         utils_1.runFill)(fill), doStroke = (0, utils_1.runStroke)(stroke, lineWidth);
         if (!rect.valid || !visible) return;
         if (!(doFill || doStroke || background)) return;
         if (!(fVisible || sVisible || fillCb || strokeCb || background)) return;
-        0 === borderRadius || (0, vutils_1.isArray)(borderRadius) && borderRadius.every((num => 0 === num)) ? (context.beginPath(), 
-        context.rect(x, y, width, height)) : (context.beginPath(), (0, rect_1.createRectPath)(context, x, y, width, height, borderRadius)), 
+        0 === cornerRadius || (0, vutils_1.isArray)(cornerRadius) && cornerRadius.every((num => 0 === num)) ? (context.beginPath(), 
+        context.rect(x, y, width, height)) : (context.beginPath(), (0, rect_1.createRectPath)(context, x, y, width, height, cornerRadius)), 
         this._rectRenderContribitions || (this._rectRenderContribitions = this.rectRenderContribitions.getContributions() || [], 
         this._rectRenderContribitions.sort(((a, b) => b.order - a.order)));
         const doFillOrStroke = {