@zgfe/modules-event 0.0.2-event.19 → 0.0.2-event.22

package/es/components/eventFilter/index.js

@@ -8,8 +8,9 @@ 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 { Tooltip } from 'antd';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState, useContext } from 'react';
 import { BizEventSelector, BizAttributeSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
+import { EventContext } from '../../types';
 import { judgeFilterValue } from '../../modules/content/utils';
 import './styles/index.less';
 import _ from 'lodash';
@@ -17,6 +18,8 @@ var classPrefix = 'eventfilter-box';
 var EventFilter = function EventFilter(props) {
   console.log('EventFilter', props);
   var setSearchDisabled = props.setSearchDisabled;
+  var _useContext = useContext(EventContext),
+    selectEventData = _useContext.selectEventData;
   var _useState = useState(props.value && props.value.filters && props.value.filters.conditions ? props.value.filters.conditions.length : 0),
     _useState2 = _slicedToArray(_useState, 2),
     count = _useState2[0],
@@ -49,11 +52,15 @@ var EventFilter = function EventFilter(props) {
     bizAttributeSelectorValue = _useState12[0],
     setBizAttributeSelectorValue = _useState12[1];
   useEffect(function () {
-    console.log('bizAttributeSelectorValue', bizAttributeSelectorValue);
-  }, [bizAttributeSelectorValue]);
-  useEffect(function () {
-    if (props.value) {
-      var _data = props.value;
+    var _data = props.value;
+    if (selectEventData) {
+      _data = selectEventData;
+      setEvent({
+        id: selectEventData.id,
+        name: selectEventData.name
+      });
+    }
+    if (_data) {
       if (_data && _data.id) {
         setEventOverview(true);
       }
@@ -64,11 +71,11 @@ var EventFilter = function EventFilter(props) {
       if (_data.dimension) {
         var _attr = _data.dimension;
         setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, _data.dimension), {}, {
-          key: _attr.propCategory === 'eventProp' ? _attr.propCategory + '-' + _attr.value : "".concat(_attr.propCategory, "-").concat(_attr.value, "-").concat(_attr.id)
+          key: _attr.propCategory === 'eventProp' ? "".concat(_attr.propCategory, "-").concat(_attr.value) : "".concat(_attr.propCategory, "-").concat(_attr.value, "-").concat(_attr.id)
         }));
       }
     }
-  }, []);
+  }, [selectEventData]);
   var onAdd = function onAdd() {
     if (event.id === -1) {
       return;
@@ -120,7 +127,7 @@ var EventFilter = function EventFilter(props) {
         category: attr.category,
         value: _value,
         id: attr.id,
-        key: attr.propCategory === 'eventProp' ? attr.propCategory + '-' + _value : "".concat(attr.propCategory, "-").concat(_value, "-").concat(attr.id)
+        key: attr.propCategory === 'eventProp' ? "".concat(attr.propCategory, "-").concat(_value) : "".concat(attr.propCategory, "-").concat(_value, "-").concat(attr.id)
       });
     }
   };

package/es/components/renderContent/index.js

@@ -15,7 +15,8 @@ var ContentPanel = function ContentPanel(props) {
   var eventData = props.eventData,
     searchData = props.searchData;
   var _useContext = useContext(EventContext),
-    loading = _useContext.loading;
+    loading = _useContext.loading,
+    onSelectEvent = _useContext.onSelectEvent;
   var _useState = useState(props.showList || []),
     _useState2 = _slicedToArray(_useState, 2),
     showList = _useState2[0],
@@ -41,7 +42,8 @@ var ContentPanel = function ContentPanel(props) {
   }, eventData ? /*#__PURE__*/React.createElement(EventChart, {
     dataSource: eventData,
     params: searchData,
-    showList: showList
+    showList: showList,
+    onSelectEvent: onSelectEvent
   }) : /*#__PURE__*/React.createElement(MiNone, {
     label: "\u6682\u65E0\u6570\u636E"
   })), eventData && eventData.series.length > 0 ? /*#__PURE__*/React.createElement(EventChart, {
@@ -49,7 +51,8 @@ var ContentPanel = function ContentPanel(props) {
     dataSource: eventData,
     params: searchData,
     showList: showList,
-    onChangeShow: onChangeShow
+    onChangeShow: onChangeShow,
+    onSelectEvent: onSelectEvent
   }) : null);
 };
 export default ContentPanel;

package/es/components/table/index.js

@@ -20,7 +20,7 @@ import './styles/index.less';
 import { getValue } from '../../modules/content/utils';
 import { EventContext } from '../../types';
 import emptyImg from '../../style/image/empty.png';
-var classPrefix = 'mi-table';
+var classPrefix = 'event-mi-table';
 var EventTable = function EventTable(props) {
   var dataSource = props.dataSource,
     searchData = props.searchData,
@@ -115,7 +115,7 @@ var EventTable = function EventTable(props) {
         data: searchData
       }));
     };
-    var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, dataSource.xAxis || [], userGroup, searchData, showList, onShowClick, onClickToDetail);
+    var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, dataSource.xAxis || [], userGroup, searchData, showList, onShowClick, onClickToDetail, props === null || props === void 0 ? void 0 : props.onSelectEvent);
     return _getColumns;
   }, [dataSource.xAxis, showList, panelName]);
   var seeSql = function seeSql() {
@@ -149,7 +149,7 @@ var EventTable = function EventTable(props) {
       platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
     }, searchData), {}, {
       down: {
-        fname: base64.encode('事件分析'),
+        fname: base64.encode("\u4E8B\u4EF6_".concat((searchData === null || searchData === void 0 ? void 0 : searchData.name) ? searchData === null || searchData === void 0 ? void 0 : searchData.name : '事件概览')),
         titles: seriesNames
       }
     });

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

@@ -1,4 +1,4 @@
-.mi-table {
+.event-mi-table {
   margin-top: 16px;
   &-table-header {
     display: flex;
@@ -32,6 +32,12 @@
   .ant-table {
     border-radius: 0 0 8px 8px;
   }
+  .ant-table
+    .ant-table-thead
+    .ant-table-cell.ant-table-column-has-sorters
+    .ant-table-column-sorters {
+    justify-content: flex-end !important;
+  }
   .ant-table-cell-with-append {
     padding-left: 20px;
     .ant-table-row-expand-icon {
@@ -45,6 +51,7 @@
     justify-content: space-between;
     &-market {
       display: flex;
+      cursor: pointer;
       .shoucang {
         color: #fd9f41;
         font-size: 16px !important;

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

@@ -6,4 +6,5 @@ export interface EventTableProps {
     isOverview?: boolean;
     changeShowByName: (name: string) => void;
     changeShow: (names: string[]) => void;
+    onSelectEvent?: (id: number, name: string) => void;
 }

package/es/components/topBar/index.js

@@ -21,7 +21,8 @@ var TopBar = function TopBar(props) {
     afterEditTarget = _useContext.afterEditTarget,
     enableAddScene = _useContext.enableAddScene,
     loading = _useContext.loading,
-    onLossWarning = _useContext.onLossWarning;
+    onLossWarning = _useContext.onLossWarning,
+    showWarning = _useContext.showWarning;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showPanel = _useState2[0],
@@ -126,7 +127,7 @@ var TopBar = function TopBar(props) {
     onCancel: function onCancel() {
       return closeHandle('scene');
     }
-  })), /*#__PURE__*/React.createElement(Button, {
+  })), showWarning && /*#__PURE__*/React.createElement(Button, {
     className: "".concat(classPrefix, "-earlywarning"),
     type: "primary",
     disabled: loading,

package/es/modules/chart/index.js

@@ -19,7 +19,7 @@ import moment from 'moment';
 import { Apis, chartColors } from '../../constants';
 import { Spin } from 'antd';
 import emptyImg from '../../style/image/empty.png';
-var classPrefix = 'mi-table';
+var classPrefix = 'event-mi-table';
 var EventChart = function EventChart(props) {
   var params = props.params;
   var _useState = useState(false),
@@ -174,7 +174,8 @@ 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");

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

@@ -24,6 +24,7 @@ var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'event-content';
 var EventContent = function EventContent(props) {
+  console.log('EventContent', props);
   var _useState = useState(props.value),
     _useState2 = _slicedToArray(_useState, 2),
     finalSearchData = _useState2[0],
@@ -168,7 +169,7 @@ var EventContent = function EventContent(props) {
     topPanel: /*#__PURE__*/React.createElement(TopPanel, {
       ref: collapseRef,
       onChange: onChangeSearch,
-      defaultValue: searchData,
+      value: searchData,
       ajaxFlag: ajaxFlag,
       finalSearchData: finalSearchData,
       fetchRequest: fetchRequest

package/es/modules/content/utils.js

@@ -23,12 +23,13 @@ export var judgeIsCity = function judgeIsCity(name) {
   return name && areaData.indexOf(name) !== -1 ? true : false;
 };
 export var judgeIsArea = function judgeIsArea(name) {
+  console.log('地图是否可选', name);
   var areaData = ['current_area', 'current_city', 'area', 'city'];
   return name && areaData.indexOf(name) !== -1 ? true : false;
 };
 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 = param.propCategory === 'eventProp' ? "".concat(param.propCategory, "-").concat(param.value) : "".concat(param.propCategory, "-").concat(param.value, "-").concat(param.id);
   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;

package/es/modules/home/index.js

@@ -29,30 +29,34 @@ var ModuleEvent = function ModuleEvent(props) {
     _useState2 = _slicedToArray(_useState, 2),
     searchData = _useState2[0],
     setSearchData = _useState2[1];
-  var _useState3 = useState(false),
+  var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
-    loading = _useState4[0],
-    setLoading = _useState4[1];
-  var _useState5 = useState(true),
+    selectEventData = _useState4[0],
+    setSelectEventData = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    pageLoading = _useState6[0],
-    setPageLoading = _useState6[1];
-  var _useState7 = useState(),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var _useState7 = useState(true),
     _useState8 = _slicedToArray(_useState7, 2),
-    title = _useState8[0],
-    setTitle = _useState8[1];
+    pageLoading = _useState8[0],
+    setPageLoading = _useState8[1];
   var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    panelId = _useState10[0],
-    setPanelId = _useState10[1];
+    title = _useState10[0],
+    setTitle = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    elementId = _useState12[0],
-    setElementId = _useState12[1];
+    panelId = _useState12[0],
+    setPanelId = _useState12[1];
   var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    showList = _useState14[0],
-    setShowList = _useState14[1];
+    elementId = _useState14[0],
+    setElementId = _useState14[1];
+  var _useState15 = useState(),
+    _useState16 = _slicedToArray(_useState15, 2),
+    showList = _useState16[0],
+    setShowList = _useState16[1];
   useEffect(function () {
     setPageLoading(true);
     if (props.defaultValue) {
@@ -79,6 +83,19 @@ var ModuleEvent = function ModuleEvent(props) {
       chartType: 'line'
     });
   };
+  var onSelectEvent = function onSelectEvent(id, name) {
+    console.log('onSelectEvent', id, name, searchData);
+    if ((searchData === null || searchData === void 0 ? void 0 : searchData.id) === undefined) {
+      setSelectEventData({
+        analysisIndex: searchData === null || searchData === void 0 ? void 0 : searchData.analysisIndex,
+        chartType: searchData === null || searchData === void 0 ? void 0 : searchData.chartType,
+        time: searchData === null || searchData === void 0 ? void 0 : searchData.time,
+        userGroup: searchData === null || searchData === void 0 ? void 0 : searchData.userGroup,
+        id: id,
+        name: name
+      });
+    }
+  };
   if (pageLoading) {
     return /*#__PURE__*/React.createElement(Spin, null);
   }
@@ -111,8 +128,11 @@ var ModuleEvent = function ModuleEvent(props) {
       userPropList: userPropList,
       searchData: searchData,
       setSearchData: setSearchData,
+      selectEventData: selectEventData,
+      onSelectEvent: onSelectEvent,
       panelName: title,
       includeToday: props.includeToday,
+      showWarning: props.showWarning,
       enableAddScene: props.defaultValue && props.defaultValue.enableAddScene === false ? false : true,
       afterEditTarget: props.afterEditTarget,
       onUserDrill: props.onUserDrill,

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

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

package/es/modules/topPanel/index.js

@@ -11,7 +11,8 @@ import EventFilter from '../../components/eventFilter';
 import './styles/index.less';
 var classPrefix = 'top-panel';
 var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var defaultValue = props.defaultValue,
+  console.log('TopPanel-props', props);
+  var value = props.value,
     ajaxFlag = props.ajaxFlag,
     finalSearchData = props.finalSearchData,
     fetchRequest = props.fetchRequest;
@@ -22,7 +23,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var userGroup = defaultValue.userGroup;
+  var userGroup = value.userGroup;
   var onValuesChange = function onValuesChange(data, allData) {
     var _data = {};
     if (allData.filterConditions) {
@@ -70,10 +71,10 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     initialValues: {
       userGroup: userGroup ? userGroup : [0],
       filterConditions: {
-        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
+        id: value === null || value === void 0 ? void 0 : value.id,
+        name: value === null || value === void 0 ? void 0 : value.name,
+        dimension: value === null || value === void 0 ? void 0 : value.dimension,
+        filters: value === null || value === void 0 ? void 0 : value.filters
       }
     },
     scrollToFirstError: true,

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

@@ -16,7 +16,7 @@ export interface FormHandelDataProps extends filterConditions {
     userGroup?: any[];
 }
 export interface TopPanelProps {
-    defaultValue?: SearchValue;
+    value?: SearchValue;
     onChange: (data: SearchValue, flag: boolean) => void;
     ajaxFlag: boolean;
     finalSearchData?: SearchValue;

package/es/utils/formData.d.ts

@@ -4,8 +4,9 @@ import { EventGroup, UserProp, EnvProp } from '@zgfe/business-lib/es/attributeSe
 import { ResponseDataProps, SearchValue } from '../types';
 import { EventProps } from '../modules/home/types';
 import '../style/index.less';
-export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], userGroup: number[], searchData: SearchValue, showList: string[], onShowCallback: Function, onClickToDetailCallback: Function): ColumnsType<EventProps.ColumnsDataType>;
-export declare function getEventAliasName(name: string): string;
+export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], userGroup: number[], searchData: SearchValue, showList: string[], onShowCallback: Function, onClickToDetailCallback: Function, onSelectEvent?: (id: number, name: string) => void): ColumnsType<EventProps.ColumnsDataType>;
+export declare function getEventAliasName(name: string, eventGroupList: EventGroup[] | undefined): string;
+export declare function getEventAliasId(name: string, eventGroupList: EventGroup[] | undefined): number;
 export declare function getUserGroupsCompareData(data: ResponseDataProps): ResponseDataProps;
 export declare function marketEventGroupList(eventGroupList: EventGroup[] | undefined): string[];
 export declare function getWarningId(searchData: SearchValue, eventData: ResponseDataProps, eventGroupList: EventGroup[] | undefined): number;

package/es/utils/formData.js

@@ -1,5 +1,5 @@
-import { util, IconFont, BizGlobalDataContext } from '@zgfe/business-lib';
-import React, { useContext } from 'react';
+import { util, IconFont } from '@zgfe/business-lib';
+import React from 'react';
 import { message } from 'antd';
 import _ from 'lodash';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
@@ -9,7 +9,7 @@ import { Tooltip } from 'antd';
 import '../style/index.less';
 import { getValue } from '../modules/content/utils';
 var classPrefix = 'event-form-data';
-export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, userGroup, searchData, showList, onShowCallback, onClickToDetailCallback) {
+export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, userGroup, searchData, showList, onShowCallback, onClickToDetailCallback, onSelectEvent) {
   var marketEventNameList = marketEventGroupList(eventGroupList);
   var data = [{
     title: '显示',
@@ -90,12 +90,15 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       fixed: true,
       render: function render(val) {
         console.log('事件', val);
-        var _val = getEventAliasName(val);
+        var _val = getEventAliasName(val, eventGroupList);
         return /*#__PURE__*/React.createElement(Tooltip, {
           className: "tooltip-name-box",
           title: _val
         }, /*#__PURE__*/React.createElement("div", {
-          className: "tooltip-name-box-market"
+          className: "tooltip-name-box-market",
+          onClick: function onClick() {
+            onSelectEvent && onSelectEvent(getEventAliasId(val, eventGroupList), val);
+          }
         }, marketEventNameList.indexOf(_val) !== -1 && /*#__PURE__*/React.createElement(IconFont, {
           type: "shoucang"
         }), util.strMiddleSplit(_val, {
@@ -157,9 +160,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
   }
   return data;
 }
-export function getEventAliasName(name) {
-  var _useContext = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext.eventGroupList;
+export function getEventAliasName(name, eventGroupList) {
   var aliasName = '';
   eventGroupList && eventGroupList.map(function (item) {
     item.eventList.map(function (_item) {
@@ -170,6 +171,17 @@ export function getEventAliasName(name) {
   });
   return aliasName;
 }
+export function getEventAliasId(name, eventGroupList) {
+  var eventId = -1;
+  eventGroupList && eventGroupList.map(function (item) {
+    item.eventList.map(function (_item) {
+      if (_item.name === name) {
+        eventId = _item.id;
+      }
+    });
+  });
+  return eventId;
+}
 export function getUserGroupsCompareData(data) {
   if (data.series.length <= 0) {
     return data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-event",
-  "version": "0.0.2-event.19",
+  "version": "0.0.2-event.22",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -49,7 +49,7 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "eb3b57010acd8fd4fc138260f2efdde28e257acb",
+  "gitHead": "15840a6c88bf8de655449539fccdcccc29f526fe",
   "dependencies": {
     "react-copy-to-clipboard": "^5.1.0",
     "react-highlight": "^0.15.0"