@visactor/vchart 2.1.0-alpha.9 → 2.1.0

package/cjs/plugin/other.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugin/other.ts"],"names":[],"mappings":";;;AAAA,yDAAmG;AAoB5D,4GApB9B,0CAA2B,OAoB8B;AAAzD,6GApB6B,2CAA4B,OAoB7B;AAlBrC,+DAAsF;AACtF,yDAA4D;AAC5D,6CAA0C;AAC1C,gDAAuF;AAEhF,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,IAAA,iCAAsB,GAAE,CAAC;IACzB,IAAA,iCAAwB,GAAE,CAAC;IAC3B,IAAA,+BAAsB,GAAE,CAAC;AAC3B,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAEK,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,iBAAO,CAAC,wBAAwB,CAAC,MAAM,EAAE,wBAAS,CAAC,CAAC;AACtD,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AACK,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,iBAAO,CAAC,wBAAwB,CAAC,SAAS,EAAE,sBAAO,CAAC,CAAC;AACvD,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC","file":"other.js","sourcesContent":["import { registerHtmlAttributePlugin, registerReactAttributePlugin } from '@visactor/vrender-core';\n\nimport { registerAnimate as registerVRenderAnimate } from '@visactor/vrender-animate';\nimport { DragNDrop, Gesture } from '@visactor/vrender-kits';\nimport { Factory } from '../core/factory';\nimport { registerBuiltInAnimation, registerStageAnimation } from '../animation/config';\n\nexport const registerAnimate = () => {\n  registerVRenderAnimate();\n  registerBuiltInAnimation();\n  registerStageAnimation();\n};\n\nexport const registerDragPlugin = () => {\n  Factory.registerStageEventPlugin('drag', DragNDrop);\n};\nexport const registerGesturePlugin = () => {\n  Factory.registerStageEventPlugin('gesture', Gesture);\n};\n\nexport { registerReactAttributePlugin, registerHtmlAttributePlugin };\n// export const registerMorph = registerViewMorphAPI;\n"]}
+{"version":3,"sources":["../src/plugin/other.ts"],"names":[],"mappings":";;;AAAA,yDAAmG;AAoB5D,4GApB9B,0CAA2B,OAoB8B;AAAzD,6GApB6B,2CAA4B,OAoB7B;AAlBrC,iEAA+F;AAC/F,sEAA4E;AAC5E,6CAA0C;AAC1C,gDAAuF;AAEhF,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,IAAA,0BAAsB,GAAE,CAAC;IACzB,IAAA,iCAAwB,GAAE,CAAC;IAC3B,IAAA,+BAAsB,GAAE,CAAC;AAC3B,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAEK,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,iBAAO,CAAC,wBAAwB,CAAC,MAAM,EAAE,qBAAS,CAAC,CAAC;AACtD,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AACK,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,iBAAO,CAAC,wBAAwB,CAAC,SAAS,EAAE,mBAAO,CAAC,CAAC;AACvD,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC","file":"other.js","sourcesContent":["import { registerHtmlAttributePlugin, registerReactAttributePlugin } from '@visactor/vrender-core';\n\nimport { registerAnimate as registerVRenderAnimate } from '@visactor/vrender-animate/register';\nimport { DragNDrop, Gesture } from '@visactor/vrender-kits/event/extension';\nimport { Factory } from '../core/factory';\nimport { registerBuiltInAnimation, registerStageAnimation } from '../animation/config';\n\nexport const registerAnimate = () => {\n  registerVRenderAnimate();\n  registerBuiltInAnimation();\n  registerStageAnimation();\n};\n\nexport const registerDragPlugin = () => {\n  Factory.registerStageEventPlugin('drag', DragNDrop);\n};\nexport const registerGesturePlugin = () => {\n  Factory.registerStageEventPlugin('gesture', Gesture);\n};\n\nexport { registerReactAttributePlugin, registerHtmlAttributePlugin };\n// export const registerMorph = registerViewMorphAPI;\n"]}

package/cjs/series/base/base-series.d.ts

@@ -20,8 +20,10 @@ export interface ISeriesSpecUpdatePolicy {
     compileOnlyKeys?: Record<string, true>;
     dataRelatedKeys?: Record<string, true>;
     compileOnlySubKeys?: Record<string, Record<string, true>>;
+    seriesOnlyKeys?: Record<string, true>;
 }
 export declare function markSeriesCompileEffect(compareResult: IUpdateSpecResult, dataRelated?: boolean): void;
+export declare function markSeriesOnlyEffect(compareResult: IUpdateSpecResult): void;
 export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseModel<T> implements ISeries {
     readonly specKey: string;
     readonly type: string;
@@ -168,6 +170,7 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     initSeriesStyleState(): void;
     afterInitMark(): void;
     getMarksWithoutRoot(): IMark[];
+    protected _getMarkSpecNamesForCompare(): string[];
     getMarksInType(type: string | string[]): IMark[];
     getMarkInName(name: string): IMark | undefined;
     getMarkInId(markId: number): IMark | undefined;

package/cjs/series/base/base-series.js

@@ -2,12 +2,15 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.BaseSeries = exports.markSeriesCompileEffect = void 0;
+}), exports.BaseSeries = exports.markSeriesOnlyEffect = exports.markSeriesCompileEffect = void 0;
 
-const event_1 = require("../../constant/event"), data_1 = require("../../constant/data"), attribute_1 = require("../../constant/attribute"), base_1 = require("../../constant/base"), vdataset_1 = require("@visactor/vdataset"), base_model_1 = require("../../model/base-model"), initialize_1 = require("../../data/initialize"), data_2 = require("../../util/data"), type_1 = require("../../util/type"), vutils_extension_1 = require("@visactor/vutils-extension"), add_property_1 = require("../../data/transforms/add-property"), register_1 = require("../../data/register"), tooltip_helper_1 = require("./tooltip-helper"), dimension_statistics_1 = require("../../data/transforms/dimension-statistics"), invalid_travel_1 = require("../../data/transforms/invalid-travel"), util_1 = require("../../theme/color-scheme/util"), data_key_1 = require("../../data/transforms/data-key"), mark_1 = require("../../compile/mark"), vutils_1 = require("@visactor/vutils"), color_ordinal_scale_1 = require("../../scale/color-ordinal-scale"), constant_1 = require("./constant"), utils_1 = require("../../animation/utils"), base_series_transformer_1 = require("./base-series-transformer"), config_1 = require("../../interaction/config"), layout_1 = require("../../constant/layout"), data_3 = require("../../compile/data"), util_2 = require("../../interaction/triggers/util"), defaultSeriesDataRelatedCheckKeys = Object.keys(constant_1.defaultSeriesCompileCheckKeys).reduce(((keys, key) => (constant_1.defaultSeriesCompileOnlyCheckKeys[key] || (keys[key] = !0), 
+const event_1 = require("../../constant/event"), data_1 = require("../../constant/data"), attribute_1 = require("../../constant/attribute"), base_1 = require("../../constant/base"), vdataset_1 = require("@visactor/vdataset"), base_model_1 = require("../../model/base-model"), initialize_1 = require("../../data/initialize"), data_2 = require("../../util/data"), type_1 = require("../../util/type"), vutils_extension_1 = require("@visactor/vutils-extension"), add_property_1 = require("../../data/transforms/add-property"), register_1 = require("../../data/register"), tooltip_helper_1 = require("./tooltip-helper"), dimension_statistics_1 = require("../../data/transforms/dimension-statistics"), invalid_travel_1 = require("../../data/transforms/invalid-travel"), util_1 = require("../../theme/color-scheme/util"), data_key_1 = require("../../data/transforms/data-key"), mark_1 = require("../../compile/mark"), factory_1 = require("../../core/factory"), vutils_1 = require("@visactor/vutils"), color_ordinal_scale_1 = require("../../scale/color-ordinal-scale"), constant_1 = require("./constant"), utils_1 = require("../../animation/utils"), base_series_transformer_1 = require("./base-series-transformer"), config_1 = require("../../interaction/config"), layout_1 = require("../../constant/layout"), data_3 = require("../../compile/data"), util_2 = require("../../interaction/triggers/util"), defaultSeriesDataRelatedCheckKeys = Object.keys(constant_1.defaultSeriesCompileCheckKeys).reduce(((keys, key) => (constant_1.defaultSeriesCompileOnlyCheckKeys[key] || (keys[key] = !0), 
 keys)), {}), defaultSeriesSpecUpdatePolicy = {
     compileOnlyKeys: constant_1.defaultSeriesCompileOnlyCheckKeys,
-    dataRelatedKeys: defaultSeriesDataRelatedCheckKeys
+    dataRelatedKeys: defaultSeriesDataRelatedCheckKeys,
+    seriesOnlyKeys: {
+        tooltip: !0
+    }
 }, defaultSeriesMarkCompileOnlySubKeys = {
     interactive: !0,
     zIndex: !0,
@@ -17,11 +20,13 @@ keys)), {}), defaultSeriesSpecUpdatePolicy = {
     stateSort: !0,
     customShape: !0
 }, isSpecObject = value => (0, vutils_1.isObject)(value) && !(0, vutils_1.isArray)(value) && !(0, 
-vutils_1.isFunction)(value), hasOnlyAllowedSubKeyChanges = (specValue, prevSpecValue, allowedSubKeys) => {
-    if (!isSpecObject(specValue) || !isSpecObject(prevSpecValue)) return !1;
+vutils_1.isFunction)(value), normalizeSpecObject = value => isSpecObject(value) ? value : (0, 
+vutils_1.isNil)(value) ? {} : null, hasOnlyAllowedSubKeyChanges = (specValue, prevSpecValue, allowedSubKeys) => {
+    const specObject = normalizeSpecObject(specValue), prevSpecObject = normalizeSpecObject(prevSpecValue);
+    if (!specObject || !prevSpecObject) return !1;
     let changed = !1;
-    const subKeys = Array.from(new Set([ ...Object.keys(prevSpecValue), ...Object.keys(specValue) ]));
-    for (const subKey of subKeys) if (!(0, vutils_1.isEqual)(specValue[subKey], prevSpecValue[subKey])) {
+    const subKeys = Array.from(new Set([ ...Object.keys(prevSpecObject), ...Object.keys(specObject) ]));
+    for (const subKey of subKeys) if (!(0, vutils_1.isEqual)(specObject[subKey], prevSpecObject[subKey])) {
         if (!allowedSubKeys[subKey]) return !1;
         changed = !0;
     }
@@ -37,7 +42,14 @@ function markSeriesCompileEffect(compareResult, dataRelated = !1) {
     }), dataRelated && (compareResult.effects.data = !0, compareResult.effects.scaleDomain = !0);
 }
 
-exports.markSeriesCompileEffect = markSeriesCompileEffect;
+function markSeriesOnlyEffect(compareResult) {
+    compareResult.change = !0, compareResult.effects = Object.assign(Object.assign({}, compareResult.effects), {
+        series: !0,
+        render: !0
+    });
+}
+
+exports.markSeriesCompileEffect = markSeriesCompileEffect, exports.markSeriesOnlyEffect = markSeriesOnlyEffect;
 
 class BaseSeries extends base_model_1.BaseModel {
     getRegion() {
@@ -529,6 +541,14 @@ class BaseSeries extends base_model_1.BaseModel {
             return !(null === (_a = m.name) || void 0 === _a ? void 0 : _a.includes("seriesGroup"));
         }));
     }
+    _getMarkSpecNamesForCompare() {
+        const names = new Set;
+        return this.getMarksWithoutRoot().forEach((mark => {
+            mark.name && names.add(mark.name);
+        })), Object.values(factory_1.Factory.getSeriesMarkMap(this.type)).forEach((markInfo => {
+            (null == markInfo ? void 0 : markInfo.name) && names.add(markInfo.name);
+        })), Array.from(names);
+    }
     getMarksInType(type) {
         return this._marks.getMarksInType(type);
     }
@@ -560,10 +580,10 @@ class BaseSeries extends base_model_1.BaseModel {
         return defaultSeriesSpecUpdatePolicy;
     }
     _compareSpec(spec, prevSpec, ignoreCheckKeys) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const result = super._compareSpec(spec, prevSpec), currentKeys = Object.keys(prevSpec || {}).sort(), nextKeys = Object.keys(spec || {}).sort();
         if (!(0, vutils_1.isEqual)(currentKeys, nextKeys)) return result.reMake = !0, result;
-        const specUpdatePolicy = this._getSpecUpdatePolicy(), compileOnlyKeys = null !== (_a = specUpdatePolicy.compileOnlyKeys) && void 0 !== _a ? _a : {}, dataRelatedKeys = null !== (_b = specUpdatePolicy.dataRelatedKeys) && void 0 !== _b ? _b : {}, compileOnlySubKeys = null !== (_c = specUpdatePolicy.compileOnlySubKeys) && void 0 !== _c ? _c : {}, compileCheckKeys = Object.assign(Object.assign({}, compileOnlyKeys), dataRelatedKeys), ignores = Object.assign(Object.assign(Object.assign(Object.assign({}, constant_1.defaultSeriesIgnoreCheckKeys), compileCheckKeys), ignoreCheckKeys), {
+        const specUpdatePolicy = this._getSpecUpdatePolicy(), compileOnlyKeys = null !== (_a = specUpdatePolicy.compileOnlyKeys) && void 0 !== _a ? _a : {}, dataRelatedKeys = null !== (_b = specUpdatePolicy.dataRelatedKeys) && void 0 !== _b ? _b : {}, compileOnlySubKeys = null !== (_c = specUpdatePolicy.compileOnlySubKeys) && void 0 !== _c ? _c : {}, seriesOnlyKeys = null !== (_d = specUpdatePolicy.seriesOnlyKeys) && void 0 !== _d ? _d : {}, compileCheckKeys = Object.assign(Object.assign({}, compileOnlyKeys), dataRelatedKeys), ignores = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, constant_1.defaultSeriesIgnoreCheckKeys), compileCheckKeys), seriesOnlyKeys), ignoreCheckKeys), {
             extensionMark: !0,
             label: !0,
             totalLabel: !0
@@ -573,22 +593,23 @@ class BaseSeries extends base_model_1.BaseModel {
         vutils_1.array)(spec.label), (0, vutils_1.array)(prevSpec.label), result), !result.reMake && this._compareLabelSpec((0, 
         vutils_1.array)(spec.totalLabel), (0, vutils_1.array)(prevSpec.totalLabel), result), 
         result.reMake) return result;
-        const changedMarkCompileOnlyKeys = this.getMarksWithoutRoot().map((m => m.name)).filter((name => hasOnlyAllowedSubKeyChanges(spec[name], prevSpec[name], defaultSeriesMarkCompileOnlySubKeys)));
+        const changedMarkCompileOnlyKeys = this._getMarkSpecNamesForCompare().filter((name => hasOnlyAllowedSubKeyChanges(spec[name], prevSpec[name], defaultSeriesMarkCompileOnlySubKeys)));
         changedMarkCompileOnlyKeys.forEach((k => {
             ignores[k] = !0;
         })), !result.reCompile && changedMarkCompileOnlyKeys.length && (result.reCompile = !0);
         const changedCompileKeys = currentKeys.filter((k => compileCheckKeys[k] && !(0, 
+        vutils_1.isEqual)(spec[k], prevSpec[k]))), changedSeriesOnlyKeys = currentKeys.filter((k => seriesOnlyKeys[k] && !(0, 
         vutils_1.isEqual)(spec[k], prevSpec[k]))), changedCompileOnlySubKeys = currentKeys.filter((k => compileOnlySubKeys[k] && hasOnlyAllowedSubKeyChanges(spec[k], prevSpec[k], compileOnlySubKeys[k])));
         return changedCompileOnlySubKeys.forEach((k => {
             ignores[k] = !0;
         })), result.reCompile || !changedCompileKeys.length && !changedCompileOnlySubKeys.length || (result.reCompile = !0), 
-        changedCompileKeys.some((k => dataRelatedKeys[k])) ? markSeriesCompileEffect(result, !0) : result.reCompile && !(null === (_d = result.effects) || void 0 === _d ? void 0 : _d.series) && (changedCompileKeys.length || changedCompileOnlySubKeys.length || changedMarkCompileOnlyKeys.length) && markSeriesCompileEffect(result), 
-        currentKeys.some((k => !ignores[k] && !(0, vutils_1.isEqual)(spec[k], prevSpec[k]))) ? (result.reMake = !0, 
-        result) : result;
+        changedCompileKeys.some((k => dataRelatedKeys[k])) ? markSeriesCompileEffect(result, !0) : result.reCompile && !(null === (_e = result.effects) || void 0 === _e ? void 0 : _e.series) && (changedCompileKeys.length || changedCompileOnlySubKeys.length || changedMarkCompileOnlyKeys.length) && markSeriesCompileEffect(result), 
+        changedSeriesOnlyKeys.length && markSeriesOnlyEffect(result), currentKeys.some((k => !ignores[k] && !(0, 
+        vutils_1.isEqual)(spec[k], prevSpec[k]))) ? (result.reMake = !0, result) : result;
     }
     _updateSpecData() {
         !this._rawData || !this._spec.data || this._spec.data instanceof vdataset_1.DataView || (0, 
-        initialize_1.updateDataViewInData)(this._rawData, this._spec.data, !0);
+        initialize_1.updateDataViewInData)(this._rawData, this._spec.data, !1);
     }
     reInit(spec) {
         super.reInit(spec);
@@ -626,15 +647,24 @@ class BaseSeries extends base_model_1.BaseModel {
         };
     }
     _getSeriesInfo(field, keys) {
-        const defaultShapeType = this.getDefaultShapeType();
-        return keys.map((key => ({
-            key: key,
-            originalKey: key,
-            style: this.getSeriesStyle({
+        var _a;
+        const defaultShapeType = this.getDefaultShapeType(), rawData = null === (_a = this.getRawData()) || void 0 === _a ? void 0 : _a.latestData, rawDatumMap = new Map;
+        return null == rawData || rawData.forEach((datum => {
+            const key = this.getSeriesFieldValue(datum, field);
+            rawDatumMap.has(key) || rawDatumMap.set(key, datum);
+        })), keys.map((key => {
+            var _a;
+            const datum = null !== (_a = rawDatumMap.get(key)) && void 0 !== _a ? _a : {
                 [field]: key
-            }),
-            shapeType: defaultShapeType
-        })));
+            };
+            return {
+                key: key,
+                originalKey: key,
+                datum: datum,
+                style: this.getSeriesStyle(datum),
+                shapeType: defaultShapeType
+            };
+        }));
     }
     getSeriesInfoInField(field) {
         var _a, _b;
@@ -689,15 +719,15 @@ class BaseSeries extends base_model_1.BaseModel {
                 name: markInfo.name
             }), isSeriesMark && (this._seriesMark = m), (0, vutils_1.isNil)(dataView) ? m.setData(this._data) : !1 !== dataView && m.setDataView(dataView), 
             m.setSkipBeforeLayouted(!1 !== skipBeforeLayouted), (0, vutils_1.isNil)(groupKey) || m.setGroupKey(groupKey);
-            const markConfig = Object.assign(Object.assign({}, config), {
+            const markCanMorph = null !== (_a = config.morph) && void 0 !== _a && _a, defaultMorphKeyIndex = this.getMarks().filter((mark => "group" === mark.type || mark.getMarkConfig().morph)).length + (markCanMorph ? 1 : 0), morphKey = (null === (_b = spec.morph) || void 0 === _b ? void 0 : _b.morphKey) || (markCanMorph ? `${this.getSpecIndex()}_${defaultMorphKeyIndex}` : void 0), markConfig = Object.assign(Object.assign({}, config), {
                 progressiveStep: spec.progressiveStep,
                 progressiveThreshold: spec.progressiveThreshold,
                 large: spec.large,
                 largeThreshold: spec.largeThreshold,
-                morph: null !== (_a = config.morph) && void 0 !== _a && _a,
+                morph: markCanMorph,
                 useSequentialAnimation: spec.useSequentialAnimation,
-                support3d: null !== (_b = config.support3d) && void 0 !== _b ? _b : spec.support3d || !!spec.zField,
-                morphKey: (null === (_c = spec.morph) || void 0 === _c ? void 0 : _c.morphKey) || `${this.getSpecIndex()}_${this.getMarks().length}`,
+                support3d: null !== (_c = config.support3d) && void 0 !== _c ? _c : spec.support3d || !!spec.zField,
+                morphKey: morphKey,
                 morphElementKey: null !== (_e = null === (_d = spec.morph) || void 0 === _d ? void 0 : _d.morphElementKey) && void 0 !== _e ? _e : config.morphElementKey
             });
             m.setMarkConfig(markConfig), this.initMarkStyleWithSpec(m, (0, vutils_extension_1.mergeSpec)({}, themeSpec, markSpec || spec[m.name]));