@zgfe/modules-event 0.1.15-qirui.0 → 0.1.15-qirui.1

package/es/components/searchPanel/index.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { BizDatePicker, BizSelect, BizTargetDimension } from '@zgfe/business-lib';
+import { BizDatePicker, BizSelect, BizTargetDimension, useChanged } from '@zgfe/business-lib';
 import React, { useContext, useEffect, useState, useMemo } from 'react';
 import { chartTypeOptions, getInitDate } from '../../constants';
 import { EventContext } from '../../types';
@@ -59,17 +59,6 @@ var SearchPanel = function SearchPanel(props) {
         });
       }
     }
-    var _dimension = {
-      analysisIndex: 'number'
-    };
-    if (searchData.analysisIndex) {
-      _dimension = {
-        analysisIndex: searchData.analysisIndex
-      };
-    }
-    if (searchData.analysisAttr && !searchData.analysisSubject) {
-      _dimension['analysisAttr'] = searchData.analysisAttr;
-    }
   }, [searchData]);
   useEffect(function () {
     if (!props.enableSelectChart && chart.value === 'map') {
@@ -104,6 +93,13 @@ var SearchPanel = function SearchPanel(props) {
       analysisAttr: data.analysisAttr
     });
   };
+  useChanged(function (pre, next) {
+    if (pre === next) return;
+    onDimensionChange({
+      analysisIndex: currentNormalOptions[0].value,
+      analysisAttr: undefined
+    });
+  }, props.eventId);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {

package/es/modules/content/index.js

@@ -115,9 +115,6 @@ var EventContent = function EventContent(props) {
       message.error('无查询权限');
       return;
     }
-    if (JSON.stringify(searchData) === JSON.stringify(finalSearchData)) {
-      return;
-    }
     if (flag !== undefined) ajaxFlag = flag;
     if (analysisSubjectType === 'eventProp' && !searchData.analysisSubject) return;
     if (!ajaxFlag) return;
@@ -161,9 +158,12 @@ var EventContent = function EventContent(props) {
   };
   var onChangeContent = function onChangeContent(data) {
     ajaxFlag = true;
-    setSearchData(function (value) {
-      return _objectSpread(_objectSpread(_objectSpread({}, value), data), {}, {
-        analysisAttr: data.analysisAttr
+    setTimeout(function () {
+      setSearchData(function (value) {
+        return _objectSpread(_objectSpread(_objectSpread({}, value), data), {}, {
+          analysisAttr: data.analysisAttr,
+          analysisIndex: data.analysisIndex
+        });
       });
     });
   };
@@ -181,24 +181,18 @@ var EventContent = function EventContent(props) {
   var onChangeSearch = function onChangeSearch(data, flag) {
     ajaxFlag = flag;
     data.id ? setEventId(data.id) : setEventId(-1);
-    setSearchData(function (_searchData) {
-      var _data = _objectSpread(_objectSpread(_objectSpread({}, _searchData), {}, {
-        dimension: data.dimension,
-        filters: data.filters,
-        id: data.id,
-        eventIds: data.eventIds,
-        name: data.name
-      }, data), {}, {
-        userGroup: data.analysisSubject ? [] : data.userGroup,
-        analysisSubject: data.analysisSubject ? data.analysisSubject : undefined,
-        analysisAttr: undefined,
-        analysisIndex: 'number'
-      });
-      setDimension({
-        analysisIndex: 'number'
-      });
-      return _objectSpread({}, _data);
-    });
+    setSearchData(_objectSpread(_objectSpread(_objectSpread({}, searchData), {}, {
+      dimension: data.dimension,
+      filters: data.filters,
+      id: data.id,
+      eventIds: data.eventIds,
+      name: data.name
+    }, data), {}, {
+      userGroup: data.analysisSubject ? [] : data.userGroup,
+      analysisSubject: data.analysisSubject ? data.analysisSubject : undefined,
+      analysisAttr: dimension.analysisAttr,
+      analysisIndex: dimension.analysisIndex
+    }));
   };
   var onChangeSubjectType = function onChangeSubjectType(type) {
     setAnalysisSubjectType(type);
@@ -249,8 +243,6 @@ var EventContent = function EventContent(props) {
     time: searchData === null || searchData === void 0 ? void 0 : searchData.time,
     setIsCity: setIsCity,
     setEnableSelectChart: setEnableSelectChart,
-    analysisAttr: searchData === null || searchData === void 0 ? void 0 : searchData.analysisAttr,
-    analysisIndex: searchData === null || searchData === void 0 ? void 0 : searchData.analysisIndex,
     eventId: eventId,
     enableSelectChart: enableSelectChart,
     onChange: onChangeContent,

package/es/modules/topPanel/index.js

@@ -168,6 +168,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u4E8B\u4EF6",
     name: "filterConditions",
+    validateStatus: "success",
     className: "".concat(classPrefix, "-form-event event---1"),
     rules: [{
       validator: function validator(_rule, value) {

package/es/modules/topPanel/styles/index.less

@@ -32,9 +32,9 @@
     }
   }
   &-form {
-    .ant-form-item-has-error .biz-event-select {
-      border: 1px solid @error-color !important;
-    }
+    // .ant-form-item-has-error .biz-event-select {
+    //   border: 1px solid @error-color !important;
+    // }
   }
 }
 .hoverable-form-item {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.1.15-qirui.0",
+  "version": "0.1.15-qirui.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "71f4640ffca565fea18098506b0cb78ef3a7ab05",
+  "gitHead": "eab4b0593fe915cb96c747b02b28ee0a863ff9a4",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"