@visactor/vchart 2.0.15 → 2.0.16

package/build/index.js

@@ -61806,7 +61806,7 @@
         });
     };
 
-    const version = "2.0.15";
+    const version = "2.0.16";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -81374,6 +81374,41 @@
         'rect'
     ];
 
+    class WordMeasureCache {
+        constructor(maxSize = 1000) {
+            this._map = new Map();
+            this._maxSize = maxSize;
+        }
+        get(key) {
+            const v = this._map.get(key);
+            if (!v) {
+                return undefined;
+            }
+            this._map.delete(key);
+            this._map.set(key, v);
+            return v;
+        }
+        set(key, value) {
+            if (this._map.has(key)) {
+                this._map.set(key, value);
+                return;
+            }
+            if (this._map.size >= this._maxSize) {
+                const oldest = this._map.keys().next().value;
+                if (oldest !== undefined) {
+                    this._map.delete(oldest);
+                }
+            }
+            this._map.set(key, value);
+        }
+        clear() {
+            this._map.clear();
+        }
+        size() {
+            return this._map.size;
+        }
+    }
+
     const WORD_CLOUD_TEXT = `${PREFIX}_WORD_CLOUD_TEXT`;
 
     const wordCloudSeriesMark = Object.assign(Object.assign({}, baseSeriesMark), { ["word"]: { name: "word", type: "text" }, ["fillingWord"]: { name: "fillingWord", type: "text" }, ["wordMask"]: { name: "wordMask", type: "rect" } });
@@ -81465,11 +81500,16 @@
                 !SHAPE_TYPE.includes(this._maskShape) &&
                     !['fast', 'grid', 'cloud'].includes(this._wordCloudConfig.layoutMode);
             this._defaultFontFamily = this._option.getTheme('fontFamily');
+            if (!this._wordMeasureCache) {
+                this._wordMeasureCache = new WordMeasureCache(1000);
+            }
         }
         initData() {
             var _a, _b;
             super.initData();
             (_b = (_a = this.getViewData()) === null || _a === void 0 ? void 0 : _a.target) === null || _b === void 0 ? void 0 : _b.addListener('change', () => {
+                var _a;
+                (_a = this._wordMeasureCache) === null || _a === void 0 ? void 0 : _a.clear();
                 this._dataChange = true;
                 this.compile();
             });
@@ -81660,7 +81700,7 @@
             var _a, _b, _c, _d, _e, _f;
             const fillingWordStyleSpec = (_b = (_a = this._spec.fillingWord) === null || _a === void 0 ? void 0 : _a.style) !== null && _b !== void 0 ? _b : {};
             const wordCloudShapeConfig = (_c = this._wordCloudShapeConfig) !== null && _c !== void 0 ? _c : {};
-            return Object.assign(Object.assign(Object.assign({}, wordCloudShapeConfig), this._getCommonTransformOptions()), { createImage, rotateList: this._rotateAngles, fillingRotateList: wordCloudShapeConfig.fillingRotateAngles, fillingFontFamily: isValid$1(wordCloudShapeConfig.fillingFontFamilyField)
+            return Object.assign(Object.assign(Object.assign({}, wordCloudShapeConfig), this._getCommonTransformOptions()), { createImage, measureCache: this._wordMeasureCache, rotateList: this._rotateAngles, fillingRotateList: wordCloudShapeConfig.fillingRotateAngles, fillingFontFamily: isValid$1(wordCloudShapeConfig.fillingFontFamilyField)
                     ? { field: wordCloudShapeConfig.fillingFontFamilyField }
                     : (_d = fillingWordStyleSpec.fontFamily) !== null && _d !== void 0 ? _d : this._defaultFontFamily, fillingPadding: (_f = (_e = this._spec.fillingWord) === null || _e === void 0 ? void 0 : _e.padding) !== null && _f !== void 0 ? _f : DEFAULT_FONT_PADDING, fillingFontStyle: isValid$1(wordCloudShapeConfig.fillingFontStyleField)
                     ? { field: wordCloudShapeConfig.fillingFontStyleField }
@@ -81709,6 +81749,7 @@
             return [this._wordMark];
         }
         reInit() {
+            var _a;
             super.reInit();
             if (this._keyWordColorCallback) {
                 this._keyWordColorCallback = null;
@@ -81716,6 +81757,13 @@
             if (this._fillingColorCallback) {
                 this._fillingColorCallback = null;
             }
+            (_a = this._wordMeasureCache) === null || _a === void 0 ? void 0 : _a.clear();
+        }
+        release() {
+            var _a;
+            super.release();
+            (_a = this._wordMeasureCache) === null || _a === void 0 ? void 0 : _a.clear();
+            this._wordMeasureCache = undefined;
         }
     }
     BaseWordCloudSeries.mark = wordCloudSeriesMark;
@@ -85494,6 +85542,30 @@
     !function (WORDCLOUD_SHAPE_HOOK_EVENT) {
       WORDCLOUD_SHAPE_HOOK_EVENT.BEFORE_WORDCLOUD_SHAPE_LAYOUT = "beforeWordcloudShapeLayout", WORDCLOUD_SHAPE_HOOK_EVENT.AFTER_WORDCLOUD_SHAPE_LAYOUT = "afterWordcloudShapeLayout", WORDCLOUD_SHAPE_HOOK_EVENT.AFTER_WORDCLOUD_SHAPE_DRAW = "afterWordcloudShapeDraw";
     }(exports.WORDCLOUD_SHAPE_HOOK_EVENT || (exports.WORDCLOUD_SHAPE_HOOK_EVENT = {}));
+    class MapWordMeasureCache {
+      constructor(maxSize = 1e3) {
+        this._map = new Map(), this._maxSize = maxSize;
+      }
+      get(key) {
+        const value = this._map.get(key);
+        if (void 0 !== value) return this._map.delete(key), this._map.set(key, value), value;
+      }
+      set(key, value) {
+        if (this._map.has(key)) this._map.set(key, value);else {
+          if (this._map.size >= this._maxSize) {
+            const firstKey = this._map.keys().next().value;
+            void 0 !== firstKey && this._map.delete(firstKey);
+          }
+          this._map.set(key, value);
+        }
+      }
+      clear() {
+        this._map.clear();
+      }
+      size() {
+        return this._map.size;
+      }
+    }
     const colorListEqual = (arr0, arr1) => {
       if (1 === arr1.length && "#537EF5" === arr1[0]) return !0;
       if (!Array.isArray(arr0) || !Array.isArray(arr1) || arr0.length !== arr1.length) return !1;
@@ -85581,7 +85653,7 @@
           ratio: ratio
         } = region;
         for (let i = 0; i < regionWords.length; i++) {
-          measureSprite(canvas, ctx, words, i);
+          measureSprite(canvas, ctx, words, i, layoutConfig.measureCache);
           const word = regionWords[i];
           word.x = center[0], word.y = center[1], word.hasText && word.sprite && place(board, word, maxR, ratio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
@@ -85591,7 +85663,7 @@
         if (0 === failedWords.length) break;
         for (let i = 0; i < failedWords.length; i++) {
           const word = failedWords[i];
-          measureSprite(canvas, ctx, failedWords, i), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
+          measureSprite(canvas, ctx, failedWords, i, layoutConfig.measureCache), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
       }
       layoutConfig.board = board;
@@ -85637,7 +85709,7 @@
           } = region;
         let restartTag = !1;
         for (let i = 0; i < regionWords.length; i++) {
-          measureSprite(canvas, ctx, words, i);
+          measureSprite(canvas, ctx, words, i, layoutConfig.measureCache);
           const word = regionWords[i];
           if (word.x = center[0], word.y = center[1], !word.skip && word.hasText && word.sprite && place(board, word, maxR, ratio, size, boardSize, stepFactor)) word.hasPlaced = !0;else {
             if (!word.skip && word.weight > weightStd && globalShinkFactor > globalShinkLimit) {
@@ -85662,7 +85734,7 @@
         if (0 === failedWords.length) break;
         for (let i = 0; i < failedWords.length; i++) {
           const word = failedWords[i];
-          measureSprite(canvas, ctx, failedWords, i), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
+          measureSprite(canvas, ctx, failedWords, i, layoutConfig.measureCache), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
       }
       layoutConfig.board = board;
@@ -85707,7 +85779,7 @@
           } = region;
         let restartTag = !1;
         for (let i = 0; i < regionWords.length; i++) {
-          measureSprite(canvas, ctx, words, i);
+          measureSprite(canvas, ctx, words, i, layoutConfig.measureCache);
           const word = regionWords[i];
           if (word.x = center[0], word.y = center[1], word.hasText && word.sprite && place(board, word, maxR, ratio, size, boardSize, stepFactor)) {
             if (word.hasPlaced = !0, word.weight >= weightStd && importantWordSuccessedNum++, importantWordSuccessedNum >= importantCount && !layoutFinish) {
@@ -85733,7 +85805,7 @@
         if (0 === failedWords.length) break;
         for (let i = 0; i < failedWords.length; i++) {
           const word = failedWords[i];
-          measureSprite(canvas, ctx, failedWords, i), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
+          measureSprite(canvas, ctx, failedWords, i, layoutConfig.measureCache), word.x = shapeCenter[0], word.y = shapeCenter[1], word.hasText && place(board, word, shapeMaxR, shapeRatio, size, boardSize, stepFactor) && (word.hasPlaced = !0);
         }
       }
       layoutConfig.board = board;
@@ -85812,8 +85884,13 @@
         return [ratio * (t *= .1) * Math.cos(t), t * Math.sin(t)];
       };
     }
-    function measureSprite(canvas, ctx, words, wi) {
-      if (words[wi].sprite || 0 === words[wi].fontSize) return;
+    function measureSprite(canvas, ctx, words, wi, cache) {
+      const targetWord = words[wi];
+      if (targetWord.sprite || 0 === targetWord.fontSize) return;
+      if (cache) {
+        const cached = cache.get(getWordMeasureKey(targetWord));
+        if (cached) return targetWord.sprite = cached.sprite, targetWord.bounds = cached.bounds, targetWord.wordSize = cached.wordSize, void (targetWord.hasText = !0);
+      }
       const cw = 2048,
         radians = Math.PI / 180,
         n = words.length;
@@ -85876,14 +85953,25 @@
           }
           seen && (j < dTop && (dTop = j), j > dBottom && (dBottom = j));
         }
-        word.bounds = {
+        if (word.bounds = {
           dTop: (wordSize[1] >> 1) - dTop,
           dBottom: dBottom - (wordSize[1] >> 1),
           dLeft: (wordSize[0] >> 1) - dLeft,
           dRight: dRight - (wordSize[0] >> 1)
-        }, word.sprite = sprite, delete word.LT;
+        }, word.sprite = sprite, cache) {
+          const key = getWordMeasureKey(word);
+          cache.set(key, {
+            sprite: sprite,
+            bounds: word.bounds,
+            wordSize: wordSize
+          });
+        }
+        delete word.LT;
       }
     }
+    function getWordMeasureKey(word) {
+      return String(word.text) + "|" + String(word.fontFamily) + "|" + String(word.fontStyle) + "|" + String(word.fontWeight) + "|" + String(word.fontSize) + "|" + String(word.rotate) + "|" + String(word.padding);
+    }
     function initBoardWithShape(segmentationOutput) {
       const {
           segmentation: {
@@ -85980,7 +86068,7 @@
           } = shapeBounds,
           [startX, startY] = [x1 + ~~(randomGenerator() * fillingXStep * 2), y1 + ~~(randomGenerator() * fillingYStep * 2)];
         for (let y = startY; y <= y2; y += fillingYStep) for (let x = startX; x <= x2; x += fillingXStep) {
-          measureSprite(canvas, ctx, fillingWords, wi);
+          measureSprite(canvas, ctx, fillingWords, wi, layoutConfig.measureCache);
           const word = fillingWords[wi];
           word.x = x, word.y = y;
           const {
@@ -86119,7 +86207,7 @@
         return this.progressiveResult;
       }
       doLayout() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         const segmentationInput = this.segmentationInput,
           segmentationOutput = segmentation(segmentationInput);
         if (!segmentationOutput.segmentation.regions.length) return;
@@ -86146,35 +86234,36 @@
         const layoutConfig = {
             size: options.size,
             ratio: options.ratio || .8,
+            measureCache: null !== (_a = options.measureCache) && void 0 !== _a ? _a : new MapWordMeasureCache(),
             shapeUrl: options.shape,
             random: void 0 === options.random || options.random,
-            textLayoutTimes: null !== (_a = options.textLayoutTimes) && void 0 !== _a ? _a : 3,
+            textLayoutTimes: null !== (_b = options.textLayoutTimes) && void 0 !== _b ? _b : 3,
             removeWhiteBorder: options.removeWhiteBorder,
-            layoutMode: null !== (_b = options.layoutMode) && void 0 !== _b ? _b : "default",
-            fontSizeShrinkFactor: null !== (_c = options.fontSizeShrinkFactor) && void 0 !== _c ? _c : .8,
-            stepFactor: null !== (_d = options.stepFactor) && void 0 !== _d ? _d : 1,
-            importantWordCount: null !== (_e = options.importantWordCount) && void 0 !== _e ? _e : 10,
+            layoutMode: null !== (_c = options.layoutMode) && void 0 !== _c ? _c : "default",
+            fontSizeShrinkFactor: null !== (_d = options.fontSizeShrinkFactor) && void 0 !== _d ? _d : .8,
+            stepFactor: null !== (_e = options.stepFactor) && void 0 !== _e ? _e : 1,
+            importantWordCount: null !== (_f = options.importantWordCount) && void 0 !== _f ? _f : 10,
             globalShinkLimit: options.globalShinkLimit || .2,
-            fontSizeEnlargeFactor: null !== (_f = options.fontSizeEnlargeFactor) && void 0 !== _f ? _f : 1.5,
-            fillingRatio: null !== (_g = options.fillingRatio) && void 0 !== _g ? _g : .7,
-            fillingTimes: null !== (_h = options.fillingTimes) && void 0 !== _h ? _h : 4,
-            fillingXStep: options.fillingXRatioStep ? Math.max(Math.floor(options.size[0] * options.fillingXRatioStep), 1) : null !== (_j = options.fillingXStep) && void 0 !== _j ? _j : 4,
-            fillingYStep: options.fillingYRatioStep ? Math.max(Math.floor(options.size[1] * options.fillingYRatioStep), 1) : null !== (_k = options.fillingYStep) && void 0 !== _k ? _k : 4,
+            fontSizeEnlargeFactor: null !== (_g = options.fontSizeEnlargeFactor) && void 0 !== _g ? _g : 1.5,
+            fillingRatio: null !== (_h = options.fillingRatio) && void 0 !== _h ? _h : .7,
+            fillingTimes: null !== (_j = options.fillingTimes) && void 0 !== _j ? _j : 4,
+            fillingXStep: options.fillingXRatioStep ? Math.max(Math.floor(options.size[0] * options.fillingXRatioStep), 1) : null !== (_k = options.fillingXStep) && void 0 !== _k ? _k : 4,
+            fillingYStep: options.fillingYRatioStep ? Math.max(Math.floor(options.size[1] * options.fillingYRatioStep), 1) : null !== (_l = options.fillingYStep) && void 0 !== _l ? _l : 4,
             fillingInitialFontSize: options.fillingInitialFontSize,
             fillingDeltaFontSize: options.fillingDeltaFontSize,
-            fillingInitialOpacity: null !== (_l = options.fillingInitialOpacity) && void 0 !== _l ? _l : .8,
-            fillingDeltaOpacity: null !== (_m = options.fillingDeltaOpacity) && void 0 !== _m ? _m : .05,
+            fillingInitialOpacity: null !== (_m = options.fillingInitialOpacity) && void 0 !== _m ? _m : .8,
+            fillingDeltaOpacity: null !== (_o = options.fillingDeltaOpacity) && void 0 !== _o ? _o : .05,
             getFillingFontFamily: simpleField(options.fillingFontFamily || "sans-serif"),
             getFillingFontStyle: simpleField(options.fillingFontStyle || "normal"),
             getFillingFontWeight: simpleField(options.fillingFontWeight || "normal"),
-            getFillingPadding: simpleField(null !== (_o = options.fillingPadding) && void 0 !== _o ? _o : .4),
-            fillingRotateList: null !== (_p = options.fillingRotateList) && void 0 !== _p ? _p : [0, 90],
-            fillingDeltaFontSizeFactor: null !== (_q = options.fillingDeltaFontSizeFactor) && void 0 !== _q ? _q : .2,
+            getFillingPadding: simpleField(null !== (_p = options.fillingPadding) && void 0 !== _p ? _p : .4),
+            fillingRotateList: null !== (_q = options.fillingRotateList) && void 0 !== _q ? _q : [0, 90],
+            fillingDeltaFontSizeFactor: null !== (_r = options.fillingDeltaFontSizeFactor) && void 0 !== _r ? _r : .2,
             fillingColorList: options.fillingColorList || ["#537EF5"],
             sameColorList: !1,
-            minInitFontSize: null !== (_r = options.minInitFontSize) && void 0 !== _r ? _r : 10,
-            minFontSize: null !== (_s = options.minFontSize) && void 0 !== _s ? _s : 4,
-            minFillFontSize: null !== (_t = options.minFillFontSize) && void 0 !== _t ? _t : 2
+            minInitFontSize: null !== (_s = options.minInitFontSize) && void 0 !== _s ? _s : 10,
+            minFontSize: null !== (_t = options.minFontSize) && void 0 !== _t ? _t : 4,
+            minFillFontSize: null !== (_u = options.minFillFontSize) && void 0 !== _u ? _u : 2
           },
           sameColorList = colorListEqual(wordsConfig.colorList, layoutConfig.fillingColorList);
         layoutConfig.sameColorList = sameColorList, initColorScale(data, wordsConfig, layoutConfig, options), initFillingWordsFontSize(data, wordsConfig, layoutConfig, segmentationOutput);
@@ -86221,8 +86310,8 @@
             successedWords: successedWords,
             failedWords: failedWords
           } = cloud(words, layoutConfig, segmentationOutput),
-          textKey = null !== (_v = null === (_u = options.text) || void 0 === _u ? void 0 : _u.field) && void 0 !== _v ? _v : "textKey",
-          dataIndexKey = null !== (_w = options.dataIndexKey) && void 0 !== _w ? _w : "defaultDataIndexKey",
+          textKey = null !== (_w = null === (_v = options.text) || void 0 === _v ? void 0 : _v.field) && void 0 !== _w ? _w : "textKey",
+          dataIndexKey = null !== (_x = options.dataIndexKey) && void 0 !== _x ? _x : "defaultDataIndexKey",
           as = options.as ? Object.assign(Object.assign({}, OUTPUT), options.as) : OUTPUT;
         let w, t;
         const modKeywords = [];
@@ -102883,9 +102972,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return 'cartesian';
         }
         _createMarkerComponent() {
-            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;
+            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;
             const { itemContent = {}, itemLine = {}, targetSymbol = {} } = this._spec;
-            const _9 = itemContent, { type = 'text', text: label, symbol, image, richText, customMark, textStyle, symbolStyle, imageStyle, richTextStyle, customMarkStyle, style = {}, state = {} } = _9, restItemContent = __rest$e(_9, ["type", "text", "symbol", "image", "richText", "customMark", "textStyle", "symbolStyle", "imageStyle", "richTextStyle", "customMarkStyle", "style", "state"]);
+            const _10 = itemContent, { type = 'text', text: label, symbol, image, richText, customMark, textStyle, symbolStyle, imageStyle, richTextStyle, customMarkStyle, style = {}, state = {} } = _10, restItemContent = __rest$e(_10, ["type", "text", "symbol", "image", "richText", "customMark", "textStyle", "symbolStyle", "imageStyle", "richTextStyle", "customMarkStyle", "style", "state"]);
             let itemContentState = null;
             let itemContentStyle = null;
             let defaultStyle = {};
@@ -102895,61 +102984,61 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     dx: 0,
                     dy: 0
                 };
-                itemContentStyle = transformLabelAttributes(Object.assign(Object.assign({}, label), { style: merge$1(defaultStyle, (_c = (_b = label === null || label === void 0 ? void 0 : label.textStyle) !== null && _b !== void 0 ? _b : textStyle) !== null && _c !== void 0 ? _c : style) }), this._markerData, this._markAttributeContext);
+                itemContentStyle = transformLabelAttributes(Object.assign(Object.assign({}, label), { style: merge$1(defaultStyle, (_d = (_c = (_b = label === null || label === void 0 ? void 0 : label.style) !== null && _b !== void 0 ? _b : label === null || label === void 0 ? void 0 : label.textStyle) !== null && _c !== void 0 ? _c : textStyle) !== null && _d !== void 0 ? _d : style) }), this._markerData, this._markAttributeContext);
             }
             else if (type === 'richText') {
-                itemContentState = (_d = richText === null || richText === void 0 ? void 0 : richText.state) !== null && _d !== void 0 ? _d : state;
+                itemContentState = (_e = richText === null || richText === void 0 ? void 0 : richText.state) !== null && _e !== void 0 ? _e : state;
                 defaultStyle = {
                     width: 100,
                     height: 100
                 };
-                itemContentStyle = transformStyle(merge$1(defaultStyle, (_f = (_e = richText === null || richText === void 0 ? void 0 : richText.style) !== null && _e !== void 0 ? _e : richTextStyle) !== null && _f !== void 0 ? _f : style), this._markerData, this._markAttributeContext);
+                itemContentStyle = transformStyle(merge$1(defaultStyle, (_g = (_f = richText === null || richText === void 0 ? void 0 : richText.style) !== null && _f !== void 0 ? _f : richTextStyle) !== null && _g !== void 0 ? _g : style), this._markerData, this._markAttributeContext);
             }
             else if (type === 'symbol') {
-                itemContentState = (_g = symbol === null || symbol === void 0 ? void 0 : symbol.state) !== null && _g !== void 0 ? _g : state;
+                itemContentState = (_h = symbol === null || symbol === void 0 ? void 0 : symbol.state) !== null && _h !== void 0 ? _h : state;
                 defaultStyle = {
                     symbolType: 'star',
                     fill: 'rgb(48, 115, 242)',
                     fillOpacity: 0.8,
                     size: 20
                 };
-                itemContentStyle = transformToGraphic(transformStyle(merge$1(defaultStyle, (_j = (_h = symbol === null || symbol === void 0 ? void 0 : symbol.style) !== null && _h !== void 0 ? _h : symbolStyle) !== null && _j !== void 0 ? _j : style), this._markerData, this._markAttributeContext));
+                itemContentStyle = transformToGraphic(transformStyle(merge$1(defaultStyle, (_k = (_j = symbol === null || symbol === void 0 ? void 0 : symbol.style) !== null && _j !== void 0 ? _j : symbolStyle) !== null && _k !== void 0 ? _k : style), this._markerData, this._markAttributeContext));
             }
             else if (type === 'image') {
-                itemContentState = (_k = image === null || image === void 0 ? void 0 : image.state) !== null && _k !== void 0 ? _k : state;
+                itemContentState = (_l = image === null || image === void 0 ? void 0 : image.state) !== null && _l !== void 0 ? _l : state;
                 defaultStyle = {
                     width: 80,
                     height: 80
                 };
-                itemContentStyle = transformStyle(merge$1(defaultStyle, (_m = (_l = image === null || image === void 0 ? void 0 : image.style) !== null && _l !== void 0 ? _l : imageStyle) !== null && _m !== void 0 ? _m : style), this._markerData, this._markAttributeContext);
+                itemContentStyle = transformStyle(merge$1(defaultStyle, (_o = (_m = image === null || image === void 0 ? void 0 : image.style) !== null && _m !== void 0 ? _m : imageStyle) !== null && _o !== void 0 ? _o : style), this._markerData, this._markAttributeContext);
             }
             else if (type === 'custom') {
-                itemContentState = (_o = customMark === null || customMark === void 0 ? void 0 : customMark.state) !== null && _o !== void 0 ? _o : state;
-                itemContentStyle = transformStyle((_q = (_p = customMark === null || customMark === void 0 ? void 0 : customMark.style) !== null && _p !== void 0 ? _p : customMarkStyle) !== null && _q !== void 0 ? _q : style, this._markerData, this._markAttributeContext);
+                itemContentState = (_p = customMark === null || customMark === void 0 ? void 0 : customMark.state) !== null && _p !== void 0 ? _p : state;
+                itemContentStyle = transformStyle((_r = (_q = customMark === null || customMark === void 0 ? void 0 : customMark.style) !== null && _q !== void 0 ? _q : customMarkStyle) !== null && _r !== void 0 ? _r : style, this._markerData, this._markAttributeContext);
             }
             const markPointAttrs = {
                 zIndex: this.layoutZIndex,
-                interactive: (_r = this._spec.interactive) !== null && _r !== void 0 ? _r : true,
-                hover: (_s = this._spec.interactive) !== null && _s !== void 0 ? _s : true,
-                select: (_t = this._spec.interactive) !== null && _t !== void 0 ? _t : true,
+                interactive: (_s = this._spec.interactive) !== null && _s !== void 0 ? _s : true,
+                hover: (_t = this._spec.interactive) !== null && _t !== void 0 ? _t : true,
+                select: (_u = this._spec.interactive) !== null && _u !== void 0 ? _u : true,
                 position: { x: 0, y: 0 },
-                clipInRange: (_u = this._spec.clip) !== null && _u !== void 0 ? _u : false,
+                clipInRange: (_v = this._spec.clip) !== null && _v !== void 0 ? _v : false,
                 itemContent: Object.assign(Object.assign({ type, offsetX: transformOffset(itemContent.offsetX, this._relativeSeries.getRegion()), offsetY: transformOffset(itemContent.offsetX, this._relativeSeries.getRegion()) }, restItemContent), { style: transformStyle(itemContentStyle, this._markerData, this._markAttributeContext) }),
                 targetSymbol: {
-                    offset: (_v = targetSymbol.offset) !== null && _v !== void 0 ? _v : 0,
-                    visible: (_w = targetSymbol.visible) !== null && _w !== void 0 ? _w : false,
-                    size: (_x = targetSymbol.size) !== null && _x !== void 0 ? _x : 20,
+                    offset: (_w = targetSymbol.offset) !== null && _w !== void 0 ? _w : 0,
+                    visible: (_x = targetSymbol.visible) !== null && _x !== void 0 ? _x : false,
+                    size: (_y = targetSymbol.size) !== null && _y !== void 0 ? _y : 20,
                     style: transformStyle(targetSymbol.style, this._markerData, this._markAttributeContext)
                 },
                 state: {
-                    line: transformState((_z = (_y = this._spec.itemLine.line) === null || _y === void 0 ? void 0 : _y.state) !== null && _z !== void 0 ? _z : {}, this._markerData, this._markAttributeContext),
-                    lineStartSymbol: transformState((_1 = (_0 = this._spec.itemLine.startSymbol) === null || _0 === void 0 ? void 0 : _0.state) !== null && _1 !== void 0 ? _1 : {}, this._markerData, this._markAttributeContext),
-                    lineEndSymbol: transformState((_3 = (_2 = this._spec.itemLine.endSymbol) === null || _2 === void 0 ? void 0 : _2.state) !== null && _3 !== void 0 ? _3 : {}, this._markerData, this._markAttributeContext),
+                    line: transformState((_0 = (_z = this._spec.itemLine.line) === null || _z === void 0 ? void 0 : _z.state) !== null && _0 !== void 0 ? _0 : {}, this._markerData, this._markAttributeContext),
+                    lineStartSymbol: transformState((_2 = (_1 = this._spec.itemLine.startSymbol) === null || _1 === void 0 ? void 0 : _1.state) !== null && _2 !== void 0 ? _2 : {}, this._markerData, this._markAttributeContext),
+                    lineEndSymbol: transformState((_4 = (_3 = this._spec.itemLine.endSymbol) === null || _3 === void 0 ? void 0 : _3.state) !== null && _4 !== void 0 ? _4 : {}, this._markerData, this._markAttributeContext),
                     itemContent: transformState(itemContentState, this._markerData, this._markAttributeContext),
-                    textBackground: transformState((_5 = (_4 = this._spec.itemContent.text) === null || _4 === void 0 ? void 0 : _4.labelBackground) === null || _5 === void 0 ? void 0 : _5.state, this._markerData, this._markAttributeContext),
-                    targetItem: transformState((_7 = (_6 = this._spec.targetSymbol) === null || _6 === void 0 ? void 0 : _6.state) !== null && _7 !== void 0 ? _7 : {}, this._markerData, this._markAttributeContext)
+                    textBackground: transformState((_6 = (_5 = this._spec.itemContent.text) === null || _5 === void 0 ? void 0 : _5.labelBackground) === null || _6 === void 0 ? void 0 : _6.state, this._markerData, this._markAttributeContext),
+                    targetItem: transformState((_8 = (_7 = this._spec.targetSymbol) === null || _7 === void 0 ? void 0 : _7.state) !== null && _8 !== void 0 ? _8 : {}, this._markerData, this._markAttributeContext)
                 },
-                animation: (_8 = this._spec.animation) !== null && _8 !== void 0 ? _8 : false,
+                animation: (_9 = this._spec.animation) !== null && _9 !== void 0 ? _9 : false,
                 animationEnter: this._spec.animationEnter,
                 animationExit: this._spec.animationExit,
                 animationUpdate: this._spec.animationUpdate