@zgfe/modules-event 0.0.2-event.17 → 0.0.2-event.19

package/es/components/eventFilter/index.js

@@ -15,8 +15,9 @@ import './styles/index.less';
 import _ from 'lodash';
 var classPrefix = 'eventfilter-box';
 var EventFilter = function EventFilter(props) {
+  console.log('EventFilter', props);
   var setSearchDisabled = props.setSearchDisabled;
-  var _useState = useState(0),
+  var _useState = useState(props.value && props.value.filters && props.value.filters.conditions ? props.value.filters.conditions.length : 0),
     _useState2 = _slicedToArray(_useState, 2),
     count = _useState2[0],
     setCount = _useState2[1];
@@ -25,7 +26,10 @@ var EventFilter = function EventFilter(props) {
     isAdd = _useState4[0],
     setIsAdd = _useState4[1];
   var conditionRef = useRef(null);
-  var _useState5 = useState({
+  var _useState5 = useState(props.value && props.value.id ? {
+      id: props.value.id,
+      name: props.value.name
+    } : {
       id: -100,
       name: '事件概览'
     }),
@@ -51,18 +55,16 @@ var EventFilter = function EventFilter(props) {
     if (props.value) {
       var _data = props.value;
       if (_data && _data.id) {
-        setEvent({
-          id: _data.id,
-          name: _data.name
-        });
         setEventOverview(true);
       }
       if (_data.filters) {
         setFilter(_data.filters);
+        setCount(_data.filters.conditions.length);
       }
       if (_data.dimension) {
+        var _attr = _data.dimension;
         setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, _data.dimension), {}, {
-          key: _data.dimension.propCategory + '-' + _data.dimension.value
+          key: _attr.propCategory === 'eventProp' ? _attr.propCategory + '-' + _attr.value : "".concat(_attr.propCategory, "-").concat(_attr.value, "-").concat(_attr.id)
         }));
       }
     }
@@ -117,7 +119,8 @@ var EventFilter = function EventFilter(props) {
         propCategory: attr.propCategory,
         category: attr.category,
         value: _value,
-        key: attr.propCategory + '-' + _value
+        id: attr.id,
+        key: attr.propCategory === 'eventProp' ? attr.propCategory + '-' + _value : "".concat(attr.propCategory, "-").concat(_value, "-").concat(attr.id)
       });
     }
   };

package/es/modules/home/demo/edit.js

@@ -37,14 +37,34 @@ var defaultValue = {
     filters: {
       relation: 'and',
       conditions: [{
-        attrId: 151045,
+        attrId: 151044,
         propCategory: 'eventProp',
         type: 1,
         operator: 'equal',
         values: ['55'],
         dimensionSub: 'event_attr',
-        label: '应用名称',
-        attrName: '应用名称'
+        label: '33333',
+        attrName: '33333'
+      }, {
+        attrId: 0,
+        propCategory: 'userProp',
+        type: 1,
+        operator: 'equal',
+        values: ['匿名'],
+        dimensionSub: 'is_anonymous',
+        label: '实名/匿名',
+        attrName: 'is_anonymous',
+        category: 'fixed'
+      }, {
+        attrId: 0,
+        propCategory: 'envProp',
+        type: 1,
+        operator: 'equal',
+        values: ['js'],
+        dimensionSub: 'platform',
+        label: '平台',
+        attrName: 'platform',
+        category: 'fixed'
       }]
     }
   }

package/es/modules/home/index.js

@@ -15,7 +15,7 @@ import { EventContext } from '../../types';
 import { getInitDate } from '../../constants/initData';
 import EventContent from '../content';
 import { chartTypes } from '../../constants';
-var classPrefix = 'event-container';
+var classPrefix = 'event-module-container';
 var ModuleEvent = function ModuleEvent(props) {
   console.log('ModuleEvent-props', props);
   var _useContext = useContext(BizGlobalDataContext),

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

@@ -1,4 +1,4 @@
-.event-container {
+.event-module-container {
   width: 100%;
   min-width: 1000px;
   height: auto;

package/es/types.d.ts

@@ -5,6 +5,7 @@ export interface bizAttributeSelectorValueProp {
     propCategory?: string;
     category?: string;
     value?: number | string;
+    id?: number;
     key?: number | string;
 }
 export interface eventProps {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.0.2-event.17",
+  "version": "0.0.2-event.19",
   "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.81-page.9",
+    "@zgfe/business-lib": "1.1.82-panel.3",
     "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": "5036faa930bf7ede600f683e80d5b950ab8f31ba",
+  "gitHead": "eb3b57010acd8fd4fc138260f2efdde28e257acb",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"