@visactor/react-vchart 2.0.13 → 2.0.14-alpha.1

package/build/index.js

@@ -77554,14 +77554,18 @@
             } else parseMarkInfoOfSimpleSeries();
           }
         } else "geo" === series.coordinate && (() => {
-          var _a, _b;
-          const originDatum = null === (_b = null === (_a = series.getMapViewData) || void 0 === _a ? void 0 : _a.call(series)) || void 0 === _b ? void 0 : _b.latestData.find(datum => dimensionFields.every((key, i) => datum.properties[key] === (null == dimensionData ? void 0 : dimensionData[i])));
+          var _a, _b, _c;
+          console.log("parseMarkInfoOfGeoSeries");
+          let originDatum = null === (_a = series.getViewData()) || void 0 === _a ? void 0 : _a.latestData.find(datumContainsArray(dimensionFields, dimensionData));
+          const nameMap = series.getNameMap(),
+            originMapDatum = null === (_c = null === (_b = series.getMapViewData) || void 0 === _b ? void 0 : _b.call(series)) || void 0 === _c ? void 0 : _c.latestData.find(datum => dimensionFields.every((key, i) => "name" === key ? nameMap[datum.properties[key]] === (null == dimensionData ? void 0 : dimensionData[i]) : datum.properties[key] === (null == dimensionData ? void 0 : dimensionData[i])));
+          if (!originMapDatum) return;
           let markInfoMeasureData = measureData;
-          if (!hasMeasureData) {
+          if (originMapDatum && !originDatum && (originDatum = Object.assign({}, datum)), !hasMeasureData) {
             if (measureData = getDataArrayFromFieldArray(measureFields, originDatum), markInfoMeasureData = measureData, !hasData(measureData) && !originDatum) return;
-            measureData = Object.assign({}, originDatum.properties);
+            hasData(measureData) || (measureData = [null]);
           }
-          const pos = series.type === SeriesTypeEnum.pie ? series.dataToCentralPosition(originDatum.properties) : series.dataToPosition(originDatum.properties);
+          const pos = series.dataToPosition(originDatum);
           isNil$1(pos) || isNaN(pos.x) || isNaN(pos.y) || markInfoList.push({
             pos: pos,
             data: {