@zgfe/modules-event 0.0.2-event.78 → 0.0.2-event.80

package/es/components/searchPanel/index.js

@@ -11,12 +11,15 @@ import { BizDatePicker, BizSelect, BizTargetDimension } from '@zgfe/business-lib
 import React, { useContext, useEffect, useState } from 'react';
 import { chartTypeOptions, getInitDate } from '../../constants';
 import { EventContext } from '../../types';
-import { normalOptions } from '../../modules/content/utils';
+import { normalOptions, judgeIsCity, judgeIsArea } from '../../modules/content/utils';
 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 setEnableSelectChart = props.setEnableSelectChart,
+    setIsCity = props.setIsCity;
   var _useState = useState(props.time || getInitDate(includeToday)),
     _useState2 = _slicedToArray(_useState, 2),
     time = _useState2[0],
@@ -36,6 +39,7 @@ 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({
@@ -59,7 +63,19 @@ var SearchPanel = function SearchPanel(props) {
       _dimension['analysisAttr'] = props.analysisAttr;
     }
     setDimension(_objectSpread({}, _dimension));
-  }, [props.chartType]);
+  }, []);
+  useEffect(function () {
+    if (searchData.dimension) {
+      var _value = searchData.dimension.value;
+      setEnableSelectChart && setEnableSelectChart(judgeIsArea(_value));
+      setIsCity && setIsCity(judgeIsCity(_value));
+      if (judgeIsArea(_value)) {
+        setChart({
+          value: 'map'
+        });
+      }
+    }
+  }, [searchData]);
   useEffect(function () {
     if (!props.enableSelectChart && chart.value === 'map') {
       setChart({

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

@@ -10,4 +10,6 @@ export interface SearchPanelProps {
     chartType?: EventChartTypes;
     optionNode?: ReactNode;
     onChange?: (data: SearchPanelProps) => void;
+    setIsCity?: Function;
+    setEnableSelectChart?: Function;
 }

package/es/modules/content/index.js

@@ -18,6 +18,7 @@ import { Apis } from '../../constants';
 import { judgeIsCity, judgeIsArea, getValue } from './utils';
 import { ContentPanel, SearchPanel } from '../../components';
 import { getDefaultShow, getUserGroupsCompareData, getSortData, getChartDataEventAliasName } from '../../utils/formData';
+import _ from 'lodash';
 import TopPanel from '../topPanel';
 var timer = 0;
 var ajaxFlag = true;
@@ -81,7 +82,29 @@ var EventContent = function EventContent(props) {
     handleSearch && handleSearch(loading);
   }, [loading]);
   var fetchRequest = function fetchRequest(flag) {
-    if (JSON.stringify(searchData) === JSON.stringify(finalSearchData)) {
+    var _searchData = _.cloneDeep(searchData);
+    if (_searchData.dimension) {
+      var _getValue;
+      var _attrName = (_getValue = getValue(_searchData.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name;
+      if (_attrName) {
+        setEnableSelectChart(judgeIsArea(_attrName));
+        setIsCity(judgeIsCity(_attrName));
+        if (!judgeIsArea(_attrName)) {
+          if (_searchData.chartType === 'map') {
+            console.log(222);
+            _searchData.chartType = 'line';
+          }
+        }
+      }
+    } else {
+      setEnableSelectChart(false);
+      setIsCity(false);
+      if (_searchData.chartType === 'map') {
+        console.log(1111);
+        _searchData.chartType = 'line';
+      }
+    }
+    if (JSON.stringify(_searchData) === JSON.stringify(finalSearchData)) {
       console.log('数据没变，终止请求');
       return;
     }
@@ -96,8 +119,8 @@ var EventContent = function EventContent(props) {
       method: 'post',
       data: _objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: (searchData === null || searchData === void 0 ? void 0 : searchData.platform) || 0
-      }, searchData),
+        platform: (_searchData === null || _searchData === void 0 ? void 0 : _searchData.platform) || 0
+      }, _searchData),
       cancelToken: new CancelToken(function executor(c) {
         cancel = c;
       })
@@ -107,19 +130,19 @@ var EventContent = function EventContent(props) {
         return;
       }
       var result = res.data;
-      var _data = searchData.dimension ? result : getChartDataEventAliasName(result, eventGroupList);
+      var _data = _searchData.dimension ? result : getChartDataEventAliasName(result, eventGroupList);
       console.log('dataSource66888', _data);
       setShowList(_data ? getDefaultShow(_data) : []);
-      if (['bar', 'pie', 'map'].indexOf(searchData.chartType) !== -1) {
+      if (['bar', 'pie', 'map'].indexOf(_searchData.chartType) !== -1) {
         _data = getSortData(_data);
       }
-      if (searchData.userGroup.length > 1) {
+      if (_searchData.userGroup.length > 1) {
         setEventData(getUserGroupsCompareData(_data));
       } else {
         setEventData(_data);
       }
-      setFinalSearchData(_objectSpread({}, searchData));
-      onChangeUrlParam(searchData);
+      setFinalSearchData(_objectSpread({}, _searchData));
+      onChangeUrlParam(_searchData);
       setTimeout(function () {
         setLoading(false);
       }, 0);
@@ -143,6 +166,7 @@ var EventContent = function EventContent(props) {
     });
   };
   var onChangeSearch = function onChangeSearch(data, flag) {
+    console.log('TopPanel查询条件变更,', data);
     ajaxFlag = flag;
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
@@ -151,25 +175,6 @@ var EventContent = function EventContent(props) {
         dimension: data.dimension,
         filters: data.filters
       }, data);
-      if (_data.dimension) {
-        var _getValue;
-        var _attrName = (_getValue = getValue(_data.dimension, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name;
-        if (_attrName) {
-          setEnableSelectChart(judgeIsArea(_attrName));
-          setIsCity(judgeIsCity(_attrName));
-          if (!judgeIsArea(_attrName)) {
-            if (_data.chartType === 'map') {
-              _data.chartType = 'line';
-            }
-          }
-        }
-      } else {
-        setEnableSelectChart(false);
-        setIsCity(false);
-        if (_data.chartType === 'map') {
-          _data.chartType = 'line';
-        }
-      }
       return _objectSpread({}, _data);
     });
   };
@@ -212,6 +217,8 @@ var EventContent = function EventContent(props) {
   }, /*#__PURE__*/React.createElement(SearchPanel, {
     chartType: searchData === null || searchData === void 0 ? void 0 : searchData.chartType,
     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,

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

@@ -9,33 +9,33 @@ import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
 import { ModuleEvent } from '../../../index';
 import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
-var defaultValue2 = {
+var defaultValue = {
   enlarged: 0,
-  id: 2551,
+  id: 2526,
   isPerfect: 1,
-  name: '省市000',
+  name: '事件分析',
   reqParam: {
     data: {
-      appId: 251,
-      platform: 0,
+      app_id: 251,
       module: 'event',
-      userGroup: [0],
       time: {
-        begin: '2023-09-17',
-        end: '2023-09-24',
+        begin: '2023-09-16',
+        end: '2023-09-23',
         relative: [7, 0],
         unit: 'day'
       },
+      analysisIndex: 'number',
       chartType: 'map',
-      id: 16816,
-      name: '加购商品',
+      id: 16818,
+      name: 'click',
       dimension: {
         propCategory: 'envProp',
         category: 'fixed',
         value: 'area',
         id: 0
       },
-      analysisIndex: 'number'
+      userGroup: [0],
+      appId: 251
     },
     chosen_data: []
   },
@@ -43,31 +43,31 @@ var defaultValue2 = {
   unExistEvent: '',
   renderType: 'normal',
   source: 'PANEL',
-  panelId: 342,
+  panelId: 286,
   panelType: 'edit',
   data: {
-    appId: 251,
-    platform: 0,
+    app_id: 251,
     module: 'event',
-    userGroup: [0],
     time: {
-      begin: '2023-09-17',
-      end: '2023-09-24',
+      begin: '2023-09-16',
+      end: '2023-09-23',
       relative: [7, 0],
       unit: 'day'
     },
+    analysisIndex: 'number',
     chartType: 'map',
-    id: 16816,
-    name: '加购商品',
+    id: 16818,
+    name: 'click',
     dimension: {
       propCategory: 'envProp',
       category: 'fixed',
       value: 'area',
       id: 0
     },
-    analysisIndex: 'number'
+    userGroup: [0],
+    appId: 251
   },
-  chosen_data: ['北京市']
+  chosen_data: []
 };
 export default (function () {
   var _useState = useState(false),
@@ -78,7 +78,7 @@ export default (function () {
     _useState4 = _slicedToArray(_useState3, 2),
     detailParams = _useState4[0],
     setDetailParams = _useState4[1];
-  var _useState5 = useState(defaultValue2),
+  var _useState5 = useState(defaultValue),
     _useState6 = _slicedToArray(_useState5, 2),
     searchParams = _useState6[0],
     setSearchParams = _useState6[1];

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

@@ -1,5 +1,5 @@
 import { AttrConditionTypes } from '@zgfe/business-lib';
-import { bizAttributeSelectorValueProp, SearchValue } from '../../types';
+import { bizAttributeSelectorValueProp, SearchValue, EventChartTypes } from '../../types';
 interface filterConditions {
     id?: number;
     name?: string;
@@ -14,6 +14,7 @@ export interface FormDataProps {
 }
 export interface FormHandelDataProps extends filterConditions {
     userGroup?: any[];
+    chartType?: EventChartTypes | undefined;
 }
 export interface TopPanelProps {
     value?: SearchValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.0.2-event.78",
+  "version": "0.0.2-event.80",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "b706bb6ba27d077399b49a097288fe33b08a9186",
+  "gitHead": "ccef46071bc2255d0e1b18724c75d886030c7de2",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"