@visactor/vchart 1.7.4 → 1.8.0-alpha.0

package/esm/series/word-cloud/word-cloud-3d.js

@@ -1,17 +1,11 @@
-import { AttributeLevel, DEFAULT_DATA_KEY } from "../../constant";
+import { AttributeLevel } from "../../constant";
 
-import { TextMark } from "../../mark/text";
+import { registerTextMark } from "../../mark/text";
 
 import { SeriesMarkNameEnum, SeriesTypeEnum } from "../interface/type";
 
 import { animationConfig, userAnimationConfig } from "../../animation/utils";
 
-import { LinearScale } from "@visactor/vscale";
-
-import { extent } from "@visactor/vgrammar-util";
-
-import { WORD_CLOUD_ANGLE, WORD_CLOUD_FILLING_ANGLE, WORD_CLOUD_TEXT, WORD_CLOUD_WEIGHT } from "../../constant/word-cloud";
-
 import { BaseWordCloudSeries } from "./base";
 
 import { Factory } from "../../core/factory";
@@ -26,114 +20,19 @@ export class WordCloud3dSeries extends BaseWordCloudSeries {
     constructor() {
         super(...arguments), this.type = SeriesTypeEnum.wordCloud3d;
     }
-    compile() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27;
-        super.compile();
-        const wordCloudTransforms = [], valueField = this._valueField, valueScale = new LinearScale, fontWeightRange = this._fontWeightRange, rotateAngles = this._rotateAngles, fontWeightField = this._fontWeightField, fillingRotateAngles = this._wordCloudShapeConfig.fillingRotateAngles;
-        if (valueField) {
-            const [minValue, maxValue] = extent(null === (_a = this.getViewData()) || void 0 === _a ? void 0 : _a.latestData.map((datum => +datum[valueField])));
-            valueScale.domain([ minValue, maxValue ], !0).range(fontWeightRange), wordCloudTransforms.push({
-                type: "map",
-                as: WORD_CLOUD_WEIGHT,
-                callback: datum => minValue === maxValue ? valueScale.scale(maxValue) : valueScale.scale(datum[valueField])
-            });
-        }
-        wordCloudTransforms.push({
-            type: "map",
-            as: WORD_CLOUD_ANGLE,
-            callback: () => rotateAngles[Math.floor(Math.random() * rotateAngles.length)]
-        }), wordCloudTransforms.push({
-            type: "map",
-            as: WORD_CLOUD_FILLING_ANGLE,
-            callback: () => fillingRotateAngles[Math.floor(Math.random() * fillingRotateAngles.length)]
-        }), (null === (_b = this._spec.word) || void 0 === _b ? void 0 : _b.formatMethod) && wordCloudTransforms.push({
-            type: "map",
-            as: WORD_CLOUD_TEXT,
-            callback: this._spec.word.formatMethod
+    _wordCloudTransformOption() {
+        var _a;
+        return Object.assign(Object.assign({}, super._wordCloudTransformOption()), {
+            postProjection: null !== (_a = this._spec.postProjection) && void 0 !== _a ? _a : "StereographicProjection",
+            depth_3d: this._spec.depth_3d
+        });
+    }
+    _wordCloudShapeTransformOption() {
+        var _a;
+        return Object.assign(Object.assign({}, super._wordCloudShapeTransformOption()), {
+            postProjection: null !== (_a = this._spec.postProjection) && void 0 !== _a ? _a : "StereographicProjection",
+            depth_3d: this._spec.depth_3d
         });
-        const textField = (null === (_c = this._spec.word) || void 0 === _c ? void 0 : _c.formatMethod) ? WORD_CLOUD_TEXT : this._nameField;
-        this._isWordCloudShape ? wordCloudTransforms.push({
-            type: "wordcloudShape",
-            size: [ this._region.getLayoutRect().width, this._region.getLayoutRect().height ],
-            shape: this._maskShape,
-            postProjection: null !== (_m = this._spec.postProjection) && void 0 !== _m ? _m : "StereographicProjection",
-            dataIndexKey: DEFAULT_DATA_KEY,
-            text: {
-                field: textField
-            },
-            fontSize: valueField ? {
-                field: valueField
-            } : this._fontSizeRange[0],
-            fontSizeRange: this._fontSizeRange,
-            padding: this._fontPadding,
-            rotateList: rotateAngles,
-            fontFamily: null !== (_r = null !== (_o = this._fontFamilyField) && void 0 !== _o ? _o : null === (_q = null === (_p = this._spec.word) || void 0 === _p ? void 0 : _p.style) || void 0 === _q ? void 0 : _q.fontFamily) && void 0 !== _r ? _r : this._defaultFontFamily,
-            fontWeight: fontWeightField ? {
-                field: fontWeightField
-            } : valueField ? {
-                field: WORD_CLOUD_WEIGHT
-            } : null,
-            fontStyle: null !== (_s = this._fontStyleField) && void 0 !== _s ? _s : null === (_u = null === (_t = this._spec.word) || void 0 === _t ? void 0 : _t.style) || void 0 === _u ? void 0 : _u.fontStyle,
-            depth_3d: this._spec.depth_3d,
-            fillingFontFamily: null !== (_z = null !== (_w = null === (_v = this._wordCloudShapeConfig) || void 0 === _v ? void 0 : _v.fillingFontFamilyField) && void 0 !== _w ? _w : null === (_y = null === (_x = this._spec.word) || void 0 === _x ? void 0 : _x.style) || void 0 === _y ? void 0 : _y.fontFamily) && void 0 !== _z ? _z : this._defaultFontFamily,
-            fillingPadding: this._fillingFontPadding,
-            fillingFontStyle: null !== (_1 = null === (_0 = this._wordCloudShapeConfig) || void 0 === _0 ? void 0 : _0.fillingFontStyleField) && void 0 !== _1 ? _1 : null === (_3 = null === (_2 = this._spec.word) || void 0 === _2 ? void 0 : _2.style) || void 0 === _3 ? void 0 : _3.fontStyle,
-            fillingFontWeight: null !== (_5 = null === (_4 = this._wordCloudShapeConfig) || void 0 === _4 ? void 0 : _4.fillingFontWeightField) && void 0 !== _5 ? _5 : null === (_7 = null === (_6 = this._spec.word) || void 0 === _6 ? void 0 : _6.style) || void 0 === _7 ? void 0 : _7.fontWeight,
-            fillingRotateList: fillingRotateAngles,
-            fillingTimes: null === (_8 = this._wordCloudShapeConfig) || void 0 === _8 ? void 0 : _8.fillingTimes,
-            fillingXStep: null === (_9 = this._wordCloudShapeConfig) || void 0 === _9 ? void 0 : _9.fillingXStep,
-            fillingYStep: null === (_10 = this._wordCloudShapeConfig) || void 0 === _10 ? void 0 : _10.fillingYStep,
-            fillingXRatioStep: null === (_11 = this._wordCloudShapeConfig) || void 0 === _11 ? void 0 : _11.fillingXRatioStep,
-            fillingYRatioStep: null === (_12 = this._wordCloudShapeConfig) || void 0 === _12 ? void 0 : _12.fillingYRatioStep,
-            fillingInitialOpacity: null === (_13 = this._wordCloudShapeConfig) || void 0 === _13 ? void 0 : _13.fillingInitialOpacity,
-            fillingDeltaOpacity: null === (_14 = this._wordCloudShapeConfig) || void 0 === _14 ? void 0 : _14.fillingDeltaOpacity,
-            fillingInitialFontSize: null === (_15 = this._wordCloudShapeConfig) || void 0 === _15 ? void 0 : _15.fillingInitialFontSize,
-            fillingDeltaFontSize: null === (_16 = this._wordCloudShapeConfig) || void 0 === _16 ? void 0 : _16.fillingDeltaFontSize,
-            ratio: null === (_17 = this._wordCloudShapeConfig) || void 0 === _17 ? void 0 : _17.ratio,
-            fillingRatio: null === (_18 = this._wordCloudShapeConfig) || void 0 === _18 ? void 0 : _18.fillingRatio,
-            removeWhiteBorder: null === (_19 = this._wordCloudShapeConfig) || void 0 === _19 ? void 0 : _19.removeWhiteBorder,
-            textLayoutTimes: null === (_20 = this._wordCloudShapeConfig) || void 0 === _20 ? void 0 : _20.textLayoutTimes,
-            fontSizeShrinkFactor: null === (_21 = this._wordCloudShapeConfig) || void 0 === _21 ? void 0 : _21.fontSizeShrinkFactor,
-            stepFactor: null === (_22 = this._wordCloudShapeConfig) || void 0 === _22 ? void 0 : _22.stepFactor,
-            layoutMode: null === (_23 = this._wordCloudShapeConfig) || void 0 === _23 ? void 0 : _23.layoutMode,
-            importantWordCount: null === (_24 = this._wordCloudShapeConfig) || void 0 === _24 ? void 0 : _24.importantWordCount,
-            globalShinkLimit: null === (_25 = this._wordCloudShapeConfig) || void 0 === _25 ? void 0 : _25.globalShinkLimit,
-            fontSizeEnlargeFactor: null === (_26 = this._wordCloudShapeConfig) || void 0 === _26 ? void 0 : _26.fontSizeEnlargeFactor,
-            fillingDeltaFontSizeFactor: null === (_27 = this._wordCloudShapeConfig) || void 0 === _27 ? void 0 : _27.fillingDeltaFontSizeFactor
-        }) : (wordCloudTransforms.push({
-            type: "wordcloud",
-            layoutType: this._wordCloudConfig.layoutMode,
-            size: [ this._region.getLayoutRect().width, this._region.getLayoutRect().height ],
-            shape: this._maskShape,
-            postProjection: null !== (_d = this._spec.postProjection) && void 0 !== _d ? _d : "StereographicProjection",
-            dataIndexKey: DEFAULT_DATA_KEY,
-            text: {
-                field: textField
-            },
-            fontSize: valueField ? {
-                field: valueField
-            } : this._fontSizeRange[0],
-            fontSizeRange: this._fontSizeRange,
-            padding: this._fontPadding,
-            rotate: {
-                field: WORD_CLOUD_ANGLE
-            },
-            fontFamily: null !== (_h = null !== (_e = this._fontFamilyField) && void 0 !== _e ? _e : null === (_g = null === (_f = this._spec.word) || void 0 === _f ? void 0 : _f.style) || void 0 === _g ? void 0 : _g.fontFamily) && void 0 !== _h ? _h : this._defaultFontFamily,
-            fontWeight: fontWeightField ? {
-                field: fontWeightField
-            } : valueField ? {
-                field: WORD_CLOUD_WEIGHT
-            } : null,
-            fontStyle: null !== (_j = this._fontStyleField) && void 0 !== _j ? _j : null === (_l = null === (_k = this._spec.word) || void 0 === _k ? void 0 : _k.style) || void 0 === _l ? void 0 : _l.fontStyle,
-            depth_3d: this._spec.depth_3d,
-            randomVisible: this._random,
-            clip: "clip" === this._wordCloudConfig.drawOutOfBound,
-            shrink: this._wordCloudConfig.zoomToFit.shrink,
-            enlarge: this._wordCloudConfig.zoomToFit.enlarge,
-            minFontSize: this._wordCloudConfig.zoomToFit.fontSizeLimitMin,
-            progressiveTime: this._wordCloudConfig.progressiveTime,
-            progressiveStep: this._wordCloudConfig.progressiveStep
-        }), this._wordMark.getProduct().transform(wordCloudTransforms)), this._data.getProduct().transform(wordCloudTransforms);
     }
     initMark() {
         this._wordMark = this._createMark(BaseWordCloudSeries.mark.word, {
@@ -147,66 +46,43 @@ export class WordCloud3dSeries extends BaseWordCloudSeries {
         }));
     }
     initMarkStyle() {
-        var _a, _b, _c, _d, _e, _f;
+        super.initMarkStyle();
         const wordMark = this._wordMark, fillingWordMark = this._fillingWordMark;
-        wordMark && (this.setMarkStyle(wordMark, {
-            fill: this._colorHexField ? datum => datum[this._colorHexField] : this.getWordColorAttribute(this._seriesField, !1),
-            text: datum => datum[this._nameField],
-            x: datum => datum.x,
-            y: datum => datum.y,
+        wordMark && this.setMarkStyle(wordMark, {
             z: datum => {
                 var _a;
                 return null !== (_a = datum.z) && void 0 !== _a ? _a : 0;
-            },
-            fontFamily: datum => datum.fontFamily,
-            fontSize: datum => datum.fontSize,
-            fontStyle: datum => datum.fontStyle,
-            fontWeight: datum => datum.fontWeight,
-            angle: datum => datum.angle,
-            visible: datum => !datum.isFillingWord
-        }, "normal", AttributeLevel.Series), this.setMarkStyle(wordMark, {
-            fontFamily: null !== (_c = null === (_b = null === (_a = this._spec.word) || void 0 === _a ? void 0 : _a.style) || void 0 === _b ? void 0 : _b.fontFamily) && void 0 !== _c ? _c : this._defaultFontFamily
-        }, "normal", AttributeLevel.User_Mark)), fillingWordMark && (this.setMarkStyle(fillingWordMark, {
-            fill: this._wordCloudShapeConfig.fillingColorHexField ? datum => datum[this._wordCloudShapeConfig.fillingColorHexField] : this.getWordColorAttribute(this._wordCloudShapeConfig.fillingSeriesField, !0),
-            text: datum => datum[this._nameField],
-            x: datum => datum.x,
-            y: datum => datum.y,
+            }
+        }, "normal", AttributeLevel.Series), fillingWordMark && this.setMarkStyle(fillingWordMark, {
             z: datum => {
                 var _a;
                 return null !== (_a = datum.z) && void 0 !== _a ? _a : 0;
-            },
-            fontFamily: datum => datum.fontFamily,
-            fontSize: datum => datum.fontSize,
-            fontStyle: datum => datum.fontStyle,
-            fontWeight: datum => datum.fontWeight,
-            angle: datum => datum.angle,
-            visible: datum => datum.isFillingWord
-        }, "normal", AttributeLevel.Series), this.setMarkStyle(fillingWordMark, {
-            fontFamily: null !== (_f = null === (_e = null === (_d = this._spec.word) || void 0 === _d ? void 0 : _d.style) || void 0 === _e ? void 0 : _e.fontFamily) && void 0 !== _f ? _f : this._defaultFontFamily
-        }, "normal", AttributeLevel.User_Mark)), this._trigger.registerMark(wordMark), this._trigger.registerMark(fillingWordMark);
+            }
+        }, "normal", AttributeLevel.Series);
     }
     initAnimation() {
-        var _a, _b;
-        this._wordMark && this._wordMark.setAnimationConfig(animationConfig(null === (_a = Factory.getAnimationInKey("wordCloud3d")) || void 0 === _a ? void 0 : _a((() => {
-            var _a, _b, _c, _d, _e;
-            const srView = this.getCompiler().getVGrammarView(), width = srView.width() - (null === (_a = this._padding) || void 0 === _a ? void 0 : _a.left) || 0 - (null === (_b = this._padding) || void 0 === _b ? void 0 : _b.right) || 0, height = srView.height() - (null === (_c = this._padding) || void 0 === _c ? void 0 : _c.top) || 0 - (null === (_d = this._padding) || void 0 === _d ? void 0 : _d.bottom) || 0, r = Math.max(width, height) / 2;
+        var _a, _b, _c;
+        const padding = null !== (_a = this._padding) && void 0 !== _a ? _a : {};
+        this._wordMark && this._wordMark.setAnimationConfig(animationConfig(null === (_b = Factory.getAnimationInKey("wordCloud3d")) || void 0 === _b ? void 0 : _b((() => {
+            var _a;
+            const srView = this.getCompiler().getVGrammarView(), width = srView.width() - padding.left || 0 - padding.right || 0, height = srView.height() - padding.top || 0 - padding.bottom || 0, r = Math.max(width, height) / 2;
             return {
                 center: {
                     x: r,
                     y: r,
-                    z: null !== (_e = this._spec.depth_3d) && void 0 !== _e ? _e : r
+                    z: null !== (_a = this._spec.depth_3d) && void 0 !== _a ? _a : r
                 },
                 r: r
             };
         })), userAnimationConfig(SeriesMarkNameEnum.word, this._spec, this._markAttributeContext))), 
-        this._fillingWordMark && this._fillingWordMark.setAnimationConfig(animationConfig(null === (_b = Factory.getAnimationInKey("wordCloud3d")) || void 0 === _b ? void 0 : _b((() => {
-            var _a, _b, _c, _d, _e;
-            const srView = this.getCompiler().getVGrammarView(), width = srView.width() - (null === (_a = this._padding) || void 0 === _a ? void 0 : _a.left) || 0 - (null === (_b = this._padding) || void 0 === _b ? void 0 : _b.right) || 0, height = srView.height() - (null === (_c = this._padding) || void 0 === _c ? void 0 : _c.top) || 0 - (null === (_d = this._padding) || void 0 === _d ? void 0 : _d.bottom) || 0, r = Math.max(width, height) / 2;
+        this._fillingWordMark && this._fillingWordMark.setAnimationConfig(animationConfig(null === (_c = Factory.getAnimationInKey("wordCloud3d")) || void 0 === _c ? void 0 : _c((() => {
+            var _a;
+            const srView = this.getCompiler().getVGrammarView(), width = srView.width() - padding.left || 0 - padding.right || 0, height = srView.height() - padding.top || 0 - padding.bottom || 0, r = Math.max(width, height) / 2;
             return {
                 center: {
                     x: r,
                     y: r,
-                    z: null !== (_e = this._spec.depth_3d) && void 0 !== _e ? _e : r
+                    z: null !== (_a = this._spec.depth_3d) && void 0 !== _a ? _a : r
                 },
                 r: r
             };
@@ -217,12 +93,12 @@ export class WordCloud3dSeries extends BaseWordCloudSeries {
 WordCloud3dSeries.type = SeriesTypeEnum.wordCloud3d;
 
 export const registerWordCloud3dSeries = () => {
-    registerWordCloudTransforms(), Factory.registerMark(TextMark.type, TextMark), Factory.registerSeries(WordCloud3dSeries.type, WordCloud3dSeries), 
-    registerWordCloud3dAnimation();
+    registerWordCloudTransforms(), registerTextMark(), registerWordCloud3dAnimation(), 
+    Factory.registerSeries(WordCloud3dSeries.type, WordCloud3dSeries);
 };
 
 export const registerWordCloudShape3dSeries = () => {
-    registerWordCloudShapeTransforms(), registerWordCloudTransforms(), Factory.registerMark(TextMark.type, TextMark), 
-    Factory.registerSeries(WordCloud3dSeries.type, WordCloud3dSeries), registerWordCloud3dAnimation();
+    registerWordCloudShapeTransforms(), registerWordCloudTransforms(), registerTextMark(), 
+    registerWordCloud3dAnimation(), Factory.registerSeries(WordCloud3dSeries.type, WordCloud3dSeries);
 };
 //# sourceMappingURL=word-cloud-3d.js.map

package/esm/series/word-cloud/word-cloud-3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/word-cloud/word-cloud-3d.ts"],"names":[],"mappings":"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","file":"word-cloud-3d.js","sourcesContent":["import { AttributeLevel, DEFAULT_DATA_KEY } from '../../constant';\nimport { TextMark, type ITextMark } from '../../mark/text';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport type { IWordCloud3dSeriesSpec } from './interface';\nimport type { Datum } from '../../typings';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { LinearScale } from '@visactor/vscale';\nimport { extent } from '@visactor/vgrammar-util';\nimport {\n  WORD_CLOUD_ANGLE,\n  WORD_CLOUD_FILLING_ANGLE,\n  WORD_CLOUD_TEXT,\n  WORD_CLOUD_WEIGHT\n} from '../../constant/word-cloud';\nimport type { ICompilableMark } from '../../compile/mark';\nimport { BaseWordCloudSeries } from './base';\nimport { Factory } from '../../core/factory';\nimport { registerWordCloud3dAnimation } from './animation';\nimport { registerWordCloudTransforms } from '@visactor/vgrammar-wordcloud';\nimport { registerWordCloudShapeTransforms } from '@visactor/vgrammar-wordcloud-shape';\n\nexport class WordCloud3dSeries<\n  T extends IWordCloud3dSeriesSpec = IWordCloud3dSeriesSpec\n> extends BaseWordCloudSeries<T> {\n  static readonly type: string = SeriesTypeEnum.wordCloud3d;\n  type = SeriesTypeEnum.wordCloud3d;\n\n  compile(): void {\n    super.compile();\n\n    const wordCloudTransforms: any[] = [];\n    const valueField = this._valueField;\n    const valueScale = new LinearScale();\n    const fontWeightRange = this._fontWeightRange;\n    const rotateAngles = this._rotateAngles;\n    const fontWeightField = this._fontWeightField;\n    const fillingRotateAngles = this._wordCloudShapeConfig.fillingRotateAngles;\n\n    // fontWeight处理\n    if (valueField) {\n      const [minValue, maxValue] = extent(this.getViewData()?.latestData.map((datum: any) => +datum[valueField]));\n      valueScale.domain([minValue, maxValue], true).range(fontWeightRange);\n      wordCloudTransforms.push({\n        type: 'map',\n        as: WORD_CLOUD_WEIGHT,\n        callback: (datum: any) => {\n          if (minValue === maxValue) {\n            return valueScale.scale(maxValue);\n          }\n          return valueScale.scale(datum[valueField]);\n        }\n      });\n    }\n\n    // rotateAngles处理\n    wordCloudTransforms.push({\n      type: 'map',\n      as: WORD_CLOUD_ANGLE,\n      callback: () => {\n        return rotateAngles[Math.floor(Math.random() * rotateAngles.length)];\n      }\n    });\n    wordCloudTransforms.push({\n      type: 'map',\n      as: WORD_CLOUD_FILLING_ANGLE,\n      callback: () => {\n        return fillingRotateAngles[Math.floor(Math.random() * fillingRotateAngles.length)];\n      }\n    });\n\n    // text fromat method 处理\n    if (this._spec.word?.formatMethod) {\n      wordCloudTransforms.push({\n        type: 'map',\n        as: WORD_CLOUD_TEXT,\n        callback: this._spec.word.formatMethod\n      });\n    }\n\n    const textField = this._spec.word?.formatMethod ? WORD_CLOUD_TEXT : this._nameField;\n\n    // 词云 transform\n    if (!this._isWordCloudShape) {\n      wordCloudTransforms.push({\n        type: 'wordcloud',\n        layoutType: this._wordCloudConfig.layoutMode,\n        size: [this._region.getLayoutRect().width, this._region.getLayoutRect().height],\n        shape: this._maskShape,\n        postProjection: this._spec.postProjection ?? 'StereographicProjection',\n        dataIndexKey: DEFAULT_DATA_KEY,\n        text: { field: textField },\n        fontSize: valueField ? { field: valueField } : this._fontSizeRange[0],\n        fontSizeRange: this._fontSizeRange,\n        padding: this._fontPadding,\n        rotate: { field: WORD_CLOUD_ANGLE },\n        fontFamily: this._fontFamilyField ?? this._spec.word?.style?.fontFamily ?? this._defaultFontFamily,\n        fontWeight: fontWeightField ? { field: fontWeightField } : valueField ? { field: WORD_CLOUD_WEIGHT } : null,\n        fontStyle: this._fontStyleField ?? this._spec.word?.style?.fontStyle,\n        depth_3d: this._spec.depth_3d,\n\n        randomVisible: this._random,\n        clip: this._wordCloudConfig.drawOutOfBound === 'clip',\n        shrink: this._wordCloudConfig.zoomToFit.shrink,\n        enlarge: this._wordCloudConfig.zoomToFit.enlarge,\n        minFontSize: this._wordCloudConfig.zoomToFit.fontSizeLimitMin,\n        progressiveTime: this._wordCloudConfig.progressiveTime,\n        progressiveStep: this._wordCloudConfig.progressiveStep\n      });\n      // 挂到mark的trnsform上，注册的时候决定transform的执行时机\n      (this._wordMark as ICompilableMark).getProduct().transform(wordCloudTransforms);\n    }\n    // 形状词云 transform\n    else {\n      wordCloudTransforms.push({\n        type: 'wordcloudShape',\n        size: [this._region.getLayoutRect().width, this._region.getLayoutRect().height],\n        shape: this._maskShape,\n        postProjection: this._spec.postProjection ?? 'StereographicProjection',\n        dataIndexKey: DEFAULT_DATA_KEY,\n        text: { field: textField },\n        fontSize: valueField ? { field: valueField } : this._fontSizeRange[0],\n        fontSizeRange: this._fontSizeRange,\n        padding: this._fontPadding,\n        rotateList: rotateAngles,\n        fontFamily: this._fontFamilyField ?? this._spec.word?.style?.fontFamily ?? this._defaultFontFamily,\n        fontWeight: fontWeightField ? { field: fontWeightField } : valueField ? { field: WORD_CLOUD_WEIGHT } : null,\n        fontStyle: this._fontStyleField ?? this._spec.word?.style?.fontStyle,\n        depth_3d: this._spec.depth_3d,\n\n        fillingFontFamily:\n          this._wordCloudShapeConfig?.fillingFontFamilyField ??\n          this._spec.word?.style?.fontFamily ??\n          this._defaultFontFamily,\n        fillingPadding: this._fillingFontPadding,\n        fillingFontStyle: this._wordCloudShapeConfig?.fillingFontStyleField ?? this._spec.word?.style?.fontStyle,\n        fillingFontWeight: this._wordCloudShapeConfig?.fillingFontWeightField ?? this._spec.word?.style?.fontWeight, // 填充词fontWeight默认不跟随valueField\n        fillingRotateList: fillingRotateAngles,\n\n        fillingTimes: this._wordCloudShapeConfig?.fillingTimes,\n        fillingXStep: this._wordCloudShapeConfig?.fillingXStep,\n        fillingYStep: this._wordCloudShapeConfig?.fillingYStep,\n        fillingXRatioStep: this._wordCloudShapeConfig?.fillingXRatioStep,\n        fillingYRatioStep: this._wordCloudShapeConfig?.fillingYRatioStep,\n        fillingInitialOpacity: this._wordCloudShapeConfig?.fillingInitialOpacity,\n        fillingDeltaOpacity: this._wordCloudShapeConfig?.fillingDeltaOpacity,\n        fillingInitialFontSize: this._wordCloudShapeConfig?.fillingInitialFontSize,\n        fillingDeltaFontSize: this._wordCloudShapeConfig?.fillingDeltaFontSize,\n\n        ratio: this._wordCloudShapeConfig?.ratio,\n        fillingRatio: this._wordCloudShapeConfig?.fillingRatio,\n        removeWhiteBorder: this._wordCloudShapeConfig?.removeWhiteBorder,\n        textLayoutTimes: this._wordCloudShapeConfig?.textLayoutTimes,\n        fontSizeShrinkFactor: this._wordCloudShapeConfig?.fontSizeShrinkFactor,\n        stepFactor: this._wordCloudShapeConfig?.stepFactor,\n        layoutMode: this._wordCloudShapeConfig?.layoutMode,\n        importantWordCount: this._wordCloudShapeConfig?.importantWordCount,\n        globalShinkLimit: this._wordCloudShapeConfig?.globalShinkLimit,\n        fontSizeEnlargeFactor: this._wordCloudShapeConfig?.fontSizeEnlargeFactor,\n        fillingDeltaFontSizeFactor: this._wordCloudShapeConfig?.fillingDeltaFontSizeFactor\n      });\n    }\n    // 把transform挂载到data的product上\n    this._data.getProduct().transform(wordCloudTransforms);\n  }\n\n  initMark(): void {\n    this._wordMark = this._createMark(BaseWordCloudSeries.mark.word, {\n      groupKey: this._seriesField,\n      support3d: true,\n      isSeriesMark: true\n    }) as ITextMark;\n    if (this._isWordCloudShape) {\n      this._fillingWordMark = this._createMark(BaseWordCloudSeries.mark.fillingWord, {\n        groupKey: this._seriesField,\n        support3d: true,\n        isSeriesMark: true\n      }) as ITextMark;\n    }\n  }\n\n  initMarkStyle() {\n    const wordMark = this._wordMark;\n    const fillingWordMark = this._fillingWordMark;\n    if (wordMark) {\n      this.setMarkStyle(\n        wordMark,\n        {\n          fill: this._colorHexField\n            ? (datum: Datum) => datum[this._colorHexField]\n            : this.getWordColorAttribute(this._seriesField, false),\n          text: (datum: Datum) => datum[this._nameField],\n          x: (datum: Datum) => datum.x,\n          y: (datum: Datum) => datum.y,\n          z: (datum: Datum) => datum.z ?? 0,\n          fontFamily: (datum: Datum) => datum.fontFamily,\n          fontSize: (datum: Datum) => datum.fontSize,\n          fontStyle: (datum: Datum) => datum.fontStyle,\n          fontWeight: (datum: Datum) => datum.fontWeight,\n          angle: (datum: Datum) => datum.angle,\n          visible: (datum: Datum) => !datum.isFillingWord\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      this.setMarkStyle(\n        wordMark,\n        {\n          fontFamily: this._spec.word?.style?.fontFamily ?? this._defaultFontFamily\n        },\n        'normal',\n        AttributeLevel.User_Mark\n      );\n    }\n    if (fillingWordMark) {\n      this.setMarkStyle(\n        fillingWordMark,\n        {\n          fill: this._wordCloudShapeConfig.fillingColorHexField\n            ? (datum: Datum) => datum[this._wordCloudShapeConfig.fillingColorHexField]\n            : this.getWordColorAttribute(this._wordCloudShapeConfig.fillingSeriesField, true),\n          text: (datum: Datum) => datum[this._nameField],\n          x: (datum: Datum) => datum.x,\n          y: (datum: Datum) => datum.y,\n          z: (datum: Datum) => datum.z ?? 0,\n          fontFamily: (datum: Datum) => datum.fontFamily,\n          fontSize: (datum: Datum) => datum.fontSize,\n          fontStyle: (datum: Datum) => datum.fontStyle,\n          fontWeight: (datum: Datum) => datum.fontWeight,\n          angle: (datum: Datum) => datum.angle,\n          visible: (datum: Datum) => datum.isFillingWord\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n      this.setMarkStyle(\n        fillingWordMark,\n        {\n          fontFamily: this._spec.word?.style?.fontFamily ?? this._defaultFontFamily\n        },\n        'normal',\n        AttributeLevel.User_Mark\n      );\n    }\n    this._trigger.registerMark(wordMark);\n    this._trigger.registerMark(fillingWordMark);\n  }\n\n  initAnimation() {\n    if (this._wordMark) {\n      this._wordMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('wordCloud3d')?.(() => {\n            const srView = this.getCompiler().getVGrammarView();\n            const width = srView.width() - this._padding?.left || 0 - this._padding?.right || 0;\n            const height = srView.height() - this._padding?.top || 0 - this._padding?.bottom || 0;\n            const r = Math.max(width, height) / 2;\n            return {\n              center: { x: r, y: r, z: this._spec.depth_3d ?? r },\n              r\n            };\n          }),\n          userAnimationConfig(SeriesMarkNameEnum.word, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n    if (this._fillingWordMark) {\n      this._fillingWordMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('wordCloud3d')?.(() => {\n            const srView = this.getCompiler().getVGrammarView();\n            const width = srView.width() - this._padding?.left || 0 - this._padding?.right || 0;\n            const height = srView.height() - this._padding?.top || 0 - this._padding?.bottom || 0;\n            const r = Math.max(width, height) / 2;\n            return {\n              center: { x: r, y: r, z: this._spec.depth_3d ?? r },\n              r\n            };\n          }),\n          userAnimationConfig(SeriesMarkNameEnum.fillingWord, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n  }\n}\n\nexport const registerWordCloud3dSeries = () => {\n  registerWordCloudTransforms();\n  Factory.registerMark(TextMark.type, TextMark);\n  Factory.registerSeries(WordCloud3dSeries.type, WordCloud3dSeries);\n  registerWordCloud3dAnimation();\n};\n\nexport const registerWordCloudShape3dSeries = () => {\n  registerWordCloudShapeTransforms();\n  registerWordCloud3dSeries();\n};\n"]}
+{"version":3,"sources":["../src/series/word-cloud/word-cloud-3d.ts"],"names":[],"mappings":"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","file":"word-cloud-3d.js","sourcesContent":["import { AttributeLevel } from '../../constant';\nimport { type ITextMark, registerTextMark } from '../../mark/text';\nimport { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';\nimport type { IWordCloud3dSeriesSpec } from './interface';\nimport type { Datum } from '../../typings';\nimport { animationConfig, userAnimationConfig } from '../../animation/utils';\nimport { BaseWordCloudSeries } from './base';\nimport { Factory } from '../../core/factory';\nimport { registerWordCloud3dAnimation } from './animation';\nimport { registerWordCloudTransforms } from '@visactor/vgrammar-wordcloud';\nimport { registerWordCloudShapeTransforms } from '@visactor/vgrammar-wordcloud-shape';\n\nexport class WordCloud3dSeries<\n  T extends IWordCloud3dSeriesSpec = IWordCloud3dSeriesSpec\n> extends BaseWordCloudSeries<T> {\n  static readonly type: string = SeriesTypeEnum.wordCloud3d;\n  type = SeriesTypeEnum.wordCloud3d;\n\n  protected _wordCloudTransformOption() {\n    return {\n      ...super._wordCloudTransformOption(),\n      postProjection: this._spec.postProjection ?? 'StereographicProjection',\n      depth_3d: this._spec.depth_3d\n    };\n  }\n\n  protected _wordCloudShapeTransformOption() {\n    return {\n      ...super._wordCloudShapeTransformOption(),\n      postProjection: this._spec.postProjection ?? 'StereographicProjection',\n      depth_3d: this._spec.depth_3d\n    };\n  }\n\n  initMark(): void {\n    this._wordMark = this._createMark(BaseWordCloudSeries.mark.word, {\n      groupKey: this._seriesField,\n      support3d: true,\n      isSeriesMark: true\n    }) as ITextMark;\n    if (this._isWordCloudShape) {\n      this._fillingWordMark = this._createMark(BaseWordCloudSeries.mark.fillingWord, {\n        groupKey: this._seriesField,\n        support3d: true,\n        isSeriesMark: true\n      }) as ITextMark;\n    }\n  }\n\n  initMarkStyle() {\n    super.initMarkStyle();\n    const wordMark = this._wordMark;\n    const fillingWordMark = this._fillingWordMark;\n    if (wordMark) {\n      this.setMarkStyle(\n        wordMark,\n        {\n          z: (datum: Datum) => datum.z ?? 0\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n    if (fillingWordMark) {\n      this.setMarkStyle(\n        fillingWordMark,\n        {\n          z: (datum: Datum) => datum.z ?? 0\n        },\n        'normal',\n        AttributeLevel.Series\n      );\n    }\n  }\n\n  initAnimation() {\n    const padding = this._padding ?? {};\n    if (this._wordMark) {\n      this._wordMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('wordCloud3d')?.(() => {\n            const srView = this.getCompiler().getVGrammarView();\n            const width = srView.width() - padding.left || 0 - padding.right || 0;\n            const height = srView.height() - padding.top || 0 - padding.bottom || 0;\n            const r = Math.max(width, height) / 2;\n            return {\n              center: { x: r, y: r, z: this._spec.depth_3d ?? r },\n              r\n            };\n          }),\n          userAnimationConfig(SeriesMarkNameEnum.word, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n    if (this._fillingWordMark) {\n      this._fillingWordMark.setAnimationConfig(\n        animationConfig(\n          Factory.getAnimationInKey('wordCloud3d')?.(() => {\n            const srView = this.getCompiler().getVGrammarView();\n            const width = srView.width() - padding.left || 0 - padding.right || 0;\n            const height = srView.height() - padding.top || 0 - padding.bottom || 0;\n            const r = Math.max(width, height) / 2;\n            return {\n              center: { x: r, y: r, z: this._spec.depth_3d ?? r },\n              r\n            };\n          }),\n          userAnimationConfig(SeriesMarkNameEnum.fillingWord, this._spec, this._markAttributeContext)\n        )\n      );\n    }\n  }\n}\n\nexport const registerWordCloud3dSeries = () => {\n  registerWordCloudTransforms();\n  registerTextMark();\n  registerWordCloud3dAnimation();\n  Factory.registerSeries(WordCloud3dSeries.type, WordCloud3dSeries);\n};\n\nexport const registerWordCloudShape3dSeries = () => {\n  registerWordCloudShapeTransforms();\n  registerWordCloud3dSeries();\n};\n"]}

package/esm/series/word-cloud/word-cloud.js

@@ -4,14 +4,14 @@ import { BaseWordCloudSeries } from "./base";
 
 import { Factory } from "../../core/factory";
 
-import { TextMark } from "../../mark";
-
 import { registerWordCloudAnimation } from "./animation";
 
 import { registerWordCloudTransforms } from "@visactor/vgrammar-wordcloud";
 
 import { registerWordCloudShapeTransforms } from "@visactor/vgrammar-wordcloud-shape";
 
+import { registerTextMark } from "../../mark/text";
+
 export class WordCloudSeries extends BaseWordCloudSeries {
     constructor() {
         super(...arguments), this.type = SeriesTypeEnum.wordCloud;
@@ -21,12 +21,12 @@ export class WordCloudSeries extends BaseWordCloudSeries {
 WordCloudSeries.type = SeriesTypeEnum.wordCloud;
 
 export const registerWordCloudSeries = () => {
-    registerWordCloudTransforms(), Factory.registerMark(TextMark.type, TextMark), Factory.registerSeries(WordCloudSeries.type, WordCloudSeries), 
-    registerWordCloudAnimation();
+    registerWordCloudTransforms(), registerTextMark(), registerWordCloudAnimation(), 
+    Factory.registerSeries(WordCloudSeries.type, WordCloudSeries);
 };
 
 export const registerWordCloudShapeSeries = () => {
-    registerWordCloudShapeTransforms(), registerWordCloudTransforms(), Factory.registerMark(TextMark.type, TextMark), 
-    Factory.registerSeries(WordCloudSeries.type, WordCloudSeries), registerWordCloudAnimation();
+    registerWordCloudShapeTransforms(), registerWordCloudTransforms(), registerTextMark(), 
+    registerWordCloudAnimation(), Factory.registerSeries(WordCloudSeries.type, WordCloudSeries);
 };
 //# sourceMappingURL=word-cloud.js.map

package/esm/series/word-cloud/word-cloud.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/series/word-cloud/word-cloud.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AAEtF,MAAM,OAAO,eAAuE,SAAQ,mBAAsB;IAAlH;;QAEE,SAAI,GAAG,cAAc,CAAC,SAAS,CAAC;IAClC,CAAC;;AAFiB,oBAAI,GAAW,cAAc,CAAC,SAAS,CAAC;AAI1D,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,2BAA2B,EAAE,CAAC;IAC9B,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,OAAO,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAC9D,0BAA0B,EAAE,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,EAAE;IAC/C,gCAAgC,EAAE,CAAC;IACnC,uBAAuB,EAAE,CAAC;AAC5B,CAAC,CAAC","file":"word-cloud.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { SeriesTypeEnum } from '../interface/type';\nimport type { IWordCloudSeriesSpec } from './interface';\nimport { BaseWordCloudSeries } from './base';\nimport { Factory } from '../../core/factory';\nimport { TextMark } from '../../mark';\nimport { registerWordCloudAnimation } from './animation';\nimport { registerWordCloudTransforms } from '@visactor/vgrammar-wordcloud';\nimport { registerWordCloudShapeTransforms } from '@visactor/vgrammar-wordcloud-shape';\n\nexport class WordCloudSeries<T extends IWordCloudSeriesSpec = IWordCloudSeriesSpec> extends BaseWordCloudSeries<T> {\n  static readonly type: string = SeriesTypeEnum.wordCloud;\n  type = SeriesTypeEnum.wordCloud;\n}\n\nexport const registerWordCloudSeries = () => {\n  registerWordCloudTransforms();\n  Factory.registerMark(TextMark.type, TextMark);\n  Factory.registerSeries(WordCloudSeries.type, WordCloudSeries);\n  registerWordCloudAnimation();\n};\n\nexport const registerWordCloudShapeSeries = () => {\n  registerWordCloudShapeTransforms();\n  registerWordCloudSeries();\n};\n"]}
+{"version":3,"sources":["../src/series/word-cloud/word-cloud.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,OAAO,eAAuE,SAAQ,mBAAsB;IAAlH;;QAEE,SAAI,GAAG,cAAc,CAAC,SAAS,CAAC;IAClC,CAAC;;AAFiB,oBAAI,GAAW,cAAc,CAAC,SAAS,CAAC;AAI1D,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE;IAC1C,2BAA2B,EAAE,CAAC;IAC9B,gBAAgB,EAAE,CAAC;IACnB,0BAA0B,EAAE,CAAC;IAC7B,OAAO,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAChE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,EAAE;IAC/C,gCAAgC,EAAE,CAAC;IACnC,uBAAuB,EAAE,CAAC;AAC5B,CAAC,CAAC","file":"word-cloud.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport { SeriesTypeEnum } from '../interface/type';\nimport type { IWordCloudSeriesSpec } from './interface';\nimport { BaseWordCloudSeries } from './base';\nimport { Factory } from '../../core/factory';\nimport { registerWordCloudAnimation } from './animation';\nimport { registerWordCloudTransforms } from '@visactor/vgrammar-wordcloud';\nimport { registerWordCloudShapeTransforms } from '@visactor/vgrammar-wordcloud-shape';\nimport { registerTextMark } from '../../mark/text';\n\nexport class WordCloudSeries<T extends IWordCloudSeriesSpec = IWordCloudSeriesSpec> extends BaseWordCloudSeries<T> {\n  static readonly type: string = SeriesTypeEnum.wordCloud;\n  type = SeriesTypeEnum.wordCloud;\n}\n\nexport const registerWordCloudSeries = () => {\n  registerWordCloudTransforms();\n  registerTextMark();\n  registerWordCloudAnimation();\n  Factory.registerSeries(WordCloudSeries.type, WordCloudSeries);\n};\n\nexport const registerWordCloudShapeSeries = () => {\n  registerWordCloudShapeTransforms();\n  registerWordCloudSeries();\n};\n"]}

package/esm/theme/builtin/common/component/axis/common-axis.js

@@ -38,7 +38,9 @@ export const commonAxis = {
     },
     tick: {
         visible: !0,
+        inside: !1,
         tickSize: THEME_CONSTANTS.axisTickSize,
+        alignWithLabel: !0,
         style: {
             lineWidth: 1,
             stroke: {
@@ -62,6 +64,7 @@ export const commonAxis = {
     },
     label: {
         visible: !0,
+        inside: !1,
         space: 10,
         style: {
             fontSize: THEME_CONSTANTS.l5FontSize,
@@ -75,6 +78,7 @@ export const commonAxis = {
     },
     title: {
         space: 10,
+        padding: 0,
         style: {
             fontSize: THEME_CONSTANTS.l5FontSize,
             lineHeight: THEME_CONSTANTS.l5LineHeight,

package/esm/theme/builtin/common/component/axis/common-axis.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/component/axis/common-axis.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,CAAC,MAAM,UAAU,GAAqB;IAC1C,UAAU,EAAE;QACV,OAAO,EAAE,IAAI;QACb,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,aAAa,EAAE,CAAC;SACjB;KACF;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,IAAI;QACb,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE;YACjD,aAAa,EAAE,CAAC;YAChB,QAAQ,EAAE,EAAE;SACb;KACF;IACD,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;QACd,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE;YACjD,aAAa,EAAE,CAAC;YAChB,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;SACjB;KACF;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,eAAe,CAAC,YAAY;QACtC,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,aAAa,EAAE,CAAC;SACjB;KACF;IACD,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,eAAe,CAAC,YAAY,GAAG,CAAC;QAC1C,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,aAAa,EAAE,CAAC;SACjB;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,EAAE;QACT,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;YACpD,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE,EAAE;QACT,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,UAAU,EAAE,eAAe,CAAC,YAAY;YAExC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;YACpD,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;CACF,CAAC","file":"common-axis.js","sourcesContent":["import type { IAxisCommonTheme } from '../../../../../component/axis';\nimport { THEME_CONSTANTS } from '../../constants';\n\nexport const commonAxis: IAxisCommonTheme = {\n  domainLine: {\n    visible: true,\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'axisDomainColor' },\n      strokeOpacity: 1\n    }\n  },\n  grid: {\n    visible: true,\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'axisGridColor' },\n      strokeOpacity: 1,\n      lineDash: []\n    }\n  },\n  subGrid: {\n    visible: false,\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'axisGridColor' },\n      strokeOpacity: 1,\n      lineDash: [4, 4]\n    }\n  },\n  tick: {\n    visible: true,\n    tickSize: THEME_CONSTANTS.axisTickSize,\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'axisDomainColor' },\n      strokeOpacity: 1\n    }\n  },\n  subTick: {\n    visible: false,\n    tickSize: THEME_CONSTANTS.axisTickSize / 2,\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'axisDomainColor' },\n      strokeOpacity: 1\n    }\n  },\n  label: {\n    visible: true,\n    space: 10,\n    style: {\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      fill: { type: 'palette', key: 'axisLabelFontColor' },\n      fontWeight: 'normal',\n      fillOpacity: 1\n    }\n  },\n  title: {\n    space: 10,\n    style: {\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      lineHeight: THEME_CONSTANTS.l5LineHeight,\n\n      fill: { type: 'palette', key: 'secondaryFontColor' },\n      fontWeight: 'normal',\n      fillOpacity: 1\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/component/axis/common-axis.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,CAAC,MAAM,UAAU,GAAqB;IAC1C,UAAU,EAAE;QACV,OAAO,EAAE,IAAI;QACb,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,aAAa,EAAE,CAAC;SACjB;KACF;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,IAAI;QACb,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE;YACjD,aAAa,EAAE,CAAC;YAChB,QAAQ,EAAE,EAAE;SACb;KACF;IACD,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;QACd,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE;YACjD,aAAa,EAAE,CAAC;YAChB,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;SACjB;KACF;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,eAAe,CAAC,YAAY;QACtC,cAAc,EAAE,IAAI;QACpB,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,aAAa,EAAE,CAAC;SACjB;KACF;IACD,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,eAAe,CAAC,YAAY,GAAG,CAAC;QAC1C,KAAK,EAAE;YACL,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,iBAAiB,EAAE;YACnD,aAAa,EAAE,CAAC;SACjB;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,EAAE;QACT,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;YACpD,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;IACD,KAAK,EAAE;QACL,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,CAAC;QACV,KAAK,EAAE;YACL,QAAQ,EAAE,eAAe,CAAC,UAAU;YACpC,UAAU,EAAE,eAAe,CAAC,YAAY;YACxC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,oBAAoB,EAAE;YACpD,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,CAAC;SACf;KACF;CACF,CAAC","file":"common-axis.js","sourcesContent":["import type { IAxisCommonTheme } from '../../../../../component/axis';\nimport { THEME_CONSTANTS } from '../../constants';\n\nexport const commonAxis: IAxisCommonTheme = {\n  domainLine: {\n    visible: true,\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'axisDomainColor' },\n      strokeOpacity: 1\n    }\n  },\n  grid: {\n    visible: true,\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'axisGridColor' },\n      strokeOpacity: 1,\n      lineDash: []\n    }\n  },\n  subGrid: {\n    visible: false,\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'axisGridColor' },\n      strokeOpacity: 1,\n      lineDash: [4, 4]\n    }\n  },\n  tick: {\n    visible: true,\n    inside: false,\n    tickSize: THEME_CONSTANTS.axisTickSize,\n    alignWithLabel: true,\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'axisDomainColor' },\n      strokeOpacity: 1\n    }\n  },\n  subTick: {\n    visible: false,\n    tickSize: THEME_CONSTANTS.axisTickSize / 2,\n    style: {\n      lineWidth: 1,\n      stroke: { type: 'palette', key: 'axisDomainColor' },\n      strokeOpacity: 1\n    }\n  },\n  label: {\n    visible: true,\n    inside: false,\n    space: 10,\n    style: {\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      fill: { type: 'palette', key: 'axisLabelFontColor' },\n      fontWeight: 'normal',\n      fillOpacity: 1\n    }\n  },\n  title: {\n    space: 10,\n    padding: 0,\n    style: {\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      lineHeight: THEME_CONSTANTS.l5LineHeight,\n      fill: { type: 'palette', key: 'secondaryFontColor' },\n      fontWeight: 'normal',\n      fillOpacity: 1\n    }\n  }\n};\n"]}

package/esm/theme/builtin/common/component/data-zoom.js

@@ -97,8 +97,7 @@ export const dataZoom = {
                 type: "palette",
                 key: "dataZoomHandleStrokeColor"
             },
-            lineWidth: 1,
-            zIndex: 100
+            lineWidth: 1
         }
     },
     endHandler: {
@@ -114,8 +113,7 @@ export const dataZoom = {
                 type: "palette",
                 key: "dataZoomHandleStrokeColor"
             },
-            lineWidth: 1,
-            zIndex: 100
+            lineWidth: 1
         }
     },
     startText: {

package/esm/theme/builtin/common/component/data-zoom.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/common/component/data-zoom.ts"],"names":[],"mappings":"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","file":"data-zoom.js","sourcesContent":["import type { IDataZoomTheme } from '../../../../component/data-zoom';\nimport { THEME_CONSTANTS } from '../constants';\n\n// eslint-disable-next-line max-len\nconst DataZoomHandlerSymbolType = `M-0.5-2.4h0.9c0.4,0,0.7,0.3,0.7,0.7v3.3c0,0.4-0.3,0.7-0.7,0.7h-0.9c-0.4,0-0.7-0.3-0.7-0.7v-3.3\nC-1.2-2-0.9-2.4-0.5-2.4z M-0.4-1.4L-0.4-1.4c0,0,0,0.1,0,0.1v2.6c0,0.1,0,0.1,0,0.1l0,0c0,0,0-0.1,0-0.1v-2.6\nC-0.4-1.4-0.4-1.4-0.4-1.4z M0.3-1.4L0.3-1.4c0,0,0,0.1,0,0.1v2.6c0,0.1,0,0.1,0,0.1l0,0c0,0,0-0.1,0-0.1v-2.6\nC0.3-1.4,0.3-1.4,0.3-1.4z;`;\n\nexport const dataZoom: IDataZoomTheme = {\n  padding: [12, 0],\n  showDetail: 'auto',\n  brushSelect: false,\n  middleHandler: {\n    visible: false,\n    background: {\n      size: 6,\n      style: {\n        stroke: { type: 'palette', key: 'dataZoomHandleStrokeColor' },\n        cornerRadius: 2\n      }\n    },\n    icon: {\n      style: {\n        size: 4,\n        fill: { type: 'palette', key: 'sliderHandleColor' },\n        stroke: { type: 'palette', key: 'dataZoomHandleStrokeColor' },\n        symbolType:\n          // eslint-disable-next-line max-len\n          'M 0.3 -0.5 C 0.41 -0.5 0.5 -0.41 0.5 -0.3 C 0.5 -0.3 0.5 0.3 0.5 0.3 C 0.5 0.41 0.41 0.5 0.3 0.5 C 0.3 0.5 -0.3 0.5 -0.3 0.5 C -0.41 0.5 -0.5 0.41 -0.5 0.3 C -0.5 0.3 -0.5 -0.3 -0.5 -0.3 C -0.5 -0.41 -0.41 -0.5 -0.3 -0.5 C -0.3 -0.5 0.3 -0.5 0.3 -0.5 Z',\n        lineWidth: 0.5\n      }\n    }\n  },\n  background: {\n    size: 20,\n    style: {\n      fill: { type: 'palette', key: 'sliderRailColor' },\n      lineWidth: 0\n    }\n  },\n  selectedBackground: {\n    style: {\n      fill: { type: 'palette', key: 'sliderTrackColor' },\n      fillOpacity: 0.1,\n      outerBorder: {\n        stroke: { type: 'palette', key: 'sliderTrackColor' },\n        strokeOpacity: 0.2,\n        distance: -0.5,\n        lineWidth: 1\n      }\n    }\n  },\n  selectedBackgroundChart: {\n    area: {\n      style: {\n        visible: false,\n        stroke: false,\n        fill: { type: 'palette', key: 'dataZoomChartColor' }\n      }\n    },\n    line: {\n      style: {\n        visible: false,\n        stroke: { type: 'palette', key: 'dataZoomChartColor' },\n        lineWidth: 1\n      }\n    }\n  },\n  startHandler: {\n    style: {\n      symbolType: DataZoomHandlerSymbolType,\n      fill: { type: 'palette', key: 'sliderHandleColor' },\n      scaleX: 1.2,\n      scaleY: 1.2,\n      stroke: { type: 'palette', key: 'dataZoomHandleStrokeColor' },\n      lineWidth: 1,\n      zIndex: 100\n    }\n  },\n  endHandler: {\n    style: {\n      symbolType: DataZoomHandlerSymbolType,\n      fill: { type: 'palette', key: 'sliderHandleColor' },\n      scaleX: 1.2,\n      scaleY: 1.2,\n      stroke: { type: 'palette', key: 'dataZoomHandleStrokeColor' },\n      lineWidth: 1,\n      zIndex: 100\n    }\n  },\n  startText: {\n    padding: 8,\n    style: {\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      lineHeight: THEME_CONSTANTS.l5LineHeight,\n\n      fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' }\n    }\n  },\n  endText: {\n    padding: 8,\n    style: {\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      lineHeight: THEME_CONSTANTS.l5LineHeight,\n\n      fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' }\n    }\n  },\n  backgroundChart: {\n    area: {\n      style: {\n        stroke: false,\n        fill: { type: 'palette', key: 'dataZoomChartColor' }\n      }\n    },\n    line: {\n      style: {\n        stroke: { type: 'palette', key: 'dataZoomChartColor' },\n        lineWidth: 1\n      }\n    }\n  }\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/common/component/data-zoom.ts"],"names":[],"mappings":"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","file":"data-zoom.js","sourcesContent":["import type { IDataZoomTheme } from '../../../../component/data-zoom';\nimport { THEME_CONSTANTS } from '../constants';\n\n// eslint-disable-next-line max-len\nconst DataZoomHandlerSymbolType = `M-0.5-2.4h0.9c0.4,0,0.7,0.3,0.7,0.7v3.3c0,0.4-0.3,0.7-0.7,0.7h-0.9c-0.4,0-0.7-0.3-0.7-0.7v-3.3\nC-1.2-2-0.9-2.4-0.5-2.4z M-0.4-1.4L-0.4-1.4c0,0,0,0.1,0,0.1v2.6c0,0.1,0,0.1,0,0.1l0,0c0,0,0-0.1,0-0.1v-2.6\nC-0.4-1.4-0.4-1.4-0.4-1.4z M0.3-1.4L0.3-1.4c0,0,0,0.1,0,0.1v2.6c0,0.1,0,0.1,0,0.1l0,0c0,0,0-0.1,0-0.1v-2.6\nC0.3-1.4,0.3-1.4,0.3-1.4z;`;\n\nexport const dataZoom: IDataZoomTheme = {\n  padding: [12, 0],\n  showDetail: 'auto',\n  brushSelect: false,\n  middleHandler: {\n    visible: false,\n    background: {\n      size: 6,\n      style: {\n        stroke: { type: 'palette', key: 'dataZoomHandleStrokeColor' },\n        cornerRadius: 2\n      }\n    },\n    icon: {\n      style: {\n        size: 4,\n        fill: { type: 'palette', key: 'sliderHandleColor' },\n        stroke: { type: 'palette', key: 'dataZoomHandleStrokeColor' },\n        symbolType:\n          // eslint-disable-next-line max-len\n          'M 0.3 -0.5 C 0.41 -0.5 0.5 -0.41 0.5 -0.3 C 0.5 -0.3 0.5 0.3 0.5 0.3 C 0.5 0.41 0.41 0.5 0.3 0.5 C 0.3 0.5 -0.3 0.5 -0.3 0.5 C -0.41 0.5 -0.5 0.41 -0.5 0.3 C -0.5 0.3 -0.5 -0.3 -0.5 -0.3 C -0.5 -0.41 -0.41 -0.5 -0.3 -0.5 C -0.3 -0.5 0.3 -0.5 0.3 -0.5 Z',\n        lineWidth: 0.5\n      }\n    }\n  },\n  background: {\n    size: 20,\n    style: {\n      fill: { type: 'palette', key: 'sliderRailColor' },\n      lineWidth: 0\n    }\n  },\n  selectedBackground: {\n    style: {\n      fill: { type: 'palette', key: 'sliderTrackColor' },\n      fillOpacity: 0.1,\n      outerBorder: {\n        stroke: { type: 'palette', key: 'sliderTrackColor' },\n        strokeOpacity: 0.2,\n        distance: -0.5,\n        lineWidth: 1\n      }\n    }\n  },\n  selectedBackgroundChart: {\n    area: {\n      style: {\n        visible: false,\n        stroke: false,\n        fill: { type: 'palette', key: 'dataZoomChartColor' }\n      }\n    },\n    line: {\n      style: {\n        visible: false,\n        stroke: { type: 'palette', key: 'dataZoomChartColor' },\n        lineWidth: 1\n      }\n    }\n  },\n  startHandler: {\n    style: {\n      symbolType: DataZoomHandlerSymbolType,\n      fill: { type: 'palette', key: 'sliderHandleColor' },\n      scaleX: 1.2,\n      scaleY: 1.2,\n      stroke: { type: 'palette', key: 'dataZoomHandleStrokeColor' },\n      lineWidth: 1\n    }\n  },\n  endHandler: {\n    style: {\n      symbolType: DataZoomHandlerSymbolType,\n      fill: { type: 'palette', key: 'sliderHandleColor' },\n      scaleX: 1.2,\n      scaleY: 1.2,\n      stroke: { type: 'palette', key: 'dataZoomHandleStrokeColor' },\n      lineWidth: 1\n    }\n  },\n  startText: {\n    padding: 8,\n    style: {\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      lineHeight: THEME_CONSTANTS.l5LineHeight,\n\n      fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' }\n    }\n  },\n  endText: {\n    padding: 8,\n    style: {\n      fontSize: THEME_CONSTANTS.l5FontSize,\n      lineHeight: THEME_CONSTANTS.l5LineHeight,\n\n      fill: { type: 'palette', key: 'secondaryFontColor', default: '#89909d' }\n    }\n  },\n  backgroundChart: {\n    area: {\n      style: {\n        stroke: false,\n        fill: { type: 'palette', key: 'dataZoomChartColor' }\n      }\n    },\n    line: {\n      style: {\n        stroke: { type: 'palette', key: 'dataZoomChartColor' },\n        lineWidth: 1\n      }\n    }\n  }\n};\n"]}

package/esm/theme/builtin/index.d.ts

@@ -1,6 +1,5 @@
 export * from './light';
 export * from './dark';
-export * from './common/legacy';
 import type { ITheme } from '../interface';
 export declare const builtinThemes: Record<string, ITheme>;
 export declare const defaultThemeName: string;

package/esm/theme/builtin/index.js

@@ -2,8 +2,6 @@ export * from "./light";
 
 export * from "./dark";
 
-export * from "./common/legacy";
-
 import { isString } from "@visactor/vutils";
 
 import { mergeTheme } from "../../util/spec/merge-theme";

package/esm/theme/builtin/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/theme/builtin/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["export * from './light';\nexport * from './dark';\n/** 历史弃用主题 */\nexport * from './common/legacy';\n\nimport { isString } from '@visactor/vutils';\nimport { mergeTheme } from '../../util/spec/merge-theme';\nimport type { ITheme } from '../interface';\nimport { lightTheme } from './light';\n// import { darkTheme } from './dark';\nimport { preprocessTheme } from '../../util/spec/preprocess';\n\n/** 声明内置主题(含 token 未转换) */\nexport const builtinThemes: Record<string, ITheme> = {\n  [lightTheme.name]: lightTheme\n  // [darkTheme.name]: darkTheme\n};\n/** 默认主题名称 */\nexport const defaultThemeName = lightTheme.name;\n\n/** 全局主题 map (包含用户新注册的主题)(含 token 未转换) */\nexport const themes: Map<string, ITheme> = new Map(Object.keys(builtinThemes).map(key => [key, builtinThemes[key]]));\n\n/** 全局已将 token 转换的主题 map (包含用户新注册的主题) */\nconst transformedThemes: Map<string, ITheme> = new Map(\n  Object.keys(builtinThemes).map(key => [key, preprocessTheme(builtinThemes[key], builtinThemes[key].colorScheme)])\n);\n\n/** 主题 map 中的元素是否 merge 过默认主题 (非默认主题的其他内置主题没有 merge 过默认主题) */\nexport const hasThemeMerged: Map<string, boolean> = new Map(\n  Object.keys(builtinThemes).map(key => [key, key === defaultThemeName])\n);\n\n/** 注册主题 */\nexport const registerTheme = (name: string, theme: Partial<ITheme>) => {\n  if (!name) {\n    return;\n  }\n  // 所有主题基于默认主题扩展，保证基础值\n  const mergedTheme = getMergedTheme(theme);\n  themes.set(name, mergedTheme);\n  transformedThemes.set(name, preprocessTheme(mergedTheme, mergedTheme.colorScheme));\n  hasThemeMerged.set(name, true);\n};\n/**\n * 获取注册过的主题\n * @param name 主题名称\n * @param transformed 是否获取 token 转换后的主题\n * @returns 返回主题\n */\nexport const getTheme = (name: string = defaultThemeName, transformed: boolean = false) => {\n  if (hasThemeMerged.has(name) && !hasThemeMerged.get(name)) {\n    // 重新 merge 默认主题\n    registerTheme(name, themes.get(name));\n  }\n\n  if (transformed) {\n    return transformedThemes.get(name);\n  }\n\n  return themes.get(name);\n};\n\n/** 删除主题 */\nexport const removeTheme = (name: string): boolean => {\n  return themes.delete(name) && transformedThemes.delete(name) && hasThemeMerged.delete(name);\n};\n\n/** 主题是否存在 */\nexport const themeExist = (name: any) => {\n  if (!isString(name)) {\n    return false;\n  }\n  return themes.has(name);\n};\n\n/** 使新主题基于默认主题扩展，保证基础值 */\nexport const getMergedTheme = (theme: Partial<ITheme>): ITheme => {\n  const baseTheme = getTheme(defaultThemeName);\n  return mergeTheme({}, baseTheme, theme);\n};\n"]}
+{"version":3,"sources":["../src/theme/builtin/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["export * from './light';\nexport * from './dark';\n\nimport { isString } from '@visactor/vutils';\nimport { mergeTheme } from '../../util/spec/merge-theme';\nimport type { ITheme } from '../interface';\nimport { lightTheme } from './light';\n// import { darkTheme } from './dark';\nimport { preprocessTheme } from '../../util/spec/preprocess';\n\n/** 声明内置主题(含 token 未转换) */\nexport const builtinThemes: Record<string, ITheme> = {\n  [lightTheme.name]: lightTheme\n  // [darkTheme.name]: darkTheme\n};\n/** 默认主题名称 */\nexport const defaultThemeName = lightTheme.name;\n\n/** 全局主题 map (包含用户新注册的主题)(含 token 未转换) */\nexport const themes: Map<string, ITheme> = new Map(Object.keys(builtinThemes).map(key => [key, builtinThemes[key]]));\n\n/** 全局已将 token 转换的主题 map (包含用户新注册的主题) */\nconst transformedThemes: Map<string, ITheme> = new Map(\n  Object.keys(builtinThemes).map(key => [key, preprocessTheme(builtinThemes[key], builtinThemes[key].colorScheme)])\n);\n\n/** 主题 map 中的元素是否 merge 过默认主题 (非默认主题的其他内置主题没有 merge 过默认主题) */\nexport const hasThemeMerged: Map<string, boolean> = new Map(\n  Object.keys(builtinThemes).map(key => [key, key === defaultThemeName])\n);\n\n/** 注册主题 */\nexport const registerTheme = (name: string, theme: Partial<ITheme>) => {\n  if (!name) {\n    return;\n  }\n  // 所有主题基于默认主题扩展，保证基础值\n  const mergedTheme = getMergedTheme(theme);\n  themes.set(name, mergedTheme);\n  transformedThemes.set(name, preprocessTheme(mergedTheme, mergedTheme.colorScheme));\n  hasThemeMerged.set(name, true);\n};\n/**\n * 获取注册过的主题\n * @param name 主题名称\n * @param transformed 是否获取 token 转换后的主题\n * @returns 返回主题\n */\nexport const getTheme = (name: string = defaultThemeName, transformed: boolean = false) => {\n  if (hasThemeMerged.has(name) && !hasThemeMerged.get(name)) {\n    // 重新 merge 默认主题\n    registerTheme(name, themes.get(name));\n  }\n\n  if (transformed) {\n    return transformedThemes.get(name);\n  }\n\n  return themes.get(name);\n};\n\n/** 删除主题 */\nexport const removeTheme = (name: string): boolean => {\n  return themes.delete(name) && transformedThemes.delete(name) && hasThemeMerged.delete(name);\n};\n\n/** 主题是否存在 */\nexport const themeExist = (name: any) => {\n  if (!isString(name)) {\n    return false;\n  }\n  return themes.has(name);\n};\n\n/** 使新主题基于默认主题扩展，保证基础值 */\nexport const getMergedTheme = (theme: Partial<ITheme>): ITheme => {\n  const baseTheme = getTheme(defaultThemeName);\n  return mergeTheme({}, baseTheme, theme);\n};\n"]}

package/esm/typings/spec/chart.d.ts

@@ -24,6 +24,7 @@ import type { ITreemapChartSpec } from '../../chart/treemap';
 import type { IWaterfallChartSpec } from '../../chart/waterfall';
 import type { ICorrelationChartSpec } from '../../chart/correlation';
 import type { IWordCloudChartSpec, IWordCloud3dChartSpec } from '../../chart/word-cloud';
+import type { IChartSpec } from './common';
 export interface ChartSpecMap {
     readonly common: ICommonChartSpec;
     readonly area: IAreaChartSpec;
@@ -58,4 +59,4 @@ export interface ChartSpecMap {
     readonly heatmap: IHeatmapChartSpec;
     readonly correlation: ICorrelationChartSpec;
 }
-export type ISpec = ChartSpecMap[keyof ChartSpecMap];
+export type ISpec = ChartSpecMap[keyof ChartSpecMap] | IChartSpec;

package/esm/typings/spec/chart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/typings/spec/chart.ts"],"names":[],"mappings":"","file":"chart.js","sourcesContent":["import type { IAreaChartSpec } from '../../chart/area';\nimport type { IBarChartSpec, IBar3dChartSpec } from '../../chart/bar';\nimport type { IBoxPlotChartSpec } from '../../chart/box-plot';\nimport type { ICirclePackingChartSpec } from '../../chart/circle-packing';\nimport type { ICommonChartSpec } from '../../chart/common';\nimport type { IFunnelChartSpec, IFunnel3dChartSpec } from '../../chart/funnel';\nimport type { IGaugeChartSpec } from '../../chart/gauge';\nimport type { IHeatmapChartSpec } from '../../chart/heatmap';\nimport type { IHistogramChartSpec, IHistogram3dChartSpec } from '../../chart/histogram';\nimport type { ILineChartSpec } from '../../chart/line';\nimport type { IMapChartSpec } from '../../chart/map';\nimport type { IPieChartSpec, IPie3dChartSpec } from '../../chart/pie';\nimport type { ICircularProgressChartSpec } from '../../chart/progress/circular';\nimport type { ILinearProgressChartSpec } from '../../chart/progress/linear';\nimport type { IRadarChartSpec } from '../../chart/radar';\nimport type { IRangeAreaChartSpec } from '../../chart/range-area';\nimport type { IRangeColumnChartSpec, IRangeColumn3dChartSpec } from '../../chart/range-column';\nimport type { IRoseChartSpec } from '../../chart/rose';\nimport type { ISankeyChartSpec } from '../../chart/sankey';\nimport type { IScatterChartSpec } from '../../chart/scatter';\nimport type { ISequenceChartSpec } from '../../chart/sequence';\nimport type { ISunburstChartSpec } from '../../chart/sunburst';\nimport type { ITreemapChartSpec } from '../../chart/treemap';\nimport type { IWaterfallChartSpec } from '../../chart/waterfall';\nimport type { ICorrelationChartSpec } from '../../chart/correlation';\nimport type { IWordCloudChartSpec, IWordCloud3dChartSpec } from '../../chart/word-cloud';\n\nexport interface ChartSpecMap {\n  readonly common: ICommonChartSpec;\n  readonly area: IAreaChartSpec;\n  readonly line: ILineChartSpec;\n  readonly bar: IBarChartSpec;\n  readonly bar3d: IBar3dChartSpec;\n  readonly histogram: IHistogramChartSpec;\n  readonly histogram3d: IHistogram3dChartSpec;\n  readonly rangeColumn: IRangeColumnChartSpec;\n  readonly rangeColumn3d: IRangeColumn3dChartSpec;\n  readonly rangeArea: IRangeAreaChartSpec;\n  readonly map: IMapChartSpec;\n  readonly pie: IPieChartSpec;\n  readonly pie3d: IPie3dChartSpec;\n  readonly radar: IRadarChartSpec;\n  readonly rose: IRoseChartSpec;\n  readonly scatter: IScatterChartSpec;\n  readonly sequence: ISequenceChartSpec;\n  readonly circleProgress: ICircularProgressChartSpec;\n  readonly linearProgress: ILinearProgressChartSpec;\n  readonly wordCloud: IWordCloudChartSpec;\n  readonly wordCloud3d: IWordCloud3dChartSpec;\n  readonly funnel: IFunnelChartSpec;\n  readonly funnel3d: IFunnel3dChartSpec;\n  readonly waterfall: IWaterfallChartSpec;\n  readonly boxplot: IBoxPlotChartSpec;\n  readonly gauge: IGaugeChartSpec;\n  readonly sankey: ISankeyChartSpec;\n  readonly treemap: ITreemapChartSpec;\n  readonly sunburst: ISunburstChartSpec;\n  readonly circlePacking: ICirclePackingChartSpec;\n  readonly heatmap: IHeatmapChartSpec;\n  readonly correlation: ICorrelationChartSpec;\n}\n\nexport type ISpec = ChartSpecMap[keyof ChartSpecMap];\n"]}
+{"version":3,"sources":["../src/typings/spec/chart.ts"],"names":[],"mappings":"","file":"chart.js","sourcesContent":["import type { IAreaChartSpec } from '../../chart/area';\nimport type { IBarChartSpec, IBar3dChartSpec } from '../../chart/bar';\nimport type { IBoxPlotChartSpec } from '../../chart/box-plot';\nimport type { ICirclePackingChartSpec } from '../../chart/circle-packing';\nimport type { ICommonChartSpec } from '../../chart/common';\nimport type { IFunnelChartSpec, IFunnel3dChartSpec } from '../../chart/funnel';\nimport type { IGaugeChartSpec } from '../../chart/gauge';\nimport type { IHeatmapChartSpec } from '../../chart/heatmap';\nimport type { IHistogramChartSpec, IHistogram3dChartSpec } from '../../chart/histogram';\nimport type { ILineChartSpec } from '../../chart/line';\nimport type { IMapChartSpec } from '../../chart/map';\nimport type { IPieChartSpec, IPie3dChartSpec } from '../../chart/pie';\nimport type { ICircularProgressChartSpec } from '../../chart/progress/circular';\nimport type { ILinearProgressChartSpec } from '../../chart/progress/linear';\nimport type { IRadarChartSpec } from '../../chart/radar';\nimport type { IRangeAreaChartSpec } from '../../chart/range-area';\nimport type { IRangeColumnChartSpec, IRangeColumn3dChartSpec } from '../../chart/range-column';\nimport type { IRoseChartSpec } from '../../chart/rose';\nimport type { ISankeyChartSpec } from '../../chart/sankey';\nimport type { IScatterChartSpec } from '../../chart/scatter';\nimport type { ISequenceChartSpec } from '../../chart/sequence';\nimport type { ISunburstChartSpec } from '../../chart/sunburst';\nimport type { ITreemapChartSpec } from '../../chart/treemap';\nimport type { IWaterfallChartSpec } from '../../chart/waterfall';\nimport type { ICorrelationChartSpec } from '../../chart/correlation';\nimport type { IWordCloudChartSpec, IWordCloud3dChartSpec } from '../../chart/word-cloud';\nimport type { IChartSpec } from './common';\n\nexport interface ChartSpecMap {\n  readonly common: ICommonChartSpec;\n  readonly area: IAreaChartSpec;\n  readonly line: ILineChartSpec;\n  readonly bar: IBarChartSpec;\n  readonly bar3d: IBar3dChartSpec;\n  readonly histogram: IHistogramChartSpec;\n  readonly histogram3d: IHistogram3dChartSpec;\n  readonly rangeColumn: IRangeColumnChartSpec;\n  readonly rangeColumn3d: IRangeColumn3dChartSpec;\n  readonly rangeArea: IRangeAreaChartSpec;\n  readonly map: IMapChartSpec;\n  readonly pie: IPieChartSpec;\n  readonly pie3d: IPie3dChartSpec;\n  readonly radar: IRadarChartSpec;\n  readonly rose: IRoseChartSpec;\n  readonly scatter: IScatterChartSpec;\n  readonly sequence: ISequenceChartSpec;\n  readonly circleProgress: ICircularProgressChartSpec;\n  readonly linearProgress: ILinearProgressChartSpec;\n  readonly wordCloud: IWordCloudChartSpec;\n  readonly wordCloud3d: IWordCloud3dChartSpec;\n  readonly funnel: IFunnelChartSpec;\n  readonly funnel3d: IFunnel3dChartSpec;\n  readonly waterfall: IWaterfallChartSpec;\n  readonly boxplot: IBoxPlotChartSpec;\n  readonly gauge: IGaugeChartSpec;\n  readonly sankey: ISankeyChartSpec;\n  readonly treemap: ITreemapChartSpec;\n  readonly sunburst: ISunburstChartSpec;\n  readonly circlePacking: ICirclePackingChartSpec;\n  readonly heatmap: IHeatmapChartSpec;\n  readonly correlation: ICorrelationChartSpec;\n}\n\nexport type ISpec = ChartSpecMap[keyof ChartSpecMap] | IChartSpec;\n"]}

package/esm/util/model.d.ts

@@ -2,3 +2,4 @@ import type { IRegion, ISeriesFilter } from '../region/interface';
 import type { ISeries } from '../series/interface';
 export declare function eachSeries(regions: IRegion[], callback: (s: ISeries) => boolean | void, filter?: ISeriesFilter): boolean;
 export declare function getSeries(regions: IRegion[], filter?: ISeriesFilter): ISeries[];
+export declare const getFirstSeries: (regions: IRegion[], coordinateType?: 'cartesian' | 'polar') => ISeries;

package/esm/util/model.js

@@ -12,4 +12,16 @@ export function getSeries(regions, filter) {
     for (const r of regions) for (const s of r.getSeries(filter)) result.push(s);
     return result;
 }
+
+export const getFirstSeries = (regions, coordinateType) => {
+    for (let i = 0; i < regions.length; i++) {
+        const series = regions[i].getSeries();
+        for (let j = 0; j < series.length; j++) {
+            const s = series[j];
+            if (coordinateType && s && s.coordinate === coordinateType) return s;
+            if (!coordinateType && s) return s;
+        }
+    }
+    return null;
+};
 //# sourceMappingURL=model.js.map

package/esm/util/model.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,MAAM,UAAU,UAAU,CAAC,OAAkB,EAAE,QAAwC,EAAE,MAAsB;IAC7G,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE;QACpC,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;YACvB,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;gBACnC,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAChC,IAAI,IAAI,EAAE;oBACR,OAAO,IAAI,CAAC;iBACb;aACF;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAkB,EAAE,MAAsB;IAClE,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAChB;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","file":"model.js","sourcesContent":["import type { IRegion, ISeriesFilter } from '../region/interface';\nimport type { ISeries } from '../series/interface';\nimport { isFunction } from './type';\n\nexport function eachSeries(regions: IRegion[], callback: (s: ISeries) => boolean | void, filter?: ISeriesFilter) {\n  let flag = false;\n  if (callback && isFunction(callback)) {\n    for (const r of regions) {\n      for (const s of r.getSeries(filter)) {\n        flag = !!callback.call(null, s);\n        if (flag) {\n          return flag;\n        }\n      }\n    }\n  }\n  return flag;\n}\n\nexport function getSeries(regions: IRegion[], filter?: ISeriesFilter) {\n  const result: ISeries[] = [];\n  for (const r of regions) {\n    for (const s of r.getSeries(filter)) {\n      result.push(s);\n    }\n  }\n  return result;\n}\n"]}
+{"version":3,"sources":["../src/util/model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,MAAM,UAAU,UAAU,CAAC,OAAkB,EAAE,QAAwC,EAAE,MAAsB;IAC7G,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE;QACpC,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;YACvB,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;gBACnC,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAChC,IAAI,IAAI,EAAE;oBACR,OAAO,IAAI,CAAC;iBACb;aACF;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAkB,EAAE,MAAsB;IAClE,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAChB;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAkB,EAAE,cAAsC,EAAE,EAAE;IAC3F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACvC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC;QAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,cAAc,IAAI,CAAC,IAAI,CAAC,CAAC,UAAU,KAAK,cAAc,EAAE;gBAC1D,OAAO,CAAC,CAAC;aACV;YACD,IAAI,CAAC,cAAc,IAAI,CAAC,EAAE;gBACxB,OAAO,CAAC,CAAC;aACV;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC","file":"model.js","sourcesContent":["import type { IChart } from '../chart/interface';\nimport type { IRegion, ISeriesFilter } from '../region/interface';\nimport type { ISeries } from '../series/interface';\nimport { isFunction } from './type';\n\nexport function eachSeries(regions: IRegion[], callback: (s: ISeries) => boolean | void, filter?: ISeriesFilter) {\n  let flag = false;\n  if (callback && isFunction(callback)) {\n    for (const r of regions) {\n      for (const s of r.getSeries(filter)) {\n        flag = !!callback.call(null, s);\n        if (flag) {\n          return flag;\n        }\n      }\n    }\n  }\n  return flag;\n}\n\nexport function getSeries(regions: IRegion[], filter?: ISeriesFilter) {\n  const result: ISeries[] = [];\n  for (const r of regions) {\n    for (const s of r.getSeries(filter)) {\n      result.push(s);\n    }\n  }\n  return result;\n}\n\nexport const getFirstSeries = (regions: IRegion[], coordinateType?: 'cartesian' | 'polar') => {\n  for (let i = 0; i < regions.length; i++) {\n    const r = regions[i];\n    const series = r.getSeries();\n    for (let j = 0; j < series.length; j++) {\n      const s = series[j];\n      if (coordinateType && s && s.coordinate === coordinateType) {\n        return s;\n      }\n      if (!coordinateType && s) {\n        return s;\n      }\n    }\n  }\n  return null;\n};\n"]}

package/esm/util/space.d.ts

@@ -1,10 +1,8 @@
 import { type IBoundsLike } from '@visactor/vutils';
-import type { IPadding, IRect } from '../typings/space';
+import type { IPadding } from '../typings/space';
 import type { IPoint } from '../typings/coordinate';
 import type { ILayoutNumber, ILayoutRect, IPercent, IPercentOffset, ILayoutPaddingSpec, ILayoutOrientPadding } from '../typings/layout';
 export declare function isValidOrient(orient: string): boolean;
-export declare function isPointInRect(point: IPoint, rect: IRect): boolean;
-export declare function isPointInTriangle(point: IPoint, v1: IPoint, v2: IPoint, v3: IPoint): boolean;
 export declare function isPercent(v: any): v is IPercent;
 export declare function isPercentOffset(v: any): v is IPercentOffset;
 export declare function calcLayoutNumber(v: ILayoutNumber | undefined, size: number, callOp?: ILayoutRect): number;