@zgfe/modules-event 1.0.6 → 1.0.29-zhongyuan.0

package/es/modules/chart/index.js

@@ -12,42 +12,46 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 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 { BizChart, BizGlobalDataContext, ajax, BizLoading, BizEmpty } 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 { getShowColor, getUserGroupsCompareData, getSortData, getChartDataEventAliasName, formTableData, sortOriginalData } from '../../utils/formData';
 import _ from 'lodash';
 import moment from 'moment';
 import { Apis, chartColors } from '../../constants';
 var classPrefix = 'event-mi-table';
 var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var params = props.params;
-  var _useState = useState(false),
+  var _useState = useState(props === null || props === void 0 ? void 0 : props.completedSearchData),
     _useState2 = _slicedToArray(_useState, 2),
-    isCity = _useState2[0],
-    setIsCity = _useState2[1];
-  var _useState3 = useState(props.type || 'line'),
+    completedSearchData = _useState2[0],
+    setCompletedSearchData = _useState2[1];
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    chartType = _useState4[0],
-    setChartType = _useState4[1];
-  var _useState5 = useState(props.showList || []),
+    isCity = _useState4[0],
+    setIsCity = _useState4[1];
+  var _useState5 = useState(props.type || 'line'),
     _useState6 = _slicedToArray(_useState5, 2),
-    showList = _useState6[0],
-    setShowList = _useState6[1];
-  var _useState7 = useState(props.dataSource),
+    chartType = _useState6[0],
+    setChartType = _useState6[1];
+  var _useState7 = useState(props.showList || []),
     _useState8 = _slicedToArray(_useState7, 2),
-    dataSource = _useState8[0],
-    setDataSource = _useState8[1];
+    showList = _useState8[0],
+    setShowList = _useState8[1];
+  var _useState9 = useState(props.dataSource),
+    _useState10 = _slicedToArray(_useState9, 2),
+    dataSource = _useState10[0],
+    setDataSource = _useState10[1];
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp,
     eventGroupList = _useContext.eventGroupList,
     eventEnvList = _useContext.eventEnvList,
-    userPropList = _useContext.userPropList;
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    loading = _useState10[0],
-    setLoading = _useState10[1];
+    userPropList = _useContext.userPropList,
+    currentApp = _useContext.currentApp;
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    loading = _useState12[0],
+    setLoading = _useState12[1];
   var showColors = useMemo(function () {
     if (!dataSource) return chartColors;
     return getShowColor(dataSource, showList);
@@ -58,31 +62,46 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   }, [params]);
   useEffect(function () {
+    if (!dataSource || !dataSource.series.length) return;
     if (!props.showList || !props.showList.length) {
-      setShowList(dataSource ? getDefaultShow(dataSource) : []);
+      var _dataSource$series$;
+      var gLen = (params === null || params === void 0 ? void 0 : params.dimension) ? 1 : 0;
+      var _data = formTableData(dataSource, (params === null || params === void 0 ? void 0 : params.userGroup) || [0], gLen);
+      var _sortData = sortOriginalData(_data, {
+        columnKey: "field".concat(((_dataSource$series$ = dataSource.series[0]) === null || _dataSource$series$ === void 0 ? void 0 : _dataSource$series$.values.length) - 1),
+        order: 'descend'
+      });
+      var _showlist = [];
+      _sortData.forEach(function (item, index) {
+        if (index < 10) {
+          _showlist.push(item.nameGroup);
+        }
+      });
+      setShowList(_showlist);
+      props.onChangeShow && props.onChangeShow(_showlist);
     } else {
       setShowList(props.showList);
     }
-  }, [props.showList, props.type, dataSource]);
+  }, [dataSource, props.showList]);
   useEffect(function () {
-    var _params$chartType;
-    if (!params) return;
-    var chartData = ((_params$chartType = params.chartType) === null || _params$chartType === void 0 ? void 0 : _params$chartType.split(',')) || ['line'];
+    var _completedSearchData$;
+    if (!completedSearchData) return;
+    var chartData = ((_completedSearchData$ = completedSearchData.chartType) === null || _completedSearchData$ === void 0 ? void 0 : _completedSearchData$.split(',')) || ['line'];
     var type = chartData[0];
     if (!props.dataSource) {
       type = (chartData === null || chartData === void 0 ? void 0 : chartData.length) > 1 ? chartData[chartData.length - 1] : chartData[0];
     }
     setChartType(props.type || type);
-    if (params.id) {
-      var dimensions = params.dimension;
+    if (completedSearchData.id) {
+      var dimensions = completedSearchData.dimension;
       if (type === 'map' && dimensions) {
         var _getValue;
         setIsCity(judgeIsCity((_getValue = getValue(dimensions, eventGroupList, eventEnvList, userPropList)) === null || _getValue === void 0 ? void 0 : _getValue.name));
       }
     }
-  }, [params, props.type]);
+  }, [completedSearchData, props.type]);
   var fetchResult = function fetchResult() {
-    var _params$chartType2;
+    var _params$chartType;
     setLoading(true);
     ajax(Apis.dataList, {
       method: 'post',
@@ -90,9 +109,11 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: (params === null || params === void 0 ? void 0 : params.platform) || 0
       }, params), {}, {
-        chartType: (params === null || params === void 0 ? void 0 : (_params$chartType2 = params.chartType) === null || _params$chartType2 === void 0 ? void 0 : _params$chartType2.indexOf(',')) === -1 ? params === null || params === void 0 ? void 0 : params.chartType : 'grid'
+        chartType: (params === null || params === void 0 ? void 0 : (_params$chartType = params.chartType) === null || _params$chartType === void 0 ? void 0 : _params$chartType.indexOf(',')) === -1 ? params === null || params === void 0 ? void 0 : params.chartType : 'grid'
       })
     }).then(function (res) {
+      var _params$userGroup;
+      setCompletedSearchData(params);
       if (!res) {
         setLoading(false);
         return;
@@ -101,7 +122,7 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
       if (['bar', 'pie', 'map'].indexOf(params.chartType) !== -1) {
         _data = getSortData(_data);
       }
-      if (params.userGroup.length > 1) {
+      if ((params === null || params === void 0 ? void 0 : params.userGroup) && (params === null || params === void 0 ? void 0 : (_params$userGroup = params.userGroup) === null || _params$userGroup === void 0 ? void 0 : _params$userGroup.length) > 1) {
         setDataSource(getUserGroupsCompareData(_data));
       } else {
         setDataSource(_data);
@@ -117,16 +138,37 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     } else {
       list.splice(index, 1);
     }
+    setShowList(list);
     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")
     });
   }
+  if (dataSource && dataSource.delEvent) {
+    if (!props.isHideDel) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          display: 'flex',
+          minHeight: 345,
+          justifyContent: 'center',
+          alignItems: 'center'
+        }
+      }, /*#__PURE__*/React.createElement(BizEmpty, {
+        imageStyle: {
+          height: 58
+        },
+        description: /*#__PURE__*/React.createElement("span", {
+          style: {
+            color: '#9AA1A9'
+          }
+        }, "\u4E8B\u4EF6\u5DF2\u88AB\u5220\u9664\u65E0\u6CD5\u67E5\u770B\uFF0C\u8BF7\u91CD\u65B0\u8BBE\u7F6E")
+      }));
+    } else {
+      return null;
+    }
+  }
   if (!dataSource || !dataSource.xAxis.length || !dataSource.series.length) {
     return /*#__PURE__*/React.createElement(Empty, {
       image: Empty.PRESENTED_IMAGE_SIMPLE,
@@ -139,6 +181,33 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
       title: '当前图表数据实时更新，约每分钟更新一次'
     }, /*#__PURE__*/React.createElement("div", null, "\u6570\u636E\u66F4\u65B0\u65F6\u95F4\uFF1A", moment().format('YYYY-MM-DD HH:mm')));
   };
+  var tooltipFormatter = function tooltipFormatter(params) {
+    var xLabel = '';
+    var array = params[0].name.split('|');
+    if (array.length > 1) {
+      xLabel = moment(array[0]).format('MM-DD') + '~' + moment(array[1]).format('MM-DD');
+    } else {
+      xLabel = moment(array[0]).isValid() ? moment(array[0]).format('MM-DD') : array[0];
+    }
+    var series = [];
+    var seriesMap = {};
+    params.forEach(function (item) {
+      if (item.value === null || item.value === undefined || seriesMap[item.seriesName] !== null && seriesMap[item.seriesName] !== undefined) return;
+      seriesMap[item.seriesName] = item.value;
+      var value = item.value;
+      var seriesName = item.seriesName || item.axisValueLabel;
+      seriesName = [seriesName].join('<br/>');
+      series.push({
+        text: "<div class='biz-chart-tooltip-item'>\n                      <div class='biz-chart-tooltip-content'>\n                        <span class=\"biz-tooltip-marker\" style=\"background:".concat(item.color, "\"></span>\n                        <div class=\"biz-tooltip-name\">").concat(seriesName, "</div>\n                      </div> \n                      <div class='biz-chart-tooltip-value'>\n                      ").concat(value, "\n                      </div>\n                    </div>"),
+        value: value
+      });
+    });
+    return "<div class='biz-chart-tooltip-title'>".concat(xLabel, "</div>").concat(series.sort(function (a, b) {
+      return parseInt(b.value) - parseInt(a.value);
+    }).map(function (item) {
+      return item.text;
+    }).join(''));
+  };
   switch (chartType) {
     case 'line':
     case 'bar':
@@ -156,7 +225,8 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
         colors: showColors,
         xRotate: chartType === 'bar' && dataSource.series.length > 5 ? 40 : 0,
         reverseXAxis: chartType === 'bar',
-        isCity: isCity
+        isCity: isCity,
+        tooltipFormatter: tooltipFormatter
       }));
     case 'grid':
       return /*#__PURE__*/React.createElement(EventTable, {
@@ -164,7 +234,6 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
         sourcePanel: !props.dataSource,
         searchData: params,
         showList: showList,
-        changeShow: onChangeShow,
         changeShowByName: onChangeShowByName,
         onSelectEvent: props === null || props === void 0 ? void 0 : props.onSelectEvent
       });

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

@@ -3,14 +3,17 @@ import { SearchValue } from '../../types';
 export declare namespace eventChartProps {
     interface ChartTypesProps extends ChartTypes.Value {
         xAxis: [];
+        delEvent?: number;
     }
     interface Props {
         dataSource?: ChartTypesProps;
         params?: SearchValue;
+        completedSearchData?: SearchValue;
         type?: string;
         showList?: string[];
         showColors?: string[];
         onChangeShow?: (data: string[]) => void;
         onSelectEvent?: (id: number, name: string) => void;
+        isHideDel?: boolean;
     }
 }

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

@@ -1,5 +1,5 @@
 import React from 'react';
 import { EventContentProps } from './types';
 import './styles/index.less';
-declare const EventContent: React.FC<EventContentProps.Props>;
+declare const EventContent: React.ForwardRefExoticComponent<EventContentProps.Props & React.RefAttributes<any>>;
 export default EventContent;

package/es/modules/content/index.js

@@ -12,56 +12,69 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { ajax, BizGlobalDataContext, BizLayout, BizTargetFromPanelContext } from '@zgfe/business-lib';
 import { message } from 'antd';
-import React, { useContext, useEffect, useRef, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState, useImperativeHandle } from 'react';
 import Request from 'umi-request';
 import TopBar from '../../components/topBar';
 import { EventContext } from '../../types';
 import './styles/index.less';
 import { Apis } from '../../constants';
 import { ContentPanel, SearchPanel } from '../../components';
-import { getDefaultShow, getUserGroupsCompareData, getSortData, getChartDataEventAliasName } from '../../utils/formData';
+import { getUserGroupsCompareData, getSortData, getChartDataEventAliasName, sortOriginalData, formTableData } from '../../utils/formData';
 import TopPanel from '../topPanel';
 var timer = 0;
 var ajaxFlag = true;
+var refresh = false;
 var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'event-content';
-var EventContent = function EventContent(props) {
-  var _props$value, _props$value2;
+var EventContent = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var _props$value, _props$value2, _topPanelRef$current4;
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp,
     authority = _useContext.authority;
   var _useContext2 = useContext(EventContext),
+    currentApp = _useContext2.currentApp,
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData,
     eventGroupList = _useContext2.eventGroupList,
     loading = _useContext2.loading,
     setLoading = _useContext2.setLoading,
     afterEditTarget = _useContext2.afterEditTarget,
-    onChangeUrlParam = _useContext2.onChangeUrlParam;
+    onChangeUrlParam = _useContext2.onChangeUrlParam,
+    panelId = _useContext2.panelId,
+    setShowListHome = _useContext2.setShowListHome,
+    setRefreshLoading = _useContext2.setRefreshLoading,
+    setCompletedSearchData = _useContext2.setCompletedSearchData;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     eventData = _useState2[0],
     setEventData = _useState2[1];
-  var _useState3 = useState(props.show || []),
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    showList = _useState4[0],
-    setShowList = _useState4[1];
+    enableSelectChart = _useState4[0],
+    setEnableSelectChart = _useState4[1];
   var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    enableSelectChart = _useState6[0],
-    setEnableSelectChart = _useState6[1];
-  var _useState7 = useState(false),
+    isCity = _useState6[0],
+    setIsCity = _useState6[1];
+  var _useState7 = useState(props.value.id),
     _useState8 = _slicedToArray(_useState7, 2),
-    isCity = _useState8[0],
-    setIsCity = _useState8[1];
-  var _useState9 = useState(props.value.id),
+    eventId = _useState8[0],
+    setEventId = _useState8[1];
+  var _useState9 = useState(true),
     _useState10 = _slicedToArray(_useState9, 2),
-    eventId = _useState10[0],
-    setEventId = _useState10[1];
+    first = _useState10[0],
+    setFirst = _useState10[1];
   var _useContext3 = useContext(BizTargetFromPanelContext),
     handleSearch = _useContext3.handleSearch;
-  var collapseRef = useRef();
+  var topPanelRef = useRef();
+  useImperativeHandle(ref, function () {
+    return {
+      onFormSetFieldsValue: function onFormSetFieldsValue(data) {
+        var _topPanelRef$current;
+        topPanelRef === null || topPanelRef === void 0 ? void 0 : (_topPanelRef$current = topPanelRef.current) === null || _topPanelRef$current === void 0 ? void 0 : _topPanelRef$current.onFormSetFieldsValue(data);
+      }
+    };
+  });
   var chartRef = useRef();
   var _useState11 = useState('user'),
     _useState12 = _slicedToArray(_useState11, 2),
@@ -71,17 +84,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;
@@ -120,48 +129,81 @@ var EventContent = function EventContent(props) {
     if (flag !== undefined) ajaxFlag = flag;
     if (analysisSubjectType === 'eventProp' && !searchData.analysisSubject) return;
     if (!ajaxFlag) return;
-    setLoading(true);
+    if (!refresh) setLoading(true);
     setEventData(undefined);
     if (typeof cancel === 'function') {
       cancel();
     }
     ajax(Apis.dataList, {
       method: 'post',
-      data: _objectSpread({
+      data: _objectSpread(_objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: (searchData === null || searchData === void 0 ? void 0 : searchData.platform) || 0
-      }, searchData),
+      }, searchData), {}, {
+        refresh: refresh
+      }),
       cancelToken: new CancelToken(function executor(c) {
         cancel = c;
       })
     }).then(function (res) {
-      var _searchData$userGroup, _props$show;
+      var _searchData$userGroup;
+      setCompletedSearchData && setCompletedSearchData(searchData);
+      setRefreshLoading(false);
       if (!res) {
         setLoading(false);
         return;
       }
       var result = res.data;
+      if (!result.series.length) {
+        setLoading(false);
+        return;
+      }
       var _data = searchData.dimension ? result : getChartDataEventAliasName(result, eventGroupList);
+      var gLen = (searchData === null || searchData === void 0 ? void 0 : searchData.dimension) ? 1 : 0;
+      var dataTemp = formTableData(_data, (searchData === null || searchData === void 0 ? void 0 : searchData.userGroup) || [0], gLen);
+      var _sortData = [];
       if (['bar', 'pie', 'map'].indexOf(searchData.chartType) !== -1) {
         _data = getSortData(_data);
+      } else {
+        var _data$series$;
+        _sortData = sortOriginalData(dataTemp, {
+          columnKey: "field".concat(((_data$series$ = _data.series[0]) === null || _data$series$ === void 0 ? void 0 : _data$series$.values.length) - 1),
+          order: 'descend'
+        });
       }
       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);
+      if (first) {
+        setFirst(false);
       } else {
-        var list = _data ? getDefaultShow(_data) : [];
-        setShowList(list);
-        props.onChangeShow && props.onChangeShow(list);
+        var _showlist = [];
+        _sortData.forEach(function (item, index) {
+          if (index < 10) {
+            _showlist.push(item.nameGroup);
+          }
+        });
+        setShowListHome(_showlist);
       }
       setEventData(_data);
       onChangeUrlParam(searchData);
       setLoading(false);
     });
   };
+  var refreshHandle = function refreshHandle() {
+    refresh = true;
+    setRefreshLoading(true);
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(function () {
+      fetchRequest();
+      refresh = false;
+      clearTimeout(timer);
+    }, 500);
+  };
   var onChangeContent = function onChangeContent(data) {
+    var _topPanelRef$current2;
     ajaxFlag = true;
+    (_topPanelRef$current2 = topPanelRef.current) === null || _topPanelRef$current2 === void 0 ? void 0 : _topPanelRef$current2.submit();
     setSearchData(function (value) {
       return _objectSpread(_objectSpread(_objectSpread({}, value), data), {}, {
         analysisAttr: data.analysisAttr,
@@ -169,12 +211,10 @@ var EventContent = function EventContent(props) {
       });
     });
   };
-  var onChangeShow = function onChangeShow(data) {
-    setShowList(data);
-    props.onChangeShow && props.onChangeShow(data);
-  };
   var platformChange = function platformChange(data) {
+    var _topPanelRef$current3;
     ajaxFlag = true;
+    (_topPanelRef$current3 = topPanelRef.current) === null || _topPanelRef$current3 === void 0 ? void 0 : _topPanelRef$current3.submit();
     setSearchData(function (_searchData) {
       return _objectSpread(_objectSpread({}, _searchData), {}, {
         platform: data
@@ -215,19 +255,12 @@ var EventContent = function EventContent(props) {
     };
     if (afterEditTarget) afterEditTarget('report', params);
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
-    eventData: eventData,
-    searchData: searchData,
-    platformChange: platformChange,
-    enableSelectChart: enableSelectChart,
-    showList: showList,
-    onClickGenerateReport: onClickGenerateReport
-  }), /*#__PURE__*/React.createElement(BizLayout, {
-    showTitle: false,
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizLayout, {
+    showTitle: !panelId,
     hasCollapse: true,
-    collapseRef: collapseRef,
+    collapseRef: topPanelRef === null || topPanelRef === void 0 ? void 0 : (_topPanelRef$current4 = topPanelRef.current) === null || _topPanelRef$current4 === void 0 ? void 0 : _topPanelRef$current4.getCollapseRef(),
     topPanel: /*#__PURE__*/React.createElement(TopPanel, {
-      ref: collapseRef,
+      ref: topPanelRef,
       onChange: onChangeSearch,
       loading: loading,
       value: searchData,
@@ -235,6 +268,13 @@ var EventContent = function EventContent(props) {
       setIsCity: setIsCity,
       setEnableSelectChart: setEnableSelectChart,
       onChangeSubjectType: onChangeSubjectType
+    }),
+    toolbar: /*#__PURE__*/React.createElement(TopBar, {
+      eventData: eventData,
+      searchData: searchData,
+      platformChange: platformChange,
+      enableSelectChart: enableSelectChart,
+      onClickGenerateReport: onClickGenerateReport
     })
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix
@@ -248,14 +288,13 @@ var EventContent = function EventContent(props) {
     onChange: onChangeContent,
     dimension: dimension,
     setDimension: setDimension,
-    analysisSubjectType: analysisSubjectType
+    analysisSubjectType: analysisSubjectType,
+    refreshHandle: refreshHandle
   }), /*#__PURE__*/React.createElement(ContentPanel, {
     ref: chartRef,
     isCity: isCity,
     eventData: eventData,
-    searchData: searchData,
-    showList: showList,
-    onChangeShow: onChangeShow
+    searchData: searchData
   }))));
-};
+});
 export default EventContent;

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

@@ -1,3 +1,15 @@
+.event-content-topBar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  > span {
+    color: #021429;
+    font-size: 16px;
+  }
+  .modules-event-topbar {
+    padding-right: 0;
+  }
+}
 .event-content {
   &-options {
     display: flex;

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

@@ -7,7 +7,7 @@ export declare const judgeIsCity: (name: string | undefined) => boolean;
 export declare const judgeIsArea: (name: string | undefined) => boolean;
 export declare const getValue: (param: bizAttributeSelectorValueProp, eventGroupList: EventGroup[] | undefined, eventEnvList: EnvProp[] | undefined, userPropList: UserProp[] | undefined) => AttributeSelect.Value | undefined;
 export declare const getNumberPanelData: (data: any) => Promise<unknown>;
-export declare const normalOptions: {
+export declare const normalOptions: (type: any) => {
     label: string;
     value: string;
 }[];

package/es/modules/content/utils.js

@@ -48,22 +48,21 @@ export var judgeIsArea = function judgeIsArea(name) {
 };
 export var getValue = function getValue(param, eventGroupList, eventEnvList, userPropList) {
   var res = undefined;
-  var key = "".concat(param.propCategory, "-").concat(param.value);
   if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'envProp') {
     eventEnvList === null || eventEnvList === void 0 ? void 0 : eventEnvList.forEach(function (attr) {
-      if (attr.key === key) res = attr;
+      if (attr.id === param.id && attr.name === param.value) res = attr;
     });
   } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'eventProp') {
     eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
       group.eventList.forEach(function (event) {
         event.attrList.forEach(function (attr) {
-          if (attr.key === key) res = attr;
+          if (attr.id === param.id) res = attr;
         });
       });
     });
   } else if ((param === null || param === void 0 ? void 0 : param.propCategory) === 'userProp') {
     userPropList === null || userPropList === void 0 ? void 0 : userPropList.forEach(function (attr) {
-      if (attr.key === key) res = attr;
+      if (attr.id === param.id && attr.category === param.category && attr.name === param.value) res = attr;
     });
   }
   return res;
@@ -80,21 +79,23 @@ export var getNumberPanelData = function getNumberPanelData(data) {
     });
   });
 };
-export var normalOptions = [{
-  label: '人数',
-  value: 'number'
-}, {
-  label: '次数',
-  value: 'times'
-}, {
-  label: '活跃比',
-  value: 'active_ratio'
-}, {
-  label: '人均次数',
-  value: 'per'
-}];
+export var normalOptions = function normalOptions(type) {
+  return [{
+    label: "".concat(type != 'user' ? '主体数' : '人数'),
+    value: 'number'
+  }, {
+    label: '次数',
+    value: 'times'
+  }, {
+    label: '活跃比',
+    value: 'active_ratio'
+  }, {
+    label: "".concat(type != 'user' ? '主体平均次数' : '人均次数'),
+    value: 'per'
+  }];
+};
 export var normalEventOptions = [{
-  label: '主体数',
+  label: '口径数',
   value: 'number'
 }, {
   label: '次数',

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

@@ -14,21 +14,20 @@ var defaultValue = {
   id: 249641,
   name: '事件',
   data: {
-    app_id: 502391,
+    app_id: 503302,
     module: 'event',
-    appId: 502391,
-    platform: 0,
     userGroup: [0],
     time: {
-      begin: '2023-12-12',
-      end: '2024-01-11',
+      begin: '2024-08-04',
+      end: '2024-09-03',
       relative: [30, 0],
       unit: 'day'
     },
     chartType: 'line',
-    analysisIndex: 'number'
+    analysisIndex: 'number',
+    appId: 503302
   },
-  chosen_data: ['订单支付页-支付订单', '订单详情页-查看订单', '收入']
+  chosen_data: ['崩溃']
 };
 export default (function () {
   var _useState = useState(false),

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

@@ -39,7 +39,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 461
+    defaultApp: 616
   }, 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);