@zgfe/modules-event 0.1.2 → 0.1.5

package/es/components/eventFilter/index.js

@@ -33,28 +33,36 @@ var EventFilter = function EventFilter(props) {
     isAdd = _useState4[0],
     setIsAdd = _useState4[1];
   var conditionRef = useRef(null);
-  var _useState5 = useState(props.value && props.value.id ? {
+  var _useState5 = useState(props.value && props.value.eventGroupId ? {
+      id: props.value.eventGroupId
+    } : {
+      id: 0
+    }),
+    _useState6 = _slicedToArray(_useState5, 2),
+    group = _useState6[0],
+    setGroup = _useState6[1];
+  var _useState7 = useState(props.value && props.value.id ? {
       id: props.value.id,
       name: props.value.name
     } : {
       id: -100,
       name: '事件概览'
     }),
-    _useState6 = _slicedToArray(_useState5, 2),
-    event = _useState6[0],
-    setEvent = _useState6[1];
-  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    eventOverview = _useState8[0],
-    setEventOverview = _useState8[1];
-  var _useState9 = useState(),
+    event = _useState8[0],
+    setEvent = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    filter = _useState10[0],
-    setFilter = _useState10[1];
+    eventOverview = _useState10[0],
+    setEventOverview = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    bizAttributeSelectorValue = _useState12[0],
-    setBizAttributeSelectorValue = _useState12[1];
+    filter = _useState12[0],
+    setFilter = _useState12[1];
+  var _useState13 = useState(),
+    _useState14 = _slicedToArray(_useState13, 2),
+    bizAttributeSelectorValue = _useState14[0],
+    setBizAttributeSelectorValue = _useState14[1];
   useEffect(function () {
     var _data = props.value;
     if (selectEventData) {
@@ -105,6 +113,7 @@ var EventFilter = function EventFilter(props) {
     if (count <= 0) setFilter(undefined);
   }, [count, filter]);
   var onChangeEvent = function onChangeEvent(event) {
+    console.log('onChangeEvent', event);
     if (event && event.event && event.event.id === -100) {
       setEventOverview(false);
     } else {
@@ -113,6 +122,9 @@ var EventFilter = function EventFilter(props) {
     if (event && event.event) {
       setEvent(event.event);
     }
+    if (event && event.group) {
+      setGroup(event.group);
+    }
     setBizAttributeSelectorValue(undefined);
     setFilter(undefined);
     setIsAdd(false);
@@ -152,8 +164,9 @@ var EventFilter = function EventFilter(props) {
       delete _dimension.key;
       _event.dimension = _dimension;
     }
+    _event.eventGroupId = group.id ? group.id : undefined;
     props.onChange && props.onChange(_event);
-  }, [bizAttributeSelectorValue, filter, event]);
+  }, [bizAttributeSelectorValue, filter, event, group]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
@@ -162,7 +175,8 @@ var EventFilter = function EventFilter(props) {
     popupContainer: false,
     defaultSelectAble: false,
     value: {
-      event: event
+      event: event,
+      group: group
     },
     onChange: onChangeEvent,
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"

package/es/components/searchPanel/index.js

@@ -16,8 +16,7 @@ import './styles/index.less';
 var classPrefix = 'search-panel';
 var SearchPanel = function SearchPanel(props) {
   var _useContext = useContext(EventContext),
-    includeToday = _useContext.includeToday,
-    searchData = _useContext.searchData;
+    includeToday = _useContext.includeToday;
   var _useState = useState(props.time || getInitDate(includeToday)),
     _useState2 = _slicedToArray(_useState, 2),
     time = _useState2[0],
@@ -37,7 +36,6 @@ var SearchPanel = function SearchPanel(props) {
     dimension = _useState8[0],
     setDimension = _useState8[1];
   useEffect(function () {
-    console.log('123123123', props.chartType, searchData);
     if (props.chartType && props.chartType !== chart.value) {
       if (props.chartType.indexOf(',') !== -1) {
         setChart({

package/es/modules/topPanel/index.js

@@ -33,11 +33,13 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     form = _Form$useForm2[0];
   var userGroup = value.userGroup;
   var onValuesChange = function onValuesChange(data, allData) {
+    console.log('用户组和事件变更', data, allData);
     var _data = {};
     if (allData.filterConditions) {
       if (allData.filterConditions.id !== -100) {
         _data = allData.filterConditions;
       }
+      _data.eventGroupId = allData.filterConditions.eventGroupId;
     }
     if (allData.userGroup) {
       _data.userGroup = allData.userGroup.filter(function (item) {
@@ -48,7 +50,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
     }
     if (data.filterConditions) {
-      if (finalSearchData && finalSearchData.id && data.filterConditions.id === finalSearchData.id) {
+      if (finalSearchData && finalSearchData.id && data.filterConditions.id === finalSearchData.id && data.filterConditions.eventGroupId === finalSearchData.eventGroupId) {
         ajaxFlag = false;
       } else {
         ajaxFlag = true;

package/es/modules/topPanel/types.d.ts

@@ -2,6 +2,7 @@ import { AttrConditionTypes } from '@zgfe/business-lib';
 import { bizAttributeSelectorValueProp, SearchValue, EventChartTypes } from '../../types';
 interface filterConditions {
     id?: number;
+    eventGroupId?: number;
     name?: string;
     filters?: AttrConditionTypes.GroupValue;
     dimension?: bizAttributeSelectorValueProp;

package/es/types.d.ts

@@ -10,12 +10,14 @@ export interface bizAttributeSelectorValueProp {
 }
 export interface eventProps {
     id?: number;
+    eventGroupId?: number;
     name?: string;
     filters?: AttrConditionTypes.GroupValue;
     dimension?: bizAttributeSelectorValueProp;
 }
 export interface SearchValue {
     id?: number;
+    eventGroupId?: number;
     name?: string;
     platform?: number;
     chartType?: EventChartTypes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -36,7 +36,7 @@
     "@types/lodash": "^4.14.191",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.1.84-panel.18",
+    "@zgfe/business-lib": "1.1.87-auth.11",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "df27e42a22cf203f4434d64ec4dcd6c519779e3a",
+  "gitHead": "c27edbb2b887a38448c5f1cc16132ecb737c18ec",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"