@zgfe/modules-event 0.1.5-event.40 → 0.1.5-event.43

package/es/components/eventFilter/index.js

@@ -14,14 +14,12 @@ import { Tooltip } from 'antd';
 import React, { useEffect, useRef, useState, useContext } from 'react';
 import { BizEventSelector, BizAttributeSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
 import { EventContext } from '../../types';
-import { judgeFilterValue } from '../../modules/content/utils';
 import './styles/index.less';
 import { judgeIsCity, judgeIsArea } from '../../modules/content/utils';
 import _ from 'lodash';
 var classPrefix = 'eventfilter-box';
 var EventFilter = function EventFilter(props) {
-  var setSearchDisabled = props.setSearchDisabled,
-    countChange = props.countChange,
+  var countChange = props.countChange,
     setIsCity = props.setIsCity,
     setEnableSelectChart = props.setEnableSelectChart,
     analysisType = props.analysisType;
@@ -49,7 +47,7 @@ var EventFilter = function EventFilter(props) {
   var _useState7 = useState(props.value && props.value.id ? {
       id: props.value.id,
       name: props.value.name
-    } : {
+    } : analysisType === 'eventProp' ? undefined : {
       id: -100,
       name: '事件概览'
     }),
@@ -58,8 +56,8 @@ var EventFilter = function EventFilter(props) {
     setEvent = _useState8[1];
   var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    eventOverview = _useState10[0],
-    setEventOverview = _useState10[1];
+    showDimension = _useState10[0],
+    setShowDimension = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
     filter = _useState12[0],
@@ -83,7 +81,7 @@ var EventFilter = function EventFilter(props) {
     }
     if (_data) {
       if (_data && _data.id) {
-        setEventOverview(true);
+        setShowDimension(true);
       }
       if (_data.filters) {
         setFilter(_data.filters);
@@ -114,18 +112,15 @@ var EventFilter = function EventFilter(props) {
   };
   useEffect(function () {
     countChange(count);
-    if (!judgeFilterValue(filter, count)) {
-      setSearchDisabled(true);
-    } else {
-      setSearchDisabled(false);
-    }
     if (count <= 0) setFilter(undefined);
   }, [count, filter]);
   var onChangeEvent = function onChangeEvent(val) {
     if (analysisType === 'eventProp' && val.length > 1) {
       setEventList(val);
       setEvent(undefined);
-      setEventOverview(false);
+      setShowDimension(false);
+      setFilter(undefined);
+      setIsAdd(false);
       return;
     }
     var event = _.isArray(val) ? {
@@ -139,9 +134,9 @@ var EventFilter = function EventFilter(props) {
       });
     }
     if (event && event.event && event.event.id === -100) {
-      setEventOverview(false);
+      setShowDimension(false);
     } else {
-      setEventOverview(true);
+      setShowDimension(true);
     }
     if (event && event.event) {
       setEvent(event.event);
@@ -211,7 +206,7 @@ var EventFilter = function EventFilter(props) {
     },
     onChange: onChangeEvent,
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
-  }), eventOverview && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizAttributeSelector, {
+  }), showDimension && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
     enableUserProp: analysisType === 'eventProp' ? false : true,
     enableEnvProp: true,
@@ -241,7 +236,7 @@ var EventFilter = function EventFilter(props) {
     enableEventProp: true,
     enableDelete: true,
     enableUserProp: analysisType === 'eventProp' ? false : true,
-    eventIdList: [event.id],
+    eventIdList: event ? [event.id] : [],
     onChange: onChangeFilters,
     onConditionsCount: setCount
   })));

package/es/components/eventFilter/types.d.ts

@@ -13,7 +13,6 @@ export interface ConditionsnProps {
 export interface EventFilterProps {
     value?: eventProps | number[];
     onChange?: (event: eventProps | number[]) => {};
-    setSearchDisabled: (disabled: boolean) => void;
     countChange: (count: number) => void;
     setIsCity?: Function;
     setEnableSelectChart?: Function;

package/es/modules/topPanel/index.js

@@ -25,20 +25,16 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     loading = props.loading;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    searchDisabled = _useState2[0],
-    setSearchDisabled = _useState2[1];
-  var _useState3 = useState(false),
+    marginStyle = _useState2[0],
+    setmarginStyle = _useState2[1];
+  var _useState3 = useState('user'),
     _useState4 = _slicedToArray(_useState3, 2),
-    marginStyle = _useState4[0],
-    setmarginStyle = _useState4[1];
-  var _useState5 = useState('user'),
+    analysisType = _useState4[0],
+    setAnalysisType = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    analysisType = _useState6[0],
-    setAnalysisType = _useState6[1];
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    inited = _useState8[0],
-    setInited = _useState8[1];
+    inited = _useState6[0],
+    setInited = _useState6[1];
   var _useSubject = useSubject(),
     subjectList = _useSubject.subjectList,
     subjectLoading = _useSubject.loading;
@@ -50,7 +46,8 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     form = _Form$useForm2[0];
   var userGroup = value.userGroup;
   function onSearch(data) {
-    var _data$filterCondition, _data$filterCondition2;
+    var _data$filterCondition, _data$filterCondition2, _data$filterCondition3;
+    console.log('查询参数', data);
     var searchData = _objectSpread(_objectSpread({
       analysisSubject: data.analysisSubject ? {
         subjectId: data.analysisSubject.id || data.analysisSubject.subjectId,
@@ -62,7 +59,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       eventIds: _.isArray(data.filterConditions) ? data.filterConditions : undefined,
       eventGroupId: (_data$filterCondition = data.filterConditions) === null || _data$filterCondition === void 0 ? void 0 : _data$filterCondition.eventGroupId,
       userGroup: data.userGroup || [0],
-      id: (_data$filterCondition2 = data.filterConditions) === null || _data$filterCondition2 === void 0 ? void 0 : _data$filterCondition2.id
+      id: ((_data$filterCondition2 = data.filterConditions) === null || _data$filterCondition2 === void 0 ? void 0 : _data$filterCondition2.id) >= 0 ? (_data$filterCondition3 = data.filterConditions) === null || _data$filterCondition3 === void 0 ? void 0 : _data$filterCondition3.id : undefined
     });
     props.onChange(searchData, true);
   }
@@ -149,7 +146,16 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   })) : /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u4E3B\u4F53\u540D\u79F0",
     name: "analysisSubject",
-    className: "".concat(classPrefix, "-form-event")
+    className: "".concat(classPrefix, "-form-event"),
+    rules: [{
+      validator: function validator(_rule, value) {
+        if (value && value.id) {
+          return Promise.resolve();
+        } else {
+          return Promise.reject('请选择分析主体');
+        }
+      }
+    }]
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-form-event-select"),
     options: subjectList,
@@ -161,9 +167,35 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u4E8B\u4EF6",
     name: "filterConditions",
-    className: "".concat(classPrefix, "-form-event")
+    className: "".concat(classPrefix, "-form-event"),
+    rules: [{
+      validator: function validator(_rule, value) {
+        var _value$filters, _value$filters$condit;
+        if (_.isArray(value)) {
+          if (!value.length) {
+            return Promise.reject('请选择事件');
+          } else {
+            return Promise.resolve();
+          }
+        }
+        if (!value || !value.id) {
+          return Promise.reject('请选择事件');
+        }
+        var conditionValIsNull = false;
+        value === null || value === void 0 ? void 0 : (_value$filters = value.filters) === null || _value$filters === void 0 ? void 0 : (_value$filters$condit = _value$filters.conditions) === null || _value$filters$condit === void 0 ? void 0 : _value$filters$condit.forEach(function (item) {
+          var _item$values;
+          if (!/null/.test(item.operator || '') && !((_item$values = item.values) === null || _item$values === void 0 ? void 0 : _item$values.length)) {
+            conditionValIsNull = true;
+          }
+        });
+        if (conditionValIsNull) {
+          return Promise.reject('请填写完整的条件');
+        }
+        return Promise.resolve();
+      },
+      validateTrigger: 'onBlur'
+    }]
   }, /*#__PURE__*/React.createElement(EventFilter, {
-    setSearchDisabled: setSearchDisabled,
     countChange: countChange,
     setIsCity: setIsCity,
     setEnableSelectChart: setEnableSelectChart,
@@ -175,7 +207,6 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
     loading: subjectLoading || loading,
     type: "primary",
-    disabled: searchDisabled,
     onClick: function onClick() {
       form.submit();
     }

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

@@ -19,6 +19,9 @@
         background: #e8efff;
       }
     }
+    .ant-form-item-explain-error {
+      padding-left: 24px;
+    }
   }
   &-form-botton-box {
     display: flex;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/modules-event",
-    "version": "0.1.5-event.40",
+    "version": "0.1.5-event.43",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",
@@ -49,7 +49,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "c8ed08aabd48535f2fe57a395f83068e76fa34cc",
+    "gitHead": "460ac62899547f82ed459f4e5ecb395c6b272a69",
     "dependencies": {
         "react-copy-to-clipboard": "^5.1.0",
         "react-highlight": "^0.15.0"