@visactor/vrender-components 0.18.10-alpha.1 → 0.18.10-alpha.2

package/cjs/marker/config.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.DEFAULT_MARK_POINT_TEXT_STYLE_MAP = exports.DEFAULT_MARK_POINT_THEME = exports.DEFAULT_CARTESIAN_MARK_AREA_TEXT_STYLE_MAP = exports.DEFAULT_POLAR_MARK_AREA_THEME = exports.DEFAULT_CARTESIAN_MARK_AREA_THEME = exports.DEFAULT_COMMON_MARK_LINE_TEXT_STYLE_MAP = exports.DEFAULT_COMMON_MARK_LINE_THEME = void 0;
+}), exports.DEFAULT_MARK_POINT_TEXT_STYLE_MAP = exports.DEFAULT_MARK_POINT_THEME = exports.DEFAULT_CARTESIAN_MARK_AREA_TEXT_STYLE_MAP = exports.DEFAULT_POLAR_MARK_AREA_THEME = exports.DEFAULT_CARTESIAN_MARK_AREA_THEME = exports.DEFAULT_POLAR_MARK_LINE_THEME = exports.DEFAULT_CARTESIAN_MARK_LINE_THEME = void 0;
 
 const type_1 = require("./type");
 
-exports.DEFAULT_COMMON_MARK_LINE_THEME = {
+exports.DEFAULT_CARTESIAN_MARK_LINE_THEME = {
     interactive: !0,
     startSymbol: {
         visible: !1,
@@ -23,7 +23,7 @@ exports.DEFAULT_COMMON_MARK_LINE_THEME = {
         lineWidth: 0
     },
     label: {
-        position: type_1.ICommonMarkLineLabelPosition.end,
+        position: type_1.ICartesianMarkLineLabelPosition.end,
         refX: 0,
         refY: 0,
         refAngle: 0,
@@ -33,7 +33,9 @@ exports.DEFAULT_COMMON_MARK_LINE_THEME = {
             lineWidth: 0,
             fontSize: 10,
             fontWeight: "normal",
-            fontStyle: "normal"
+            fontStyle: "normal",
+            textAlign: "center",
+            textBaseline: "middle"
         },
         padding: [ 2, 2, 4, 4 ],
         panel: {
@@ -48,42 +50,49 @@ exports.DEFAULT_COMMON_MARK_LINE_THEME = {
         lineWidth: 1,
         lineDash: [ 2 ]
     }
-}, exports.DEFAULT_COMMON_MARK_LINE_TEXT_STYLE_MAP = {
-    start: {
-        textAlign: "right",
-        textBaseline: "middle"
-    },
-    insideStartTop: {
-        textAlign: "left",
-        textBaseline: "bottom"
-    },
-    insideStartBottom: {
-        textAlign: "left",
-        textBaseline: "top"
-    },
-    middle: {
-        textAlign: "center",
-        textBaseline: "middle"
-    },
-    insideMiddleTop: {
-        textAlign: "center",
-        textBaseline: "bottom"
-    },
-    insideMiddleBottom: {
-        textAlign: "center",
-        textBaseline: "top"
+}, exports.DEFAULT_POLAR_MARK_LINE_THEME = {
+    interactive: !0,
+    startSymbol: {
+        visible: !1,
+        symbolType: "triangle",
+        size: 12,
+        fill: "rgba(46, 47, 50)",
+        lineWidth: 0
     },
-    end: {
-        textAlign: "left",
-        textBaseline: "middle"
+    endSymbol: {
+        visible: !0,
+        symbolType: "triangle",
+        size: 12,
+        fill: "rgba(46, 47, 50)",
+        lineWidth: 0
     },
-    insideEndTop: {
-        textAlign: "right",
-        textBaseline: "bottom"
+    label: {
+        position: type_1.IPolarMarkLabelPosition.arcOuterMiddle,
+        refX: 0,
+        refY: 0,
+        refAngle: 0,
+        textStyle: {
+            fill: "#fff",
+            stroke: "#fff",
+            lineWidth: 0,
+            fontSize: 10,
+            fontWeight: "normal",
+            fontStyle: "normal",
+            textAlign: "center",
+            textBaseline: "middle"
+        },
+        padding: [ 2, 2, 4, 4 ],
+        panel: {
+            visible: !0,
+            cornerRadius: 0,
+            fill: "rgb(48, 115, 242)",
+            fillOpacity: .8
+        }
     },
-    insideEndBottom: {
-        textAlign: "right",
-        textBaseline: "top"
+    lineStyle: {
+        stroke: "#b2bacf",
+        lineWidth: 1,
+        lineDash: [ 2 ]
     }
 }, exports.DEFAULT_CARTESIAN_MARK_AREA_THEME = {
     interactive: !0,
@@ -95,7 +104,9 @@ exports.DEFAULT_COMMON_MARK_LINE_THEME = {
             lineWidth: 0,
             fontSize: 10,
             fontWeight: "normal",
-            fontStyle: "normal"
+            fontStyle: "normal",
+            textAlign: "center",
+            textBaseline: "middle"
         },
         padding: [ 2, 2, 4, 4 ],
         panel: {
@@ -112,7 +123,7 @@ exports.DEFAULT_COMMON_MARK_LINE_THEME = {
 }, exports.DEFAULT_POLAR_MARK_AREA_THEME = {
     interactive: !0,
     label: {
-        position: type_1.IPolarMarkAreaLabelPosition.arcInner,
+        position: type_1.IPolarMarkLabelPosition.arcOuterMiddle,
         textStyle: {
             fill: "#fff",
             stroke: "#fff",
@@ -121,7 +132,7 @@ exports.DEFAULT_COMMON_MARK_LINE_THEME = {
             fontWeight: "normal",
             fontStyle: "normal",
             textAlign: "center",
-            textBaseLine: "middle"
+            textBaseline: "middle"
         },
         padding: [ 2, 2, 4, 4 ],
         panel: {

package/cjs/marker/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/config.ts"],"names":[],"mappings":";;;AACA,iCAAoH;AAEvG,QAAA,8BAA8B,GAAG;IAC5C,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE;QACX,OAAO,EAAE,KAAK;QACd,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,kBAAkB;QACxB,SAAS,EAAE,CAAC;KACb;IACD,SAAS,EAAE;QACT,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,kBAAkB;QACxB,SAAS,EAAE,CAAC;KACb;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,mCAA4B,CAAC,GAAG;QAC1C,IAAI,EAAE,CAAC;QACP,IAAI,EAAE,CAAC;QACP,QAAQ,EAAE,CAAC;QACX,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,QAAQ;SACpB;QACD,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACrB,KAAK,EAAE;YACL,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,CAAC;YACf,IAAI,EAAE,mBAAmB;YACzB,WAAW,EAAE,GAAG;SACjB;KACF;IACD,SAAS,EAAE;QACT,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,CAAC;QACZ,QAAQ,EAAE,CAAC,CAAC,CAAC;KACd;CACF,CAAC;AAEW,QAAA,uCAAuC,GAKhD;IACF,KAAK,EAAE;QACL,SAAS,EAAE,OAAO;QAClB,YAAY,EAAE,QAAQ;KACvB;IACD,cAAc,EAAE;QACd,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;KACvB;IACD,iBAAiB,EAAE;QACjB,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,KAAK;KACpB;IAED,MAAM,EAAE;QACN,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,QAAQ;KACvB;IACD,eAAe,EAAE;QACf,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,QAAQ;KACvB;IACD,kBAAkB,EAAE;QAClB,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,KAAK;KACpB;IAED,GAAG,EAAE;QACH,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;KACvB;IACD,YAAY,EAAE;QACZ,SAAS,EAAE,OAAO;QAClB,YAAY,EAAE,QAAQ;KACvB;IACD,eAAe,EAAE;QACf,SAAS,EAAE,OAAO;QAClB,YAAY,EAAE,KAAK;KACpB;CACF,CAAC;AAEW,QAAA,iCAAiC,GAAG;IAC/C,WAAW,EAAE,IAAI;IACjB,KAAK,EAAE;QACL,QAAQ,EAAE,sCAA+B,CAAC,KAAK;QAC/C,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,QAAQ;SACpB;QACD,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACrB,KAAK,EAAE;YACL,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,CAAC;YACf,IAAI,EAAE,mBAAmB;YACzB,WAAW,EAAE,GAAG;SACjB;KACF;IACD,SAAS,EAAE;QACT,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;KACd;CACF,CAAC;AAEW,QAAA,6BAA6B,GAAG;IAC3C,WAAW,EAAE,IAAI;IACjB,KAAK,EAAE;QACL,QAAQ,EAAE,kCAA2B,CAAC,QAAQ;QAC9C,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,QAAQ;YACnB,YAAY,EAAE,QAAQ;SACvB;QACD,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACrB,KAAK,EAAE;YACL,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,CAAC;YACf,IAAI,EAAE,mBAAmB;YACzB,WAAW,EAAE,GAAG;SACjB;KACF;IACD,SAAS,EAAE;QACT,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;KACd;CACF,CAAC;AAEW,QAAA,0CAA0C,GAKnD;IACF,IAAI,EAAE;QACJ,SAAS,EAAE,OAAO;QAClB,YAAY,EAAE,QAAQ;KACvB;IACD,UAAU,EAAE;QACV,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;KACvB;IAED,KAAK,EAAE;QACL,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;KACvB;IACD,WAAW,EAAE;QACX,SAAS,EAAE,OAAO;QAClB,YAAY,EAAE,QAAQ;KACvB;IAED,GAAG,EAAE;QACH,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,QAAQ;KACvB;IACD,SAAS,EAAE;QACT,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,KAAK;KACpB;IAED,MAAM,EAAE;QACN,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,KAAK;KACpB;IACD,YAAY,EAAE;QACZ,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,QAAQ;KACvB;IAED,MAAM,EAAE;QACN,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,QAAQ;KACvB;CACF,CAAC;AAEW,QAAA,wBAAwB,GAAG;IACtC,WAAW,EAAE,IAAI;IACjB,QAAQ,EAAE;QACR,OAAO,EAAE,IAAI;QACb,cAAc,EAAE;YACd,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,EAAE;SACX;QACD,WAAW,EAAE;YACX,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,QAAQ;YACpB,IAAI,EAAE,EAAE;YACR,KAAK,EAAE;gBACL,IAAI,EAAE,KAAK;gBACX,MAAM,EAAE,kBAAkB;aAC3B;SACF;QACD,SAAS,EAAE;YACT,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,UAAU;YACtB,IAAI,EAAE,EAAE;YACR,KAAK,EAAE;gBACL,IAAI,EAAE,KAAK;gBACX,MAAM,EAAE,kBAAkB;aAC3B;SACF;QACD,SAAS,EAAE;YACT,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,CAAC;SACb;KACF;IACD,WAAW,EAAE;QACX,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,QAAQ;QAClB,IAAI,EAAE,EAAE;QACR,WAAW,EAAE;YACX,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,mBAAmB;YACzB,WAAW,EAAE,GAAG;YAChB,IAAI,EAAE,EAAE;SACT;QACD,SAAS,EAAE;YACT,EAAE,EAAE,CAAC;YACL,EAAE,EAAE,CAAC;SACN;QACD,UAAU,EAAE;YACV,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACX;QACD,aAAa,EAAE;YACb,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,GAAG;SACZ;KACF;CACF,CAAC;AAEW,QAAA,iCAAiC,GAK1C;IACF,GAAG,EAAE;QACH,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;KACvB;IACD,MAAM,EAAE;QACN,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,KAAK;KACpB;IACD,MAAM,EAAE;QACN,SAAS,EAAE,MAAM;QACjB,YAAY,EAAE,QAAQ;KACvB;IACD,SAAS,EAAE;QACT,SAAS,EAAE,OAAO;QAClB,YAAY,EAAE,QAAQ;KACvB;IACD,YAAY,EAAE;QACZ,SAAS,EAAE,OAAO;QAClB,YAAY,EAAE,KAAK;KACpB;IACD,YAAY,EAAE;QACZ,SAAS,EAAE,OAAO;QAClB,YAAY,EAAE,QAAQ;KACvB;CACF,CAAC","file":"config.js","sourcesContent":["import type { TextAlignType, TextBaselineType } from '@visactor/vrender-core';\nimport { ICartesianMarkAreaLabelPosition, ICommonMarkLineLabelPosition, IPolarMarkAreaLabelPosition } from './type';\n\nexport const DEFAULT_COMMON_MARK_LINE_THEME = {\n  interactive: true,\n  startSymbol: {\n    visible: false,\n    symbolType: 'triangle',\n    size: 12,\n    fill: 'rgba(46, 47, 50)',\n    lineWidth: 0\n  },\n  endSymbol: {\n    visible: true,\n    symbolType: 'triangle',\n    size: 12,\n    fill: 'rgba(46, 47, 50)',\n    lineWidth: 0\n  },\n  label: {\n    position: ICommonMarkLineLabelPosition.end,\n    refX: 0,\n    refY: 0,\n    refAngle: 0,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal'\n    },\n    padding: [2, 2, 4, 4],\n    panel: {\n      visible: true,\n      cornerRadius: 0,\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8\n    }\n  },\n  lineStyle: {\n    stroke: '#b2bacf',\n    lineWidth: 1,\n    lineDash: [2]\n  }\n};\n\nexport const DEFAULT_COMMON_MARK_LINE_TEXT_STYLE_MAP: {\n  [K: string]: {\n    textAlign: TextAlignType;\n    textBaseline: TextBaselineType;\n  };\n} = {\n  start: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  },\n  insideStartTop: {\n    textAlign: 'left',\n    textBaseline: 'bottom'\n  },\n  insideStartBottom: {\n    textAlign: 'left',\n    textBaseline: 'top'\n  },\n\n  middle: {\n    textAlign: 'center',\n    textBaseline: 'middle'\n  },\n  insideMiddleTop: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  insideMiddleBottom: {\n    textAlign: 'center',\n    textBaseline: 'top'\n  },\n\n  end: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n  insideEndTop: {\n    textAlign: 'right',\n    textBaseline: 'bottom'\n  },\n  insideEndBottom: {\n    textAlign: 'right',\n    textBaseline: 'top'\n  }\n};\n\nexport const DEFAULT_CARTESIAN_MARK_AREA_THEME = {\n  interactive: true,\n  label: {\n    position: ICartesianMarkAreaLabelPosition.right,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal'\n    },\n    padding: [2, 2, 4, 4],\n    panel: {\n      visible: true,\n      cornerRadius: 0,\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8\n    }\n  },\n  areaStyle: {\n    fill: '#b2bacf',\n    visible: true\n  }\n};\n\nexport const DEFAULT_POLAR_MARK_AREA_THEME = {\n  interactive: true,\n  label: {\n    position: IPolarMarkAreaLabelPosition.arcInner,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal',\n      textAlign: 'center',\n      textBaseLine: 'middle'\n    },\n    padding: [2, 2, 4, 4],\n    panel: {\n      visible: true,\n      cornerRadius: 0,\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8\n    }\n  },\n  areaStyle: {\n    fill: '#b2bacf',\n    visible: true\n  }\n};\n\nexport const DEFAULT_CARTESIAN_MARK_AREA_TEXT_STYLE_MAP: {\n  [K: string]: {\n    textAlign: TextAlignType;\n    textBaseline: TextBaselineType;\n  };\n} = {\n  left: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  },\n  insideLeft: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n\n  right: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n  insideRight: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  },\n\n  top: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  insideTop: {\n    textAlign: 'center',\n    textBaseline: 'top'\n  },\n\n  bottom: {\n    textAlign: 'center',\n    textBaseline: 'top'\n  },\n  insideBottom: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n\n  middle: {\n    textAlign: 'center',\n    textBaseline: 'middle'\n  }\n};\n\nexport const DEFAULT_MARK_POINT_THEME = {\n  interactive: true,\n  itemLine: {\n    visible: true,\n    decorativeLine: {\n      visible: false,\n      length: 30\n    },\n    startSymbol: {\n      visible: true,\n      clip: true,\n      symbolType: 'circle',\n      size: 20,\n      style: {\n        fill: false,\n        stroke: 'rgba(46, 47, 50)'\n      }\n    },\n    endSymbol: {\n      visible: false,\n      clip: true,\n      symbolType: 'triangle',\n      size: 12,\n      style: {\n        fill: false,\n        stroke: 'rgba(46, 47, 50)'\n      }\n    },\n    lineStyle: {\n      stroke: '#000',\n      lineWidth: 1\n    }\n  },\n  itemContent: {\n    type: 'text',\n    position: 'middle',\n    refX: 10,\n    symbolStyle: {\n      symbolType: 'star',\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8,\n      size: 20\n    },\n    textStyle: {\n      dx: 0,\n      dy: 0\n    },\n    imageStyle: {\n      width: 80,\n      height: 80\n    },\n    richTextStyle: {\n      width: 100,\n      height: 100\n    }\n  }\n};\n\nexport const DEFAULT_MARK_POINT_TEXT_STYLE_MAP: {\n  [K: string]: {\n    textAlign: TextAlignType;\n    textBaseline: TextBaselineType;\n  };\n} = {\n  top: {\n    textAlign: 'left',\n    textBaseline: 'bottom'\n  },\n  bottom: {\n    textAlign: 'left',\n    textBaseline: 'top'\n  },\n  middle: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n  insideTop: {\n    textAlign: 'right',\n    textBaseline: 'bottom'\n  },\n  insideBottom: {\n    textAlign: 'right',\n    textBaseline: 'top'\n  },\n  insideMiddle: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  }\n};\n"]}
+{"version":3,"sources":["../src/marker/config.ts"],"names":[],"mappings":"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","file":"config.js","sourcesContent":["import type { TextAlignType, TextBaselineType } from '@visactor/vrender-core';\nimport { ICartesianMarkAreaLabelPosition, ICartesianMarkLineLabelPosition, IPolarMarkLabelPosition } from './type';\n\nexport const DEFAULT_CARTESIAN_MARK_LINE_THEME = {\n  interactive: true,\n  startSymbol: {\n    visible: false,\n    symbolType: 'triangle',\n    size: 12,\n    fill: 'rgba(46, 47, 50)',\n    lineWidth: 0\n  },\n  endSymbol: {\n    visible: true,\n    symbolType: 'triangle',\n    size: 12,\n    fill: 'rgba(46, 47, 50)',\n    lineWidth: 0\n  },\n  label: {\n    position: ICartesianMarkLineLabelPosition.end,\n    refX: 0,\n    refY: 0,\n    refAngle: 0,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal',\n      textAlign: 'center',\n      textBaseline: 'middle'\n    },\n    padding: [2, 2, 4, 4],\n    panel: {\n      visible: true,\n      cornerRadius: 0,\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8\n    }\n  },\n  lineStyle: {\n    stroke: '#b2bacf',\n    lineWidth: 1,\n    lineDash: [2]\n  }\n};\n\nexport const DEFAULT_POLAR_MARK_LINE_THEME = {\n  interactive: true,\n  startSymbol: {\n    visible: false,\n    symbolType: 'triangle',\n    size: 12,\n    fill: 'rgba(46, 47, 50)',\n    lineWidth: 0\n  },\n  endSymbol: {\n    visible: true,\n    symbolType: 'triangle',\n    size: 12,\n    fill: 'rgba(46, 47, 50)',\n    lineWidth: 0\n  },\n  label: {\n    position: IPolarMarkLabelPosition.arcOuterMiddle,\n    refX: 0,\n    refY: 0,\n    refAngle: 0,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal',\n      textAlign: 'center',\n      textBaseline: 'middle'\n    },\n    padding: [2, 2, 4, 4],\n    panel: {\n      visible: true,\n      cornerRadius: 0,\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8\n    }\n  },\n  lineStyle: {\n    stroke: '#b2bacf',\n    lineWidth: 1,\n    lineDash: [2]\n  }\n};\n\nexport const DEFAULT_CARTESIAN_MARK_AREA_THEME = {\n  interactive: true,\n  label: {\n    position: ICartesianMarkAreaLabelPosition.right,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal',\n      textAlign: 'center',\n      textBaseline: 'middle'\n    },\n    padding: [2, 2, 4, 4],\n    panel: {\n      visible: true,\n      cornerRadius: 0,\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8\n    }\n  },\n  areaStyle: {\n    fill: '#b2bacf',\n    visible: true\n  }\n};\n\nexport const DEFAULT_POLAR_MARK_AREA_THEME = {\n  interactive: true,\n  label: {\n    position: IPolarMarkLabelPosition.arcOuterMiddle,\n    textStyle: {\n      fill: '#fff',\n      stroke: '#fff',\n      lineWidth: 0,\n      fontSize: 10,\n      fontWeight: 'normal',\n      fontStyle: 'normal',\n      textAlign: 'center',\n      textBaseline: 'middle'\n    },\n    padding: [2, 2, 4, 4],\n    panel: {\n      visible: true,\n      cornerRadius: 0,\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8\n    }\n  },\n  areaStyle: {\n    fill: '#b2bacf',\n    visible: true\n  }\n};\n\nexport const DEFAULT_CARTESIAN_MARK_AREA_TEXT_STYLE_MAP: {\n  [K: string]: {\n    textAlign: TextAlignType;\n    textBaseline: TextBaselineType;\n  };\n} = {\n  left: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  },\n  insideLeft: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n\n  right: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n  insideRight: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  },\n\n  top: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  insideTop: {\n    textAlign: 'center',\n    textBaseline: 'top'\n  },\n\n  bottom: {\n    textAlign: 'center',\n    textBaseline: 'top'\n  },\n  insideBottom: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n\n  middle: {\n    textAlign: 'center',\n    textBaseline: 'middle'\n  }\n};\n\nexport const DEFAULT_MARK_POINT_THEME = {\n  interactive: true,\n  itemLine: {\n    visible: true,\n    decorativeLine: {\n      visible: false,\n      length: 30\n    },\n    startSymbol: {\n      visible: true,\n      clip: true,\n      symbolType: 'circle',\n      size: 20,\n      style: {\n        fill: false,\n        stroke: 'rgba(46, 47, 50)'\n      }\n    },\n    endSymbol: {\n      visible: false,\n      clip: true,\n      symbolType: 'triangle',\n      size: 12,\n      style: {\n        fill: false,\n        stroke: 'rgba(46, 47, 50)'\n      }\n    },\n    lineStyle: {\n      stroke: '#000',\n      lineWidth: 1\n    }\n  },\n  itemContent: {\n    type: 'text',\n    position: 'middle',\n    refX: 10,\n    symbolStyle: {\n      symbolType: 'star',\n      fill: 'rgb(48, 115, 242)',\n      fillOpacity: 0.8,\n      size: 20\n    },\n    textStyle: {\n      dx: 0,\n      dy: 0\n    },\n    imageStyle: {\n      width: 80,\n      height: 80\n    },\n    richTextStyle: {\n      width: 100,\n      height: 100\n    }\n  }\n};\n\nexport const DEFAULT_MARK_POINT_TEXT_STYLE_MAP: {\n  [K: string]: {\n    textAlign: TextAlignType;\n    textBaseline: TextBaselineType;\n  };\n} = {\n  top: {\n    textAlign: 'left',\n    textBaseline: 'bottom'\n  },\n  bottom: {\n    textAlign: 'left',\n    textBaseline: 'top'\n  },\n  middle: {\n    textAlign: 'left',\n    textBaseline: 'middle'\n  },\n  insideTop: {\n    textAlign: 'right',\n    textBaseline: 'bottom'\n  },\n  insideBottom: {\n    textAlign: 'right',\n    textBaseline: 'top'\n  },\n  insideMiddle: {\n    textAlign: 'right',\n    textBaseline: 'middle'\n  }\n};\n"]}

package/cjs/marker/point.d.ts

@@ -72,7 +72,7 @@ export declare class MarkPoint extends Marker<MarkPointAttrs> {
     protected setItemAttributes(item: ISymbol | Tag | IImage | IRichText, itemContent: IItemContent, itemPosition: Point, itemType: 'symbol' | 'text' | 'image' | 'richText' | 'custom'): void;
     protected getItemDx(item: ISymbol | Tag | IImage | IRichText, position: keyof typeof IMarkPointItemPosition, style?: IImageGraphicAttribute | IRichTextGraphicAttribute): number;
     protected getItemDy(item: ISymbol | Tag | IImage | IRichText, position: keyof typeof IMarkPointItemPosition, style?: IImageGraphicAttribute | IRichTextGraphicAttribute): number;
-    protected initItem(itemContent: IItemContent, itemPosition: Point): IGroup | Tag | ISymbol | IRichText | IImage;
+    protected initItem(itemContent: IItemContent, itemPosition: Point): IGroup | Tag | IRichText | ISymbol | IImage;
     protected getItemLineAttr(itemLine: IItemLine, position: Point, itemPosition: Point): Point[];
     protected setItemLineAttr(itemLine: IItemLine, position: Point, itemPosition: Point, visible: boolean): void;
     protected getDecorativeLineAttr(itemLine: IItemLine, itemPosition: Point): {

package/cjs/marker/polar/arc-line.d.ts

@@ -1,11 +1,22 @@
 import { ArcSegment } from '../../segment';
-import type { PolarMarkArcLineAttrs } from '../type';
 import { BaseMarkLine } from '../base-line';
-export declare class PolarMarkArcLine extends BaseMarkLine {
+import { IPolarMarkLabelPosition } from '../type';
+import type { PolarMarkArcLineAttrs } from '../type';
+import type { ComponentOptions } from '../../interface';
+export declare class PolarMarkArcLine extends BaseMarkLine<IPolarMarkLabelPosition> {
     name: string;
     static defaultAttributes: Partial<PolarMarkArcLineAttrs>;
     protected _line: ArcSegment;
+    constructor(attributes: PolarMarkArcLineAttrs, options?: ComponentOptions);
     protected isValidPoints(): boolean;
+    protected getPositionByDirection(direction: IPolarMarkLabelPosition): {
+        position: {
+            x: number;
+            y: number;
+        };
+        angle: number;
+    };
+    protected setLabelPos(): void;
     protected createSegment(): ArcSegment;
     protected setLineAttributes(): void;
 }

package/cjs/marker/polar/arc-line.js

@@ -4,17 +4,70 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.PolarMarkArcLine = void 0;
 
-const vutils_1 = require("@visactor/vutils"), segment_1 = require("../../segment"), config_1 = require("../config"), register_1 = require("../register"), constant_1 = require("../../constant"), base_line_1 = require("../base-line");
+const vutils_1 = require("@visactor/vutils"), segment_1 = require("../../segment"), register_1 = require("../register"), constant_1 = require("../../constant"), base_line_1 = require("../base-line"), type_1 = require("../type"), config_1 = require("../config");
 
 (0, register_1.loadPolarMarkArcLineComponent)();
 
 class PolarMarkArcLine extends base_line_1.BaseMarkLine {
-    constructor() {
-        super(...arguments), this.name = "polarMarkArcLine";
+    constructor(attributes, options) {
+        super((null == options ? void 0 : options.skipDefault) ? attributes : (0, vutils_1.merge)({}, PolarMarkArcLine.defaultAttributes, attributes)), 
+        this.name = "polarMarkArcLine";
     }
     isValidPoints() {
         return !0;
     }
+    getPositionByDirection(direction) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const {center: center, radius: radius, startAngle: startAngle, endAngle: endAngle, label: label} = this.attribute, {refX: refX = 0, refY: refY = 0} = label, labelRectHeight = Math.abs((null !== (_b = null === (_a = this._label.getTextShape().AABBBounds) || void 0 === _a ? void 0 : _a.y2) && void 0 !== _b ? _b : 0) - (null !== (_d = null === (_c = this._label.getTextShape()) || void 0 === _c ? void 0 : _c.AABBBounds.y1) && void 0 !== _d ? _d : 0)), labelTextHeight = Math.abs((null !== (_f = null === (_e = this._label.getBgRect().AABBBounds) || void 0 === _e ? void 0 : _e.y2) && void 0 !== _f ? _f : 0) - (null !== (_h = null === (_g = this._label.getBgRect()) || void 0 === _g ? void 0 : _g.AABBBounds.y1) && void 0 !== _h ? _h : 0)), labelHeight = Math.max(labelRectHeight, labelTextHeight);
+        let angle, orthogonalOffsetDirection;
+        switch (direction) {
+          case type_1.IPolarMarkLabelPosition.center:
+            angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = 0;
+            break;
+
+          case type_1.IPolarMarkLabelPosition.arcInnerStart:
+            angle = startAngle, orthogonalOffsetDirection = -1;
+            break;
+
+          case type_1.IPolarMarkLabelPosition.arcOuterStart:
+            angle = startAngle, orthogonalOffsetDirection = 1;
+            break;
+
+          case type_1.IPolarMarkLabelPosition.arcInnerEnd:
+            angle = endAngle, orthogonalOffsetDirection = -1;
+            break;
+
+          case type_1.IPolarMarkLabelPosition.arcOuterEnd:
+            angle = endAngle, orthogonalOffsetDirection = 1;
+            break;
+
+          case type_1.IPolarMarkLabelPosition.arcInnerMiddle:
+            angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = -1;
+            break;
+
+          case type_1.IPolarMarkLabelPosition.arcOuterMiddle:
+            angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = 1;
+            break;
+
+          default:
+            angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = -1;
+        }
+        return {
+            position: {
+                x: center.x + (radius + orthogonalOffsetDirection * labelHeight / 2 + refY) * Math.cos(angle) + refX * Math.cos(angle - Math.PI / 2),
+                y: center.y + (radius + orthogonalOffsetDirection * labelHeight / 2 + refY) * Math.sin(angle) + refX * Math.sin(angle - Math.PI / 2)
+            },
+            angle: angle
+        };
+    }
+    setLabelPos() {
+        var _a;
+        super.setLabelPos();
+        const {label: label = {}} = this.attribute, {position: position = "arcInnerMiddle", autoRotate: autoRotate = !0} = label, labelAttr = this.getPositionByDirection(position);
+        this._label.setAttributes(Object.assign(Object.assign({}, labelAttr.position), {
+            angle: autoRotate ? labelAttr.angle - Math.PI / 2 + (null !== (_a = label.refAngle) && void 0 !== _a ? _a : 0) : 0
+        }));
+    }
     createSegment() {
         const {center: center, radius: radius, startAngle: startAngle, endAngle: endAngle, startSymbol: startSymbol, endSymbol: endSymbol, lineStyle: lineStyle, state: state} = this.attribute;
         return new segment_1.ArcSegment({
@@ -46,5 +99,5 @@ class PolarMarkArcLine extends base_line_1.BaseMarkLine {
     }
 }
 
-exports.PolarMarkArcLine = PolarMarkArcLine, PolarMarkArcLine.defaultAttributes = config_1.DEFAULT_COMMON_MARK_LINE_THEME;
+exports.PolarMarkArcLine = PolarMarkArcLine, PolarMarkArcLine.defaultAttributes = config_1.DEFAULT_POLAR_MARK_LINE_THEME;
 //# sourceMappingURL=arc-line.js.map

package/cjs/marker/polar/arc-line.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/polar/arc-line.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,2CAA2C;AAC3C,sCAA2D;AAE3D,0CAA4D;AAC5D,6CAAgD;AAChD,4CAA4C;AAE5C,IAAA,wCAA6B,GAAE,CAAC;AAChC,MAAa,gBAAiB,SAAQ,wBAAY;IAAlD;;QACE,SAAI,GAAG,kBAAkB,CAAC;IA0C5B,CAAC;IAtCW,aAAa;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAES,aAAa;QACrB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;aAC5F,SAAkC,CAAC;QACtC,OAAO,IAAI,oBAAU,CAAC;YACpB,MAAM;YACN,MAAM;YACN,UAAU;YACV,QAAQ;YACR,WAAW;YACX,SAAS;YACT,SAAS;YACT,KAAK,EAAE;gBACL,IAAI,EAAE,IAAA,cAAK,EAAC,EAAE,EAAE,yBAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC;gBAC5C,WAAW,EAAE,IAAA,cAAK,EAAC,EAAE,EAAE,yBAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,eAAe,CAAC;gBAC9D,SAAS,EAAE,IAAA,cAAK,EAAC,EAAE,EAAE,yBAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,CAAC;aAC3D;SACF,CAAC,CAAC;IACL,CAAC;IAES,iBAAiB;QACzB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAI;aACrF,SAAkC,CAAC;QACtC,IAAI,IAAI,CAAC,KAAK,EAAE;YACb,IAAI,CAAC,KAAa,CAAC,aAAa,CAAC;gBAChC,MAAM;gBACN,MAAM;gBACN,UAAU;gBACV,QAAQ;gBACR,WAAW;gBACX,SAAS;gBACT,SAAS;aACV,CAAC,CAAC;SACJ;IACH,CAAC;;AA1CH,4CA2CC;AAzCQ,kCAAiB,GAAmC,uCAA8B,CAAC","file":"arc-line.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport { ArcSegment } from '../../segment';\nimport { DEFAULT_COMMON_MARK_LINE_THEME } from '../config';\nimport type { PolarMarkArcLineAttrs } from '../type';\nimport { loadPolarMarkArcLineComponent } from '../register';\nimport { DEFAULT_STATES } from '../../constant';\nimport { BaseMarkLine } from '../base-line';\n\nloadPolarMarkArcLineComponent();\nexport class PolarMarkArcLine extends BaseMarkLine {\n  name = 'polarMarkArcLine';\n  static defaultAttributes: Partial<PolarMarkArcLineAttrs> = DEFAULT_COMMON_MARK_LINE_THEME;\n  protected _line!: ArcSegment;\n\n  protected isValidPoints() {\n    return true;\n  }\n\n  protected createSegment() {\n    const { center, radius, startAngle, endAngle, startSymbol, endSymbol, lineStyle, state } = this\n      .attribute as PolarMarkArcLineAttrs;\n    return new ArcSegment({\n      center,\n      radius,\n      startAngle,\n      endAngle,\n      startSymbol,\n      endSymbol,\n      lineStyle,\n      state: {\n        line: merge({}, DEFAULT_STATES, state?.line),\n        startSymbol: merge({}, DEFAULT_STATES, state?.lineStartSymbol),\n        endSymbol: merge({}, DEFAULT_STATES, state?.lineEndSymbol)\n      }\n    });\n  }\n\n  protected setLineAttributes() {\n    const { center, radius, startAngle, endAngle, startSymbol, endSymbol, lineStyle } = this\n      .attribute as PolarMarkArcLineAttrs;\n    if (this._line) {\n      (this._line as any).setAttributes({\n        center,\n        radius,\n        startAngle,\n        endAngle,\n        startSymbol,\n        endSymbol,\n        lineStyle\n      });\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/marker/polar/arc-line.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,2CAA2C;AAC3C,0CAA4D;AAC5D,6CAAgD;AAChD,4CAA4C;AAC5C,kCAAkD;AAGlD,sCAA0D;AAG1D,IAAA,wCAA6B,GAAE,CAAC;AAChC,MAAa,gBAAiB,SAAQ,wBAAqC;IAOzE,YAAY,UAAiC,EAAE,OAA0B;QACvE,KAAK,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,EAAE,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC;QAPvG,SAAI,GAAG,kBAAkB,CAAC;IAQ1B,CAAC;IAES,aAAa;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAES,sBAAsB,CAAC,SAAkC;;QACjE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,SAAkC,CAAC;QAChG,MAAM,EAAE,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC;QAErC,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAC9B,CAAC,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,UAAU,0CAAE,EAAE,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,0CAAE,UAAU,CAAC,EAAE,mCAAI,CAAC,CAAC,CACpG,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAC9B,CAAC,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,UAAU,0CAAE,EAAE,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,0CAAE,UAAU,CAAC,EAAE,mCAAI,CAAC,CAAC,CAC9F,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAE/D,IAAI,KAAK,CAAC;QAGV,IAAI,yBAAyB,CAAC;QAE9B,QAAQ,SAAS,EAAE;YACjB,KAAK,8BAAuB,CAAC,MAAM;gBACjC,KAAK,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACpC,yBAAyB,GAAG,CAAC,CAAC;gBAC9B,MAAM;YACR,KAAK,8BAAuB,CAAC,aAAa;gBACxC,KAAK,GAAG,UAAU,CAAC;gBACnB,yBAAyB,GAAG,CAAC,CAAC,CAAC;gBAC/B,MAAM;YACR,KAAK,8BAAuB,CAAC,aAAa;gBACxC,KAAK,GAAG,UAAU,CAAC;gBACnB,yBAAyB,GAAG,CAAC,CAAC;gBAC9B,MAAM;YACR,KAAK,8BAAuB,CAAC,WAAW;gBACtC,KAAK,GAAG,QAAQ,CAAC;gBACjB,yBAAyB,GAAG,CAAC,CAAC,CAAC;gBAC/B,MAAM;YACR,KAAK,8BAAuB,CAAC,WAAW;gBACtC,KAAK,GAAG,QAAQ,CAAC;gBACjB,yBAAyB,GAAG,CAAC,CAAC;gBAC9B,MAAM;YACR,KAAK,8BAAuB,CAAC,cAAc;gBACzC,KAAK,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACpC,yBAAyB,GAAG,CAAC,CAAC,CAAC;gBAC/B,MAAM;YACR,KAAK,8BAAuB,CAAC,cAAc;gBACzC,KAAK,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACpC,yBAAyB,GAAG,CAAC,CAAC;gBAC9B,MAAM;YACR;gBACE,KAAK,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACpC,yBAAyB,GAAG,CAAC,CAAC,CAAC;SAClC;QAED,OAAO;YACL,QAAQ,EAAE;gBACR,CAAC,EACC,MAAM,CAAC,CAAC;oBACR,CAAC,MAAM,GAAG,CAAC,yBAAyB,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;oBACjF,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;gBACtC,CAAC,EACC,MAAM,CAAC,CAAC;oBACR,CAAC,MAAM,GAAG,CAAC,yBAAyB,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;oBACjF,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;aACvC;YACD,KAAK;SACN,CAAC;IACJ,CAAC;IAES,WAAW;;QACnB,KAAK,CAAC,WAAW,EAAE,CAAC;QACpB,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,SAAkC,CAAC;QAC/D,MAAM,EAAE,QAAQ,GAAG,gBAAgB,EAAE,UAAU,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;QACjE,MAAM,SAAS,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAe,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM,CAAC,aAAa,iCACpB,SAAS,CAAC,QAAQ,KACrB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,MAAA,KAAK,CAAC,QAAQ,mCAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAC7E,CAAC;IACL,CAAC;IAES,aAAa;QACrB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;aAC5F,SAAkC,CAAC;QACtC,OAAO,IAAI,oBAAU,CAAC;YACpB,MAAM;YACN,MAAM;YACN,UAAU;YACV,QAAQ;YACR,WAAW;YACX,SAAS;YACT,SAAS;YACT,KAAK,EAAE;gBACL,IAAI,EAAE,IAAA,cAAK,EAAC,EAAE,EAAE,yBAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC;gBAC5C,WAAW,EAAE,IAAA,cAAK,EAAC,EAAE,EAAE,yBAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,eAAe,CAAC;gBAC9D,SAAS,EAAE,IAAA,cAAK,EAAC,EAAE,EAAE,yBAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,CAAC;aAC3D;SACF,CAAC,CAAC;IACL,CAAC;IAES,iBAAiB;QACzB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAI;aACrF,SAAkC,CAAC;QACtC,IAAI,IAAI,CAAC,KAAK,EAAE;YACb,IAAI,CAAC,KAAa,CAAC,aAAa,CAAC;gBAChC,MAAM;gBACN,MAAM;gBACN,UAAU;gBACV,QAAQ;gBACR,WAAW;gBACX,SAAS;gBACT,SAAS;aACV,CAAC,CAAC;SACJ;IACH,CAAC;;AA9HH,4CA+HC;AA5HQ,kCAAiB,GACtB,sCAAiE,CAAC","file":"arc-line.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport { ArcSegment } from '../../segment';\nimport { loadPolarMarkArcLineComponent } from '../register';\nimport { DEFAULT_STATES } from '../../constant';\nimport { BaseMarkLine } from '../base-line';\nimport { IPolarMarkLabelPosition } from '../type';\n// eslint-disable-next-line no-duplicate-imports\nimport type { PolarMarkArcLineAttrs } from '../type';\nimport { DEFAULT_POLAR_MARK_LINE_THEME } from '../config';\nimport type { ComponentOptions } from '../../interface';\n\nloadPolarMarkArcLineComponent();\nexport class PolarMarkArcLine extends BaseMarkLine<IPolarMarkLabelPosition> {\n  name = 'polarMarkArcLine';\n  // eslint-disable-next-line max-len\n  static defaultAttributes: Partial<PolarMarkArcLineAttrs> =\n    DEFAULT_POLAR_MARK_LINE_THEME as unknown as PolarMarkArcLineAttrs;\n  protected _line!: ArcSegment;\n\n  constructor(attributes: PolarMarkArcLineAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, PolarMarkArcLine.defaultAttributes, attributes));\n  }\n\n  protected isValidPoints() {\n    return true;\n  }\n\n  protected getPositionByDirection(direction: IPolarMarkLabelPosition) {\n    const { center, radius, startAngle, endAngle, label } = this.attribute as PolarMarkArcLineAttrs;\n    const { refX = 0, refY = 0 } = label;\n    // eslint-disable-next-line max-len\n    const labelRectHeight = Math.abs(\n      (this._label.getTextShape().AABBBounds?.y2 ?? 0) - (this._label.getTextShape()?.AABBBounds.y1 ?? 0)\n    );\n    // eslint-disable-next-line max-len\n    const labelTextHeight = Math.abs(\n      (this._label.getBgRect().AABBBounds?.y2 ?? 0) - (this._label.getBgRect()?.AABBBounds.y1 ?? 0)\n    );\n    const labelHeight = Math.max(labelRectHeight, labelTextHeight);\n\n    let angle;\n    // tag在正交方向是向内偏移，还是向外偏移\n    // 不偏移: 0, 内: -1, 外: 1\n    let orthogonalOffsetDirection;\n\n    switch (direction) {\n      case IPolarMarkLabelPosition.center:\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = 0;\n        break;\n      case IPolarMarkLabelPosition.arcInnerStart:\n        angle = startAngle;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IPolarMarkLabelPosition.arcOuterStart:\n        angle = startAngle;\n        orthogonalOffsetDirection = 1;\n        break;\n      case IPolarMarkLabelPosition.arcInnerEnd:\n        angle = endAngle;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IPolarMarkLabelPosition.arcOuterEnd:\n        angle = endAngle;\n        orthogonalOffsetDirection = 1;\n        break;\n      case IPolarMarkLabelPosition.arcInnerMiddle:\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IPolarMarkLabelPosition.arcOuterMiddle:\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = 1;\n        break;\n      default: // default arcInnerMiddle\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = -1;\n    }\n\n    return {\n      position: {\n        x:\n          center.x +\n          (radius + (orthogonalOffsetDirection * labelHeight) / 2 + refY) * Math.cos(angle) +\n          refX * Math.cos(angle - Math.PI / 2),\n        y:\n          center.y +\n          (radius + (orthogonalOffsetDirection * labelHeight) / 2 + refY) * Math.sin(angle) +\n          refX * Math.sin(angle - Math.PI / 2)\n      },\n      angle\n    };\n  }\n\n  protected setLabelPos(): void {\n    super.setLabelPos();\n    const { label = {} } = this.attribute as PolarMarkArcLineAttrs;\n    const { position = 'arcInnerMiddle', autoRotate = true } = label;\n    const labelAttr = this.getPositionByDirection(position as any);\n    this._label.setAttributes({\n      ...labelAttr.position,\n      angle: autoRotate ? labelAttr.angle - Math.PI / 2 + (label.refAngle ?? 0) : 0\n    });\n  }\n\n  protected createSegment() {\n    const { center, radius, startAngle, endAngle, startSymbol, endSymbol, lineStyle, state } = this\n      .attribute as PolarMarkArcLineAttrs;\n    return new ArcSegment({\n      center,\n      radius,\n      startAngle,\n      endAngle,\n      startSymbol,\n      endSymbol,\n      lineStyle,\n      state: {\n        line: merge({}, DEFAULT_STATES, state?.line),\n        startSymbol: merge({}, DEFAULT_STATES, state?.lineStartSymbol),\n        endSymbol: merge({}, DEFAULT_STATES, state?.lineEndSymbol)\n      }\n    });\n  }\n\n  protected setLineAttributes() {\n    const { center, radius, startAngle, endAngle, startSymbol, endSymbol, lineStyle } = this\n      .attribute as PolarMarkArcLineAttrs;\n    if (this._line) {\n      (this._line as any).setAttributes({\n        center,\n        radius,\n        startAngle,\n        endAngle,\n        startSymbol,\n        endSymbol,\n        lineStyle\n      });\n    }\n  }\n}\n"]}

package/cjs/marker/polar/area.d.ts

@@ -1,14 +1,14 @@
 import type { IArc, IGroup } from '@visactor/vrender-core';
 import { Tag } from '../../tag';
 import { Marker } from '../base';
-import { IPolarMarkAreaLabelPosition, type PolarMarkAreaAttrs } from '../type';
+import { IPolarMarkLabelPosition, type PolarMarkAreaAttrs } from '../type';
 import type { ComponentOptions } from '../../interface';
 export declare class PolarMarkArea extends Marker<PolarMarkAreaAttrs> {
     name: string;
     static defaultAttributes: {
         interactive: boolean;
         label: {
-            position: IPolarMarkAreaLabelPosition;
+            position: IPolarMarkLabelPosition;
             textStyle: {
                 fill: string;
                 stroke: string;
@@ -17,7 +17,7 @@ export declare class PolarMarkArea extends Marker<PolarMarkAreaAttrs> {
                 fontWeight: string;
                 fontStyle: string;
                 textAlign: string;
-                textBaseLine: string;
+                textBaseline: string;
             };
             padding: number[];
             panel: {
@@ -36,7 +36,13 @@ export declare class PolarMarkArea extends Marker<PolarMarkAreaAttrs> {
     getArea(): IArc;
     getLabel(): Tag;
     constructor(attributes: PolarMarkAreaAttrs, options?: ComponentOptions);
-    private _getPositionByDirection;
+    protected getPositionByDirection(direction: string): {
+        position: {
+            x: number;
+            y: number;
+        };
+        angle: number;
+    };
     protected setLabelPos(): void;
     protected initMarker(container: IGroup): void;
     protected updateMarker(): void;

package/cjs/marker/polar/area.js

@@ -19,51 +19,57 @@ class PolarMarkArea extends base_1.Marker {
         super((null == options ? void 0 : options.skipDefault) ? attributes : (0, vutils_1.merge)({}, PolarMarkArea.defaultAttributes, attributes)), 
         this.name = "polarMarkArea";
     }
-    _getPositionByDirection(area, direction) {
-        const {center: center, innerRadius: innerRadius, outerRadius: outerRadius, startAngle: startAngle, endAngle: endAngle} = this.attribute;
+    getPositionByDirection(direction) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const {center: center, innerRadius: innerRadius, outerRadius: outerRadius, startAngle: startAngle, endAngle: endAngle, label: label} = this.attribute, {refX: refX = 0, refY: refY = 0} = label, labelRectHeight = Math.abs((null !== (_b = null === (_a = this._label.getTextShape().AABBBounds) || void 0 === _a ? void 0 : _a.y2) && void 0 !== _b ? _b : 0) - (null !== (_d = null === (_c = this._label.getTextShape()) || void 0 === _c ? void 0 : _c.AABBBounds.y1) && void 0 !== _d ? _d : 0)), labelTextHeight = Math.abs((null !== (_f = null === (_e = this._label.getBgRect().AABBBounds) || void 0 === _e ? void 0 : _e.y2) && void 0 !== _f ? _f : 0) - (null !== (_h = null === (_g = this._label.getBgRect()) || void 0 === _g ? void 0 : _g.AABBBounds.y1) && void 0 !== _h ? _h : 0)), labelHeight = Math.max(labelRectHeight, labelTextHeight);
+        let radius, angle, orthogonalOffsetDirection;
         switch (direction) {
-          case type_1.IPolarMarkAreaLabelPosition.center:
-            return {
-                x: center.x + (innerRadius + outerRadius) / 2 * Math.cos((startAngle + endAngle) / 2),
-                y: center.y + (innerRadius + outerRadius) / 2 * Math.sin((startAngle + endAngle) / 2)
-            };
+          case type_1.IPolarMarkLabelPosition.center:
+            radius = (innerRadius + outerRadius) / 2, angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = 0;
+            break;
 
-          case type_1.IPolarMarkAreaLabelPosition.arcStart:
-            return {
-                x: center.x + (innerRadius + outerRadius) / 2 * Math.cos(startAngle),
-                y: center.y + (innerRadius + outerRadius) / 2 * Math.sin(startAngle)
-            };
+          case type_1.IPolarMarkLabelPosition.arcInnerStart:
+            radius = innerRadius, angle = startAngle, orthogonalOffsetDirection = -1;
+            break;
 
-          case type_1.IPolarMarkAreaLabelPosition.arcEnd:
-            return {
-                x: center.x + (innerRadius + outerRadius) / 2 * Math.cos(endAngle),
-                y: center.y + (innerRadius + outerRadius) / 2 * Math.sin(endAngle)
-            };
+          case type_1.IPolarMarkLabelPosition.arcOuterStart:
+            radius = outerRadius, angle = startAngle, orthogonalOffsetDirection = 1;
+            break;
 
-          case type_1.IPolarMarkAreaLabelPosition.arcInner:
-            return {
-                x: center.x + innerRadius * Math.cos((startAngle + endAngle) / 2),
-                y: center.y + innerRadius * Math.sin((startAngle + endAngle) / 2)
-            };
+          case type_1.IPolarMarkLabelPosition.arcInnerEnd:
+            radius = innerRadius, angle = endAngle, orthogonalOffsetDirection = -1;
+            break;
 
-          case type_1.IPolarMarkAreaLabelPosition.arcOuter:
-            return {
-                x: center.x + outerRadius * Math.cos((startAngle + endAngle) / 2),
-                y: center.y + outerRadius * Math.sin((startAngle + endAngle) / 2)
-            };
+          case type_1.IPolarMarkLabelPosition.arcOuterEnd:
+            radius = outerRadius, angle = endAngle, orthogonalOffsetDirection = 1;
+            break;
+
+          case type_1.IPolarMarkLabelPosition.arcInnerMiddle:
+            radius = innerRadius, angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = -1;
+            break;
+
+          case type_1.IPolarMarkLabelPosition.arcOuterMiddle:
+            radius = outerRadius, angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = 1;
+            break;
 
           default:
-            return {
-                x: center.x + innerRadius * Math.cos((startAngle + endAngle) / 2),
-                y: center.y + innerRadius * Math.sin((startAngle + endAngle) / 2)
-            };
+            radius = innerRadius, angle = (startAngle + endAngle) / 2, orthogonalOffsetDirection = -1;
         }
+        return {
+            position: {
+                x: center.x + (radius + orthogonalOffsetDirection * labelHeight / 2 + refY) * Math.cos(angle) + refX * Math.cos(angle - Math.PI / 2),
+                y: center.y + (radius + orthogonalOffsetDirection * labelHeight / 2 + refY) * Math.sin(angle) + refX * Math.sin(angle - Math.PI / 2)
+            },
+            angle: angle
+        };
     }
     setLabelPos() {
         var _a;
         if (this._label && this._area) {
-            const {label: label = {}} = this.attribute, labelPosition = null !== (_a = label.position) && void 0 !== _a ? _a : "middle", labelPoint = this._getPositionByDirection(this._area, labelPosition);
-            if (this._label.setAttributes(Object.assign({}, labelPoint)), this.attribute.limitRect && label.confine) {
+            const {label: label = {}} = this.attribute, {position: labelPosition = "arcInnerMiddle", autoRotate: autoRotate = !0} = label, labelAttr = this.getPositionByDirection(labelPosition);
+            if (this._label.setAttributes(Object.assign(Object.assign({}, labelAttr.position), {
+                angle: autoRotate ? labelAttr.angle - Math.PI / 2 + (null !== (_a = label.refAngle) && void 0 !== _a ? _a : 0) : 0
+            })), this.attribute.limitRect && label.confine) {
                 const {x: x, y: y, width: width, height: height} = this.attribute.limitRect;
                 (0, limit_shape_1.limitShapeInBounds)(this._label, {
                     x1: x,

package/cjs/marker/polar/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/marker/polar/area.ts"],"names":[],"mappings":";;;AAEA,yDAAwD;AACxD,6CAAyC;AAGzC,mCAAgC;AAChC,kCAAiC;AACjC,sCAA0D;AAC1D,kCAA+E;AAC/E,wDAA4D;AAE5D,0CAAyD;AACzD,6CAAgD;AAEhD,IAAA,qCAA0B,GAAE,CAAC;AAC7B,MAAa,aAAc,SAAQ,aAA0B;IAK3D,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,YAAY,UAA8B,EAAE,OAA0B;QACpE,KAAK,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,EAAE,EAAE,aAAa,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC;QAbpG,SAAI,GAAG,eAAe,CAAC;IAcvB,CAAC;IAEO,uBAAuB,CAAC,IAAU,EAAE,SAAiB;QAC3D,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,SAA+B,CAAC;QAExG,QAAQ,SAAS,EAAE;YACjB,KAAK,kCAA2B,CAAC,MAAM;gBACrC,OAAO;oBACL,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACvF,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;iBACxF,CAAC;YACJ,KAAK,kCAA2B,CAAC,QAAQ;gBACvC,OAAO;oBACL,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;oBACtE,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;iBACvE,CAAC;YACJ,KAAK,kCAA2B,CAAC,MAAM;gBACrC,OAAO;oBACL,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;oBACpE,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;iBACrE,CAAC;YACJ,KAAK,kCAA2B,CAAC,QAAQ;gBACvC,OAAO;oBACL,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACjE,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;iBAClE,CAAC;YACJ,KAAK,kCAA2B,CAAC,QAAQ;gBACvC,OAAO;oBACL,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACjE,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;iBAClE,CAAC;YACJ;gBACE,OAAO;oBACL,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;oBACjE,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;iBAClE,CAAC;SACL;IACH,CAAC;IAES,WAAW;;QACnB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,SAA+B,CAAC;YAC5D,MAAM,aAAa,GAAG,MAAA,KAAK,CAAC,QAAQ,mCAAI,QAAQ,CAAC;YACjD,MAAM,UAAU,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;YAC3E,IAAI,CAAC,MAAM,CAAC,aAAa,mBACpB,UAAU,EACb,CAAC;YAEH,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,IAAI,KAAK,CAAC,OAAO,EAAE;gBAC7C,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;gBACzD,IAAA,gCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE;oBAC9B,EAAE,EAAE,CAAC;oBACL,EAAE,EAAE,CAAC;oBACL,EAAE,EAAE,CAAC,GAAG,KAAK;oBACb,EAAE,EAAE,CAAC,GAAG,MAAM;iBACf,CAAC,CAAC;aACJ;SACF;IACH,CAAC;IAES,UAAU,CAAC,SAAiB;QACpC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;aAC7F,SAA+B,CAAC;QACnC,MAAM,IAAI,GAAG,6BAAc,CAAC,GAAG,iBAC7B,CAAC,EAAE,MAAM,CAAC,CAAC,EACX,CAAC,EAAE,MAAM,CAAC,CAAC,EACX,WAAW;YACX,WAAW;YACX,UAAU;YACV,QAAQ,IACL,SAAS,EACZ,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAA,cAAK,EAAC,EAAE,EAAE,yBAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEpB,MAAM,SAAS,GAAG,IAAI,SAAG,iCACnB,KAAuB,KAC3B,KAAK,EAAE;gBACL,KAAK,EAAE,IAAA,cAAK,EAAC,EAAE,EAAE,yBAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,eAAe,CAAC;gBACxD,IAAI,EAAE,IAAA,cAAK,EAAC,EAAE,EAAE,yBAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,CAAC;aAC9C,IACD,CAAC;QACH,SAAS,CAAC,IAAI,GAAG,iBAAiB,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,SAAS,CAAC,GAAG,CAAC,SAA6B,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAES,YAAY;QACpB,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;aACtF,SAA+B,CAAC;QACnC,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,aAAa,iBACtB,CAAC,EAAE,MAAM,CAAC,CAAC,EACX,CAAC,EAAE,MAAM,CAAC,CAAC,EACX,WAAW;gBACX,WAAW;gBACX,UAAU;gBACV,QAAQ,IACL,SAAS,EACZ,CAAC;SACJ;QACD,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,MAAM,CAAC,aAAa,iBACvB,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,IACD,KAAuB,EAC3B,CAAC;SACJ;QACD,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAES,aAAa;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;;AAnIH,sCAoIC;AAlIQ,+BAAiB,GAAG,sCAA6B,CAAC","file":"area.js","sourcesContent":["import type { IArc, IGroup, INode } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { graphicCreator } from '@visactor/vrender-core';\nimport { merge } from '@visactor/vutils';\nimport type { TagAttributes } from '../../tag';\n// eslint-disable-next-line no-duplicate-imports\nimport { Tag } from '../../tag';\nimport { Marker } from '../base';\nimport { DEFAULT_POLAR_MARK_AREA_THEME } from '../config';\nimport { IPolarMarkAreaLabelPosition, type PolarMarkAreaAttrs } from '../type';\nimport { limitShapeInBounds } from '../../util/limit-shape';\nimport type { ComponentOptions } from '../../interface';\nimport { loadPolarMarkAreaComponent } from '../register';\nimport { DEFAULT_STATES } from '../../constant';\n\nloadPolarMarkAreaComponent();\nexport class PolarMarkArea extends Marker<PolarMarkAreaAttrs> {\n  name = 'polarMarkArea';\n  static defaultAttributes = DEFAULT_POLAR_MARK_AREA_THEME;\n  private _area!: IArc;\n\n  getArea() {\n    return this._area;\n  }\n\n  getLabel() {\n    return this._label;\n  }\n\n  constructor(attributes: PolarMarkAreaAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, PolarMarkArea.defaultAttributes, attributes));\n  }\n\n  private _getPositionByDirection(area: IArc, direction: string) {\n    const { center, innerRadius, outerRadius, startAngle, endAngle } = this.attribute as PolarMarkAreaAttrs;\n\n    switch (direction) {\n      case IPolarMarkAreaLabelPosition.center:\n        return {\n          x: center.x + ((innerRadius + outerRadius) / 2) * Math.cos((startAngle + endAngle) / 2),\n          y: center.y + ((innerRadius + outerRadius) / 2) * Math.sin((startAngle + endAngle) / 2)\n        };\n      case IPolarMarkAreaLabelPosition.arcStart:\n        return {\n          x: center.x + ((innerRadius + outerRadius) / 2) * Math.cos(startAngle),\n          y: center.y + ((innerRadius + outerRadius) / 2) * Math.sin(startAngle)\n        };\n      case IPolarMarkAreaLabelPosition.arcEnd:\n        return {\n          x: center.x + ((innerRadius + outerRadius) / 2) * Math.cos(endAngle),\n          y: center.y + ((innerRadius + outerRadius) / 2) * Math.sin(endAngle)\n        };\n      case IPolarMarkAreaLabelPosition.arcInner:\n        return {\n          x: center.x + innerRadius * Math.cos((startAngle + endAngle) / 2),\n          y: center.y + innerRadius * Math.sin((startAngle + endAngle) / 2)\n        };\n      case IPolarMarkAreaLabelPosition.arcOuter:\n        return {\n          x: center.x + outerRadius * Math.cos((startAngle + endAngle) / 2),\n          y: center.y + outerRadius * Math.sin((startAngle + endAngle) / 2)\n        };\n      default: // default arcOuter\n        return {\n          x: center.x + innerRadius * Math.cos((startAngle + endAngle) / 2),\n          y: center.y + innerRadius * Math.sin((startAngle + endAngle) / 2)\n        };\n    }\n  }\n\n  protected setLabelPos() {\n    if (this._label && this._area) {\n      const { label = {} } = this.attribute as PolarMarkAreaAttrs;\n      const labelPosition = label.position ?? 'middle';\n      const labelPoint = this._getPositionByDirection(this._area, labelPosition);\n      this._label.setAttributes({\n        ...labelPoint\n      });\n\n      if (this.attribute.limitRect && label.confine) {\n        const { x, y, width, height } = this.attribute.limitRect;\n        limitShapeInBounds(this._label, {\n          x1: x,\n          y1: y,\n          x2: x + width,\n          y2: y + height\n        });\n      }\n    }\n  }\n\n  protected initMarker(container: IGroup) {\n    const { center, innerRadius, outerRadius, startAngle, endAngle, areaStyle, label, state } = this\n      .attribute as PolarMarkAreaAttrs;\n    const area = graphicCreator.arc({\n      x: center.x,\n      y: center.y,\n      innerRadius,\n      outerRadius,\n      startAngle,\n      endAngle,\n      ...areaStyle\n    });\n    area.states = merge({}, DEFAULT_STATES, state?.area);\n    area.name = 'polar-mark-area-area';\n    this._area = area;\n    container.add(area);\n\n    const markLabel = new Tag({\n      ...(label as TagAttributes),\n      state: {\n        panel: merge({}, DEFAULT_STATES, state?.labelBackground),\n        text: merge({}, DEFAULT_STATES, state?.label)\n      }\n    });\n    markLabel.name = 'mark-area-label';\n    this._label = markLabel;\n    container.add(markLabel as unknown as INode);\n    this.setLabelPos();\n  }\n\n  protected updateMarker() {\n    const { center, innerRadius, outerRadius, startAngle, endAngle, areaStyle, label } = this\n      .attribute as PolarMarkAreaAttrs;\n    if (this._area) {\n      this._area.setAttributes({\n        x: center.x,\n        y: center.y,\n        innerRadius,\n        outerRadius,\n        startAngle,\n        endAngle,\n        ...areaStyle\n      });\n    }\n    if (this._area) {\n      this._label.setAttributes({\n        dx: 0,\n        dy: 0, // 需要进行复位\n        ...(label as TagAttributes)\n      });\n    }\n    this.setLabelPos();\n  }\n\n  protected isValidPoints() {\n    return true;\n  }\n}\n"]}
+{"version":3,"sources":["../src/marker/polar/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import type { IArc, IGroup, INode } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { graphicCreator } from '@visactor/vrender-core';\nimport { merge } from '@visactor/vutils';\nimport type { TagAttributes } from '../../tag';\n// eslint-disable-next-line no-duplicate-imports\nimport { Tag } from '../../tag';\nimport { Marker } from '../base';\nimport { DEFAULT_POLAR_MARK_AREA_THEME } from '../config';\nimport { IPolarMarkLabelPosition, type PolarMarkAreaAttrs } from '../type';\nimport { limitShapeInBounds } from '../../util/limit-shape';\nimport type { ComponentOptions } from '../../interface';\nimport { loadPolarMarkAreaComponent } from '../register';\nimport { DEFAULT_STATES } from '../../constant';\n\nloadPolarMarkAreaComponent();\nexport class PolarMarkArea extends Marker<PolarMarkAreaAttrs> {\n  name = 'polarMarkArea';\n  static defaultAttributes = DEFAULT_POLAR_MARK_AREA_THEME;\n  private _area!: IArc;\n\n  getArea() {\n    return this._area;\n  }\n\n  getLabel() {\n    return this._label;\n  }\n\n  constructor(attributes: PolarMarkAreaAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, PolarMarkArea.defaultAttributes, attributes));\n  }\n\n  protected getPositionByDirection(direction: string) {\n    const { center, innerRadius, outerRadius, startAngle, endAngle, label } = this.attribute as PolarMarkAreaAttrs;\n    const { refX = 0, refY = 0 } = label;\n    // eslint-disable-next-line max-len\n    const labelRectHeight = Math.abs(\n      (this._label.getTextShape().AABBBounds?.y2 ?? 0) - (this._label.getTextShape()?.AABBBounds.y1 ?? 0)\n    );\n    // eslint-disable-next-line max-len\n    const labelTextHeight = Math.abs(\n      (this._label.getBgRect().AABBBounds?.y2 ?? 0) - (this._label.getBgRect()?.AABBBounds.y1 ?? 0)\n    );\n    const labelHeight = Math.max(labelRectHeight, labelTextHeight);\n\n    let radius;\n    let angle;\n    // tag在正交方向是向内偏移，还是向外偏移\n    // 不偏移: 0, 内: -1, 外: 1\n    let orthogonalOffsetDirection;\n\n    switch (direction) {\n      case IPolarMarkLabelPosition.center:\n        radius = (innerRadius + outerRadius) / 2;\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = 0;\n        break;\n      case IPolarMarkLabelPosition.arcInnerStart:\n        radius = innerRadius;\n        angle = startAngle;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IPolarMarkLabelPosition.arcOuterStart:\n        radius = outerRadius;\n        angle = startAngle;\n        orthogonalOffsetDirection = 1;\n        break;\n      case IPolarMarkLabelPosition.arcInnerEnd:\n        radius = innerRadius;\n        angle = endAngle;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IPolarMarkLabelPosition.arcOuterEnd:\n        radius = outerRadius;\n        angle = endAngle;\n        orthogonalOffsetDirection = 1;\n        break;\n      case IPolarMarkLabelPosition.arcInnerMiddle:\n        radius = innerRadius;\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = -1;\n        break;\n      case IPolarMarkLabelPosition.arcOuterMiddle:\n        radius = outerRadius;\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = 1;\n        break;\n      default: // default arcInnerMiddle\n        radius = innerRadius;\n        angle = (startAngle + endAngle) / 2;\n        orthogonalOffsetDirection = -1;\n    }\n\n    return {\n      position: {\n        x:\n          center.x +\n          (radius + (orthogonalOffsetDirection * labelHeight) / 2 + refY) * Math.cos(angle) +\n          refX * Math.cos(angle - Math.PI / 2),\n        y:\n          center.y +\n          (radius + (orthogonalOffsetDirection * labelHeight) / 2 + refY) * Math.sin(angle) +\n          refX * Math.sin(angle - Math.PI / 2)\n      },\n      angle\n    };\n  }\n\n  protected setLabelPos() {\n    if (this._label && this._area) {\n      const { label = {} } = this.attribute as PolarMarkAreaAttrs;\n      const { position: labelPosition = 'arcInnerMiddle', autoRotate = true } = label;\n      const labelAttr = this.getPositionByDirection(labelPosition);\n\n      this._label.setAttributes({\n        ...labelAttr.position,\n        angle: autoRotate ? labelAttr.angle - Math.PI / 2 + (label.refAngle ?? 0) : 0\n      });\n\n      if (this.attribute.limitRect && label.confine) {\n        const { x, y, width, height } = this.attribute.limitRect;\n        limitShapeInBounds(this._label, {\n          x1: x,\n          y1: y,\n          x2: x + width,\n          y2: y + height\n        });\n      }\n    }\n  }\n\n  protected initMarker(container: IGroup) {\n    const { center, innerRadius, outerRadius, startAngle, endAngle, areaStyle, label, state } = this\n      .attribute as PolarMarkAreaAttrs;\n    const area = graphicCreator.arc({\n      x: center.x,\n      y: center.y,\n      innerRadius,\n      outerRadius,\n      startAngle,\n      endAngle,\n      ...areaStyle\n    });\n    area.states = merge({}, DEFAULT_STATES, state?.area);\n    area.name = 'polar-mark-area-area';\n    this._area = area;\n    container.add(area);\n\n    const markLabel = new Tag({\n      ...(label as TagAttributes),\n      state: {\n        panel: merge({}, DEFAULT_STATES, state?.labelBackground),\n        text: merge({}, DEFAULT_STATES, state?.label)\n      }\n    });\n    markLabel.name = 'mark-area-label';\n    this._label = markLabel;\n    container.add(markLabel as unknown as INode);\n    this.setLabelPos();\n  }\n\n  protected updateMarker() {\n    const { center, innerRadius, outerRadius, startAngle, endAngle, areaStyle, label } = this\n      .attribute as PolarMarkAreaAttrs;\n    if (this._area) {\n      this._area.setAttributes({\n        x: center.x,\n        y: center.y,\n        innerRadius,\n        outerRadius,\n        startAngle,\n        endAngle,\n        ...areaStyle\n      });\n    }\n    if (this._area) {\n      this._label.setAttributes({\n        dx: 0,\n        dy: 0, // 需要进行复位\n        ...(label as TagAttributes)\n      });\n    }\n    this.setLabelPos();\n  }\n\n  protected isValidPoints() {\n    return true;\n  }\n}\n"]}

package/cjs/marker/type.d.ts

@@ -2,7 +2,7 @@ import type { EasingType, IArcGraphicAttribute, IGroup, IGroupGraphicAttribute,
 import type { CommonSegmentAttributes, ILineGraphicWithCornerRadius, SegmentAttributes, SymbolAttributes } from '../segment';
 import type { TagAttributes } from '../tag';
 import type { Point, State } from '../core/type';
-export declare enum ICommonMarkLineLabelPosition {
+export declare enum ICartesianMarkLineLabelPosition {
     start = "start",
     middle = "middle",
     end = "end",
@@ -24,11 +24,13 @@ export declare enum ICartesianMarkAreaLabelPosition {
     insideTop = "insideTop",
     insideBottom = "insideBottom"
 }
-export declare enum IPolarMarkAreaLabelPosition {
-    arcStart = "arcStart",
-    arcEnd = "arcEnd",
-    arcInner = "arcInner",
-    arcOuter = "arcOuter",
+export declare enum IPolarMarkLabelPosition {
+    arcInnerStart = "arcInnerStart",
+    arcInnerEnd = "arcInnerEnd",
+    arcInnerMiddle = "arcInnerMiddle",
+    arcOuterStart = "arcOuterStart",
+    arcOuterEnd = "arcOuterEnd",
+    arcOuterMiddle = "arcOuterMiddle",
     center = "center"
 }
 export declare enum IMarkPointItemPosition {
@@ -113,26 +115,26 @@ export type MarkPointState = {
     richText?: State<Partial<IRichTextGraphicAttribute>>;
     customMark?: State<Partial<IGroupGraphicAttribute>>;
 };
-export type CommonMarkLineAttrs = MarkerAttrs & Omit<CommonSegmentAttributes, 'state' | 'lineStyle'> & {
+export type CommonMarkLineAttrs<T> = MarkerAttrs & Omit<CommonSegmentAttributes, 'state' | 'lineStyle'> & {
     label?: {
-        position?: keyof typeof ICommonMarkLineLabelPosition;
+        position?: T;
         confine?: boolean;
     } & IMarkRef & IMarkLabel;
     state?: CommonMarkLineState;
 } & BaseMarkerAnimation<CommonMarkLineAnimationType>;
-export type CartesianMarkLineAttrs = CommonMarkLineAttrs & {
+export type CartesianMarkLineAttrs = CommonMarkLineAttrs<keyof typeof ICartesianMarkLineLabelPosition> & {
     type?: 'cartesian-line';
     multiSegment?: boolean;
     mainSegmentIndex?: number;
     points: Point[] | Point[][];
     lineStyle?: ILineGraphicAttribute;
 };
-export type PolarMarkLineAttrs = CommonMarkLineAttrs & {
+export type PolarMarkLineAttrs = CommonMarkLineAttrs<keyof typeof ICartesianMarkLineLabelPosition> & {
     type?: 'polar-line';
     points: Point[] | Point[][];
     lineStyle?: ILineGraphicAttribute;
 };
-export type PolarMarkArcLineAttrs = CommonMarkLineAttrs & {
+export type PolarMarkArcLineAttrs = CommonMarkLineAttrs<keyof typeof IPolarMarkLabelPosition> & {
     type?: 'polar-arc-line';
     center: {
         x: number;
@@ -164,9 +166,9 @@ export type PolarMarkAreaAttrs = MarkerAttrs & {
     startAngle: number;
     endAngle: number;
     label?: {
-        position?: keyof typeof IPolarMarkAreaLabelPosition;
+        position?: keyof typeof IPolarMarkLabelPosition;
         confine?: boolean;
-    } & IMarkLabel;
+    } & IMarkRef & IMarkLabel;
     areaStyle?: IArcGraphicAttribute;
     state?: PolarMarkAreaState;
 } & BaseMarkerAnimation<CommonMarkAreaAnimationType>;