@visactor/vchart 1.2.1 → 1.2.2-beta.1

package/esm/component/tooltip/handler/utils/get-spec.js

@@ -5,26 +5,60 @@ import { makeDefaultPattern } from "./pattern";
 import { getTooltipActualActiveType } from "../../utils";
 
 export const getTooltipSpecForShow = (activeType, globalSpec, series, dimensionInfo) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g;
     const finalSpec = Object.assign(Object.assign({}, globalSpec), {
         activeType: activeType
     });
-    let defaultPattern = {}, userPattern = {};
     if ("mark" === activeType && series) {
         const seriesSpec = null !== (_b = null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec) && void 0 !== _b ? _b : {};
         if (isValid(seriesSpec.visible) || isValid(seriesSpec.activeType) ? finalSpec.visible = getTooltipActualActiveType(seriesSpec).includes("mark") : isValid(globalSpec.visible) || isValid(globalSpec.activeType) ? finalSpec.visible = getTooltipActualActiveType(globalSpec).includes("mark") : finalSpec.visible = !0, 
         finalSpec.handler = null !== (_d = null !== (_c = seriesSpec.handler) && void 0 !== _c ? _c : globalSpec.handler) && void 0 !== _d ? _d : void 0, 
         null === (_e = finalSpec.handler) || void 0 === _e ? void 0 : _e.showTooltip) return finalSpec;
-        defaultPattern = null !== (_f = makeDefaultPattern(series, "mark")) && void 0 !== _f ? _f : {}, 
-        userPattern = merge({}, cloneDeep(globalSpec.mark), cloneDeep(seriesSpec.mark));
     } else if ("dimension" === activeType && (null == dimensionInfo ? void 0 : dimensionInfo.length)) {
-        const seriesList = dimensionInfo.reduce(((list, cur) => list.concat(cur.data.map((data => data.series)).filter(isValid))), []);
-        if (seriesList.every((series => {
+        if (getSeriesListFromDimensionInfo(dimensionInfo).every((series => {
             var _a;
             return !getTooltipActualActiveType(null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec).includes("dimension");
         })) ? finalSpec.visible = !1 : isValid(globalSpec.visible) || isValid(globalSpec.activeType) ? finalSpec.visible = getTooltipActualActiveType(globalSpec).includes("dimension") : finalSpec.visible = !0, 
-        finalSpec.handler = null !== (_g = globalSpec.handler) && void 0 !== _g ? _g : void 0, 
-        null === (_h = finalSpec.handler) || void 0 === _h ? void 0 : _h.showTooltip) return finalSpec;
+        finalSpec.handler = null !== (_f = globalSpec.handler) && void 0 !== _f ? _f : void 0, 
+        null === (_g = finalSpec.handler) || void 0 === _g ? void 0 : _g.showTooltip) return finalSpec;
+    }
+    const defaultPattern = getDefaultTooltipPattern(activeType, series, dimensionInfo), seriesPattern = getSeriesTooltipPattern(activeType, series, dimensionInfo), userPattern = merge({}, cloneDeep(globalSpec[activeType]), seriesPattern), defaultPatternTitle = defaultPattern.title, titleShape = getShapePattern(void 0, userPattern, void 0, defaultPatternTitle);
+    if (isValid(userPattern.title)) if (isFunction(userPattern.title)) {
+        const userPatternTitle = userPattern.title;
+        userPattern.title = (data, params) => {
+            var _a;
+            const userResult = null !== (_a = userPatternTitle(data, params)) && void 0 !== _a ? _a : {};
+            return Object.assign(Object.assign({}, titleShape), userResult);
+        };
+    } else userPattern.title = Object.assign(Object.assign(Object.assign({}, defaultPattern.title), titleShape), userPattern.title); else userPattern.title = Object.assign(Object.assign({}, defaultPattern.title), titleShape);
+    const defaultPatternContent = array(defaultPattern.content);
+    if (isValid(userPattern.content)) {
+        const shapePatternMap = getShapePatternMapOfEachSeries(defaultPatternContent);
+        if (isFunction(userPattern.content)) {
+            const userPatternContent = userPattern.content;
+            userPattern.content = (data, params) => {
+                var _a;
+                const newPatternContent = [];
+                return array(null !== (_a = userPatternContent(data, params)) && void 0 !== _a ? _a : []).forEach((userLine => {
+                    newPatternContent.push(Object.assign(Object.assign({}, getShapePattern(userLine, userPattern, shapePatternMap)), userLine));
+                })), newPatternContent;
+            };
+        } else {
+            const newPatternContent = [];
+            array(userPattern.content).forEach((userLine => {
+                newPatternContent.push(Object.assign(Object.assign({}, getShapePattern(userLine, userPattern, shapePatternMap)), userLine));
+            })), userPattern.content = newPatternContent;
+        }
+    } else userPattern.content = defaultPatternContent.map((line => Object.assign(Object.assign({}, line), getShapePattern(void 0, userPattern, void 0, line))));
+    return finalSpec[activeType] = Object.assign(Object.assign(Object.assign({}, defaultPattern), userPattern), {
+        activeType: activeType
+    }), finalSpec;
+};
+
+const getDefaultTooltipPattern = (activeType, series, dimensionInfo) => {
+    var _a;
+    let defaultPattern = {};
+    if ("mark" === activeType && series) defaultPattern = null !== (_a = makeDefaultPattern(series, "mark")) && void 0 !== _a ? _a : {}; else if ("dimension" === activeType && (null == dimensionInfo ? void 0 : dimensionInfo.length)) {
         const patternList = [];
         dimensionInfo[0].data.forEach((data => {
             const {series: series} = data, mockDimensionInfo = [ Object.assign(Object.assign({}, dimensionInfo[0]), {
@@ -38,8 +72,16 @@ export const getTooltipSpecForShow = (activeType, globalSpec, series, dimensionI
         })), defaultPattern = Object.assign(Object.assign({}, patternList[0]), {
             content: defaultPatternContent
         });
-        let seriesDimensionPattern = {};
-        const seriesPatternList = seriesList.filter((series => {
+    }
+    return defaultPattern;
+}, getSeriesTooltipPattern = (activeType, series, dimensionInfo) => {
+    var _a, _b;
+    let seriesPattern = {};
+    if ("mark" === activeType && series) {
+        const seriesSpec = null !== (_b = null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec) && void 0 !== _b ? _b : {};
+        seriesPattern = seriesSpec.mark ? cloneDeep(seriesSpec.mark) : {};
+    } else if ("dimension" === activeType && (null == dimensionInfo ? void 0 : dimensionInfo.length)) {
+        const seriesPatternList = getSeriesListFromDimensionInfo(dimensionInfo).filter((series => {
             var _a;
             const spec = null === (_a = series.tooltipHelper) || void 0 === _a ? void 0 : _a.spec;
             return isValid(null == spec ? void 0 : spec.dimension) && getTooltipActualActiveType(spec).includes("dimension");
@@ -48,50 +90,26 @@ export const getTooltipSpecForShow = (activeType, globalSpec, series, dimensionI
             let seriesPatternContent = [];
             seriesPatternList.every((({content: content}) => isNil(content))) ? seriesPatternContent = void 0 : seriesPatternList.forEach((({content: content}) => {
                 isNil(content) || (isFunction(content) ? null == seriesPatternContent || seriesPatternContent.push(content) : null == seriesPatternContent || seriesPatternContent.push(...array(content)));
-            })), seriesDimensionPattern = Object.assign(Object.assign({}, seriesPatternList[0]), {
+            })), seriesPattern = Object.assign(Object.assign({}, seriesPatternList[0]), {
                 content: seriesPatternContent
             });
         }
-        userPattern = merge({}, cloneDeep(globalSpec.dimension), seriesDimensionPattern);
     }
-    const defaultPatternTitle = defaultPattern.title, titleShape = {
-        hasShape: null !== (_j = userPattern.hasShape) && void 0 !== _j ? _j : null == defaultPatternTitle ? void 0 : defaultPatternTitle.hasShape,
-        shapeType: null !== (_k = userPattern.shapeType) && void 0 !== _k ? _k : null == defaultPatternTitle ? void 0 : defaultPatternTitle.shapeType,
-        shapeColor: null !== (_l = userPattern.shapeColor) && void 0 !== _l ? _l : null == defaultPatternTitle ? void 0 : defaultPatternTitle.shapeColor
-    };
-    if (isValid(userPattern.title)) if (isFunction(userPattern.title)) {
-        const userPatternTitle = userPattern.title;
-        userPattern.title = (data, params) => {
-            var _a;
-            const userResult = null !== (_a = userPatternTitle(data, params)) && void 0 !== _a ? _a : {};
-            return Object.assign(Object.assign({}, titleShape), userResult);
-        };
-    } else userPattern.title = Object.assign(Object.assign(Object.assign({}, defaultPattern.title), titleShape), userPattern.title); else userPattern.title = Object.assign(Object.assign({}, defaultPattern.title), titleShape);
-    const getContentShape = defaultContentLine => {
+    return seriesPattern;
+}, getSeriesListFromDimensionInfo = dimensionInfo => dimensionInfo.reduce(((list, cur) => list.concat(cur.data.map((data => data.series)).filter(isValid))), []), getShapePatternMapOfEachSeries = content => {
+    const shapePatternMap = {};
+    return content.forEach((line => {
+        var _a;
+        const key = null !== (_a = line.seriesId) && void 0 !== _a ? _a : 0;
+        shapePatternMap[key] || (shapePatternMap[key] = line);
+    })), shapePatternMap;
+}, getShapePattern = (userLinePattern, userPattern, shapePatternMap, defaultShapePattern) => {
+    var _a, _b;
+    const shapePatternFromMap = null !== (_b = null == shapePatternMap ? void 0 : shapePatternMap[null !== (_a = null == userLinePattern ? void 0 : userLinePattern.seriesId) && void 0 !== _a ? _a : 0]) && void 0 !== _b ? _b : null == shapePatternMap ? void 0 : shapePatternMap[0], shapePattern = {};
+    return [ "hasShape", "shapeType", "shapeColor" ].forEach((key => {
         var _a, _b, _c;
-        return {
-            hasShape: null !== (_a = userPattern.hasShape) && void 0 !== _a ? _a : null == defaultContentLine ? void 0 : defaultContentLine.hasShape,
-            shapeType: null !== (_b = userPattern.shapeType) && void 0 !== _b ? _b : null == defaultContentLine ? void 0 : defaultContentLine.shapeType,
-            shapeColor: null !== (_c = userPattern.shapeColor) && void 0 !== _c ? _c : null == defaultContentLine ? void 0 : defaultContentLine.shapeColor
-        };
-    }, defaultPatternContent = array(defaultPattern.content);
-    if (isValid(userPattern.content)) if (isFunction(userPattern.content)) {
-        const userPatternContent = userPattern.content;
-        userPattern.content = (data, params) => {
-            var _a;
-            const userResult = array(null !== (_a = userPatternContent(data, params)) && void 0 !== _a ? _a : []);
-            return userResult.forEach(((line, i) => {
-                userResult[i] = Object.assign(Object.assign({}, getContentShape(defaultPatternContent[0])), line);
-            })), userResult;
-        };
-    } else {
-        const userPatternContent = array(userPattern.content);
-        userPatternContent.forEach(((line, i) => {
-            userPatternContent[i] = Object.assign(Object.assign({}, getContentShape(defaultPatternContent[0])), line);
-        }));
-    } else userPattern.content = defaultPatternContent.map((line => Object.assign(Object.assign({}, line), getContentShape(line))));
-    return finalSpec[activeType] = Object.assign(Object.assign(Object.assign({}, defaultPattern), userPattern), {
-        activeType: activeType
-    }), finalSpec;
+        const value = null !== (_c = null !== (_b = null !== (_a = null == userLinePattern ? void 0 : userLinePattern[key]) && void 0 !== _a ? _a : null == userPattern ? void 0 : userPattern[key]) && void 0 !== _b ? _b : null == shapePatternFromMap ? void 0 : shapePatternFromMap[key]) && void 0 !== _c ? _c : null == defaultShapePattern ? void 0 : defaultShapePattern[key];
+        void 0 !== value && (shapePattern[key] = value);
+    })), shapePattern;
 };
 //# sourceMappingURL=get-spec.js.map

package/esm/component/tooltip/handler/utils/get-spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/utils/get-spec.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,UAA6B,EAC7B,UAAwB,EACxB,MAAgB,EAChB,aAAgC,EAClB,EAAE;;IAEhB,MAAM,SAAS,GAAG,gCACb,UAAU,KACb,UAAU,GACK,CAAC;IAElB,IAAI,cAAc,GAAG,EAAqB,CAAC;IAE3C,IAAI,WAAW,GAAG,EAAqB,CAAC;IAExC,IAAI,UAAU,KAAK,MAAM,IAAI,MAAM,EAAE;QAEnC,MAAM,UAAU,GAAG,CAAC,MAAA,MAAA,MAAM,CAAC,aAAa,0CAAE,IAAI,mCAAI,EAAE,CAAiB,CAAC;QAGtE,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACjE,SAAS,CAAC,OAAO,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC7E;aAAM,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACxE,SAAS,CAAC,OAAO,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC7E;aAAM;YACL,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;SAC1B;QAGD,SAAS,CAAC,OAAO,GAAG,MAAA,MAAA,UAAU,CAAC,OAAO,mCAAI,UAAU,CAAC,OAAO,mCAAI,SAAS,CAAC;QAC1E,IAAI,MAAA,SAAS,CAAC,OAAO,0CAAE,WAAW,EAAE;YAClC,OAAO,SAAS,CAAC;SAClB;QAGD,cAAc,GAAG,MAAA,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,mCAAI,EAAE,CAAC;QAC1D,WAAW,GAAG,KAAK,CAAC,EAAE,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;KACjF;SAAM,IAAI,UAAU,KAAK,WAAW,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAA,EAAE;QAE9D,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CACrC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAC7E,EAAe,CAChB,CAAC;QAGF,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,WAAC,OAAA,CAAC,0BAA0B,CAAC,MAAA,MAAM,CAAC,aAAa,0CAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA,EAAA,CAAC,EAAE;YAC7G,SAAS,CAAC,OAAO,GAAG,KAAK,CAAC;SAC3B;aAAM,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YACxE,SAAS,CAAC,OAAO,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;SAClF;aAAM;YACL,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;SAC1B;QAGD,SAAS,CAAC,OAAO,GAAG,MAAA,UAAU,CAAC,OAAO,mCAAI,SAAS,CAAC;QACpD,IAAI,MAAA,SAAS,CAAC,OAAO,0CAAE,WAAW,EAAE;YAClC,OAAO,SAAS,CAAC;SAClB;QAGD,MAAM,WAAW,GAAsB,EAAE,CAAC;QAC1C,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACxB,MAAM,iBAAiB,GAAG;gDAEnB,aAAa,CAAC,CAAC,CAAC,KACnB,IAAI,EAAE,CAAC,IAAI,CAAC;aAEK,CAAC;YACtB,MAAM,OAAO,GAAG,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;YAC3E,IAAI,OAAO,EAAE;gBACX,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC3B;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,qBAAqB,GAAmE,EAAE,CAAC;QACjG,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;YAClC,IAAI,UAAU,CAAC,OAAO,CAAC,EAAE;gBACvB,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACrC;iBAAM;gBACL,qBAAqB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;aAC/C;QACH,CAAC,CAAC,CAAC;QACH,cAAc,mCACT,WAAW,CAAC,CAAC,CAAC,KACjB,OAAO,EAAE,qBAAqB,GAC/B,CAAC;QAGF,IAAI,sBAAsB,GAAoB,EAAE,CAAC;QACjD,MAAM,iBAAiB,GAAG,UAAU;aACjC,MAAM,CAAC,MAAM,CAAC,EAAE;;YACf,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,aAAa,0CAAE,IAAI,CAAC;YACxC,OAAO,OAAO,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,CAAC,IAAI,0BAA0B,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC5F,CAAC,CAAC;aACD,GAAG,CAAC,MAAM,CAAC,EAAE;YACZ,MAAM,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC,IAAK,CAAC,SAAU,CAAC;YACtD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QACL,IAAI,iBAAiB,CAAC,MAAM,EAAE;YAE5B,IAAI,oBAAoB,GAA+E,EAAE,CAAC;YAC1G,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE;gBAC5D,oBAAoB,GAAG,SAAS,CAAC;aAClC;iBAAM;gBACL,iBAAiB,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;oBACxC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;wBAClB,OAAO;qBACR;oBACD,IAAI,UAAU,CAAC,OAAO,CAAC,EAAE;wBACvB,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,IAAI,CAAC,OAAO,CAAC,CAAC;qBACrC;yBAAM;wBACL,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;qBAC/C;gBACH,CAAC,CAAC,CAAC;aACJ;YACD,sBAAsB,mCACjB,iBAAiB,CAAC,CAAC,CAAC,KACvB,OAAO,EAAE,oBAAoB,GAC9B,CAAC;SACH;QAED,WAAW,GAAG,KAAK,CAAC,EAAE,EAAE,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,sBAAsB,CAAC,CAAC;KAClF;IAGD,MAAM,mBAAmB,GAAG,cAAc,CAAC,KAAwC,CAAC;IACpF,MAAM,UAAU,GAAyB;QACvC,QAAQ,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,QAAQ;QAC/D,SAAS,EAAE,MAAA,WAAW,CAAC,SAAS,mCAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,SAAS;QAClE,UAAU,EAAE,MAAA,WAAW,CAAC,UAAU,mCAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,UAAU;KACtE,CAAC;IACF,IAAI,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;QAE9B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;YAClC,WAAW,CAAC,KAAK,iDACZ,cAAc,CAAC,KAAK,GACpB,UAAU,GACV,WAAW,CAAC,KAAK,CACrB,CAAC;SACH;aAAM;YACL,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC;YAC3C,WAAW,CAAC,KAAK,GAAG,CAAC,IAAkB,EAAE,MAA6B,EAAE,EAAE;;gBACxE,MAAM,UAAU,GAAG,MAAA,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,mCAAI,EAAE,CAAC;gBACxD,uCACK,UAAU,GACV,UAAU,EACb;YACJ,CAAC,CAAC;SACH;KACF;SAAM;QACL,WAAW,CAAC,KAAK,mCACZ,cAAc,CAAC,KAAK,GACpB,UAAU,CACd,CAAC;KACH;IAED,MAAM,eAAe,GAAG,CAAC,kBAAwC,EAAwB,EAAE;;QAAC,OAAA,CAAC;YAC3F,QAAQ,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,QAAQ;YAC9D,SAAS,EAAE,MAAA,WAAW,CAAC,SAAS,mCAAI,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,SAAS;YACjE,UAAU,EAAE,MAAA,WAAW,CAAC,UAAU,mCAAI,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,UAAU;SACrE,CAAC,CAAA;KAAA,CAAC;IACH,MAAM,qBAAqB,GAAG,KAAK,CAAC,cAAc,CAAC,OAAO,CAA0B,CAAC;IACrF,IAAI,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;QAEhC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACpC,MAAM,kBAAkB,GAAG,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACtD,kBAAkB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;gBACrC,kBAAkB,CAAC,CAAC,CAAC,mCAChB,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,GACzC,IAAI,CACR,CAAC;YACJ,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,kBAAkB,GAAG,WAAW,CAAC,OAAO,CAAC;YAC/C,WAAW,CAAC,OAAO,GAAG,CAAC,IAAkB,EAAE,MAA6B,EAAE,EAAE;;gBAC1E,MAAM,UAAU,GAAG,KAAK,CAAC,MAAA,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,mCAAI,EAAE,CAAC,CAAC;gBACjE,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;oBAC7B,UAAU,CAAC,CAAC,CAAC,mCACR,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,GACzC,IAAI,CACR,CAAC;gBACJ,CAAC,CAAC,CAAC;gBACH,OAAO,UAAU,CAAC;YACpB,CAAC,CAAC;SACH;KACF;SAAM;QACL,WAAW,CAAC,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,iCACnD,IAAI,GACJ,eAAe,CAAC,IAAI,CAAC,EACxB,CAAC,CAAC;KACL;IAED,SAAS,CAAC,UAAU,CAAC,iDAChB,cAAc,GACd,WAAW,KACd,UAAU,GACX,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC","file":"get-spec.js","sourcesContent":["import type { ITooltipSpec, TooltipHandlerParams } from '../../interface';\nimport type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  ITooltipShapePattern,\n  MaybeArray,\n  TooltipActiveType,\n  TooltipData,\n  TooltipPatternProperty\n} from '../../../../typings';\nimport type { ISeries } from '../../../../series/interface';\nimport { cloneDeep, isValid, merge, array, isFunction, isNil } from '../../../../util';\nimport { makeDefaultPattern } from './pattern';\nimport type { IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport { getTooltipActualActiveType } from '../../utils';\n\nexport const getTooltipSpecForShow = (\n  activeType: TooltipActiveType,\n  globalSpec: ITooltipSpec,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipSpec => {\n  // 组装tooltip spec\n  const finalSpec = {\n    ...globalSpec,\n    activeType\n  } as ITooltipSpec;\n  // 默认的pattern\n  let defaultPattern = {} as ITooltipPattern;\n  // 用户配置的pattern\n  let userPattern = {} as ITooltipPattern;\n\n  if (activeType === 'mark' && series) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesSpec = (series.tooltipHelper?.spec ?? {}) as ITooltipSpec;\n\n    // visible\n    if (isValid(seriesSpec.visible) || isValid(seriesSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(seriesSpec).includes('mark');\n    } else if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(globalSpec).includes('mark');\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = seriesSpec.handler ?? globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n\n    // pattern\n    defaultPattern = makeDefaultPattern(series, 'mark') ?? {};\n    userPattern = merge({}, cloneDeep(globalSpec.mark), cloneDeep(seriesSpec.mark));\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesList = dimensionInfo.reduce(\n      (list, cur) => list.concat(cur.data.map(data => data.series).filter(isValid)),\n      [] as ISeries[]\n    );\n\n    // visible\n    if (seriesList.every(series => !getTooltipActualActiveType(series.tooltipHelper?.spec).includes('dimension'))) {\n      finalSpec.visible = false;\n    } else if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(globalSpec).includes('dimension');\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n\n    // 默认 pattern\n    const patternList: ITooltipPattern[] = [];\n    dimensionInfo[0].data.forEach(data => {\n      const { series } = data;\n      const mockDimensionInfo = [\n        {\n          ...dimensionInfo[0],\n          data: [data]\n        }\n      ] as IDimensionInfo[];\n      const pattern = makeDefaultPattern(series, 'dimension', mockDimensionInfo);\n      if (pattern) {\n        patternList.push(pattern);\n      }\n    });\n    // 拼接默认 tooltip content\n    const defaultPatternContent: Array<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>> = [];\n    patternList.forEach(({ content }) => {\n      if (isFunction(content)) {\n        defaultPatternContent.push(content);\n      } else {\n        defaultPatternContent.push(...array(content));\n      }\n    });\n    defaultPattern = {\n      ...patternList[0],\n      content: defaultPatternContent\n    };\n\n    // 系列 pattern\n    let seriesDimensionPattern: ITooltipPattern = {};\n    const seriesPatternList = seriesList\n      .filter(series => {\n        const spec = series.tooltipHelper?.spec;\n        return isValid(spec?.dimension) && getTooltipActualActiveType(spec).includes('dimension');\n      })\n      .map(series => {\n        const pattern = series.tooltipHelper.spec!.dimension!;\n        return pattern;\n      });\n    if (seriesPatternList.length) {\n      // 拼接系列 tooltip content\n      let seriesPatternContent: Array<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>> | undefined = [];\n      if (seriesPatternList.every(({ content }) => isNil(content))) {\n        seriesPatternContent = undefined;\n      } else {\n        seriesPatternList.forEach(({ content }) => {\n          if (isNil(content)) {\n            return;\n          }\n          if (isFunction(content)) {\n            seriesPatternContent?.push(content);\n          } else {\n            seriesPatternContent?.push(...array(content));\n          }\n        });\n      }\n      seriesDimensionPattern = {\n        ...seriesPatternList[0],\n        content: seriesPatternContent\n      };\n    }\n\n    userPattern = merge({}, cloneDeep(globalSpec.dimension), seriesDimensionPattern);\n  }\n\n  // 对pattern进行组装\n  const defaultPatternTitle = defaultPattern.title as IToolTipLinePattern | undefined;\n  const titleShape: ITooltipShapePattern = {\n    hasShape: userPattern.hasShape ?? defaultPatternTitle?.hasShape,\n    shapeType: userPattern.shapeType ?? defaultPatternTitle?.shapeType,\n    shapeColor: userPattern.shapeColor ?? defaultPatternTitle?.shapeColor\n  };\n  if (isValid(userPattern.title)) {\n    // 排除是回调的情况\n    if (!isFunction(userPattern.title)) {\n      userPattern.title = {\n        ...defaultPattern.title,\n        ...titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n        ...userPattern.title\n      };\n    } else {\n      const userPatternTitle = userPattern.title;\n      userPattern.title = (data?: TooltipData, params?: TooltipHandlerParams) => {\n        const userResult = userPatternTitle(data, params) ?? {};\n        return {\n          ...titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n          ...userResult\n        };\n      };\n    }\n  } else {\n    userPattern.title = {\n      ...defaultPattern.title,\n      ...titleShape\n    };\n  }\n\n  const getContentShape = (defaultContentLine?: IToolTipLinePattern): ITooltipShapePattern => ({\n    hasShape: userPattern.hasShape ?? defaultContentLine?.hasShape,\n    shapeType: userPattern.shapeType ?? defaultContentLine?.shapeType,\n    shapeColor: userPattern.shapeColor ?? defaultContentLine?.shapeColor\n  });\n  const defaultPatternContent = array(defaultPattern.content) as IToolTipLinePattern[];\n  if (isValid(userPattern.content)) {\n    // 排除是回调的情况\n    if (!isFunction(userPattern.content)) {\n      const userPatternContent = array(userPattern.content);\n      userPatternContent.forEach((line, i) => {\n        userPatternContent[i] = {\n          ...getContentShape(defaultPatternContent[0]), // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n          ...line\n        };\n      });\n    } else {\n      const userPatternContent = userPattern.content;\n      userPattern.content = (data?: TooltipData, params?: TooltipHandlerParams) => {\n        const userResult = array(userPatternContent(data, params) ?? []);\n        userResult.forEach((line, i) => {\n          userResult[i] = {\n            ...getContentShape(defaultPatternContent[0]), // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n            ...line\n          };\n        });\n        return userResult;\n      };\n    }\n  } else {\n    userPattern.content = defaultPatternContent.map(line => ({\n      ...line,\n      ...getContentShape(line)\n    }));\n  }\n\n  finalSpec[activeType] = {\n    ...defaultPattern,\n    ...userPattern,\n    activeType\n  };\n\n  return finalSpec;\n};\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/utils/get-spec.ts"],"names":[],"mappings":"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","file":"get-spec.js","sourcesContent":["import type { ITooltipSpec, TooltipHandlerParams } from '../../interface';\nimport type {\n  IToolTipLinePattern,\n  ITooltipPattern,\n  ITooltipShapePattern,\n  MaybeArray,\n  TooltipActiveType,\n  TooltipData,\n  TooltipPatternProperty\n} from '../../../../typings';\nimport type { ISeries } from '../../../../series/interface';\nimport { cloneDeep, isValid, merge, array, isFunction, isNil } from '../../../../util';\nimport { makeDefaultPattern } from './pattern';\nimport type { IDimensionInfo } from '../../../../event/events/dimension/interface';\nimport { getTooltipActualActiveType } from '../../utils';\n\nexport const getTooltipSpecForShow = (\n  activeType: TooltipActiveType,\n  globalSpec: ITooltipSpec,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipSpec => {\n  // 组装tooltip spec\n  const finalSpec = {\n    ...globalSpec,\n    activeType\n  } as ITooltipSpec;\n  if (activeType === 'mark' && series) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesSpec = (series.tooltipHelper?.spec ?? {}) as ITooltipSpec;\n\n    // visible\n    if (isValid(seriesSpec.visible) || isValid(seriesSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(seriesSpec).includes('mark');\n    } else if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(globalSpec).includes('mark');\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = seriesSpec.handler ?? globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // tooltip spec覆盖优先级: series spec > global spec > default pattern\n    const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);\n\n    // visible\n    if (seriesList.every(series => !getTooltipActualActiveType(series.tooltipHelper?.spec).includes('dimension'))) {\n      finalSpec.visible = false;\n    } else if (isValid(globalSpec.visible) || isValid(globalSpec.activeType)) {\n      finalSpec.visible = getTooltipActualActiveType(globalSpec).includes('dimension');\n    } else {\n      finalSpec.visible = true;\n    }\n\n    // 优先使用自定义handler\n    finalSpec.handler = globalSpec.handler ?? undefined;\n    if (finalSpec.handler?.showTooltip) {\n      return finalSpec;\n    }\n  }\n\n  // 默认的 pattern\n  const defaultPattern = getDefaultTooltipPattern(activeType, series, dimensionInfo);\n  // 来自系列的 pattern\n  const seriesPattern = getSeriesTooltipPattern(activeType, series, dimensionInfo);\n  // 来自用户配置的 pattern\n  const userPattern: ITooltipPattern = merge({}, cloneDeep(globalSpec[activeType]), seriesPattern);\n\n  // 对pattern进行组装\n  // 组装 title\n  const defaultPatternTitle = defaultPattern.title as IToolTipLinePattern | undefined;\n  const titleShape: ITooltipShapePattern = getShapePattern(undefined, userPattern, undefined, defaultPatternTitle);\n  if (isValid(userPattern.title)) {\n    // 排除是回调的情况\n    if (!isFunction(userPattern.title)) {\n      userPattern.title = {\n        ...defaultPattern.title,\n        ...titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n        ...userPattern.title\n      };\n    } else {\n      const userPatternTitle = userPattern.title;\n      userPattern.title = (data?: TooltipData, params?: TooltipHandlerParams) => {\n        const userResult = userPatternTitle(data, params) ?? {};\n        return {\n          ...titleShape, // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n          ...userResult\n        };\n      };\n    }\n  } else {\n    userPattern.title = {\n      ...defaultPattern.title,\n      ...titleShape\n    };\n  }\n\n  // 组装 content\n  const defaultPatternContent = array(defaultPattern.content) as IToolTipLinePattern[];\n  if (isValid(userPattern.content)) {\n    const shapePatternMap = getShapePatternMapOfEachSeries(defaultPatternContent);\n    // 排除是回调的情况\n    if (!isFunction(userPattern.content)) {\n      const newPatternContent: IToolTipLinePattern[] = [];\n      array(userPattern.content).forEach(userLine => {\n        newPatternContent.push({\n          ...getShapePattern(userLine as IToolTipLinePattern, userPattern, shapePatternMap), // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n          ...userLine\n        });\n      });\n      userPattern.content = newPatternContent;\n    } else {\n      const userPatternContent = userPattern.content;\n      userPattern.content = (data?: TooltipData, params?: TooltipHandlerParams) => {\n        const newPatternContent: IToolTipLinePattern[] = [];\n        array(userPatternContent(data, params) ?? []).forEach(userLine => {\n          newPatternContent.push({\n            ...getShapePattern(userLine as IToolTipLinePattern, userPattern, shapePatternMap), // shape默认回调实现较复杂，如果用户没有配置则填补默认逻辑\n            ...userLine\n          });\n        });\n        return newPatternContent;\n      };\n    }\n  } else {\n    userPattern.content = defaultPatternContent.map(line => ({\n      ...line,\n      ...getShapePattern(undefined, userPattern, undefined, line)\n    }));\n  }\n\n  finalSpec[activeType] = {\n    ...defaultPattern,\n    ...userPattern,\n    activeType\n  };\n\n  return finalSpec;\n};\n\n/** 获取默认 tooltip pattern */\nconst getDefaultTooltipPattern = (\n  activeType: TooltipActiveType,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipPattern => {\n  // 默认的pattern\n  let defaultPattern = {} as ITooltipPattern;\n  if (activeType === 'mark' && series) {\n    // mark tooltip\n    defaultPattern = makeDefaultPattern(series, 'mark') ?? {};\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // dimension tooltip\n    const patternList: ITooltipPattern[] = [];\n    dimensionInfo[0].data.forEach(data => {\n      const { series } = data;\n      const mockDimensionInfo = [\n        {\n          ...dimensionInfo[0],\n          data: [data]\n        }\n      ] as IDimensionInfo[];\n      const pattern = makeDefaultPattern(series, 'dimension', mockDimensionInfo);\n      if (pattern) {\n        patternList.push(pattern);\n      }\n    });\n    // 拼接默认 tooltip content\n    const defaultPatternContent: Array<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>> = [];\n    patternList.forEach(({ content }) => {\n      if (isFunction(content)) {\n        defaultPatternContent.push(content);\n      } else {\n        defaultPatternContent.push(...array(content));\n      }\n    });\n    defaultPattern = {\n      ...patternList[0],\n      content: defaultPatternContent\n    };\n  }\n  return defaultPattern;\n};\n\n/** 获取来自系列 spec 的 tooltip pattern */\nconst getSeriesTooltipPattern = (\n  activeType: TooltipActiveType,\n  series?: ISeries,\n  dimensionInfo?: IDimensionInfo[]\n): ITooltipPattern => {\n  // 默认的pattern\n  let seriesPattern = {} as ITooltipPattern;\n  if (activeType === 'mark' && series) {\n    // mark tooltip\n    const seriesSpec = (series.tooltipHelper?.spec ?? {}) as ITooltipSpec;\n    seriesPattern = seriesSpec.mark ? cloneDeep(seriesSpec.mark) : {};\n  } else if (activeType === 'dimension' && dimensionInfo?.length) {\n    // dimension tooltip\n    const seriesList = getSeriesListFromDimensionInfo(dimensionInfo);\n    const seriesPatternList = seriesList\n      .filter(series => {\n        const spec = series.tooltipHelper?.spec;\n        return isValid(spec?.dimension) && getTooltipActualActiveType(spec).includes('dimension');\n      })\n      .map(series => series.tooltipHelper.spec.dimension);\n    if (seriesPatternList.length) {\n      // 拼接系列 tooltip content\n      let seriesPatternContent: Array<TooltipPatternProperty<MaybeArray<IToolTipLinePattern>>> | undefined = [];\n      if (seriesPatternList.every(({ content }) => isNil(content))) {\n        seriesPatternContent = undefined;\n      } else {\n        seriesPatternList.forEach(({ content }) => {\n          if (isNil(content)) {\n            return;\n          }\n          if (isFunction(content)) {\n            seriesPatternContent?.push(content);\n          } else {\n            seriesPatternContent?.push(...array(content));\n          }\n        });\n      }\n      seriesPattern = {\n        ...seriesPatternList[0],\n        content: seriesPatternContent\n      };\n    }\n  }\n  return seriesPattern;\n};\n\nconst getSeriesListFromDimensionInfo = (dimensionInfo: IDimensionInfo[]): ISeries[] => {\n  return dimensionInfo.reduce(\n    (list, cur) => list.concat(cur.data.map(data => data.series).filter(isValid)),\n    [] as ISeries[]\n  );\n};\n\n/** 获取每个系列对应的 shape pattern */\nconst getShapePatternMapOfEachSeries = (content: IToolTipLinePattern[]): Record<number, ITooltipShapePattern> => {\n  const shapePatternMap: Record<number, ITooltipShapePattern> = {};\n  content.forEach(line => {\n    const key = line.seriesId ?? 0;\n    if (!shapePatternMap[key]) {\n      shapePatternMap[key] = line;\n    }\n  });\n  return shapePatternMap;\n};\n\n/** 根据优先级获取形状配置 */\nconst getShapePattern = (\n  userLinePattern?: IToolTipLinePattern,\n  userPattern?: ITooltipPattern,\n  shapePatternMap?: Record<number, ITooltipShapePattern>,\n  defaultShapePattern?: ITooltipShapePattern\n): ITooltipShapePattern => {\n  const shapePatternFromMap = shapePatternMap?.[userLinePattern?.seriesId ?? 0] ?? shapePatternMap?.[0];\n  const shapeKeys: (keyof ITooltipShapePattern)[] = ['hasShape', 'shapeType', 'shapeColor'];\n  const shapePattern: ITooltipShapePattern = {};\n  shapeKeys.forEach(key => {\n    const value =\n      userLinePattern?.[key] ?? userPattern?.[key] ?? shapePatternFromMap?.[key] ?? defaultShapePattern?.[key];\n    if (value !== undefined) {\n      shapePattern[key as any] = value;\n    }\n  });\n  return shapePattern;\n};\n"]}

package/esm/core/index.d.ts

@@ -1,7 +1,7 @@
 import { VChart } from './vchart';
 import { Factory } from './factory';
 export { VChart, Factory };
-export declare const version = "1.2.1";
+export declare const version = "1.2.2-beta.1";
 export type { IVChart } from './interface';
 export * from '../event/interface';
 export * from '../typings/spec/common';

package/esm/core/index.js

@@ -19,7 +19,7 @@ Factory.registerLayout("base", Layout);
 
 export { VChart, Factory };
 
-export const version = "1.2.1";
+export const version = "1.2.2-beta.1";
 
 export * from "../event/interface";
 

package/esm/core/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAKvD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;AAGtD,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAa,CAAC,CAAC;AAGhD,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAa,CAAC,CAAC;AAE9C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC;AAK/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AAEvC,cAAc,oBAAoB,CAAC;AAGnC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC","file":"index.js","sourcesContent":["import { Logger, LoggerLevel } from '@visactor/vutils';\n/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\nimport { Region } from '../region/region';\nimport { Layout } from '../layout/base-layout';\nimport { GroupMark } from '../mark/group';\nimport { ComponentMark } from '../mark/component';\nimport { ImageMark } from './../mark/image';\n\n// register groupMark and componentMark\nVChart.useMark([ComponentMark, GroupMark, ImageMark]);\n\n// install region module\nFactory.registerRegion('region', Region as any);\n\n// install layout module\nFactory.registerLayout('base', Layout as any);\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.2.1\";\n\n// export necessary types\nexport type { IVChart } from './interface';\n// the event types\nexport * from '../event/interface';\nexport * from '../typings/spec/common';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\nexport * from '../theme/interface';\n\n// set default logger level to Level.error\nLogger.getInstance(LoggerLevel.Error);\n"]}
+{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAKvD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;AAGtD,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAa,CAAC,CAAC;AAGhD,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAa,CAAC,CAAC;AAE9C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,cAAc,CAAC;AAKtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AAEvC,cAAc,oBAAoB,CAAC;AAGnC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC","file":"index.js","sourcesContent":["import { Logger, LoggerLevel } from '@visactor/vutils';\n/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\nimport { Region } from '../region/region';\nimport { Layout } from '../layout/base-layout';\nimport { GroupMark } from '../mark/group';\nimport { ComponentMark } from '../mark/component';\nimport { ImageMark } from './../mark/image';\n\n// register groupMark and componentMark\nVChart.useMark([ComponentMark, GroupMark, ImageMark]);\n\n// install region module\nFactory.registerRegion('region', Region as any);\n\n// install layout module\nFactory.registerLayout('base', Layout as any);\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.2.2-beta.1\";\n\n// export necessary types\nexport type { IVChart } from './interface';\n// the event types\nexport * from '../event/interface';\nexport * from '../typings/spec/common';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\nexport * from '../theme/interface';\n\n// set default logger level to Level.error\nLogger.getInstance(LoggerLevel.Error);\n"]}

package/esm/core/vchart.d.ts

@@ -91,6 +91,7 @@ export declare class VChart implements IVChart {
     setSelected(datum: MaybeArray<any> | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void;
     setHovered(datum: MaybeArray<Datum> | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void;
     private _updateCurrentTheme;
+    private _getBackground;
     getCurrentTheme(): ITheme;
     getCurrentThemeName(): string;
     setCurrentTheme(name: string): Promise<IVChart>;

package/esm/core/vchart.js

@@ -138,12 +138,10 @@ export class VChart {
             });
         }), 100), this._option = merge(this._option, options), this._onError = this._option.onError;
         const _e = this._option, {dom: dom, renderCanvas: renderCanvas, mode: mode, stage: stage, poptip: poptip} = _e, restOptions = __rest(_e, [ "dom", "renderCanvas", "mode", "stage", "poptip" ]);
-        if (dom && (this._container = isString(dom) ? null === document || void 0 === document ? void 0 : document.getElementById(dom) : dom), 
-        renderCanvas && (this._canvas = renderCanvas), stage && (this._stage = stage), "node" !== mode && !this._container && !this._canvas && !this._stage) return void this._option.onError("please specify container or renderCanvas!");
-        this._viewBox = this._option.viewBox, this._currentThemeName = ThemeManager.getCurrentThemeName(), 
-        this._setSpec(spec), this._updateCurrentTheme();
-        const specBackground = "string" == typeof spec.background ? spec.background : null;
-        this._compiler = new Compiler({
+        dom && (this._container = isString(dom) ? null === document || void 0 === document ? void 0 : document.getElementById(dom) : dom), 
+        renderCanvas && (this._canvas = renderCanvas), stage && (this._stage = stage), "node" === mode || this._container || this._canvas || this._stage ? (this._viewBox = this._option.viewBox, 
+        this._currentThemeName = ThemeManager.getCurrentThemeName(), this._setSpec(spec), 
+        this._updateCurrentTheme(), this._compiler = new Compiler({
             dom: null !== (_a = this._container) && void 0 !== _a ? _a : "none",
             canvas: renderCanvas
         }, Object.assign(Object.assign({
@@ -151,7 +149,7 @@ export class VChart {
             stage: stage,
             pluginList: !1 !== poptip ? [ "poptipForText" ] : []
         }, restOptions), {
-            background: specBackground || this._currentTheme.background || this._option.background,
+            background: this._getBackground(),
             onError: this._onError
         })), this._eventDispatcher = new EventDispatcher(this, this._compiler), this._event = new Event(this._eventDispatcher, mode), 
         this._compiler.initView(), null === (_b = this.getStage()) || void 0 === _b || _b.setTheme({
@@ -163,7 +161,7 @@ export class VChart {
             width: spec.width || 0,
             height: spec.height || 0
         }, this._bindResizeEvent(), this._bindVGrammarViewEvent(), this._event.emit(ChartEvent.initialized, {}), 
-        InstanceManager.registerInstance(this);
+        InstanceManager.registerInstance(this)) : this._option.onError("please specify container or renderCanvas!");
     }
     _setSpec(spec) {
         spec && (this._spec = specTransform(isString(spec) ? JSON.parse(spec) : spec));
@@ -247,7 +245,7 @@ export class VChart {
     _reCompile(updateResult) {
         var _a, _b;
         updateResult.reMake ? (this._releaseData(), this._initDataSet(), this._chart.release(), 
-        this._chart = null, null === (_a = this._compiler) || void 0 === _a || _a.releaseGrammar()) : updateResult.reCompile && (this.getComponents().forEach((c => c.clear())), 
+        this._chart = null, null === (_a = this._compiler) || void 0 === _a || _a.releaseGrammar()) : (this.getComponents().forEach((c => c.clear())), 
         null === (_b = this._compiler) || void 0 === _b || _b.compile({
             chart: this._chart,
             vChart: this
@@ -406,10 +404,14 @@ export class VChart {
         this._chart && this._chart.setHovered(datum, filter, region);
     }
     _updateCurrentTheme() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         isString(null === (_a = this._spec) || void 0 === _a ? void 0 : _a.theme) ? (this._currentTheme = merge({}, ThemeManager.getTheme(this._spec.theme)), 
         this._currentThemeName = this._spec.theme) : this._currentTheme = merge({}, ThemeManager.getTheme(this._currentThemeName), null !== (_c = null === (_b = this._spec) || void 0 === _b ? void 0 : _b.theme) && void 0 !== _c ? _c : {}), 
-        setPoptipTheme(merge({}, null === (_d = this._currentTheme.component) || void 0 === _d ? void 0 : _d.poptip));
+        setPoptipTheme(merge({}, null === (_d = this._currentTheme.component) || void 0 === _d ? void 0 : _d.poptip)), 
+        null === (_e = this._compiler) || void 0 === _e || _e.setBackground(this._getBackground());
+    }
+    _getBackground() {
+        return ("string" == typeof this._spec.background ? this._spec.background : null) || this._currentTheme.background || this._option.background;
     }
     getCurrentTheme() {
         return this._currentTheme;