@zgfe/modules-event 0.1.5-event.31 → 0.1.5-event.33

package/es/components/eventFilter/index.js

@@ -27,7 +27,8 @@ var EventFilter = function EventFilter(props) {
     analysisType = props.analysisType;
   var _useContext = useContext(EventContext),
     selectEventData = _useContext.selectEventData,
-    searchData = _useContext.searchData;
+    searchData = _useContext.searchData,
+    setSearchData = _useContext.setSearchData;
   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],
@@ -117,6 +118,13 @@ var EventFilter = function EventFilter(props) {
     if (count <= 0) setFilter(undefined);
   }, [count, filter]);
   var onChangeEvent = function onChangeEvent(event) {
+    if (searchData.chartType === 'map') {
+      setSearchData(function (value) {
+        return _objectSpread(_objectSpread({}, value), {}, {
+          chartType: 'line'
+        });
+      });
+    }
     if (event && event.event && event.event.id === -100) {
       setEventOverview(false);
     } else {
@@ -159,9 +167,7 @@ var EventFilter = function EventFilter(props) {
       var _dimension = _.cloneDeep(bizAttributeSelectorValue);
       setEnableSelectChart && setEnableSelectChart(judgeIsArea(_dimension.value));
       setIsCity && setIsCity(judgeIsCity(_dimension.value));
-      if (judgeIsArea(_dimension.value)) {
-        _event.chartType = 'map';
-      } else {
+      if (!judgeIsArea(_dimension.value)) {
         if (searchData.chartType === 'map') _event.chartType = 'line';
       }
       delete _dimension.key;

package/es/components/eventFilter/styles/index.less

@@ -1,8 +1,7 @@
 .eventfilter-box {
   > :nth-child(1) {
     display: flex;
-    margin-bottom: 4px;
-    padding: 4px 0 4px 24px;
+    padding-left: 24px;
     .biz-event-select,
     .biz-attr-select {
       width: 208px;

package/es/components/searchPanel/index.js

@@ -19,7 +19,8 @@ import './styles/index.less';
 var classPrefix = 'search-panel';
 var SearchPanel = function SearchPanel(props) {
   var _useContext = useContext(EventContext),
-    includeToday = _useContext.includeToday;
+    includeToday = _useContext.includeToday,
+    searchData = _useContext.searchData;
   var analysisSubjectType = props.analysisSubjectType,
     dimension = props.dimension,
     setDimension = props.setDimension;
@@ -47,30 +48,30 @@ var SearchPanel = function SearchPanel(props) {
     return analysisSubjectType === 'user' ? normalOptions : normalEventOptions;
   }, [analysisSubjectType]);
   useEffect(function () {
-    if (props.chartType && props.chartType !== chart.value) {
-      if (props.chartType.indexOf(',') !== -1) {
+    if (searchData.chartType && searchData.chartType !== chart.value) {
+      if (searchData.chartType.indexOf(',') !== -1) {
         setChart({
-          value: props.chartType.split(',')[0]
+          value: searchData.chartType.split(',')[0]
         });
       } else {
         setChart({
-          value: props.chartType
+          value: searchData.chartType
         });
       }
     }
     var _dimension = {
       analysisIndex: 'number'
     };
-    if (props.analysisIndex) {
+    if (searchData.analysisIndex) {
       _dimension = {
-        analysisIndex: props.analysisIndex
+        analysisIndex: searchData.analysisIndex
       };
     }
-    if (props.analysisAttr && !props.analysisSubject) {
-      _dimension['analysisAttr'] = props.analysisAttr;
+    if (searchData.analysisAttr && !searchData.analysisSubject) {
+      _dimension['analysisAttr'] = searchData.analysisAttr;
     }
     setDimension && setDimension(_objectSpread({}, _dimension));
-  }, []);
+  }, [searchData]);
   useEffect(function () {
     if (!props.enableSelectChart && chart.value === 'map') {
       setChart({

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

@@ -11,9 +11,31 @@ import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
 var defaultValue = {
   enlarged: 0,
-  id: 247162,
+  id: 247329,
   isPerfect: 1,
-  name: '008',
+  name: '事件分析-饼图和表格',
+  data: {
+    appId: 461,
+    platform: 0,
+    module: 'event',
+    userGroup: [0],
+    time: {
+      begin: '2023-10-13',
+      end: '2023-10-20',
+      relative: [7, 0],
+      unit: 'day'
+    },
+    chartType: 'pie,grid',
+    dimension: {
+      propCategory: 'userProp',
+      category: 'fixed',
+      value: 'current_area',
+      id: 0
+    },
+    id: 24292408,
+    name: '免费注册-点击选择职位',
+    analysisIndex: 'number'
+  },
   reqParam: {
     data: {
       appId: 461,
@@ -21,31 +43,23 @@ var defaultValue = {
       module: 'event',
       userGroup: [0],
       time: {
-        begin: '2023-10-05',
-        end: '2023-10-12',
+        begin: '2023-10-13',
+        end: '2023-10-20',
         relative: [7, 0],
         unit: 'day'
       },
-      chartType: 'line',
-      eventGroupId: 4339,
+      chartType: 'pie,grid',
+      dimension: {
+        propCategory: 'userProp',
+        category: 'fixed',
+        value: 'current_area',
+        id: 0
+      },
+      id: 24292408,
+      name: '免费注册-点击选择职位',
       analysisIndex: 'number'
     },
-    chosen_data: ['首页-点击即刻体验demo', '首页-点击免费试用', '智能辅助API调用事件']
-  },
-  data: {
-    appId: 461,
-    platform: 0,
-    module: 'event',
-    userGroup: [0],
-    time: {
-      begin: '2023-10-05',
-      end: '2023-10-12',
-      relative: [14, 0],
-      unit: 'day'
-    },
-    chartType: 'line',
-    eventGroupId: 4339,
-    analysisIndex: 'number'
+    chosen_data: []
   },
   type: 0,
   unExistEvent: ''

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

@@ -7,12 +7,18 @@
     }
     &-select {
       width: 208px;
-      margin-bottom: 24px;
       margin-left: 24px;
       .biz-select-handle-input {
         padding-left: 12px;
       }
     }
+    .ant-form-item-row .ant-form-item-control {
+      margin-bottom: 24px;
+      padding: 4px 0;
+      &:hover {
+        background: #e8efff;
+      }
+    }
   }
   &-form-botton-box {
     display: flex;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/modules-event",
-    "version": "0.1.5-event.31",
+    "version": "0.1.5-event.33",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",
@@ -49,7 +49,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "688a882e262a8918a459a4c6e55aa91f93abd378",
+    "gitHead": "90b7132fef7271f6693255181b092797b843ccf7",
     "dependencies": {
         "react-copy-to-clipboard": "^5.1.0",
         "react-highlight": "^0.15.0"