@zgfe/modules-event 0.0.2-event.9 → 0.1.0

package/es/components/topBar/index.js

@@ -13,12 +13,17 @@ import { BizAddToPanel, BizAddToScene, BizGlobalDataContext } from '@zgfe/busine
 import './styles/index.less';
 import { EventContext } from '../../types';
 import { chartTypes, platformOption } from '../../constants/fields';
+import { getWarningId } from '../../utils/formData';
 var classPrefix = 'modules-event-topbar';
 var TopBar = function TopBar(props) {
   var _useContext = useContext(EventContext),
     panelId = _useContext.panelId,
     afterEditTarget = _useContext.afterEditTarget,
-    enableAddScene = _useContext.enableAddScene;
+    enableAddScene = _useContext.enableAddScene,
+    loading = _useContext.loading,
+    onLossWarning = _useContext.onLossWarning,
+    showWarning = _useContext.showWarning,
+    enableGenerateReport = _useContext.enableGenerateReport;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showPanel = _useState2[0],
@@ -28,10 +33,14 @@ var TopBar = function TopBar(props) {
     showScene = _useState4[0],
     setShowScene = _useState4[1];
   var _useContext2 = useContext(BizGlobalDataContext),
-    currentApp = _useContext2.currentApp;
+    currentApp = _useContext2.currentApp,
+    eventGroupList = _useContext2.eventGroupList;
   var searchData = props.searchData,
     showList = props.showList,
-    platformChange = props.platformChange;
+    platformChange = props.platformChange,
+    eventData = props.eventData,
+    onClickGenerateReport = props.onClickGenerateReport,
+    enableSelectChart = props.enableSelectChart;
   var _useState5 = useState(chartTypes),
     _useState6 = _slicedToArray(_useState5, 2),
     options = _useState6[0],
@@ -40,28 +49,29 @@ var TopBar = function TopBar(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     selectPlatform = _useState8[0],
     setselectPlatform = _useState8[1];
-  console.log('showList_showList', showList);
-  useEffect(function () {
-    if (searchData === null || searchData === void 0 ? void 0 : searchData.id) {
-      setOptions(chartTypes.map(function (item) {
-        if (item.value == 'number') {
-          item.disabled = false;
-        }
-        return item;
-      }));
-    } else {
-      setOptions(chartTypes.map(function (item) {
-        if (item.value == 'number') {
-          item.disabled = true;
-        }
-        return item;
-      }));
-    }
-  }, [searchData]);
-  var _useState9 = useState(),
+  var _useState9 = useState(-1),
     _useState10 = _slicedToArray(_useState9, 2),
-    panelType = _useState10[0],
-    setPanelType = _useState10[1];
+    warningId = _useState10[0],
+    setWarningId = _useState10[1];
+  useEffect(function () {
+    setWarningId(getWarningId(searchData, eventData, eventGroupList));
+  }, [searchData, eventData, eventGroupList]);
+  useEffect(function () {
+    options.map(function (item) {
+      if (item.value.indexOf('number') !== -1) {
+        item.value = "".concat(searchData === null || searchData === void 0 ? void 0 : searchData.chartType, ",number");
+        item.disabled = (searchData === null || searchData === void 0 ? void 0 : searchData.id) ? false : true;
+      }
+      if (item.value.indexOf('map') !== -1) {
+        item.disabled = enableSelectChart ? false : true;
+      }
+      return item;
+    }), setOptions(options);
+  }, [searchData, enableSelectChart]);
+  var _useState11 = useState(),
+    _useState12 = _slicedToArray(_useState11, 2),
+    panelType = _useState12[0],
+    setPanelType = _useState12[1];
   var closeHandle = function closeHandle(type) {
     if (type === 'panel') {
       setPanelType(undefined);
@@ -90,7 +100,7 @@ var TopBar = function TopBar(props) {
       module: 'event'
     }, searchData),
     styleOptions: options,
-    showList: showList,
+    showList: (searchData === null || searchData === void 0 ? void 0 : searchData.chartType) !== 'map' ? showList : [],
     onCancel: function onCancel() {
       return closeHandle('panel');
     },
@@ -115,11 +125,16 @@ var TopBar = function TopBar(props) {
     onCancel: function onCancel() {
       return closeHandle('scene');
     }
-  })), /*#__PURE__*/React.createElement(Button, {
+  })), !panelId && enableGenerateReport && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-panel")
+  }, /*#__PURE__*/React.createElement(Button, {
+    onClick: onClickGenerateReport
+  }, "\u6DFB\u52A0\u5230\u6570\u636E\u62A5\u544A")), showWarning && /*#__PURE__*/React.createElement(Button, {
     className: "".concat(classPrefix, "-earlywarning"),
     type: "primary",
+    disabled: loading,
     onClick: function onClick() {
-      return console.log('设置预警流失');
+      return onLossWarning(warningId);
     }
   }, "\u8BBE\u7F6E\u9884\u8B66\u6D41\u5931"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-platform")

package/es/components/topBar/styles/index.less

@@ -7,9 +7,23 @@
   padding-right: 24px;
   &-panel {
     margin-right: 16px;
+    .ant-btn {
+      background: #fff;
+      border-color: #f2f3f4;
+    }
+    .ant-btn:hover {
+      border-color: #165dff;
+    }
   }
   &-scene {
     margin-right: 16px;
+    .ant-btn {
+      background: #fff;
+      border-color: #f2f3f4;
+    }
+    .ant-btn:hover {
+      border-color: #165dff;
+    }
   }
   &-earlywarning {
     margin-right: 16px;

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

@@ -1,6 +1,9 @@
-import { SearchValue } from '../../types';
+import { SearchValue, ResponseDataProps } from '../../types';
 export interface TopBarProps {
     searchData?: SearchValue;
     showList: string[];
     platformChange: (data: number) => void;
+    eventData?: ResponseDataProps;
+    onClickGenerateReport?: (value: any) => void;
+    enableSelectChart: boolean;
 }

package/es/constants/fields.js

@@ -2,14 +2,14 @@ export var platformOption = [{
   key: 0,
   value: '全部'
 }, {
-  key: 1,
-  value: 'Android'
+  key: 3,
+  value: 'JS'
 }, {
   key: 2,
   value: 'IOS'
 }, {
-  key: 3,
-  value: 'JS'
+  key: 1,
+  value: 'Android'
 }];
 export var chartTypes = [{
   label: '趋势图',

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

@@ -1,4 +1,4 @@
 import React from 'react';
 import { eventChartProps } from './types';
-declare const EventChart: React.FC<eventChartProps.Props>;
+declare const EventChart: React.ForwardRefExoticComponent<eventChartProps.Props & React.RefAttributes<any>>;
 export default EventChart;

package/es/modules/chart/index.js

@@ -8,17 +8,17 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useMemo, useState } from 'react';
-import { BizChart, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
-import { EventTable, MiNone } from '../../components';
+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 } from '../../modules/content/utils';
-import { getDefaultShow, getShowColor } from '../../utils/formData';
+import { getDefaultShow, getShowColor, getUserGroupsCompareData, getSortData, getChartDataEventAliasName } from '../../utils/formData';
 import _ from 'lodash';
+import moment from 'moment';
 import { Apis, chartColors } from '../../constants';
-import { Spin } from 'antd';
-import emptyImg from '../../components/table/images/empty.png';
-var classPrefix = 'mi-table';
-var EventChart = function EventChart(props) {
+var classPrefix = 'event-mi-table';
+var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var params = props.params;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -49,21 +49,11 @@ var EventChart = function EventChart(props) {
     if (!dataSource) return chartColors;
     return getShowColor(dataSource, showList);
   }, [showList]);
-  var chartData = useMemo(function () {
-    console.log('chartData?.length', dataSource);
-    if (dataSource) {
-      var data = _.cloneDeep(dataSource);
-      data.x_axis = dataSource.xAxis;
-      return data;
-    } else {
-      return [];
-    }
-  }, [dataSource, chartType]);
   useEffect(function () {
     if (!props.dataSource) {
       fetchResult();
     }
-  }, []);
+  }, [params]);
   useEffect(function () {
     if (!props.showList || !props.showList.length) {
       setShowList(dataSource ? getDefaultShow(dataSource) : []);
@@ -75,7 +65,10 @@ var EventChart = function EventChart(props) {
     var _params$chartType;
     if (!params) return;
     var chartData = ((_params$chartType = params.chartType) === null || _params$chartType === void 0 ? void 0 : _params$chartType.split(',')) || ['line'];
-    var type = (chartData === null || chartData === void 0 ? void 0 : chartData.length) > 1 ? chartData[chartData.length - 1] : chartData[0];
+    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;
@@ -86,20 +79,30 @@ var EventChart = function EventChart(props) {
     }
   }, [params, props.type]);
   var fetchResult = function fetchResult() {
+    var _params$chartType2;
     setLoading(true);
     ajax(Apis.dataList, {
       method: 'post',
-      data: _objectSpread({
+      data: _objectSpread(_objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: (params === null || params === void 0 ? void 0 : params.platform) || 0
-      }, params)
+      }, 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'
+      })
     }).then(function (res) {
       if (!res) {
+        setLoading(false);
         return;
       }
-      setDataSource(res.data);
-      setLoading(false);
-    }).catch(function () {
+      var _data = params.dimension ? res.data : getChartDataEventAliasName(res.data, eventGroupList);
+      if (['bar', 'pie', 'map'].indexOf(params.chartType) !== -1) {
+        _data = getSortData(_data);
+      }
+      if (params.userGroup.length > 1) {
+        setDataSource(getUserGroupsCompareData(_data));
+      } else {
+        setDataSource(_data);
+      }
       setLoading(false);
     });
   };
@@ -117,35 +120,43 @@ var EventChart = function EventChart(props) {
     if (props.onChangeShow) props.onChangeShow(names);
   };
   if (loading) {
-    return /*#__PURE__*/React.createElement(Spin, {
-      className: "spin-container"
+    return /*#__PURE__*/React.createElement(BizLoading, {
+      className: "".concat(classPrefix, "-loading")
     });
   }
   if (!dataSource || !(dataSource.xAxis.length || dataSource.series.length)) {
-    return /*#__PURE__*/React.createElement(MiNone, {
-      label: "\u6682\u65E0\u6570\u636E"
+    return /*#__PURE__*/React.createElement(Empty, {
+      image: Empty.PRESENTED_IMAGE_SIMPLE,
+      description: "\u6682\u65E0\u6570\u636E"
     });
   }
+  var dataUpdateTime = function dataUpdateTime() {
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      className: "".concat(classPrefix, "-chart-box-tooltip"),
+      title: '当前图表数据实时更新，约每分钟更新一次'
+    }, /*#__PURE__*/React.createElement("div", null, "\u6570\u636E\u66F4\u65B0\u65F6\u95F4\uFF1A", moment().format('YYYY-MM-DD HH:mm')));
+  };
   var chartBox = function chartBox() {
-    if (chartData.series.length <= 0) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "".concat(classPrefix, "-table-empty")
-      }, /*#__PURE__*/React.createElement("img", {
-        src: emptyImg
-      }), /*#__PURE__*/React.createElement("p", null, "\u6682\u65E0\u6570\u636E"));
+    if (dataSource.series.length <= 0) {
+      return /*#__PURE__*/React.createElement(Empty, {
+        image: Empty.PRESENTED_IMAGE_SIMPLE,
+        description: "\u6682\u65E0\u6570\u636E"
+      });
     } else {
-      return /*#__PURE__*/React.createElement(BizChart, {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-chart-box")
+      }, !!props.dataSource && dataUpdateTime(), /*#__PURE__*/React.createElement(BizChart, {
+        ref: ref,
         key: chartType,
         type: chartType,
-        data: chartData,
+        data: dataSource,
         legendPosition: "bottom",
         showList: showList,
         colors: showColors,
         xRotate: chartType === 'bar' && dataSource.series.length > 5 ? 40 : 0,
         reverseXAxis: chartType === 'bar',
-        isCity: isCity,
-        radius: ['30%', '75%']
-      });
+        isCity: isCity
+      }));
     }
   };
   switch (chartType) {
@@ -160,12 +171,13 @@ var EventChart = function EventChart(props) {
         searchData: params,
         showList: showList,
         changeShow: onChangeShow,
-        changeShowByName: onChangeShowByName
+        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");
   }
-};
+});
 EventChart.defaultProps = {
   showList: []
 };

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

@@ -11,5 +11,6 @@ export declare namespace eventChartProps {
         showList?: string[];
         showColors?: string[];
         onChangeShow?: (data: string[]) => void;
+        onSelectEvent?: (id: number, name: string) => void;
     }
 }

package/es/modules/content/index.js

@@ -8,15 +8,15 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 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 Request from 'umi-request';
 import TopBar from '../../components/topBar';
 import { EventContext } from '../../types';
 import './styles/index.less';
 import { Apis } from '../../constants';
-import { judgeIsCity, judgeIsArea, getValue } from './utils';
 import { ContentPanel, SearchPanel } from '../../components';
-import { getDefaultShow } from '../../utils/formData';
+import { getDefaultShow, getUserGroupsCompareData, getSortData, getChartDataEventAliasName } from '../../utils/formData';
 import TopPanel from '../topPanel';
 var timer = 0;
 var ajaxFlag = true;
@@ -24,59 +24,43 @@ var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'event-content';
 var EventContent = function EventContent(props) {
-  var _useState = useState(props.value),
-    _useState2 = _slicedToArray(_useState, 2),
-    finalSearchData = _useState2[0],
-    setFinalSearchData = _useState2[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    eventData = _useState4[0],
-    setEventData = _useState4[1];
-  var _useState5 = useState(props.show || []),
-    _useState6 = _slicedToArray(_useState5, 2),
-    showList = _useState6[0],
-    setShowList = _useState6[1];
-  var _useState7 = useState(true),
-    _useState8 = _slicedToArray(_useState7, 2),
-    loading = _useState8[0],
-    setLoading = _useState8[1];
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    enableSelectChart = _useState10[0],
-    setEnableSelectChart = _useState10[1];
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    isCity = _useState12[0],
-    setIsCity = _useState12[1];
-  var _useState13 = useState(-1),
-    _useState14 = _slicedToArray(_useState13, 2),
-    eventId = _useState14[0],
-    setEventId = _useState14[1];
   var _useContext2 = useContext(EventContext),
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData,
+    finalSearchData = _useContext2.finalSearchData,
+    setFinalSearchData = _useContext2.setFinalSearchData,
     eventGroupList = _useContext2.eventGroupList,
-    eventEnvList = _useContext2.eventEnvList,
-    userPropList = _useContext2.userPropList;
+    loading = _useContext2.loading,
+    setLoading = _useContext2.setLoading,
+    afterEditTarget = _useContext2.afterEditTarget,
+    onChangeUrlParam = _useContext2.onChangeUrlParam;
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    eventData = _useState2[0],
+    setEventData = _useState2[1];
+  var _useState3 = useState(props.show || []),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showList = _useState4[0],
+    setShowList = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    enableSelectChart = _useState6[0],
+    setEnableSelectChart = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    isCity = _useState8[0],
+    setIsCity = _useState8[1];
+  var _useState9 = useState(props.elementId),
+    _useState10 = _slicedToArray(_useState9, 2),
+    eventId = _useState10[0],
+    setEventId = _useState10[1];
   var _useContext3 = useContext(BizTargetFromPanelContext),
     handleSearch = _useContext3.handleSearch;
   var collapseRef = useRef();
+  var chartRef = useRef();
   useEffect(function () {
-    if (props.defaultValue) {
-      setEventId(props.defaultValue.id);
-    }
-  }, [props.defaultValue]);
-  useEffect(function () {
-    if (searchData && 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 (timer) clearTimeout(timer);
     var flag = true;
     timer = setTimeout(function () {
@@ -93,6 +77,9 @@ var EventContent = function EventContent(props) {
     handleSearch && handleSearch(loading);
   }, [loading]);
   var fetchRequest = function fetchRequest(flag) {
+    if (JSON.stringify(searchData) === JSON.stringify(finalSearchData)) {
+      return;
+    }
     if (flag !== undefined) ajaxFlag = flag;
     if (!ajaxFlag) return;
     setLoading(true);
@@ -100,7 +87,6 @@ var EventContent = function EventContent(props) {
     if (typeof cancel === 'function') {
       cancel();
     }
-    props.onChange && props.onChange(searchData);
     ajax(Apis.dataList, {
       method: 'post',
       data: _objectSpread({
@@ -116,14 +102,21 @@ var EventContent = function EventContent(props) {
         return;
       }
       var result = res.data;
-      setShowList(result ? getDefaultShow(result) : []);
-      setEventData(result);
+      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.userGroup.length > 1) {
+        setEventData(getUserGroupsCompareData(_data));
+      } else {
+        setEventData(_data);
+      }
       setFinalSearchData(_objectSpread({}, searchData));
+      onChangeUrlParam(searchData);
       setTimeout(function () {
         setLoading(false);
       }, 0);
-    }).catch(function () {
-      setLoading(false);
     });
   };
   var onChangeContent = function onChangeContent(data) {
@@ -147,17 +140,35 @@ var EventContent = function EventContent(props) {
     ajaxFlag = flag;
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
-      return _objectSpread({
-        time: _searchData.time,
-        analysisIndex: _searchData.analysisIndex,
-        chartType: _searchData.chartType
+      var _data = _objectSpread(_objectSpread({}, _searchData), {}, {
+        dimension: data.dimension,
+        filters: data.filters
       }, data);
+      return _objectSpread({}, _data);
     });
   };
+  var onClickGenerateReport = function onClickGenerateReport() {
+    if (!chartRef.current) {
+      message.warning('未选择事件或查询失败！');
+      return;
+    }
+    var url = chartRef.current.instance.getDataURL();
+    var params = {
+      image: url,
+      context: {
+        api: '/web/sdk/v2/event/eventAnalytics',
+        queryParam: searchData
+      }
+    };
+    if (afterEditTarget) afterEditTarget('report', params);
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
+    eventData: eventData,
     searchData: searchData,
     platformChange: platformChange,
-    showList: showList
+    enableSelectChart: enableSelectChart,
+    showList: showList,
+    onClickGenerateReport: onClickGenerateReport
   }), /*#__PURE__*/React.createElement(BizLayout, {
     showTitle: false,
     hasCollapse: true,
@@ -165,8 +176,10 @@ var EventContent = function EventContent(props) {
     topPanel: /*#__PURE__*/React.createElement(TopPanel, {
       ref: collapseRef,
       onChange: onChangeSearch,
-      defaultValue: searchData,
+      value: searchData,
       ajaxFlag: ajaxFlag,
+      setIsCity: setIsCity,
+      setEnableSelectChart: setEnableSelectChart,
       finalSearchData: finalSearchData,
       fetchRequest: fetchRequest
     })
@@ -175,13 +188,15 @@ 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,
     enableSelectChart: enableSelectChart,
     onChange: onChangeContent
   }), /*#__PURE__*/React.createElement(ContentPanel, {
-    loading: loading,
+    ref: chartRef,
     isCity: isCity,
     eventData: eventData,
     searchData: finalSearchData,

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

@@ -1,11 +1,10 @@
 import { SearchValue } from '../../types';
 export declare namespace EventContentProps {
     interface Props {
-        defaultValue?: SearchValue;
+        elementId: number | undefined;
         value: SearchValue;
         show?: string[];
         onSearching?: (flag: boolean) => void;
-        onChange?: (data: SearchValue) => void;
         initSearch?: () => void;
     }
 }

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

@@ -1,7 +1,12 @@
-import { AttributeSelect } from '@zgfe/business-lib';
+import { AttributeSelect, AttrConditionTypes } from '@zgfe/business-lib';
 import { bizAttributeSelectorValueProp } from '../../types';
 import { EventGroup, UserProp, EnvProp } from '@zgfe/business-lib/es/attributeSelector/types';
+export declare const judgeFilterValue: (data: AttrConditionTypes.GroupValue | undefined, count: number) => boolean;
 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: {
+    label: string;
+    value: string;
+}[];

package/es/modules/content/utils.js

@@ -3,6 +3,21 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 import { ajax } from '@zgfe/business-lib';
 import { Apis } from '../../constants';
+export var judgeFilterValue = function judgeFilterValue(data, count) {
+  var flag = true;
+  if (data === undefined) {
+    if (count > 0) flag = false;
+  } else {
+    if (data.conditions.length <= 0 || data.conditions.length !== count) {
+      flag = false;
+    }
+    data.conditions.map(function (item) {
+      var _item$values;
+      if (item.values && (((_item$values = item.values) === null || _item$values === void 0 ? void 0 : _item$values.length) <= 0 || item.values[0] === '')) flag = false;
+    });
+  }
+  return flag;
+};
 export var judgeIsCity = function judgeIsCity(name) {
   var areaData = ['current_city', 'city'];
   return name && areaData.indexOf(name) !== -1 ? true : false;
@@ -13,7 +28,7 @@ export var judgeIsArea = function judgeIsArea(name) {
 };
 export var getValue = function getValue(param, eventGroupList, eventEnvList, userPropList) {
   var res = undefined;
-  var key = param.propCategory === 'eventProp' ? param.value : param.propCategory + '-' + param.value;
+  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;
@@ -31,7 +46,6 @@ export var getValue = function getValue(param, eventGroupList, eventEnvList, use
       if (attr.key === key) res = attr;
     });
   }
-  console.log('获取当前属性的全部数据', res);
   return res;
 };
 export var getNumberPanelData = function getNumberPanelData(data) {
@@ -45,4 +59,17 @@ export var getNumberPanelData = function getNumberPanelData(data) {
       reject(err);
     });
   });
-};
+};
+export var normalOptions = [{
+  label: '人数',
+  value: 'number'
+}, {
+  label: '次数',
+  value: 'times'
+}, {
+  label: '活跃比',
+  value: 'active_ratio'
+}, {
+  label: '人均次数',
+  value: 'per'
+}];