@zgfe/modules-event 0.0.2-event.61 → 0.0.2-event.63

package/es/components/eventFilter/index.js

@@ -70,7 +70,7 @@ var EventFilter = function EventFilter(props) {
       if (_data.dimension) {
         var _attr = _data.dimension;
         setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, _data.dimension), {}, {
-          key: _attr.propCategory === 'eventProp' ? "".concat(_attr.propCategory, "-").concat(_attr.value) : "".concat(_attr.propCategory, "-").concat(_attr.value)
+          key: "".concat(_attr.propCategory, "-").concat(_attr.value)
         }));
       }
     }
@@ -122,7 +122,7 @@ var EventFilter = function EventFilter(props) {
         category: attr.category,
         value: _value,
         id: attr.id,
-        key: attr.propCategory === 'eventProp' ? "".concat(attr.propCategory, "-").concat(_value) : "".concat(attr.propCategory, "-").concat(_value)
+        key: "".concat(attr.propCategory, "-").concat(_value)
       });
     }
   };

package/es/modules/content/index.js

@@ -67,18 +67,6 @@ var EventContent = function EventContent(props) {
   var chartRef = useRef();
   useEffect(function () {
     console.log('searchData改变了，准备请求数据', searchData);
-    if (searchData) {
-      if (searchData.dimension) {
-        var _getValue;
-        var _attrName = (_getValue = getValue(searchData.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name;
-        if (_attrName) {
-          setEnableSelectChart(judgeIsArea(_attrName));
-          setIsCity(judgeIsCity(_attrName));
-        }
-      } else {
-        setEnableSelectChart(false);
-      }
-    }
     if (timer) clearTimeout(timer);
     var flag = true;
     timer = setTimeout(function () {
@@ -95,6 +83,10 @@ var EventContent = function EventContent(props) {
     handleSearch && handleSearch(loading);
   }, [loading]);
   var fetchRequest = function fetchRequest(flag) {
+    if (JSON.stringify(searchData) === JSON.stringify(finalSearchData)) {
+      console.log('数据没变，终止请求');
+      return;
+    }
     if (flag !== undefined) ajaxFlag = flag;
     if (!ajaxFlag) return;
     setLoading(true);
@@ -161,6 +153,19 @@ var EventContent = function EventContent(props) {
         analysisIndex: _searchData.analysisIndex,
         chartType: _searchData.chartType
       }, data);
+      if (_data.dimension) {
+        var _getValue;
+        var _attrName = (_getValue = getValue(_data.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name;
+        if (_attrName) {
+          setEnableSelectChart(judgeIsArea(_attrName));
+          setIsCity(judgeIsCity(_attrName));
+        }
+      } else {
+        setEnableSelectChart(false);
+        if (_data.chartType === 'map') {
+          _data.chartType = 'line';
+        }
+      }
       onChangeUrlParam(_objectSpread({}, _data));
       return _objectSpread({}, _data);
     });

package/es/modules/content/utils.js

@@ -28,7 +28,7 @@ export var judgeIsArea = function judgeIsArea(name) {
 };
 export var getValue = function getValue(param, eventGroupList, eventEnvList, userPropList) {
   var res = undefined;
-  var key = param.propCategory === 'eventProp' ? "".concat(param.propCategory, "-").concat(param.value) : "".concat(param.propCategory, "-").concat(param.value, "-").concat(param.id);
+  var key = "".concat(param.propCategory, "-").concat(param.value);
   if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'envProp') {
     eventEnvList === null || eventEnvList === void 0 ? void 0 : eventEnvList.forEach(function (attr) {
       if (attr.key === key) res = attr;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.0.2-event.61",
+  "version": "0.0.2-event.63",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "8c79ec98431de35dafd6215ce637cdc77dbb1fc8",
+  "gitHead": "23bb5234cd82f3d393530950ccbe5b13bb0daead",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"