@zgfe/modules-event 0.1.14 → 0.1.15-qirui.1

package/es/components/eventFilter/index.js

@@ -1,30 +1,36 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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 _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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) 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, useContext } from 'react';
-import { BizEventSelector, BizAttributeSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
+import { BizEventSelector, BizAttributeSelector, IconFont, BizAttrConditionGroup, BizGlobalDataContext } from '@zgfe/business-lib';
 import { EventContext } from '../../types';
-import { judgeFilterValue } from '../../modules/content/utils';
 import './styles/index.less';
 import { judgeIsCity, judgeIsArea } from '../../modules/content/utils';
 import _ from 'lodash';
 var classPrefix = 'eventfilter-box';
 var EventFilter = function EventFilter(props) {
-  var setSearchDisabled = props.setSearchDisabled,
-    countChange = props.countChange,
+  var _props$value, _props$value2;
+  var countChange = props.countChange,
     setIsCity = props.setIsCity,
-    setEnableSelectChart = props.setEnableSelectChart;
+    setEnableSelectChart = props.setEnableSelectChart,
+    analysisType = props.analysisType;
   var _useContext = useContext(EventContext),
     selectEventData = _useContext.selectEventData,
     searchData = _useContext.searchData,
     setSearchData = _useContext.setSearchData;
+  var _useContext2 = useContext(BizGlobalDataContext),
+    _useContext2$eventIdM = _useContext2.eventIdMap,
+    eventIdMap = _useContext2$eventIdM === void 0 ? {} : _useContext2$eventIdM;
   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],
@@ -45,7 +51,7 @@ var EventFilter = function EventFilter(props) {
   var _useState7 = useState(props.value && props.value.id ? {
       id: props.value.id,
       name: props.value.name
-    } : {
+    } : analysisType === 'eventProp' ? undefined : {
       id: -100,
       name: '事件概览'
     }),
@@ -54,8 +60,8 @@ var EventFilter = function EventFilter(props) {
     setEvent = _useState8[1];
   var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    eventOverview = _useState10[0],
-    setEventOverview = _useState10[1];
+    showDimension = _useState10[0],
+    setShowDimension = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
     filter = _useState12[0],
@@ -64,6 +70,12 @@ var EventFilter = function EventFilter(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     bizAttributeSelectorValue = _useState14[0],
     setBizAttributeSelectorValue = _useState14[1];
+  var _useState15 = useState(_.isArray(props.value) ? props.value.map(function (id) {
+      return eventIdMap[id];
+    }) : props.analysisType === 'eventProp' && ((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.id) ? [eventIdMap[(_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.id]] : []),
+    _useState16 = _slicedToArray(_useState15, 2),
+    eventList = _useState16[0],
+    setEventList = _useState16[1];
   useEffect(function () {
     var _data = props.value;
     if (selectEventData) {
@@ -75,7 +87,7 @@ var EventFilter = function EventFilter(props) {
     }
     if (_data) {
       if (_data && _data.id) {
-        setEventOverview(true);
+        setShowDimension(true);
       }
       if (_data.filters) {
         setFilter(_data.filters);
@@ -90,7 +102,7 @@ var EventFilter = function EventFilter(props) {
     }
   }, [selectEventData]);
   var onAdd = function onAdd() {
-    if (event.id === -1) {
+    if ((event === null || event === void 0 ? void 0 : event.id) === -1) {
       return;
     }
     if (count >= 5) {
@@ -106,14 +118,28 @@ var EventFilter = function EventFilter(props) {
   };
   useEffect(function () {
     countChange(count);
-    if (!judgeFilterValue(filter, count)) {
-      setSearchDisabled(true);
-    } else {
-      setSearchDisabled(false);
-    }
     if (count <= 0) setFilter(undefined);
   }, [count, filter]);
-  var onChangeEvent = function onChangeEvent(event) {
+  var onChangeEvent = function onChangeEvent(val) {
+    if (analysisType === 'eventProp' && val.length > 1) {
+      setEventList(val);
+      setEvent(undefined);
+      setShowDimension(false);
+      setFilter(undefined);
+      setIsAdd(false);
+      return;
+    }
+    if (analysisType === 'eventProp' && val.length === 0) {
+      setEventList([]);
+      setEvent(undefined);
+      setShowDimension(false);
+      setFilter(undefined);
+      setIsAdd(false);
+      return;
+    }
+    var event = _.isArray(val) ? {
+      event: val[0]
+    } : val;
     if (searchData.chartType === 'map') {
       setSearchData(function (value) {
         return _objectSpread(_objectSpread({}, value), {}, {
@@ -122,9 +148,9 @@ var EventFilter = function EventFilter(props) {
       });
     }
     if (event && event.event && event.event.id === -100) {
-      setEventOverview(false);
+      setShowDimension(false);
     } else {
-      setEventOverview(true);
+      setShowDimension(true);
     }
     if (event && event.event) {
       setEvent(event.event);
@@ -132,6 +158,7 @@ var EventFilter = function EventFilter(props) {
     if (event && event.group) {
       setGroup(event.group);
     }
+    setEventList([]);
     setBizAttributeSelectorValue(undefined);
     setFilter(undefined);
     setIsAdd(false);
@@ -152,44 +179,54 @@ var EventFilter = function EventFilter(props) {
     }
   };
   useEffect(function () {
-    var _event = {
-      id: event.id,
-      name: event.name
-    };
-    if (filter) {
-      _event.filters = filter;
-    }
-    if (bizAttributeSelectorValue) {
-      var _dimension = _.cloneDeep(bizAttributeSelectorValue);
-      setEnableSelectChart && setEnableSelectChart(judgeIsArea(_dimension.value));
-      setIsCity && setIsCity(judgeIsCity(_dimension.value));
-      if (!judgeIsArea(_dimension.value)) {
-        if (searchData.chartType === 'map') _event.chartType = 'line';
+    if (analysisType === 'eventProp' && eventList.length > 1) {
+      props.onChange && props.onChange(eventList.map(function (item) {
+        return item.id;
+      }));
+    } else {
+      var _event = {
+        id: event === null || event === void 0 ? void 0 : event.id,
+        name: event === null || event === void 0 ? void 0 : event.name
+      };
+      if (filter) {
+        _event.filters = filter;
+      }
+      if (bizAttributeSelectorValue) {
+        var _dimension = _.cloneDeep(bizAttributeSelectorValue);
+        setEnableSelectChart && setEnableSelectChart(judgeIsArea(_dimension.value));
+        setIsCity && setIsCity(judgeIsCity(_dimension.value));
+        if (!judgeIsArea(_dimension.value)) {
+          if (searchData.chartType === 'map') _event.chartType = 'line';
+        }
+        delete _dimension.key;
+        _event.dimension = _dimension;
       }
-      delete _dimension.key;
-      _event.dimension = _dimension;
+      _event.eventGroupId = group.id !== 0 ? group.id : undefined;
+      props.onChange && props.onChange(_event);
     }
-    _event.eventGroupId = group.id !== 0 ? group.id : undefined;
-    props.onChange && props.onChange(_event);
-  }, [bizAttributeSelectorValue, filter, event, group]);
+  }, [bizAttributeSelectorValue, filter, event, group, eventList]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: analysisType === 'eventProp' && eventList.length > 1 ? "".concat(classPrefix, "-multiple") : ''
+  }, /*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: true,
+    key: "".concat(analysisType),
+    multiple: analysisType === 'eventProp',
     showBuiltInTarget: false,
     popupContainer: false,
     defaultSelectAble: false,
-    value: {
+    defaultValue: analysisType === 'eventProp' ? eventList : {
       event: event,
       group: group
     },
     onChange: onChangeEvent,
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
-  }), eventOverview && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizAttributeSelector, {
+  }), showDimension && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
-    enableUserProp: true,
+    enableUserProp: analysisType === 'eventProp' ? false : true,
     enableEnvProp: true,
-    eventIdList: [event.id],
+    eventIdList: [event === null || event === void 0 ? void 0 : event.id],
     value: bizAttributeSelectorValue,
     enableDelete: true,
     onChange: onChangeAttr,
@@ -201,7 +238,7 @@ var EventFilter = function EventFilter(props) {
     placement: "top",
     title: '添加属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count >= 5 || event.id === -1 ? 'disable' : ''),
+    className: "".concat(count >= 5 || (event === null || event === void 0 ? void 0 : event.id) === -1 ? 'disable' : ''),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();
@@ -214,7 +251,8 @@ var EventFilter = function EventFilter(props) {
     onlyAnd: true,
     enableEventProp: true,
     enableDelete: true,
-    eventIdList: [event.id],
+    enableUserProp: analysisType === 'eventProp' ? false : true,
+    eventIdList: event ? [event.id] : [],
     onChange: onChangeFilters,
     onConditionsCount: setCount
   })));

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

@@ -1,11 +1,16 @@
 .eventfilter-box {
-  > :nth-child(1) {
+  .attr-box-show {
+    margin-top: 4px;
+  }
+  > div:nth-child(1) {
     display: flex;
-    margin-bottom: 4px;
     padding: 4px 0 4px 24px;
+    &:hover {
+      background: #e8efff;
+    }
     .biz-event-select,
     .biz-attr-select {
-      width: 208px;
+      min-width: 208px;
       margin-right: 16px;
     }
     .shaixuan {
@@ -22,7 +27,10 @@
       cursor: not-allowed !important;
     }
   }
-  > :nth-child(1):hover {
-    background: #e8efff;
+  &-multiple {
+    .biz-event-select {
+      width: auto !important;
+      min-width: 208px;
+    }
   }
 }

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

@@ -11,10 +11,10 @@ export interface ConditionsnProps {
     dimensionSub?: string | undefined;
 }
 export interface EventFilterProps {
-    value?: eventProps;
-    onChange?: (event: eventProps) => {};
-    setSearchDisabled: (disabled: boolean) => void;
+    value?: eventProps | number[];
+    onChange?: (event: eventProps | number[]) => {};
     countChange: (count: number) => void;
     setIsCity?: Function;
     setEnableSelectChart?: Function;
+    analysisType?: string;
 }

package/es/components/renderContent/index.js

@@ -1,8 +1,8 @@
 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 _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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Empty } from 'antd';
 import React, { useState, useContext } from 'react';

package/es/components/searchPanel/index.js

@@ -1,23 +1,29 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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 _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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { BizDatePicker, BizSelect, BizTargetDimension } from '@zgfe/business-lib';
-import React, { useContext, useEffect, useState } from 'react';
+import { BizDatePicker, BizSelect, BizTargetDimension, useChanged } from '@zgfe/business-lib';
+import React, { useContext, useEffect, useState, useMemo } from 'react';
 import { chartTypeOptions, getInitDate } from '../../constants';
 import { EventContext } from '../../types';
-import { normalOptions } from '../../modules/content/utils';
+import { normalOptions, normalEventOptions } from '../../modules/content/utils';
 import './styles/index.less';
 var classPrefix = 'search-panel';
 var SearchPanel = function SearchPanel(props) {
   var _useContext = useContext(EventContext),
     includeToday = _useContext.includeToday,
     searchData = _useContext.searchData;
+  var analysisSubjectType = props.analysisSubjectType,
+    dimension = props.dimension,
+    setDimension = props.setDimension;
   var _useState = useState(props.time || getInitDate(includeToday)),
     _useState2 = _slicedToArray(_useState, 2),
     time = _useState2[0],
@@ -26,16 +32,21 @@ var SearchPanel = function SearchPanel(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     chart = _useState4[0],
     setChart = _useState4[1];
-  var _useState5 = useState(0),
+  var _useState5 = useState(true),
     _useState6 = _slicedToArray(_useState5, 2),
-    timer = _useState6[0],
-    setTimer = _useState6[1];
-  var _useState7 = useState({
-      analysisIndex: 'number'
-    }),
+    timeFlag = _useState6[0],
+    setTimeFlag = _useState6[1];
+  var _useState7 = useState(0),
     _useState8 = _slicedToArray(_useState7, 2),
-    dimension = _useState8[0],
-    setDimension = _useState8[1];
+    timer = _useState8[0],
+    setTimer = _useState8[1];
+  var currentNormalOptions = useMemo(function () {
+    setTimeFlag(false);
+    setTimeout(function () {
+      setTimeFlag(true);
+    }, 0);
+    return analysisSubjectType === 'user' ? normalOptions : normalEventOptions;
+  }, [analysisSubjectType]);
   useEffect(function () {
     if (searchData.chartType && searchData.chartType !== chart.value) {
       if (searchData.chartType.indexOf(',') !== -1) {
@@ -48,18 +59,6 @@ var SearchPanel = function SearchPanel(props) {
         });
       }
     }
-    var _dimension = {
-      analysisIndex: 'number'
-    };
-    if (searchData.analysisIndex) {
-      _dimension = {
-        analysisIndex: searchData.analysisIndex
-      };
-    }
-    if (searchData.analysisAttr) {
-      _dimension['analysisAttr'] = searchData.analysisAttr;
-    }
-    setDimension(_objectSpread({}, _dimension));
   }, [searchData]);
   useEffect(function () {
     if (!props.enableSelectChart && chart.value === 'map') {
@@ -86,7 +85,7 @@ var SearchPanel = function SearchPanel(props) {
     }, dimension));
   };
   var onDimensionChange = function onDimensionChange(data) {
-    setDimension(data);
+    setDimension && setDimension(data);
     props.onChange && props.onChange({
       time: time,
       chartType: chart.value,
@@ -94,6 +93,13 @@ var SearchPanel = function SearchPanel(props) {
       analysisAttr: data.analysisAttr
     });
   };
+  useChanged(function (pre, next) {
+    if (pre === next) return;
+    onDimensionChange({
+      analysisIndex: currentNormalOptions[0].value,
+      analysisAttr: undefined
+    });
+  }, props.eventId);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -102,11 +108,13 @@ var SearchPanel = function SearchPanel(props) {
     }
   }, /*#__PURE__*/React.createElement(BizDatePicker, {
     defaultValue: time,
-    onChange: onChangeTime
-  }), /*#__PURE__*/React.createElement(BizTargetDimension, {
-    normalOptions: normalOptions,
+    onChange: onChangeTime,
+    selectRange: 365
+  }), timeFlag && /*#__PURE__*/React.createElement(BizTargetDimension, {
+    normalOptions: currentNormalOptions,
     value: dimension,
     eventId: props.eventId,
+    isExtend: true,
     onChange: onDimensionChange
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-search-right")

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

@@ -1,6 +1,15 @@
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
 import { EventChartTypes } from '../../types';
 import { ReactNode } from 'react';
+import { TargetConditionTypes } from '@zgfe/business-lib';
+export interface AnalysisSubject {
+    subjectId?: number;
+    id?: number;
+    name?: string;
+    unit?: string;
+    subjectAlias?: string;
+    subjectName?: string;
+}
 export interface SearchPanelProps {
     analysisIndex?: string;
     analysisAttr?: string;
@@ -12,4 +21,8 @@ export interface SearchPanelProps {
     onChange?: (data: SearchPanelProps) => void;
     setIsCity?: Function;
     setEnableSelectChart?: Function;
+    analysisSubjectType?: string;
+    analysisSubject?: AnalysisSubject;
+    dimension?: TargetConditionTypes.DimensionValue;
+    setDimension?: Function;
 }

package/es/components/table/index.js

@@ -1,11 +1,14 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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 _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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { ajax, BizGlobalDataContext, IconFont } from '@zgfe/business-lib';
 import React, { useContext, useEffect, useMemo, useState } from 'react';
@@ -110,7 +113,8 @@ var EventTable = function EventTable(props) {
           })
         },
         source: 'EVENT',
-        url: '/zg/web/v2/data/appEventBatch'
+        url: searchData.analysisSubject ? '/zg/web/v2/data/eventSubjectDetail' : '/zg/web/v2/data/appEventBatch',
+        analysisSubject: searchData.analysisSubject ? searchData.analysisSubject : undefined
       }, _objectSpread(_objectSpread({
         source: 'EVENT'
       }, defaultSearch), {}, {
@@ -147,7 +151,7 @@ var EventTable = function EventTable(props) {
     if (searchData.id && !searchData.dimension || !searchData.id) {
       seriesNames.push(base64.encode('事件'));
     }
-    var fname = "\u4E8B\u4EF6_".concat((searchData === null || searchData === void 0 ? void 0 : searchData.name) ? getEventAliasName(searchData === null || searchData === void 0 ? void 0 : searchData.name, eventGroupList) : '事件概览');
+    var fname = "\u4E8B\u4EF6\u5206\u6790-".concat((searchData === null || searchData === void 0 ? void 0 : searchData.name) ? getEventAliasName(searchData === null || searchData === void 0 ? void 0 : searchData.name, eventGroupList) : '事件概览');
     var params = _objectSpread(_objectSpread({
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
       platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
@@ -196,6 +200,9 @@ var EventTable = function EventTable(props) {
     rowKey: 'id',
     columns: columns,
     dataSource: tableData,
+    scroll: {
+      x: true
+    },
     pagination: {
       showQuickJumper: true,
       total: total,

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

@@ -46,8 +46,6 @@
     }
   }
   .ant-table {
-    max-height: 550px;
-    overflow: auto;
     border-radius: 0 0 8px 8px;
   }
   .sourcepanel-table-header {
@@ -77,7 +75,7 @@
   .tooltip-name-box {
     display: flex;
     &-market {
-      max-width: calc(100% - 20px);
+      // max-width: calc(100% - 20px);
       margin-right: 8px;
       overflow: hidden;
       white-space: nowrap;

package/es/components/topBar/index.js

@@ -1,11 +1,14 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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 _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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Button } from 'antd';
 import React, { useContext, useState, useEffect } from 'react';

package/es/constants/apis.d.ts

@@ -2,5 +2,7 @@ declare const Apis: {
     dataList: string;
     getEventDataSql: string;
     eventDownloadReport: string;
+    queryAllSubjectApi: string;
+    querySubDisplayApi: string;
 };
 export default Apis;

package/es/constants/apis.js

@@ -1,6 +1,8 @@
 var Apis = {
   dataList: '/zg/web/v2/data/eventDataList',
   getEventDataSql: '/zg/web/v2/dataSql/getEventDataSql',
-  eventDownloadReport: '/zg/web/v2/data/eventDownloadReport'
+  eventDownloadReport: '/zg/web/v2/data/eventDownloadReport',
+  queryAllSubjectApi: '/zg/web/v2/analysisSubject/queryAllSubject',
+  querySubDisplayApi: '/zg/web/v2/analysisSubject/querySubDisplay'
 };
 export default Apis;

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

@@ -1,2 +1,3 @@
-declare const _default: () => JSX.Element;
+import React from 'react';
+declare const _default: () => React.JSX.Element;
 export default _default;

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

@@ -1,8 +1,8 @@
 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 _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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from 'react';
 import { EventChart } from '@zgfe/modules-event';

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

@@ -1,2 +1,3 @@
-declare const _default: () => JSX.Element;
+import React from 'react';
+declare const _default: () => React.JSX.Element;
 export default _default;