@zgfe/modules-event 0.1.15-qirui.2 → 0.1.16-xinao.0

package/es/components/eventFilter/index.js

@@ -1,36 +1,33 @@
-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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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 _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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 = 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 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, BizGlobalDataContext } from '@zgfe/business-lib';
+import { BizEventSelector, BizAttributeSelector, IconFont, BizAttrConditionGroup } 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 _props$value, _props$value2;
-  var countChange = props.countChange,
+  var setSearchDisabled = props.setSearchDisabled,
+    countChange = props.countChange,
     setIsCity = props.setIsCity,
-    setEnableSelectChart = props.setEnableSelectChart,
-    analysisType = props.analysisType;
+    setEnableSelectChart = props.setEnableSelectChart;
   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],
@@ -51,7 +48,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: '事件概览'
     }),
@@ -60,8 +57,8 @@ var EventFilter = function EventFilter(props) {
     setEvent = _useState8[1];
   var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    showDimension = _useState10[0],
-    setShowDimension = _useState10[1];
+    eventOverview = _useState10[0],
+    setEventOverview = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
     filter = _useState12[0],
@@ -70,12 +67,6 @@ 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) {
@@ -87,7 +78,7 @@ var EventFilter = function EventFilter(props) {
     }
     if (_data) {
       if (_data && _data.id) {
-        setShowDimension(true);
+        setEventOverview(true);
       }
       if (_data.filters) {
         setFilter(_data.filters);
@@ -102,7 +93,7 @@ var EventFilter = function EventFilter(props) {
     }
   }, [selectEventData]);
   var onAdd = function onAdd() {
-    if ((event === null || event === void 0 ? void 0 : event.id) === -1) {
+    if (event.id === -1) {
       return;
     }
     if (count >= 5) {
@@ -118,28 +109,14 @@ 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(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;
+  var onChangeEvent = function onChangeEvent(event) {
     if (searchData.chartType === 'map') {
       setSearchData(function (value) {
         return _objectSpread(_objectSpread({}, value), {}, {
@@ -148,9 +125,9 @@ var EventFilter = function EventFilter(props) {
       });
     }
     if (event && event.event && event.event.id === -100) {
-      setShowDimension(false);
+      setEventOverview(false);
     } else {
-      setShowDimension(true);
+      setEventOverview(true);
     }
     if (event && event.event) {
       setEvent(event.event);
@@ -158,7 +135,6 @@ var EventFilter = function EventFilter(props) {
     if (event && event.group) {
       setGroup(event.group);
     }
-    setEventList([]);
     setBizAttributeSelectorValue(undefined);
     setFilter(undefined);
     setIsAdd(false);
@@ -179,54 +155,44 @@ var EventFilter = function EventFilter(props) {
     }
   };
   useEffect(function () {
-    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;
+    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';
       }
-      _event.eventGroupId = group.id !== 0 ? group.id : undefined;
-      props.onChange && props.onChange(_event);
+      delete _dimension.key;
+      _event.dimension = _dimension;
     }
-  }, [bizAttributeSelectorValue, filter, event, group, eventList]);
+    _event.eventGroupId = group.id !== 0 ? group.id : undefined;
+    props.onChange && props.onChange(_event);
+  }, [bizAttributeSelectorValue, filter, event, group]);
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement("div", {
-    className: analysisType === 'eventProp' && eventList.length > 1 ? "".concat(classPrefix, "-multiple") : ''
-  }, /*#__PURE__*/React.createElement(BizEventSelector, {
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: true,
-    key: "".concat(analysisType),
-    multiple: analysisType === 'eventProp',
     showBuiltInTarget: false,
     popupContainer: false,
     defaultSelectAble: false,
-    defaultValue: analysisType === 'eventProp' ? eventList : {
+    value: {
       event: event,
       group: group
     },
     onChange: onChangeEvent,
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
-  }), showDimension && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizAttributeSelector, {
+  }), eventOverview && ( /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
-    enableUserProp: analysisType === 'eventProp' ? false : true,
+    enableUserProp: true,
     enableEnvProp: true,
-    eventIdList: [event === null || event === void 0 ? void 0 : event.id],
+    eventIdList: [event.id],
     value: bizAttributeSelectorValue,
     enableDelete: true,
     onChange: onChangeAttr,
@@ -238,12 +204,12 @@ var EventFilter = function EventFilter(props) {
     placement: "top",
     title: '添加属性筛选'
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count >= 5 || (event === null || event === void 0 ? void 0 : event.id) === -1 ? 'disable' : ''),
+    className: "".concat(count >= 5 || event.id === -1 ? 'disable' : ''),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();
     }
-  })))), (filter || isAdd) && /*#__PURE__*/React.createElement("div", {
+  }))))), (filter || isAdd) && ( /*#__PURE__*/React.createElement("div", {
     className: "".concat(count > 0 ? 'attr-box-show' : '', " top")
   }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,
@@ -251,10 +217,9 @@ var EventFilter = function EventFilter(props) {
     onlyAnd: true,
     enableEventProp: true,
     enableDelete: true,
-    enableUserProp: analysisType === 'eventProp' ? false : true,
-    eventIdList: event ? [event.id] : [],
+    eventIdList: [event.id],
     onChange: onChangeFilters,
     onConditionsCount: setCount
-  })));
+  }))));
 };
 export default EventFilter;

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

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

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

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

package/es/components/renderContent/index.js

@@ -2,7 +2,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 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 = 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Empty } from 'antd';
 import React, { useState, useContext } from 'react';
@@ -34,21 +34,21 @@ var ContentPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-chart-container")
-  }, eventData ? /*#__PURE__*/React.createElement(EventChart, {
+  }, eventData ? ( /*#__PURE__*/React.createElement(EventChart, {
     ref: ref,
     dataSource: eventData,
     params: searchData,
     showList: showList
-  }) : /*#__PURE__*/React.createElement(Empty, {
+  })) : ( /*#__PURE__*/React.createElement(Empty, {
     image: Empty.PRESENTED_IMAGE_SIMPLE,
     description: "\u6682\u65E0\u6570\u636E"
-  })), eventData && eventData.series.length > 0 ? /*#__PURE__*/React.createElement(EventChart, {
+  }))), eventData && eventData.series.length > 0 ? ( /*#__PURE__*/React.createElement(EventChart, {
     type: "grid",
     dataSource: eventData,
     params: searchData,
     showList: showList,
     onChangeShow: onChangeShow,
     onSelectEvent: onSelectEvent
-  }) : null);
+  })) : null);
 });
 export default ContentPanel;

package/es/components/searchPanel/index.js

@@ -1,29 +1,26 @@
-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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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 _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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 = 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { BizDatePicker, BizSelect, BizTargetDimension, useChanged } from '@zgfe/business-lib';
-import React, { useContext, useEffect, useState, useMemo } from 'react';
+import { BizDatePicker, BizSelect, BizTargetDimension } from '@zgfe/business-lib';
+import React, { useContext, useEffect, useState } from 'react';
 import { chartTypeOptions, getInitDate } from '../../constants';
 import { EventContext } from '../../types';
-import { normalOptions, normalEventOptions } from '../../modules/content/utils';
+import { normalOptions } 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],
@@ -32,21 +29,16 @@ var SearchPanel = function SearchPanel(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     chart = _useState4[0],
     setChart = _useState4[1];
-  var _useState5 = useState(true),
+  var _useState5 = useState(0),
     _useState6 = _slicedToArray(_useState5, 2),
-    timeFlag = _useState6[0],
-    setTimeFlag = _useState6[1];
-  var _useState7 = useState(0),
+    timer = _useState6[0],
+    setTimer = _useState6[1];
+  var _useState7 = useState({
+      analysisIndex: 'number'
+    }),
     _useState8 = _slicedToArray(_useState7, 2),
-    timer = _useState8[0],
-    setTimer = _useState8[1];
-  var currentNormalOptions = useMemo(function () {
-    setTimeFlag(false);
-    setTimeout(function () {
-      setTimeFlag(true);
-    }, 0);
-    return analysisSubjectType === 'user' ? normalOptions : normalEventOptions;
-  }, [analysisSubjectType]);
+    dimension = _useState8[0],
+    setDimension = _useState8[1];
   useEffect(function () {
     if (searchData.chartType && searchData.chartType !== chart.value) {
       if (searchData.chartType.indexOf(',') !== -1) {
@@ -59,6 +51,18 @@ 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') {
@@ -85,21 +89,12 @@ var SearchPanel = function SearchPanel(props) {
     }, dimension));
   };
   var onDimensionChange = function onDimensionChange(data) {
-    setDimension && setDimension(data);
-    props.onChange && props.onChange({
+    setDimension(data);
+    props.onChange && props.onChange(_objectSpread({
       time: time,
-      chartType: chart.value,
-      analysisIndex: data.analysisIndex,
-      analysisAttr: data.analysisAttr
-    });
+      chartType: chart.value
+    }, data));
   };
-  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", {
@@ -108,13 +103,11 @@ var SearchPanel = function SearchPanel(props) {
     }
   }, /*#__PURE__*/React.createElement(BizDatePicker, {
     defaultValue: time,
-    onChange: onChangeTime,
-    selectRange: 365
-  }), timeFlag && /*#__PURE__*/React.createElement(BizTargetDimension, {
-    normalOptions: currentNormalOptions,
+    onChange: onChangeTime
+  }), /*#__PURE__*/React.createElement(BizTargetDimension, {
+    normalOptions: normalOptions,
     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,15 +1,6 @@
 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;
@@ -21,8 +12,4 @@ 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,14 +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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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 _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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 = 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 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';
@@ -38,8 +38,7 @@ var EventTable = function EventTable(props) {
     _useContext$eventGrou = _useContext.eventGroupList,
     eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou,
     eventEnvList = _useContext.eventEnvList,
-    userPropList = _useContext.userPropList,
-    authority = _useContext.authority;
+    userPropList = _useContext.userPropList;
   var _useContext2 = useContext(EventContext),
     onUserDrill = _useContext2.onUserDrill,
     _useContext2$defaultS = _useContext2.defaultSearch,
@@ -83,7 +82,7 @@ var EventTable = function EventTable(props) {
       var _time = time.split('|');
       var groupValue = '';
       if (searchData.dimension && item.dimension) {
-        groupValue = item.dimension;
+        groupValue = item.originalName ? item.originalName : item.dimension;
       } else {
         eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.forEach(function (group) {
           group.eventList.forEach(function (event) {
@@ -113,8 +112,7 @@ var EventTable = function EventTable(props) {
           })
         },
         source: 'EVENT',
-        url: searchData.analysisSubject ? '/zg/web/v2/data/eventSubjectDetail' : '/zg/web/v2/data/appEventBatch',
-        analysisSubject: searchData.analysisSubject ? searchData.analysisSubject : undefined
+        url: '/zg/web/v2/data/appEventBatch'
       }, _objectSpread(_objectSpread({
         source: 'EVENT'
       }, defaultSearch), {}, {
@@ -151,7 +149,7 @@ var EventTable = function EventTable(props) {
     if (searchData.id && !searchData.dimension || !searchData.id) {
       seriesNames.push(base64.encode('事件'));
     }
-    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 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 params = _objectSpread(_objectSpread({
       appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
       platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
@@ -183,15 +181,15 @@ var EventTable = function EventTable(props) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, !sourcePanel && /*#__PURE__*/React.createElement("div", {
+  }, !sourcePanel && ( /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-table-header")
-  }, /*#__PURE__*/React.createElement("span", null, "\u6307\u6807\u8BE6\u60C5"), /*#__PURE__*/React.createElement("div", null, authority[100051] && /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", null, "\u6307\u6807\u8BE6\u60C5"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     onClick: seeSql
-  }, "\u67E5\u770BSQL"), authority[100050] && /*#__PURE__*/React.createElement("div", {
+  }, "\u67E5\u770BSQL"), /*#__PURE__*/React.createElement("div", {
     onClick: download
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "xiazai1"
-  }), "\u4E0B\u8F7D\u6570\u636E"))), /*#__PURE__*/React.createElement("div", {
+  }), "\u4E0B\u8F7D\u6570\u636E")))), /*#__PURE__*/React.createElement("div", {
     className: "table-area ".concat(sourcePanel ? 'sourcepanel-table-header' : '')
   }, /*#__PURE__*/React.createElement(ConfigProvider, {
     renderEmpty: tableEmptyRender
@@ -200,9 +198,6 @@ 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,6 +46,8 @@
     }
   }
   .ant-table {
+    max-height: 550px;
+    overflow: auto;
     border-radius: 0 0 8px 8px;
   }
   .sourcepanel-table-header {
@@ -75,7 +77,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;