@zgfe/modules-event 1.0.5-bug.1 → 1.0.5-heyh.2

package/es/components/eventFilter/index.js

@@ -102,6 +102,7 @@ var EventFilter = function EventFilter(props) {
     }
   }, [selectEventData]);
   var onAdd = function onAdd() {
+    var _conditionRef$current;
     if ((event === null || event === void 0 ? void 0 : event.id) === -1) {
       return;
     }
@@ -109,9 +110,7 @@ var EventFilter = function EventFilter(props) {
       return;
     }
     setIsAdd(true);
-    setTimeout(function () {
-      conditionRef.current.add();
-    }, 0);
+    conditionRef === null || conditionRef === void 0 ? void 0 : (_conditionRef$current = conditionRef.current) === null || _conditionRef$current === void 0 ? void 0 : _conditionRef$current.add();
   };
   var onChangeFilters = function onChangeFilters(data) {
     setFilter(data);

package/es/components/renderContent/index.js

@@ -5,7 +5,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Empty } from 'antd';
-import React, { useState, useContext, useEffect } from 'react';
+import React, { useState, useContext } from 'react';
 import { BizLoading } from '@zgfe/business-lib';
 import { EventContext } from '../../types';
 import './styles/index.less';
@@ -21,9 +21,6 @@ var ContentPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     showList = _useState2[0],
     setShowList = _useState2[1];
-  useEffect(function () {
-    setShowList(props.showList);
-  }, [eventData]);
   var onChangeShow = function onChangeShow(names) {
     setShowList(names);
     if (props.onChangeShow) props.onChangeShow(names);

package/es/components/searchPanel/index.js

@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizDatePicker, BizSelect, BizTargetDimension, useChanged } from '@zgfe/business-lib';
-import React, { useContext, useEffect, useState, useMemo } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { chartTypeOptions, getInitDate } from '../../constants';
 import { EventContext } from '../../types';
 import { normalOptions, normalEventOptions } from '../../modules/content/utils';
@@ -32,21 +32,8 @@ var SearchPanel = function SearchPanel(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     chart = _useState4[0],
     setChart = _useState4[1];
-  var _useState5 = useState(true),
-    _useState6 = _slicedToArray(_useState5, 2),
-    timeFlag = _useState6[0],
-    setTimeFlag = _useState6[1];
-  var _useState7 = useState(0),
-    _useState8 = _slicedToArray(_useState7, 2),
-    timer = _useState8[0],
-    setTimer = _useState8[1];
-  var currentNormalOptions = useMemo(function () {
-    setTimeFlag(false);
-    setTimeout(function () {
-      setTimeFlag(true);
-    }, 0);
-    return analysisSubjectType === 'user' ? normalOptions : normalEventOptions;
-  }, [analysisSubjectType]);
+  var currentNormalOptions = analysisSubjectType === 'user' ? normalOptions : normalEventOptions;
+  console.log('analysisSubjectType: ', analysisSubjectType);
   useEffect(function () {
     if (searchData.chartType && searchData.chartType !== chart.value) {
       if (searchData.chartType.indexOf(',') !== -1) {
@@ -68,14 +55,11 @@ var SearchPanel = function SearchPanel(props) {
     }
   }, [props.enableSelectChart]);
   var onChangeTime = function onChangeTime(val) {
-    if (timer) clearTimeout(timer);
-    setTimer(setTimeout(function () {
-      setTime(val);
-      props.onChange && props.onChange(_objectSpread({
-        time: val,
-        chartType: chart.value
-      }, dimension));
-    }, 10));
+    setTime(val);
+    props.onChange && props.onChange(_objectSpread({
+      time: val,
+      chartType: chart.value
+    }, dimension));
   };
   var onChange = function onChange(val) {
     setChart(val);
@@ -110,8 +94,8 @@ var SearchPanel = function SearchPanel(props) {
     defaultValue: time,
     onChange: onChangeTime,
     selectRange: 365
-  }), timeFlag && /*#__PURE__*/React.createElement(BizTargetDimension, {
-    normalOptions: currentNormalOptions,
+  }), /*#__PURE__*/React.createElement(BizTargetDimension, {
+    normalOptions: analysisSubjectType === 'user' ? normalOptions : normalEventOptions,
     value: dimension,
     eventId: props.eventId,
     isExtend: true,

package/es/constants/color.js

@@ -1 +1 @@
-export var chartColors = ['#457DFF', '#80E1D9', '#65789B', '#F8BC3B', '#6F66ED', '#66AFED', '#9661BC', '#FF7557', '#4DB273', '#F08BB4', '#CDDBFD', '#CDF3F0', '#CED4DE', '#FCE7B9', '#D1CEFD', '#D3E7F9', '#DFCFEA', '#FFD1C7', '#BBDEC8', '#FFE0ED'];
+export var chartColors = ['#165DFF', '#80E1D9', '#65789B', '#F8BC3B', '#6F66ED', '#66AFED', '#9661BC', '#FF7557', '#4DB273', '#F08BB4', '#CDDBFD', '#CDF3F0', '#CED4DE', '#FCE7B9', '#D1CEFD', '#D3E7F9', '#DFCFEA', '#FFD1C7', '#BBDEC8', '#FFE0ED'];

package/es/modules/content/index.js

@@ -73,17 +73,13 @@ var EventContent = function EventContent(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     subDisplay = _useState14[0],
     setSubDisplay = _useState14[1];
-  var _useState15 = useState(true),
-    _useState16 = _slicedToArray(_useState15, 2),
-    isFirst = _useState16[0],
-    setIsFirst = _useState16[1];
-  var _useState17 = useState({
+  var _useState15 = useState({
       analysisIndex: ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.analysisIndex) || 'number',
       analysisAttr: (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.analysisAttr
     }),
-    _useState18 = _slicedToArray(_useState17, 2),
-    dimension = _useState18[0],
-    setDimension = _useState18[1];
+    _useState16 = _slicedToArray(_useState15, 2),
+    dimension = _useState16[0],
+    setDimension = _useState16[1];
   useEffect(function () {
     if (timer) clearTimeout(timer);
     var flag = true;
@@ -137,48 +133,38 @@ var EventContent = function EventContent(props) {
         cancel = c;
       })
     }).then(function (res) {
-      var _searchData$userGroup, _props$show;
+      var _searchData$userGroup;
       if (!res) {
         setLoading(false);
         return;
       }
       var result = res.data;
       var _data = searchData.dimension ? result : getChartDataEventAliasName(result, eventGroupList);
+      setShowList(_data ? getDefaultShow(_data) : []);
       if (['bar', 'pie', 'map'].indexOf(searchData.chartType) !== -1) {
         _data = getSortData(_data);
       }
       if (searchData && (searchData === null || searchData === void 0 ? void 0 : searchData.userGroup) && (searchData === null || searchData === void 0 ? void 0 : (_searchData$userGroup = searchData.userGroup) === null || _searchData$userGroup === void 0 ? void 0 : _searchData$userGroup.length) > 1) {
-        _data = getUserGroupsCompareData(_data);
-      }
-      if (isFirst && ((_props$show = props.show) === null || _props$show === void 0 ? void 0 : _props$show.length)) {
-        setIsFirst(false);
+        setEventData(getUserGroupsCompareData(_data));
       } else {
-        var list = _data ? getDefaultShow(_data) : [];
-        setShowList(list);
-        props.onChangeShow && props.onChangeShow(list);
+        setEventData(_data);
       }
-      setEventData(_data);
       setFinalSearchData(_objectSpread({}, searchData));
       onChangeUrlParam(searchData);
-      setTimeout(function () {
-        setLoading(false);
-      }, 0);
+      setLoading(false);
     });
   };
   var onChangeContent = function onChangeContent(data) {
     ajaxFlag = true;
-    setTimeout(function () {
-      setSearchData(function (value) {
-        return _objectSpread(_objectSpread(_objectSpread({}, value), data), {}, {
-          analysisAttr: data.analysisAttr,
-          analysisIndex: data.analysisIndex
-        });
+    setSearchData(function (value) {
+      return _objectSpread(_objectSpread(_objectSpread({}, value), data), {}, {
+        analysisAttr: data.analysisAttr,
+        analysisIndex: data.analysisIndex
       });
     });
   };
   var onChangeShow = function onChangeShow(data) {
     setShowList(data);
-    props.onChangeShow && props.onChangeShow(data);
   };
   var platformChange = function platformChange(data) {
     ajaxFlag = true;

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

@@ -6,6 +6,5 @@ export declare namespace EventContentProps {
         show?: string[];
         onSearching?: (flag: boolean) => void;
         initSearch?: () => void;
-        onChangeShow?: (data: string[]) => void;
     }
 }

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

@@ -43,7 +43,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 502306
+    defaultApp: 461
   }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return setIsDetail(false);

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

@@ -10,25 +10,59 @@ import { ModuleEvent } from '../../../index';
 import { requestConfig } from '../../../utils/ajaxConfig';
 import { Button } from 'antd';
 var defaultValue = {
-  panelId: 402605,
-  id: 249641,
-  name: '事件',
+  enlarged: 0,
+  id: 247329,
+  isPerfect: 1,
+  name: '事件分析-饼图和表格',
   data: {
-    app_id: 502391,
-    module: 'event',
-    appId: 502391,
+    appId: 461,
     platform: 0,
+    module: 'event',
     userGroup: [0],
     time: {
-      begin: '2023-12-12',
-      end: '2024-01-11',
-      relative: [30, 0],
+      begin: '2023-10-13',
+      end: '2023-10-20',
+      relative: [7, 0],
       unit: 'day'
     },
-    chartType: 'line',
+    chartType: 'pie,grid',
+    dimension: {
+      propCategory: 'userProp',
+      category: 'fixed',
+      value: 'current_area',
+      id: 0
+    },
+    id: 24292408,
+    name: '免费注册-点击选择职位',
     analysisIndex: 'number'
   },
-  chosen_data: ['订单支付页-支付订单', '订单详情页-查看订单', '收入']
+  reqParam: {
+    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'
+    },
+    chosen_data: []
+  },
+  type: 0,
+  unExistEvent: ''
 };
 export default (function () {
   var _useState = useState(false),
@@ -60,7 +94,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 502391
+    defaultApp: 461
   }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return setIsDetail(false);

package/es/modules/home/index.js

@@ -90,9 +90,7 @@ var ModuleEvent = function ModuleEvent(props) {
     } else {
       initSearch();
     }
-    setTimeout(function () {
-      setPageLoading(false);
-    }, 0);
+    setPageLoading(false);
   }, []);
   var initSearch = function initSearch(userGroup) {
     setSearchData({
@@ -127,8 +125,7 @@ var ModuleEvent = function ModuleEvent(props) {
         params: _objectSpread({
           app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
           module: 'event'
-        }, searchData),
-        showList: showList
+        }, searchData)
       }
     } : undefined,
     disabled: props === null || props === void 0 ? void 0 : props.panelDisabled,
@@ -164,8 +161,7 @@ var ModuleEvent = function ModuleEvent(props) {
     elementId: elementId,
     value: searchData,
     show: showList,
-    initSearch: initSearch,
-    onChangeShow: setShowList
+    initSearch: initSearch
   })));
 };
 ModuleEvent.defaultProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "1.0.5-bug.1",
+  "version": "1.0.5-heyh.2",
   "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.99",
+    "@zgfe/business-lib": "1.2.17-heyh.1",
     "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": "c547470b1d32499155edbb36a23e1d9677ea2503",
+  "gitHead": "b59edac8a03cbc390929d470b38cf0e74249a3de",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"