@visactor/vchart 2.0.13-alpha.8 → 2.0.13

package/build/index.es.js

@@ -16489,6 +16489,7 @@ class Graphic extends Node {
     var _a;
     if (!states.length) return void this.clearStates(hasAnimation);
     if (!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) !== states.length || states.some((stateName, index) => this.currentStates[index] !== stateName))) return;
+    this.stateSort && (states = states.sort(this.stateSort));
     const stateAttrs = {};
     states.forEach(stateName => {
       var _a;
@@ -18517,7 +18518,7 @@ class Glyph extends Graphic {
     var _a;
     if (!states.length) return void this.clearStates(hasAnimation);
     if (!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) !== states.length || states.some((stateName, index) => this.currentStates[index] !== stateName))) return;
-    this.stopStateAnimates();
+    this.stopStateAnimates(), this.stateSort && (states = states.sort(this.stateSort));
     const stateAttrs = {},
       subAttrs = this.subGraphic.map(() => ({}));
     states.forEach(stateName => {
@@ -35171,8 +35172,8 @@ class AnimateExecutor {
   }
   parseParams(params, isTimeline, child) {
     var _a, _b;
-    const totalTime = this.resolveValue(params.totalTime, void 0, void 0),
-      startTime = this.resolveValue(params.startTime, void 0, 0),
+    const totalTime = this.resolveValue(params.totalTime, child, void 0),
+      startTime = this.resolveValue(params.startTime, child, 0),
       parsedParams = Object.assign({}, params);
     parsedParams.oneByOneDelay = 0, parsedParams.startTime = startTime, parsedParams.totalTime = totalTime;
     const oneByOne = this.resolveValue(params.oneByOne, child, !1);
@@ -35221,11 +35222,10 @@ class AnimateExecutor {
       let oneByOneDelay = 0;
       oneByOne && (oneByOneDelay = "number" == typeof oneByOne ? oneByOne : oneByOne ? delay + delayAfter + duration : 0), parsedParams.oneByOneDelay = oneByOneDelay, parsedParams.custom = null !== (_a = params.custom) && void 0 !== _a ? _a : AnimateExecutor.builtInAnimateMap[null !== (_b = params.type) && void 0 !== _b ? _b : "fromTo"];
       const customType = getCustomType(parsedParams.custom);
-      if (parsedParams.customType = customType, totalTime) {
-        const _totalTime = delay + delayAfter + duration + oneByOneDelay * (this._target.count - 2),
-          scale = totalTime ? totalTime / _totalTime : 1;
-        parsedParams.delay = delay * scale, parsedParams.delayAfter = delayAfter * scale, parsedParams.duration = duration * scale, parsedParams.oneByOneDelay = oneByOneDelay * scale, parsedParams.startTime = startTime;
-      }
+      parsedParams.customType = customType;
+      const _totalTime = delay + delayAfter + duration + oneByOneDelay * (this._target.count - 2),
+        scale = isValidNumber$1(totalTime) ? totalTime / _totalTime : 1;
+      parsedParams.delay = delay * scale, parsedParams.delayAfter = delayAfter * scale, parsedParams.duration = duration * scale, parsedParams.oneByOneDelay = oneByOneDelay * scale, parsedParams.startTime = startTime;
     }
     return parsedParams;
   }
@@ -58888,6 +58888,7 @@ class BaseMark extends GrammarItem {
         allGraphics.forEach((g, index) => {
             g.context.graphicCount = graphicCount;
             g.context.graphicIndex = index;
+            g.stateSort = this._stateSort;
         });
         this._dataByKey = newGroupedData;
         this._graphics = allGraphics;
@@ -58933,8 +58934,13 @@ class BaseMark extends GrammarItem {
         var _a;
         const attrsByGroup = noGroupEncode ? null : this._runGroupEncoder((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a.group);
         graphics.forEach((g, index) => {
-            var _a;
-            const attrs = this._runEncoderOfGraphic((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a.update, g);
+            var _a, _b;
+            let attrs = this._runEncoderOfGraphic((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a.update, g);
+            (_b = g.currentStates) === null || _b === void 0 ? void 0 : _b.forEach((_state) => {
+                var _a;
+                const stateAttr = this._runEncoderOfGraphic((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a[_state], g);
+                attrs = Object.assign(Object.assign({}, attrs), stateAttr);
+            });
             if (!isNil$1(this._markConfig.interactive)) {
                 attrs.pickable = this._markConfig.interactive;
             }
@@ -58956,6 +58962,7 @@ class BaseMark extends GrammarItem {
                 }
                 g.context = mockGraphic.context;
                 g.context.diffAttrs = finalAttrs;
+                g.stateSort = this._stateSort;
                 const gIndex = this._graphics === graphics ? index : index + this._graphics.length - graphics.length;
                 if (gIndex >= 0) {
                     this._graphics[gIndex] = g;
@@ -61736,7 +61743,7 @@ const lookup = (data, opt) => {
     });
 };
 
-const version = "2.0.12";
+const version = "2.0.13";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -95632,7 +95639,7 @@ const hasData = (data) => {
     return Object.keys(data).length > 0;
 };
 function showTooltip(datum, options, component) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const opt = Object.assign({ regionIndex: 0 }, options);
     const componentOptions = component.getOption();
     const region = componentOptions.getRegionsInUserIdOrIndex(isValid$1(opt.regionId) ? [opt.regionId] : undefined, isValid$1(opt.regionIndex) ? [opt.regionIndex] : undefined)[0];
@@ -95652,18 +95659,21 @@ function showTooltip(datum, options, component) {
     const getOriginDatum = (info) => {
         var _a;
         const { dimensionFields, dimensionData, measureFields, measureData, groupField, groupData } = info.data;
-        const originDatum = (_a = info.series.getViewData()) === null || _a === void 0 ? void 0 : _a.latestData.find((datum) => {
+        return (_a = info.series.getViewData()) === null || _a === void 0 ? void 0 : _a.latestData.find((datum) => {
             return (datumContainsArray(dimensionFields, dimensionData)(datum) &&
                 datumContainsArray(measureFields, measureData)(datum) &&
                 (isNil$1(groupField) || datumContainsArray([groupField], [groupData])(datum)));
         });
-        return originDatum;
     };
+    const transform = region.getOption().globalInstance.getStage().window.getViewBoxTransform().getInverse();
     const getMockEvent = (originPos) => {
         var _a, _b;
         const pos = bound(originPos);
-        const canvasX = (_a = opt.x) !== null && _a !== void 0 ? _a : regionPos.x + pos.x;
-        const canvasY = (_b = opt.y) !== null && _b !== void 0 ? _b : regionPos.y + pos.y;
+        const tempX = (_a = opt.x) !== null && _a !== void 0 ? _a : regionPos.x + pos.x;
+        const tempY = (_b = opt.y) !== null && _b !== void 0 ? _b : regionPos.y + pos.y;
+        const canvasPoint = { x: 0, y: 0 };
+        transform.transformPoint({ x: tempX, y: tempY }, canvasPoint);
+        const { x: canvasX, y: canvasY } = canvasPoint;
         return {
             canvasX,
             canvasY,
@@ -95727,7 +95737,7 @@ function showTooltip(datum, options, component) {
         if (!info) {
             return 'none';
         }
-        const mockDatum = Object.assign(Object.assign({}, getOriginDatum(info)), datum);
+        const mockDatum = (_f = info.data.originDatum) !== null && _f !== void 0 ? _f : Object.assign(Object.assign({}, getOriginDatum(info)), datum);
         const mockDimensionData = [
             {
                 datum: [mockDatum],
@@ -95744,7 +95754,7 @@ function showTooltip(datum, options, component) {
             changePositionOnly: false,
             tooltip: null,
             dimensionInfo: mockDimensionInfo,
-            chart: (_f = componentOptions.globalInstance.getChart()) !== null && _f !== void 0 ? _f : undefined,
+            chart: (_g = componentOptions.globalInstance.getChart()) !== null && _g !== void 0 ? _g : undefined,
             datum: mockDatum,
             model: info.series,
             source: Event_Source_Type.chart,
@@ -95809,6 +95819,40 @@ const getMarkInfoList = (datum, region) => {
                 series
             });
         };
+        const parseMarkInfoOfGeoSeries = () => {
+            var _a, _b;
+            const originDatum = (_b = (_a = series
+                .getMapViewData) === null || _a === void 0 ? void 0 : _a.call(series)) === null || _b === void 0 ? void 0 : _b.latestData.find((datum) => dimensionFields.every((key, i) => datum.properties[key] === (dimensionData === null || dimensionData === void 0 ? void 0 : dimensionData[i])));
+            let markInfoMeasureData = measureData;
+            if (!hasMeasureData) {
+                measureData = getDataArrayFromFieldArray(measureFields, originDatum);
+                markInfoMeasureData = measureData;
+                if (!hasData(measureData) && !originDatum) {
+                    return;
+                }
+                measureData = Object.assign({}, originDatum.properties);
+            }
+            const pos = series.type === SeriesTypeEnum.pie
+                ? series.dataToCentralPosition(originDatum.properties)
+                : series.dataToPosition(originDatum.properties);
+            if (isNil$1(pos) || isNaN(pos.x) || isNaN(pos.y)) {
+                return;
+            }
+            markInfoList.push({
+                pos,
+                data: {
+                    dimensionFields,
+                    dimensionData,
+                    measureFields,
+                    measureData: markInfoMeasureData,
+                    hasMeasureData,
+                    groupField,
+                    groupData,
+                    originDatum
+                },
+                series
+            });
+        };
         if (series.coordinate === 'cartesian') {
             const cartesianSeries = series;
             const dimType = isDiscrete((_f = (_e = series.getYAxisHelper()) === null || _e === void 0 ? void 0 : _e.getScale(0)) === null || _f === void 0 ? void 0 : _f.type) ? 'y' : 'x';
@@ -95933,7 +95977,7 @@ const getMarkInfoList = (datum, region) => {
             }
         }
         else if (series.coordinate === 'geo') {
-            parseMarkInfoOfSimpleSeries();
+            parseMarkInfoOfGeoSeries();
         }
     });
     return markInfoList;

package/build/index.js

@@ -16495,6 +16495,7 @@
         var _a;
         if (!states.length) return void this.clearStates(hasAnimation);
         if (!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) !== states.length || states.some((stateName, index) => this.currentStates[index] !== stateName))) return;
+        this.stateSort && (states = states.sort(this.stateSort));
         const stateAttrs = {};
         states.forEach(stateName => {
           var _a;
@@ -18523,7 +18524,7 @@
         var _a;
         if (!states.length) return void this.clearStates(hasAnimation);
         if (!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) !== states.length || states.some((stateName, index) => this.currentStates[index] !== stateName))) return;
-        this.stopStateAnimates();
+        this.stopStateAnimates(), this.stateSort && (states = states.sort(this.stateSort));
         const stateAttrs = {},
           subAttrs = this.subGraphic.map(() => ({}));
         states.forEach(stateName => {
@@ -35177,8 +35178,8 @@
       }
       parseParams(params, isTimeline, child) {
         var _a, _b;
-        const totalTime = this.resolveValue(params.totalTime, void 0, void 0),
-          startTime = this.resolveValue(params.startTime, void 0, 0),
+        const totalTime = this.resolveValue(params.totalTime, child, void 0),
+          startTime = this.resolveValue(params.startTime, child, 0),
           parsedParams = Object.assign({}, params);
         parsedParams.oneByOneDelay = 0, parsedParams.startTime = startTime, parsedParams.totalTime = totalTime;
         const oneByOne = this.resolveValue(params.oneByOne, child, !1);
@@ -35227,11 +35228,10 @@
           let oneByOneDelay = 0;
           oneByOne && (oneByOneDelay = "number" == typeof oneByOne ? oneByOne : oneByOne ? delay + delayAfter + duration : 0), parsedParams.oneByOneDelay = oneByOneDelay, parsedParams.custom = null !== (_a = params.custom) && void 0 !== _a ? _a : AnimateExecutor.builtInAnimateMap[null !== (_b = params.type) && void 0 !== _b ? _b : "fromTo"];
           const customType = getCustomType(parsedParams.custom);
-          if (parsedParams.customType = customType, totalTime) {
-            const _totalTime = delay + delayAfter + duration + oneByOneDelay * (this._target.count - 2),
-              scale = totalTime ? totalTime / _totalTime : 1;
-            parsedParams.delay = delay * scale, parsedParams.delayAfter = delayAfter * scale, parsedParams.duration = duration * scale, parsedParams.oneByOneDelay = oneByOneDelay * scale, parsedParams.startTime = startTime;
-          }
+          parsedParams.customType = customType;
+          const _totalTime = delay + delayAfter + duration + oneByOneDelay * (this._target.count - 2),
+            scale = isValidNumber$1(totalTime) ? totalTime / _totalTime : 1;
+          parsedParams.delay = delay * scale, parsedParams.delayAfter = delayAfter * scale, parsedParams.duration = duration * scale, parsedParams.oneByOneDelay = oneByOneDelay * scale, parsedParams.startTime = startTime;
         }
         return parsedParams;
       }
@@ -58894,6 +58894,7 @@
             allGraphics.forEach((g, index) => {
                 g.context.graphicCount = graphicCount;
                 g.context.graphicIndex = index;
+                g.stateSort = this._stateSort;
             });
             this._dataByKey = newGroupedData;
             this._graphics = allGraphics;
@@ -58939,8 +58940,13 @@
             var _a;
             const attrsByGroup = noGroupEncode ? null : this._runGroupEncoder((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a.group);
             graphics.forEach((g, index) => {
-                var _a;
-                const attrs = this._runEncoderOfGraphic((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a.update, g);
+                var _a, _b;
+                let attrs = this._runEncoderOfGraphic((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a.update, g);
+                (_b = g.currentStates) === null || _b === void 0 ? void 0 : _b.forEach((_state) => {
+                    var _a;
+                    const stateAttr = this._runEncoderOfGraphic((_a = this._encoderOfState) === null || _a === void 0 ? void 0 : _a[_state], g);
+                    attrs = Object.assign(Object.assign({}, attrs), stateAttr);
+                });
                 if (!isNil$1(this._markConfig.interactive)) {
                     attrs.pickable = this._markConfig.interactive;
                 }
@@ -58962,6 +58968,7 @@
                     }
                     g.context = mockGraphic.context;
                     g.context.diffAttrs = finalAttrs;
+                    g.stateSort = this._stateSort;
                     const gIndex = this._graphics === graphics ? index : index + this._graphics.length - graphics.length;
                     if (gIndex >= 0) {
                         this._graphics[gIndex] = g;
@@ -61742,7 +61749,7 @@
         });
     };
 
-    const version = "2.0.12";
+    const version = "2.0.13";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -95638,7 +95645,7 @@
         return Object.keys(data).length > 0;
     };
     function showTooltip(datum, options, component) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         const opt = Object.assign({ regionIndex: 0 }, options);
         const componentOptions = component.getOption();
         const region = componentOptions.getRegionsInUserIdOrIndex(isValid$1(opt.regionId) ? [opt.regionId] : undefined, isValid$1(opt.regionIndex) ? [opt.regionIndex] : undefined)[0];
@@ -95658,18 +95665,21 @@
         const getOriginDatum = (info) => {
             var _a;
             const { dimensionFields, dimensionData, measureFields, measureData, groupField, groupData } = info.data;
-            const originDatum = (_a = info.series.getViewData()) === null || _a === void 0 ? void 0 : _a.latestData.find((datum) => {
+            return (_a = info.series.getViewData()) === null || _a === void 0 ? void 0 : _a.latestData.find((datum) => {
                 return (datumContainsArray(dimensionFields, dimensionData)(datum) &&
                     datumContainsArray(measureFields, measureData)(datum) &&
                     (isNil$1(groupField) || datumContainsArray([groupField], [groupData])(datum)));
             });
-            return originDatum;
         };
+        const transform = region.getOption().globalInstance.getStage().window.getViewBoxTransform().getInverse();
         const getMockEvent = (originPos) => {
             var _a, _b;
             const pos = bound(originPos);
-            const canvasX = (_a = opt.x) !== null && _a !== void 0 ? _a : regionPos.x + pos.x;
-            const canvasY = (_b = opt.y) !== null && _b !== void 0 ? _b : regionPos.y + pos.y;
+            const tempX = (_a = opt.x) !== null && _a !== void 0 ? _a : regionPos.x + pos.x;
+            const tempY = (_b = opt.y) !== null && _b !== void 0 ? _b : regionPos.y + pos.y;
+            const canvasPoint = { x: 0, y: 0 };
+            transform.transformPoint({ x: tempX, y: tempY }, canvasPoint);
+            const { x: canvasX, y: canvasY } = canvasPoint;
             return {
                 canvasX,
                 canvasY,
@@ -95733,7 +95743,7 @@
             if (!info) {
                 return 'none';
             }
-            const mockDatum = Object.assign(Object.assign({}, getOriginDatum(info)), datum);
+            const mockDatum = (_f = info.data.originDatum) !== null && _f !== void 0 ? _f : Object.assign(Object.assign({}, getOriginDatum(info)), datum);
             const mockDimensionData = [
                 {
                     datum: [mockDatum],
@@ -95750,7 +95760,7 @@
                 changePositionOnly: false,
                 tooltip: null,
                 dimensionInfo: mockDimensionInfo,
-                chart: (_f = componentOptions.globalInstance.getChart()) !== null && _f !== void 0 ? _f : undefined,
+                chart: (_g = componentOptions.globalInstance.getChart()) !== null && _g !== void 0 ? _g : undefined,
                 datum: mockDatum,
                 model: info.series,
                 source: Event_Source_Type.chart,
@@ -95815,6 +95825,40 @@
                     series
                 });
             };
+            const parseMarkInfoOfGeoSeries = () => {
+                var _a, _b;
+                const originDatum = (_b = (_a = series
+                    .getMapViewData) === null || _a === void 0 ? void 0 : _a.call(series)) === null || _b === void 0 ? void 0 : _b.latestData.find((datum) => dimensionFields.every((key, i) => datum.properties[key] === (dimensionData === null || dimensionData === void 0 ? void 0 : dimensionData[i])));
+                let markInfoMeasureData = measureData;
+                if (!hasMeasureData) {
+                    measureData = getDataArrayFromFieldArray(measureFields, originDatum);
+                    markInfoMeasureData = measureData;
+                    if (!hasData(measureData) && !originDatum) {
+                        return;
+                    }
+                    measureData = Object.assign({}, originDatum.properties);
+                }
+                const pos = series.type === exports.SeriesTypeEnum.pie
+                    ? series.dataToCentralPosition(originDatum.properties)
+                    : series.dataToPosition(originDatum.properties);
+                if (isNil$1(pos) || isNaN(pos.x) || isNaN(pos.y)) {
+                    return;
+                }
+                markInfoList.push({
+                    pos,
+                    data: {
+                        dimensionFields,
+                        dimensionData,
+                        measureFields,
+                        measureData: markInfoMeasureData,
+                        hasMeasureData,
+                        groupField,
+                        groupData,
+                        originDatum
+                    },
+                    series
+                });
+            };
             if (series.coordinate === 'cartesian') {
                 const cartesianSeries = series;
                 const dimType = isDiscrete((_f = (_e = series.getYAxisHelper()) === null || _e === void 0 ? void 0 : _e.getScale(0)) === null || _f === void 0 ? void 0 : _f.type) ? 'y' : 'x';
@@ -95939,7 +95983,7 @@
                 }
             }
             else if (series.coordinate === 'geo') {
-                parseMarkInfoOfSimpleSeries();
+                parseMarkInfoOfGeoSeries();
             }
         });
         return markInfoList;