@zgfe/modules-event 0.0.2-event.0 → 0.0.2-event.10

package/README.md

@@ -1,6 +1,6 @@
 # modules-event
 
-洞察分析
+事件分析
 
 ## Getting Started
 

package/es/components/eventFilter/index.js

@@ -10,10 +10,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Tooltip } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 import { BizEventSelector, BizAttributeSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
+import { judgeFilterValue } from '../../modules/content/utils';
 import './styles/index.less';
 import _ from 'lodash';
 var classPrefix = 'eventfilter-box';
 var EventFilter = function EventFilter(props) {
+  var setSearchDisabled = props.setSearchDisabled;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     count = _useState2[0],
@@ -75,13 +77,18 @@ var EventFilter = function EventFilter(props) {
     }, 0);
   };
   var onChangeFilters = function onChangeFilters(data) {
-    if (data && data.conditions && data.conditions.length > 0) {
-      setFilter(data);
+    console.log('onChangeFilters', data);
+    setFilter(data);
+  };
+  useEffect(function () {
+    console.log('onChangeFilters-count', count, filter);
+    if (!judgeFilterValue(filter, count)) {
+      setSearchDisabled(true);
     } else {
-      setFilter(undefined);
-      setIsAdd(false);
+      setSearchDisabled(false);
     }
-  };
+    if (count <= 0) setFilter(undefined);
+  }, [count, filter]);
   var onChangeEvent = function onChangeEvent(event) {
     console.log('onChangeEvent', event);
     if (event && event.event && event.event.id === -100) {

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

@@ -13,4 +13,5 @@ export interface ConditionsnProps {
 export interface EventFilterProps {
     value?: eventProps;
     onChange?: (event: eventProps) => {};
+    setSearchDisabled: (disabled: boolean) => void;
 }

package/es/components/renderContent/index.js

@@ -5,15 +5,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 { Spin } from 'antd';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useContext } from 'react';
+import { EventContext } from '../../types';
 import { MiNone, MiSpin } from '..';
 import './styles/index.less';
 import EventChart from '../../modules/chart';
 var classPrefix = 'render-content';
 var ContentPanel = function ContentPanel(props) {
-  var loading = props.loading,
-    eventData = props.eventData,
+  var eventData = props.eventData,
     searchData = props.searchData;
+  var _useContext = useContext(EventContext),
+    loading = _useContext.loading;
   var _useState = useState(props.showList || []),
     _useState2 = _slicedToArray(_useState, 2),
     showList = _useState2[0],

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

@@ -1,6 +1,5 @@
 import { SearchValue, ResponseDataProps } from '../../types';
 export interface RenderContentProps {
-    loading?: boolean;
     eventData?: ResponseDataProps;
     searchData?: SearchValue;
     showList: string[];

package/es/components/searchPanel/index.js

@@ -85,7 +85,8 @@ var SearchPanel = function SearchPanel(props) {
     }
   }, /*#__PURE__*/React.createElement(BizDatePicker, {
     defaultValue: time,
-    onChange: onChangeTime
+    onChange: onChangeTime,
+    selectRange: 365
   }), /*#__PURE__*/React.createElement(BizTargetDimension, {
     value: dimension,
     eventId: props.eventId,

package/es/components/table/index.js

@@ -232,7 +232,7 @@ var EventTable = function EventTable(props) {
       whiteSpace: 'pre-wrap'
     }
   }, sqlText), /*#__PURE__*/React.createElement(CopyToClipboard, {
-    text: JSON.stringify(sqlText, null, 2),
+    text: sqlText,
     onCopy: function onCopy() {
       return message.success('复制成功！');
     }

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

@@ -40,7 +40,7 @@
       margin-top: 0;
     }
   }
-  .event-name-box {
+  .tooltip-name-box {
     display: flex;
     justify-content: space-between;
     &-market {
@@ -58,7 +58,7 @@
       color: #165dff;
     }
   }
-  .event-name-box:hover {
+  .tooltip-name-box:hover {
     .fuzhi1 {
       display: block;
     }
@@ -75,6 +75,17 @@
       color: rgba(0, 0, 0, 0.25);
     }
   }
+
+  &-chart-box {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    > :nth-child(1) {
+      width: 200px;
+      color: #67727f;
+      font-size: 12px;
+    }
+  }
 }
 .event-table-sql-modal {
   .ant-modal-header {

package/es/components/topBar/index.js

@@ -18,7 +18,9 @@ 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;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showPanel = _useState2[0],
@@ -28,9 +30,12 @@ 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,
-    platformChange = props.platformChange;
+    showList = props.showList,
+    platformChange = props.platformChange,
+    eventData = props.eventData;
   var _useState5 = useState(chartTypes),
     _useState6 = _slicedToArray(_useState5, 2),
     options = _useState6[0],
@@ -39,6 +44,25 @@ var TopBar = function TopBar(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     selectPlatform = _useState8[0],
     setselectPlatform = _useState8[1];
+  var _useState9 = useState(-1),
+    _useState10 = _slicedToArray(_useState9, 2),
+    warningId = _useState10[0],
+    setWarningId = _useState10[1];
+  useEffect(function () {
+    if (eventData && eventData.series.length > 0) {
+      if (searchData === null || searchData === void 0 ? void 0 : searchData.id) {
+        setWarningId(searchData === null || searchData === void 0 ? void 0 : searchData.id);
+      } else {
+        var _eventGroupList$, _eventGroupList$$even;
+        if (eventGroupList && ((_eventGroupList$ = eventGroupList[0]) === null || _eventGroupList$ === void 0 ? void 0 : (_eventGroupList$$even = _eventGroupList$.eventList[0]) === null || _eventGroupList$$even === void 0 ? void 0 : _eventGroupList$$even.id)) {
+          var _eventGroupList$2, _eventGroupList$2$eve;
+          setWarningId((_eventGroupList$2 = eventGroupList[0]) === null || _eventGroupList$2 === void 0 ? void 0 : (_eventGroupList$2$eve = _eventGroupList$2.eventList[0]) === null || _eventGroupList$2$eve === void 0 ? void 0 : _eventGroupList$2$eve.id);
+        }
+      }
+    } else {
+      setWarningId(-1);
+    }
+  }, [searchData, eventData, eventGroupList]);
   useEffect(function () {
     if (searchData === null || searchData === void 0 ? void 0 : searchData.id) {
       setOptions(chartTypes.map(function (item) {
@@ -56,10 +80,10 @@ var TopBar = function TopBar(props) {
       }));
     }
   }, [searchData]);
-  var _useState9 = useState(),
-    _useState10 = _slicedToArray(_useState9, 2),
-    panelType = _useState10[0],
-    setPanelType = _useState10[1];
+  var _useState11 = useState(),
+    _useState12 = _slicedToArray(_useState11, 2),
+    panelType = _useState12[0],
+    setPanelType = _useState12[1];
   var closeHandle = function closeHandle(type) {
     if (type === 'panel') {
       setPanelType(undefined);
@@ -84,9 +108,11 @@ var TopBar = function TopBar(props) {
     type: panelType,
     params: _objectSpread({
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+      platform: (searchData === null || searchData === void 0 ? void 0 : searchData.platform) || 0,
       module: 'event'
     }, searchData),
     styleOptions: options,
+    showList: showList,
     onCancel: function onCancel() {
       return closeHandle('panel');
     },
@@ -102,6 +128,7 @@ var TopBar = function TopBar(props) {
   }, "\u6DFB\u52A0\u5E38\u7528\u573A\u666F"), showScene && /*#__PURE__*/React.createElement(BizAddToScene, {
     params: _objectSpread({
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+      platform: (searchData === null || searchData === void 0 ? void 0 : searchData.platform) || 0,
       module: 'event'
     }, searchData),
     onOk: function onOk(data) {
@@ -113,8 +140,9 @@ var TopBar = function TopBar(props) {
   })), /*#__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/types.d.ts

@@ -1,5 +1,7 @@
-import { SearchValue } from '../../types';
+import { SearchValue, ResponseDataProps } from '../../types';
 export interface TopBarProps {
     searchData?: SearchValue;
+    showList: string[];
     platformChange: (data: number) => void;
+    eventData?: ResponseDataProps;
 }

package/es/modules/chart/demo/data.d.ts

@@ -36,24 +36,18 @@ export declare const totalResult: {
     })[];
 };
 export declare const searchData: {
-    targets: {
-        type: string;
-        alias: string;
-        eventId: number;
-        eventName: string;
-        eventGroupId: number;
-        analysisDimension: {
-            analysisIndex: string;
-        };
-    }[];
-    userGroup: number[];
+    appId: number;
+    platform: number;
+    module: string;
     time: {
-        unit: string;
-        relative: number[];
         begin: string;
         end: string;
+        relative: number[];
+        unit: string;
     };
+    analysisIndex: string;
     chartType: string;
+    userGroup: number[];
 };
 export declare const totalSearchData: {
     appId: number;

package/es/modules/chart/demo/data.js

@@ -447,24 +447,18 @@ export var totalResult = {
   }]
 };
 export var searchData = {
-  targets: [{
-    type: 'event',
-    alias: '事件概览',
-    eventId: -100,
-    eventName: '事件概览',
-    eventGroupId: 0,
-    analysisDimension: {
-      analysisIndex: 'number'
-    }
-  }],
-  userGroup: [0],
+  appId: 266,
+  platform: 0,
+  module: 'event',
   time: {
-    unit: 'day',
-    relative: [7, 0],
-    begin: '2023-06-14',
-    end: '2023-06-21'
+    begin: '2023-08-22',
+    end: '2023-09-05',
+    relative: [14, 0],
+    unit: 'day'
   },
-  chartType: 'line'
+  analysisIndex: 'number',
+  chartType: 'line',
+  userGroup: [0]
 };
 export var totalSearchData = {
   appId: 96,

package/es/modules/chart/demo/panel.js

@@ -1,28 +1,9 @@
-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 = 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, { useEffect, useState } from 'react';
+import React from 'react';
 import { EventChart } from '@zgfe/modules-event';
-import { result, searchData, totalResult, totalSearchData } from './data';
-import _ from 'lodash';
+import { searchData, totalResult, totalSearchData } from './data';
 export default (function () {
-  var _useState = useState(searchData),
-    _useState2 = _slicedToArray(_useState, 2),
-    value = _useState2[0],
-    setValue = _useState2[1];
-  useEffect(function () {
-    setValue(function () {
-      var data = _.cloneDeep(searchData);
-      data.chartType = 'line,grid';
-      return data;
-    });
-  }, []);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("h2", null, "\u8D8B\u52BF\u56FE\u8868\u683C"), /*#__PURE__*/React.createElement(EventChart, {
-    dataSource: result,
-    params: value
+    params: searchData
   }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("h2", null, "\u6C47\u603B\u56FE\u8868\u683C"), /*#__PURE__*/React.createElement(EventChart, {
     dataSource: totalResult,
     params: totalSearchData

package/es/modules/chart/index.js

@@ -8,12 +8,14 @@ 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 { Tooltip } from 'antd';
 import { BizChart, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
 import { EventTable, MiNone } from '../../components';
 import { judgeIsCity } from '../content/utils';
 import { getValue } from '../../modules/content/utils';
 import { getDefaultShow, getShowColor } 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';
@@ -98,6 +100,7 @@ var EventChart = function EventChart(props) {
         return;
       }
       setDataSource(res.data);
+      setLoading(false);
     }).catch(function () {
       setLoading(false);
     });
@@ -125,6 +128,12 @@ var EventChart = function EventChart(props) {
       label: "\u6682\u65E0\u6570\u636E"
     });
   }
+  var dataUpdateTime = function dataUpdateTime() {
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      className: "tooltip-name-box",
+      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", {
@@ -133,7 +142,9 @@ var EventChart = function EventChart(props) {
         src: emptyImg
       }), /*#__PURE__*/React.createElement("p", null, "\u6682\u65E0\u6570\u636E"));
     } else {
-      return /*#__PURE__*/React.createElement(BizChart, {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-chart-box")
+      }, dataUpdateTime(), /*#__PURE__*/React.createElement(BizChart, {
         key: chartType,
         type: chartType,
         data: chartData,
@@ -144,7 +155,7 @@ var EventChart = function EventChart(props) {
         reverseXAxis: chartType === 'bar',
         isCity: isCity,
         radius: ['30%', '75%']
-      });
+      }));
     }
   };
   switch (chartType) {

package/es/modules/content/index.js

@@ -38,28 +38,26 @@ var EventContent = function EventContent(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     showList = _useState6[0],
     setShowList = _useState6[1];
-  var _useState7 = useState(true),
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    loading = _useState8[0],
-    setLoading = _useState8[1];
+    enableSelectChart = _useState8[0],
+    setEnableSelectChart = _useState8[1];
   var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    enableSelectChart = _useState10[0],
-    setEnableSelectChart = _useState10[1];
-  var _useState11 = useState(false),
+    isCity = _useState10[0],
+    setIsCity = _useState10[1];
+  var _useState11 = useState(-1),
     _useState12 = _slicedToArray(_useState11, 2),
-    isCity = _useState12[0],
-    setIsCity = _useState12[1];
-  var _useState13 = useState(-1),
-    _useState14 = _slicedToArray(_useState13, 2),
-    eventId = _useState14[0],
-    setEventId = _useState14[1];
+    eventId = _useState12[0],
+    setEventId = _useState12[1];
   var _useContext2 = useContext(EventContext),
     searchData = _useContext2.searchData,
     setSearchData = _useContext2.setSearchData,
     eventGroupList = _useContext2.eventGroupList,
     eventEnvList = _useContext2.eventEnvList,
-    userPropList = _useContext2.userPropList;
+    userPropList = _useContext2.userPropList,
+    loading = _useContext2.loading,
+    setLoading = _useContext2.setLoading;
   var _useContext3 = useContext(BizTargetFromPanelContext),
     handleSearch = _useContext3.handleSearch;
   var collapseRef = useRef();
@@ -155,8 +153,10 @@ var EventContent = function EventContent(props) {
     });
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
+    eventData: eventData,
     searchData: searchData,
-    platformChange: platformChange
+    platformChange: platformChange,
+    showList: showList
   }), /*#__PURE__*/React.createElement(BizLayout, {
     showTitle: false,
     hasCollapse: true,
@@ -180,7 +180,6 @@ var EventContent = function EventContent(props) {
     enableSelectChart: enableSelectChart,
     onChange: onChangeContent
   }), /*#__PURE__*/React.createElement(ContentPanel, {
-    loading: loading,
     isCity: isCity,
     eventData: eventData,
     searchData: finalSearchData,

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

@@ -1,7 +1,8 @@
-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<import("@zgfe/business-lib/es/utils/type").InterfaceApiResult<unknown> | null>;
+export declare const getNumberPanelData: (data: any) => Promise<unknown>;

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) flag = false;
+    });
+  }
+  return flag;
+};
 export var judgeIsCity = function judgeIsCity(name) {
   var areaData = ['current_city', 'city'];
   return name && areaData.indexOf(name) !== -1 ? true : false;
@@ -35,10 +50,14 @@ export var getValue = function getValue(param, eventGroupList, eventEnvList, use
   return res;
 };
 export var getNumberPanelData = function getNumberPanelData(data) {
-  return ajax(Apis.dataList, {
-    method: 'post',
-    data: _objectSpread({}, data)
-  }).then(function (res) {
-    return res;
+  return new Promise(function (resolve, reject) {
+    ajax(Apis.dataList, {
+      method: 'post',
+      data: _objectSpread({}, data)
+    }).then(function (res) {
+      resolve(res);
+    }).catch(function (err) {
+      reject(err);
+    });
   });
 };

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

@@ -35,6 +35,9 @@ export default (function () {
     setSearchParams(searchData);
     setDetailParams(data);
   };
+  var onLossWarning = function onLossWarning(warningId) {
+    console.log('设置预警流失', warningId);
+  };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
     defaultApp: 266
@@ -45,6 +48,7 @@ export default (function () {
   }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleEvent, {
     defaultValue: searchParams,
     afterEditTarget: afterEditTarget,
-    onUserDrill: onUserDrill
+    onUserDrill: onUserDrill,
+    onLossWarning: onLossWarning
   }));
 });

package/es/modules/home/index.js

@@ -55,14 +55,18 @@ var ModuleEvent = function ModuleEvent(props) {
     setShowList = _useState14[1];
   useEffect(function () {
     setPageLoading(true);
-    if (!props.defaultValue) {
-      initSearch();
-    } else {
+    if (props.defaultValue) {
       setShowList(props.defaultValue.chosen_data);
       setPanelId(props.defaultValue.panelId);
-      setElementId(props.defaultValue.id);
       setTitle(props.defaultValue.name);
-      setSearchData(props.defaultValue.data);
+      if (props.defaultValue.data) {
+        setSearchData(props.defaultValue.data);
+        setElementId(props.defaultValue.id);
+      } else {
+        initSearch();
+      }
+    } else {
+      initSearch();
     }
     setTimeout(function () {
       setPageLoading(false);
@@ -75,15 +79,11 @@ var ModuleEvent = function ModuleEvent(props) {
       chartType: 'line'
     });
   };
-  var changeLoading = function changeLoading(flag) {
-    setLoading(flag);
-  };
   if (pageLoading) {
     return /*#__PURE__*/React.createElement(Spin, null);
   }
-  return /*#__PURE__*/React.createElement(Spin, {
-    spinning: loading,
-    wrapperClassName: classPrefix
+  return /*#__PURE__*/React.createElement("div", {
+    className: classPrefix
   }, /*#__PURE__*/React.createElement(BizTargetFromPanel, {
     value: panelId ? {
       panelId: panelId,
@@ -103,6 +103,8 @@ var ModuleEvent = function ModuleEvent(props) {
     className: "".concat(classPrefix, "-header-title")
   }, "\u4E8B\u4EF6\u5206\u6790"), /*#__PURE__*/React.createElement(EventContext.Provider, {
     value: {
+      loading: loading,
+      setLoading: setLoading,
       panelId: panelId,
       elementId: elementId,
       eventGroupList: eventGroupList,
@@ -113,9 +115,9 @@ var ModuleEvent = function ModuleEvent(props) {
       panelName: title,
       includeToday: props.includeToday,
       enableAddScene: props.defaultValue && props.defaultValue.enableAddScene === false ? false : true,
-      changeLoading: changeLoading,
       afterEditTarget: props.afterEditTarget,
-      onUserDrill: props.onUserDrill
+      onUserDrill: props.onUserDrill,
+      onLossWarning: props.onLossWarning
     }
   }, /*#__PURE__*/React.createElement(EventContent, {
     defaultValue: props.defaultValue ? props.defaultValue.data : undefined,

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

@@ -23,7 +23,7 @@
   }
   .ant-spin-container {
     width: 100%;
-    height: 100%;
+    // height: 100%;
   }
 
   .biz-select-option:not(.biz-select-option-multiple),

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

@@ -5,6 +5,7 @@ export declare namespace EventProps {
         includeToday?: boolean;
         afterEditTarget?: (type: string, value?: any) => void;
         onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
+        onLossWarning?: (id: number) => void;
     }
     interface Value {
         panelId?: number;

package/es/modules/topPanel/index.js

@@ -4,10 +4,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 = 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 from 'react';
+import React, { useState } from 'react';
 import { Form, Button } from 'antd';
 import { BizUserGroupHeader } from '@zgfe/business-lib';
 import EventFilter from '../../components/eventFilter';
+import util from '../../utils/util';
 import './styles/index.less';
 var classPrefix = 'top-panel';
 var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -15,14 +16,14 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     ajaxFlag = props.ajaxFlag,
     finalSearchData = props.finalSearchData,
     fetchRequest = props.fetchRequest;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    searchDisabled = _useState2[0],
+    setSearchDisabled = _useState2[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var id = defaultValue.id,
-    name = defaultValue.name,
-    dimension = defaultValue.dimension,
-    filters = defaultValue.filters,
-    userGroup = defaultValue.userGroup;
+  var userGroup = defaultValue.userGroup;
   var onValuesChange = function onValuesChange(data, allData) {
     var _data = {};
     console.log('用户组和事件变更', allData);
@@ -34,7 +35,17 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (allData.userGroup) {
       _data.userGroup = [];
       allData.userGroup.map(function (item) {
-        _data.userGroup && _data.userGroup.push(item.id);
+        if (util.isArray(item)) {
+          var _arr = [];
+          item.map(function (_item) {
+            var _item$;
+            var _name = "".concat(_item[1].id, ":").concat((_item$ = _item[2]) === null || _item$ === void 0 ? void 0 : _item$.layerLabelId);
+            _arr.push(_name);
+          });
+          _data.userGroup && _data.userGroup.push(_arr);
+        } else {
+          _data.userGroup && _data.userGroup.push(item.id);
+        }
       });
       if (_data.userGroup.length <= 0) _data.userGroup = [0];
     }
@@ -78,10 +89,10 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         id: 0
       }],
       filterConditions: {
-        id: id,
-        name: name,
-        dimension: dimension,
-        filters: filters
+        id: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.id,
+        name: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.name,
+        dimension: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.dimension,
+        filters: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.filters
       }
     },
     scrollToFirstError: true,
@@ -90,7 +101,8 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     label: "",
     name: "userGroup"
   }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
-    max: 3
+    max: 3,
+    enableTags: true
   })), /*#__PURE__*/React.createElement("div", {
     ref: ref
   }, /*#__PURE__*/React.createElement(Form.Item, {
@@ -99,12 +111,14 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     style: {
       paddingLeft: '24px'
     }
-  }, /*#__PURE__*/React.createElement(EventFilter, null)), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(EventFilter, {
+    setSearchDisabled: setSearchDisabled
+  })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-form-botton-box")
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
-    disabled: ajaxFlag,
+    disabled: ajaxFlag || searchDisabled,
     type: "primary",
     onClick: function onClick() {
       fetchRequest(true);

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

@@ -9,11 +9,11 @@ interface filterConditions {
 export interface FormDataProps {
     userGroup?: {
         id: number;
-    }[];
+    }[] | any[];
     filterConditions?: filterConditions;
 }
 export interface FormHandelDataProps extends filterConditions {
-    userGroup?: number[];
+    userGroup?: any[];
 }
 export interface TopPanelProps {
     defaultValue?: SearchValue;

package/es/utils/formData.js

@@ -59,13 +59,23 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       fixed: true,
       render: function render(val) {
         return /*#__PURE__*/React.createElement(Tooltip, {
+          className: "tooltip-name-box",
           title: val
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "tooltip-name-box-market"
         }, util.strMiddleSplit(val, {
           maxLength: 20,
           beginLength: 10,
           endLength: 6,
           replaceStr: '...'
-        }));
+        })), /*#__PURE__*/React.createElement(CopyToClipboard, {
+          text: val,
+          onCopy: function onCopy() {
+            return message.success('复制成功！');
+          }
+        }, /*#__PURE__*/React.createElement(IconFont, {
+          type: "fuzhi1"
+        })));
       }
     });
   }
@@ -79,10 +89,10 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       fixed: true,
       render: function render(val) {
         return /*#__PURE__*/React.createElement(Tooltip, {
-          className: "event-name-box",
+          className: "tooltip-name-box",
           title: val
         }, /*#__PURE__*/React.createElement("div", {
-          className: "event-name-box-market"
+          className: "tooltip-name-box-market"
         }, marketEventNameList.indexOf(val) !== -1 && /*#__PURE__*/React.createElement(IconFont, {
           type: "shoucang"
         }), util.strMiddleSplit(val, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.0.2-event.0",
+  "version": "0.0.2-event.10",
   "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.76-event.5",
+    "@zgfe/business-lib": "1.1.81-panel1.0.0",
     "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": "54803eed3a84f4bda36cd14da7a5c1b67f170c88",
+  "gitHead": "9f7d135adfb5489d93b11bdf86786fbb9f206d5d",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"