@zgfe/modules-event 1.0.5-heyh.9 → 1.0.6

package/es/components/renderContent/index.js

@@ -1,14 +1,33 @@
-import React, { useContext } from 'react';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+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 { BizLoading } from '@zgfe/business-lib';
 import { EventContext } from '../../types';
 import './styles/index.less';
+import EventChart from '../../modules/chart';
 var classPrefix = 'render-content';
 var ContentPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var eventData = props.eventData,
     searchData = props.searchData;
-  console.log(eventData, searchData, ref);
   var _useContext = useContext(EventContext),
-    loading = _useContext.loading;
+    loading = _useContext.loading,
+    onSelectEvent = _useContext.onSelectEvent;
+  var _useState = useState(props.showList || []),
+    _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);
+  };
   if (loading) {
     return /*#__PURE__*/React.createElement(BizLoading, {
       className: "".concat(classPrefix, "-loading")
@@ -18,6 +37,21 @@ var ContentPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-chart-container")
-  }));
+  }, eventData ? /*#__PURE__*/React.createElement(EventChart, {
+    ref: ref,
+    dataSource: eventData,
+    params: searchData,
+    showList: showList
+  }) : /*#__PURE__*/React.createElement(Empty, {
+    image: Empty.PRESENTED_IMAGE_SIMPLE,
+    description: "\u6682\u65E0\u6570\u636E"
+  })), eventData && eventData.series.length > 0 ? /*#__PURE__*/React.createElement(EventChart, {
+    type: "grid",
+    dataSource: eventData,
+    params: searchData,
+    showList: showList,
+    onChangeShow: onChangeShow,
+    onSelectEvent: onSelectEvent
+  }) : null);
 });
 export default ContentPanel;

package/es/components/table/index.js

@@ -44,8 +44,7 @@ var EventTable = function EventTable(props) {
     onUserDrill = _useContext2.onUserDrill,
     _useContext2$defaultS = _useContext2.defaultSearch,
     defaultSearch = _useContext2$defaultS === void 0 ? {} : _useContext2$defaultS,
-    panelName = _useContext2.panelName,
-    setFinalSearchData = _useContext2.setFinalSearchData;
+    panelName = _useContext2.panelName;
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     sqlModal = _useState4[0],
@@ -93,7 +92,6 @@ var EventTable = function EventTable(props) {
           });
         });
       }
-      setFinalSearchData({});
       onUserDrill && onUserDrill({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: (searchData === null || searchData === void 0 ? void 0 : searchData.platform) || 0,

package/es/constants/color.js

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

@@ -71,13 +71,17 @@ var EventContent = function EventContent(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     subDisplay = _useState14[0],
     setSubDisplay = _useState14[1];
-  var _useState15 = useState({
+  var _useState15 = useState(true),
+    _useState16 = _slicedToArray(_useState15, 2),
+    isFirst = _useState16[0],
+    setIsFirst = _useState16[1];
+  var _useState17 = 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
     }),
-    _useState16 = _slicedToArray(_useState15, 2),
-    dimension = _useState16[0],
-    setDimension = _useState16[1];
+    _useState18 = _slicedToArray(_useState17, 2),
+    dimension = _useState18[0],
+    setDimension = _useState18[1];
   useEffect(function () {
     if (timer) clearTimeout(timer);
     var flag = true;
@@ -131,22 +135,27 @@ var EventContent = function EventContent(props) {
         cancel = c;
       })
     }).then(function (res) {
-      var _searchData$userGroup;
+      var _searchData$userGroup, _props$show;
       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) {
-        setEventData(getUserGroupsCompareData(_data));
+        _data = getUserGroupsCompareData(_data);
+      }
+      if (isFirst && ((_props$show = props.show) === null || _props$show === void 0 ? void 0 : _props$show.length)) {
+        setIsFirst(false);
       } else {
-        setEventData(_data);
+        var list = _data ? getDefaultShow(_data) : [];
+        setShowList(list);
+        props.onChangeShow && props.onChangeShow(list);
       }
+      setEventData(_data);
       onChangeUrlParam(searchData);
       setLoading(false);
     });
@@ -162,6 +171,7 @@ var EventContent = function EventContent(props) {
   };
   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,5 +6,6 @@ export declare namespace EventContentProps {
         show?: string[];
         onSearching?: (flag: boolean) => void;
         initSearch?: () => void;
+        onChangeShow?: (data: string[]) => void;
     }
 }

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

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

@@ -19,8 +19,8 @@ import { getInitDate } from '../../constants/initData';
 import EventContent from '../content';
 import { chartTypes } from '../../constants';
 var classPrefix = 'event-module-container';
+var onChangeTimer = -1;
 var ModuleEvent = function ModuleEvent(props) {
-  console.log('ModuleEvent-props', props);
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     eventGroupList = _useContext.eventGroupList,
@@ -31,46 +31,42 @@ var ModuleEvent = function ModuleEvent(props) {
     _useState2 = _slicedToArray(_useState, 2),
     searchData = _useState2[0],
     setSearchData = _useState2[1];
-  useEffect(function () {
-    console.log('searchData变更: ', searchData);
-  }, [searchData]);
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    finalSearchData = _useState4[0],
-    setFinalSearchData = _useState4[1];
   var onChangeUrlParam = function onChangeUrlParam(data) {
-    props.onChange({
-      data: data
-    });
+    clearTimeout(onChangeTimer);
+    onChangeTimer = setTimeout(function () {
+      props.onChange({
+        data: data
+      });
+    }, 500);
   };
-  var _useState5 = useState(),
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectEventData = _useState4[0],
+    setSelectEventData = _useState4[1];
+  var _useState5 = useState(true),
     _useState6 = _slicedToArray(_useState5, 2),
-    selectEventData = _useState6[0],
-    setSelectEventData = _useState6[1];
+    loading = _useState6[0],
+    setLoading = _useState6[1];
   var _useState7 = useState(true),
     _useState8 = _slicedToArray(_useState7, 2),
-    loading = _useState8[0],
-    setLoading = _useState8[1];
-  var _useState9 = useState(true),
+    pageLoading = _useState8[0],
+    setPageLoading = _useState8[1];
+  var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    pageLoading = _useState10[0],
-    setPageLoading = _useState10[1];
+    title = _useState10[0],
+    setTitle = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    title = _useState12[0],
-    setTitle = _useState12[1];
+    panelId = _useState12[0],
+    setPanelId = _useState12[1];
   var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    panelId = _useState14[0],
-    setPanelId = _useState14[1];
+    elementId = _useState14[0],
+    setElementId = _useState14[1];
   var _useState15 = useState(),
     _useState16 = _slicedToArray(_useState15, 2),
-    elementId = _useState16[0],
-    setElementId = _useState16[1];
-  var _useState17 = useState(),
-    _useState18 = _slicedToArray(_useState17, 2),
-    showList = _useState18[0],
-    setShowList = _useState18[1];
+    showList = _useState16[0],
+    setShowList = _useState16[1];
   useEffect(function () {
     setPageLoading(true);
     if (props.defaultValue) {
@@ -125,7 +121,8 @@ var ModuleEvent = function ModuleEvent(props) {
         params: _objectSpread({
           app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
           module: 'event'
-        }, searchData)
+        }, searchData),
+        showList: showList
       }
     } : undefined,
     disabled: props === null || props === void 0 ? void 0 : props.panelDisabled,
@@ -144,8 +141,6 @@ var ModuleEvent = function ModuleEvent(props) {
       userPropList: userPropList,
       searchData: searchData,
       setSearchData: setSearchData,
-      finalSearchData: finalSearchData,
-      setFinalSearchData: setFinalSearchData,
       onChangeUrlParam: onChangeUrlParam,
       selectEventData: selectEventData,
       onSelectEvent: onSelectEvent,
@@ -161,7 +156,8 @@ var ModuleEvent = function ModuleEvent(props) {
     elementId: elementId,
     value: searchData,
     show: showList,
-    initSearch: initSearch
+    initSearch: initSearch,
+    onChangeShow: setShowList
   })));
 };
 ModuleEvent.defaultProps = {

package/package.json

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