@visactor/vchart 2.0.19 → 2.0.20-alpha.0

package/build/index.es.js

@@ -57698,6 +57698,9 @@ class MarkStateManager extends StateManager {
             }
         });
     }
+    clearAllStateInfo() {
+        this._stateInfoList = [];
+    }
     _isMultiMark() {
         return !this._mark || isMultiDatumMark(this._mark.type);
     }
@@ -59420,6 +59423,11 @@ class BaseMark extends GrammarItem {
     runAnimation() {
         this._runStateAnimation(this.getGraphics());
     }
+    clearBeforeReInit() {
+        this.state.clearAllStateInfo();
+        this.uncommit();
+        this.stateStyle = {};
+    }
 }
 
 var MarkTypeEnum;
@@ -61230,15 +61238,12 @@ class VChart {
         };
         let currentTheme;
         if (!isEmpty(optionTheme) || !isEmpty(specTheme)) {
-            if ((isString$1(optionTheme) && (!specTheme || isString$1(specTheme))) ||
-                (isString$1(specTheme) && (!optionTheme || isString$1(optionTheme)))) {
-                const finalTheme = mergeTheme({}, getThemeObject(this._currentThemeName), getThemeObject(optionTheme), getThemeObject(specTheme));
-                this._currentTheme = processThemeByChartType(chartType, finalTheme);
-            }
-            else {
-                const finalTheme = mergeTheme({}, getThemeObject(this._currentThemeName), getThemeObject(optionTheme), getThemeObject(specTheme));
-                this._currentTheme = processThemeByChartType(chartType, finalTheme);
-            }
+            const finalTheme = mergeTheme({}, getThemeObject(isObject$2(specTheme) && specTheme.type
+                ? specTheme.type
+                : isObject$2(optionTheme) && optionTheme.type
+                    ? optionTheme.type
+                    : this._currentThemeName), getThemeObject(optionTheme), getThemeObject(specTheme));
+            this._currentTheme = processThemeByChartType(chartType, finalTheme);
         }
         else {
             currentTheme = getThemeObject(this._currentThemeName);
@@ -63522,6 +63527,7 @@ class BaseSeries extends BaseModel {
         super.reInit(spec);
         const marks = this.getMarksWithoutRoot();
         marks.forEach(mark => {
+            mark.clearBeforeReInit();
             this._spec[mark.name] && this.initMarkStyleWithSpec(mark, this._spec[mark.name]);
         });
         this.initMarkStyle();
@@ -82110,13 +82116,14 @@ function translateChild(k, maxDepth) {
 }
 class CirclePackingLayout {
   constructor(options) {
+    var _a;
     this.options = options;
     const keyOption = null == options ? void 0 : options.nodeKey,
       keyFunc = isFunction$1(keyOption) ? keyOption : keyOption ? field$2(keyOption) : null;
     this._getNodeKey = keyFunc, this._getPadding = isNumber$1(null == options ? void 0 : options.padding) ? node => options.padding : isArray$1(null == options ? void 0 : options.padding) ? node => {
       var _a;
       return null !== (_a = options.padding[node.depth + 1]) && void 0 !== _a ? _a : 0;
-    } : () => 0, this._maxDepth = -1;
+    } : () => 0, this._maxDepth = -1, this._valueField = null !== (_a = null == options ? void 0 : options.valueField) && void 0 !== _a ? _a : "value";
   }
   layout(data, config) {
     var _a;
@@ -82137,7 +82144,7 @@ class CirclePackingLayout {
     };
     if (!data || !data.length) return [];
     const nodes = [],
-      res = calculateNodeValue$1(data, nodes, 0, -1, null, this._getNodeKey);
+      res = calculateNodeValue$1(data, nodes, 0, -1, null, this._getNodeKey, this._valueField);
     this._maxDepth = res.maxDepth;
     const random = randomLCG(),
       root = {
@@ -88752,6 +88759,7 @@ class CirclePackingSeries extends CartesianSeries {
             options: () => {
                 return {
                     nodeKey: this._categoryField,
+                    valueField: this._valueField,
                     padding: this._layoutPadding,
                     includeRoot: false,
                     width: this.getLayoutRect().width || 1,

package/build/index.js

@@ -57704,6 +57704,9 @@
                 }
             });
         }
+        clearAllStateInfo() {
+            this._stateInfoList = [];
+        }
         _isMultiMark() {
             return !this._mark || isMultiDatumMark(this._mark.type);
         }
@@ -59426,6 +59429,11 @@
         runAnimation() {
             this._runStateAnimation(this.getGraphics());
         }
+        clearBeforeReInit() {
+            this.state.clearAllStateInfo();
+            this.uncommit();
+            this.stateStyle = {};
+        }
     }
 
     exports.MarkTypeEnum = void 0;
@@ -61236,15 +61244,12 @@
             };
             let currentTheme;
             if (!isEmpty(optionTheme) || !isEmpty(specTheme)) {
-                if ((isString$1(optionTheme) && (!specTheme || isString$1(specTheme))) ||
-                    (isString$1(specTheme) && (!optionTheme || isString$1(optionTheme)))) {
-                    const finalTheme = mergeTheme({}, getThemeObject(this._currentThemeName), getThemeObject(optionTheme), getThemeObject(specTheme));
-                    this._currentTheme = processThemeByChartType(chartType, finalTheme);
-                }
-                else {
-                    const finalTheme = mergeTheme({}, getThemeObject(this._currentThemeName), getThemeObject(optionTheme), getThemeObject(specTheme));
-                    this._currentTheme = processThemeByChartType(chartType, finalTheme);
-                }
+                const finalTheme = mergeTheme({}, getThemeObject(isObject$2(specTheme) && specTheme.type
+                    ? specTheme.type
+                    : isObject$2(optionTheme) && optionTheme.type
+                        ? optionTheme.type
+                        : this._currentThemeName), getThemeObject(optionTheme), getThemeObject(specTheme));
+                this._currentTheme = processThemeByChartType(chartType, finalTheme);
             }
             else {
                 currentTheme = getThemeObject(this._currentThemeName);
@@ -63528,6 +63533,7 @@
             super.reInit(spec);
             const marks = this.getMarksWithoutRoot();
             marks.forEach(mark => {
+                mark.clearBeforeReInit();
                 this._spec[mark.name] && this.initMarkStyleWithSpec(mark, this._spec[mark.name]);
             });
             this.initMarkStyle();
@@ -82116,13 +82122,14 @@
     }
     class CirclePackingLayout {
       constructor(options) {
+        var _a;
         this.options = options;
         const keyOption = null == options ? void 0 : options.nodeKey,
           keyFunc = isFunction$1(keyOption) ? keyOption : keyOption ? field$2(keyOption) : null;
         this._getNodeKey = keyFunc, this._getPadding = isNumber$1(null == options ? void 0 : options.padding) ? node => options.padding : isArray$1(null == options ? void 0 : options.padding) ? node => {
           var _a;
           return null !== (_a = options.padding[node.depth + 1]) && void 0 !== _a ? _a : 0;
-        } : () => 0, this._maxDepth = -1;
+        } : () => 0, this._maxDepth = -1, this._valueField = null !== (_a = null == options ? void 0 : options.valueField) && void 0 !== _a ? _a : "value";
       }
       layout(data, config) {
         var _a;
@@ -82143,7 +82150,7 @@
         };
         if (!data || !data.length) return [];
         const nodes = [],
-          res = calculateNodeValue$1(data, nodes, 0, -1, null, this._getNodeKey);
+          res = calculateNodeValue$1(data, nodes, 0, -1, null, this._getNodeKey, this._valueField);
         this._maxDepth = res.maxDepth;
         const random = randomLCG(),
           root = {
@@ -88758,6 +88765,7 @@
                 options: () => {
                     return {
                         nodeKey: this._categoryField,
+                        valueField: this._valueField,
                         padding: this._layoutPadding,
                         includeRoot: false,
                         width: this.getLayoutRect().width || 1,