@zgfe/modules-event 1.0.5-heyh.4 → 1.0.5-heyh.7

package/es/components/searchPanel/index.js

@@ -33,7 +33,6 @@ var SearchPanel = function SearchPanel(props) {
     chart = _useState4[0],
     setChart = _useState4[1];
   var currentNormalOptions = analysisSubjectType === 'user' ? normalOptions : normalEventOptions;
-  console.log('analysisSubjectType: ', analysisSubjectType);
   useEffect(function () {
     if (searchData.chartType && searchData.chartType !== chart.value) {
       if (searchData.chartType.indexOf(',') !== -1) {
@@ -95,7 +94,7 @@ var SearchPanel = function SearchPanel(props) {
     onChange: onChangeTime,
     selectRange: 365
   }), /*#__PURE__*/React.createElement(BizTargetDimension, {
-    normalOptions: analysisSubjectType === 'user' ? normalOptions : normalEventOptions,
+    normalOptions: currentNormalOptions,
     value: dimension,
     eventId: props.eventId,
     isExtend: true,

package/es/modules/chart/index.js

@@ -13,9 +13,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useMemo, useState } from 'react';
 import { Tooltip, Empty } from 'antd';
 import { BizChart, BizGlobalDataContext, ajax, BizLoading } from '@zgfe/business-lib';
+import { EventTable } from '../../components';
 import { judgeIsCity } from '../content/utils';
 import { getValue, getMapChartData } from '../../modules/content/utils';
 import { getDefaultShow, getShowColor, getUserGroupsCompareData, getSortData, getChartDataEventAliasName } from '../../utils/formData';
+import _ from 'lodash';
 import moment from 'moment';
 import { Apis, chartColors } from '../../constants';
 var classPrefix = 'event-mi-table';
@@ -107,6 +109,19 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setLoading(false);
     });
   };
+  var onChangeShowByName = function onChangeShowByName(nameGroup) {
+    var list = _.cloneDeep(showList);
+    var index = list === null || list === void 0 ? void 0 : list.indexOf(nameGroup);
+    if (index < 0) {
+      list.push(nameGroup);
+    } else {
+      list.splice(index, 1);
+    }
+    if (props.onChangeShow) props.onChangeShow(list);
+  };
+  var onChangeShow = function onChangeShow(names) {
+    if (props.onChangeShow) props.onChangeShow(names);
+  };
   if (loading) {
     return /*#__PURE__*/React.createElement(BizLoading, {
       className: "".concat(classPrefix, "-loading")
@@ -125,6 +140,7 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, /*#__PURE__*/React.createElement("div", null, "\u6570\u636E\u66F4\u65B0\u65F6\u95F4\uFF1A", moment().format('YYYY-MM-DD HH:mm')));
   };
   var chartBox = function chartBox() {
+    console.log('chartBox: ', chartBox);
     if (dataSource.series.length <= 0) {
       return /*#__PURE__*/React.createElement(Empty, {
         image: Empty.PRESENTED_IMAGE_SIMPLE,
@@ -152,7 +168,28 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     case 'bar':
     case 'pie':
     case 'map':
-      return chartBox();
+      return /*#__PURE__*/React.createElement(BizChart, {
+        ref: ref,
+        key: chartType,
+        type: chartType,
+        data: chartType === 'map' ? getMapChartData(dataSource) : dataSource,
+        legendPosition: "bottom",
+        showList: showList,
+        colors: showColors,
+        xRotate: chartType === 'bar' && dataSource.series.length > 5 ? 40 : 0,
+        reverseXAxis: chartType === 'bar',
+        isCity: isCity
+      });
+    case 'grid':
+      return /*#__PURE__*/React.createElement(EventTable, {
+        dataSource: dataSource,
+        sourcePanel: !props.dataSource,
+        searchData: params,
+        showList: showList,
+        changeShow: onChangeShow,
+        changeShowByName: onChangeShowByName,
+        onSelectEvent: props === null || props === void 0 ? void 0 : props.onSelectEvent
+      });
     default:
       return /*#__PURE__*/React.createElement("div", null, "\u6682\u4E0D\u652F\u6301\u8BE5\u56FE\u8868\u7C7B\u578B");
   }

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,17 +31,17 @@ 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) {
-    clearTimeout(onChangeTimer);
-    onChangeTimer = setTimeout(function () {
-      props.onChange({
-        data: data
-      });
-    }, 500);
+    props.onChange({
+      data: data
+    });
   };
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),

package/package.json

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