@zgfe/modules-event 1.0.7 → 1.0.29-zhongyuan-event.2

package/es/modules/home/index.js

@@ -1,16 +1,16 @@
-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) { 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 _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(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+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(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useContext, useEffect, useState } from 'react';
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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(r) { if (Array.isArray(r)) return r; }
+import React, { useContext, useEffect, useState, useRef } from 'react';
 import { Spin } from 'antd';
 import { BizGlobalDataContext, BizTargetFromPanel } from '@zgfe/business-lib';
 import './styles/index.less';
@@ -26,11 +26,16 @@ var ModuleEvent = function ModuleEvent(props) {
     eventGroupList = _useContext.eventGroupList,
     eventEnvList = _useContext.eventEnvList,
     userPropList = _useContext.userPropList,
-    userGroupList = _useContext.userGroupList;
+    userGroupList = _useContext.userGroupList,
+    useBizStoreLoading = _useContext.useBizStoreLoading;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     searchData = _useState2[0],
     setSearchData = _useState2[1];
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    completedSearchData = _useState4[0],
+    setCompletedSearchData = _useState4[1];
   var onChangeUrlParam = function onChangeUrlParam(data) {
     clearTimeout(onChangeTimer);
     onChangeTimer = setTimeout(function () {
@@ -39,20 +44,20 @@ var ModuleEvent = function ModuleEvent(props) {
       });
     }, 500);
   };
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectEventData = _useState4[0],
-    setSelectEventData = _useState4[1];
   var _useState5 = useState(true),
     _useState6 = _slicedToArray(_useState5, 2),
     loading = _useState6[0],
     setLoading = _useState6[1];
-  var _useState7 = useState(true),
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    pageLoading = _useState8[0],
-    setPageLoading = _useState8[1];
-  var _useState9 = useState(),
-    _useState10 = _slicedToArray(_useState9, 2),
+    refreshLoading = _useState8[0],
+    setRefreshLoading = _useState8[1];
+  var _useState9 = useState(true),
+    _useState0 = _slicedToArray(_useState9, 2),
+    pageLoading = _useState0[0],
+    setPageLoading = _useState0[1];
+  var _useState1 = useState(),
+    _useState10 = _slicedToArray(_useState1, 2),
     title = _useState10[0],
     setTitle = _useState10[1];
   var _useState11 = useState(),
@@ -65,13 +70,13 @@ var ModuleEvent = function ModuleEvent(props) {
     setElementId = _useState14[1];
   var _useState15 = useState(),
     _useState16 = _slicedToArray(_useState15, 2),
-    showList = _useState16[0],
-    setShowList = _useState16[1];
+    showListHome = _useState16[0],
+    setShowListHome = _useState16[1];
   useEffect(function () {
     setPageLoading(true);
     if (props.defaultValue) {
       var _props$defaultValue;
-      setShowList(props.defaultValue.chosen_data);
+      setShowListHome(props.defaultValue.chosen_data);
       setPanelId(props.defaultValue.panelId);
       setTitle(props.defaultValue.name);
       if ((_props$defaultValue = props.defaultValue) === null || _props$defaultValue === void 0 ? void 0 : _props$defaultValue.id) {
@@ -95,23 +100,33 @@ var ModuleEvent = function ModuleEvent(props) {
       chartType: 'line'
     });
   };
+  var eventContentRef = useRef();
   var onSelectEvent = function onSelectEvent(id, name) {
     if ((searchData === null || searchData === void 0 ? void 0 : searchData.id) === undefined) {
-      setSelectEventData({
+      var _eventContentRef$curr;
+      setSearchData({
+        id: id,
+        name: name,
         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
+        userGroup: searchData === null || searchData === void 0 ? void 0 : searchData.userGroup
+      });
+      eventContentRef === null || eventContentRef === void 0 ? void 0 : (_eventContentRef$curr = eventContentRef.current) === null || _eventContentRef$curr === void 0 ? void 0 : _eventContentRef$curr.onFormSetFieldsValue({
+        filterConditions: {
+          id: id,
+          name: name
+        },
+        userGroup: searchData === null || searchData === void 0 ? void 0 : searchData.userGroup
       });
     }
   };
-  if (pageLoading) {
+  if (pageLoading || useBizStoreLoading) {
     return /*#__PURE__*/React.createElement(Spin, null);
   }
-  return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+  return /*#__PURE__*/React.createElement(Spin, {
+    spinning: false,
+    wrapperClassName: classPrefix
   }, /*#__PURE__*/React.createElement(BizTargetFromPanel, {
     value: panelId ? {
       panelId: panelId,
@@ -122,18 +137,21 @@ var ModuleEvent = function ModuleEvent(props) {
           app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
           module: 'event'
         }, searchData),
-        showList: showList
+        showList: showListHome
       }
     } : undefined,
     disabled: props === null || props === void 0 ? void 0 : props.panelDisabled,
     styleOptions: chartTypes,
     afterEditTarget: props.afterEditTarget
-  }), !panelId && /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-header-title")
-  }, "\u4E8B\u4EF6\u5206\u6790"), /*#__PURE__*/React.createElement(EventContext.Provider, {
+  }, /*#__PURE__*/React.createElement(EventContext.Provider, {
     value: {
+      refreshLoading: refreshLoading,
+      setRefreshLoading: setRefreshLoading,
+      currentApp: currentApp,
       loading: loading,
       setLoading: setLoading,
+      showListHome: showListHome,
+      setShowListHome: setShowListHome,
       panelId: panelId,
       elementId: elementId,
       eventGroupList: eventGroupList,
@@ -141,8 +159,9 @@ var ModuleEvent = function ModuleEvent(props) {
       userPropList: userPropList,
       searchData: searchData,
       setSearchData: setSearchData,
+      completedSearchData: completedSearchData,
+      setCompletedSearchData: setCompletedSearchData,
       onChangeUrlParam: onChangeUrlParam,
-      selectEventData: selectEventData,
       onSelectEvent: onSelectEvent,
       panelName: title,
       includeToday: props.includeToday,
@@ -154,11 +173,10 @@ var ModuleEvent = function ModuleEvent(props) {
     }
   }, /*#__PURE__*/React.createElement(EventContent, {
     elementId: elementId,
+    ref: eventContentRef,
     value: searchData,
-    show: showList,
-    initSearch: initSearch,
-    onChangeShow: setShowList
-  })));
+    initSearch: initSearch
+  }))));
 };
 ModuleEvent.defaultProps = {
   includeToday: true

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

@@ -1,49 +1,49 @@
-.event-module-container {
-  width: 100%;
-  min-width: 1000px;
-  height: auto;
-  background: #fafafb;
-  &-header-title {
-    height: 48px;
-    padding: 0px 24px;
-    color: #021429;
-    font-weight: 500;
-    font-size: 16px;
-    line-height: 48px;
-    background: #fff;
-  }
-  .biz-layout-top {
-    margin-top: 2px;
-    padding-top: 0;
-    .biz-user-group-header {
-      .ant-space-item {
-        color: #5f6085;
-      }
-    }
-  }
-  .ant-spin-container {
-    width: 100%;
-    // height: 100%;
-  }
-
-  .biz-select-option:not(.biz-select-option-multiple),
-  .biz-attr-select-option {
-    &.active {
-      background: @primary-color !important;
-    }
-  }
-
-  // 设置下拉框最大高度
-  .biz-select-overlay {
-    max-height: 300px;
-  }
-
-  .biz-layout-panel-content {
-    height: auto;
-  }
-
-  .biz-layout-collapse-container {
-    align-items: center;
-    height: 24px;
-  }
-}
+.event-module-container {
+  width: 100%;
+  min-width: 1000px;
+  height: 100% !important;
+  background: #fafafb;
+  &-header-title {
+    height: 48px;
+    padding: 0px 16px;
+    color: #021429;
+    font-weight: 500;
+    font-size: 16px;
+    line-height: 48px;
+    background: #fff;
+  }
+  .biz-layout-top {
+    margin-top: 2px;
+    padding: 0 16px 16px;
+    .biz-user-group-header {
+      .ant-space-item {
+        color: #5f6085;
+      }
+    }
+  }
+  .ant-spin-container {
+    width: 100%;
+    height: 100%;
+  }
+
+  .biz-select-option:not(.biz-select-option-multiple),
+  .biz-attr-select-option {
+    &.active {
+      background: @primary-color !important;
+    }
+  }
+
+  // 设置下拉框最大高度
+  .biz-select-overlay {
+    max-height: 300px;
+  }
+
+  .biz-layout-panel-content {
+    height: auto;
+  }
+
+  .biz-layout-collapse-container {
+    align-items: center;
+    height: 24px;
+  }
+}

package/es/modules/topPanel/index.js

@@ -1,23 +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 _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 _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(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+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(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState, useEffect } from 'react';
-import { Form, Button } from 'antd';
-import { BizUserGroupHeader, BizSelect, useSubject } from '@zgfe/business-lib';
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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(r) { if (Array.isArray(r)) return r; }
+import React, { useState, useEffect, useRef, useImperativeHandle, useContext } from 'react';
+import { Form, Button, Tooltip } from 'antd';
+import { BizUserGroupHeader, BizSelect, useSubject, IconFont } from '@zgfe/business-lib';
 import EventFilter from '../../components/eventFilter';
 import './styles/index.less';
 import _ from 'lodash';
+import { EventContext } from '../../types';
 var classPrefix = 'modules-event-top-panel';
 var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var _useContext = useContext(EventContext),
+    currentApp = _useContext.currentApp;
   var value = props.value,
     setIsCity = props.setIsCity,
     setEnableSelectChart = props.setEnableSelectChart,
@@ -62,6 +65,21 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     });
     props.onChange(searchData, true);
   }
+  var collapseRef = useRef();
+  useImperativeHandle(ref, function () {
+    return {
+      onFormSetFieldsValue: function onFormSetFieldsValue(data) {
+        form.resetFields();
+        form.setFieldsValue(data);
+      },
+      getCollapseRef: function getCollapseRef() {
+        return collapseRef;
+      },
+      submit: function submit() {
+        return form.submit();
+      }
+    };
+  });
   var resetting = function resetting() {
     form.resetFields();
     form.setFieldsValue({
@@ -114,13 +132,23 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     },
     scrollToFirstError: true,
     onFinish: onSearch
-  }, !subDisplay ? null : /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u5206\u6790\u4E3B\u4F53",
+  }, !subDisplay ? null : (/*#__PURE__*/React.createElement(Form.Item, {
+    label: /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-label-hasIcon")
+    }, /*#__PURE__*/React.createElement("span", null, "\u7EDF\u8BA1\u53E3\u5F84"), "\xA0\xA0", /*#__PURE__*/React.createElement(Tooltip, {
+      title: "\u5E2E\u52A9",
+      placement: "top"
+    }, /*#__PURE__*/React.createElement(IconFont, {
+      type: "bangzhu",
+      onClick: function onClick() {
+        return window.open("".concat(location.origin, "/webapp/app/help/intro"), '_blank');
+      }
+    }))),
     className: "".concat(classPrefix, "-form-event hoverable-form-item")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-form-event-select"),
     options: [{
-      label: '用户',
+      label: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) != 'user' ? '主体' : '用户',
       value: 'user'
     }, {
       label: '事件属性',
@@ -138,15 +166,15 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setIsCity && setIsCity(false);
       resetting();
     }
-  })), analysisType === 'user' ? /*#__PURE__*/React.createElement(Form.Item, {
+  }))), analysisType === 'user' ? (/*#__PURE__*/React.createElement(Form.Item, {
     label: "",
     name: "userGroup",
     className: "hoverable-form-item"
   }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
     max: 3,
     enableTags: true
-  })) : /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u4E3B\u4F53\u540D\u79F0",
+  }))) : (/*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u53E3\u5F84\u540D\u79F0",
     name: "analysisSubject",
     className: "".concat(classPrefix, "-form-event hoverable-form-item"),
     rules: [{
@@ -154,7 +182,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
         if (value && (value.id || value.subjectId)) {
           return Promise.resolve();
         } else {
-          return Promise.reject('请选择分析主体');
+          return Promise.reject('请选择口径名称');
         }
       }
     }]
@@ -164,8 +192,8 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     aliasField: "subjectAlias",
     labelField: "subjectName",
     keyField: "id"
-  })), /*#__PURE__*/React.createElement("div", {
-    ref: ref
+  }))), /*#__PURE__*/React.createElement("div", {
+    ref: collapseRef
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u4E8B\u4EF6",
     name: "filterConditions",

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

@@ -1,49 +1,50 @@
-.modules-event-top-panel {
-  &-form-event {
-    margin-bottom: 0;
-    & .ant-form-item-label {
-      padding-left: 24px !important;
-      font-weight: 500;
-    }
-    &-select {
-      width: 208px;
-      margin-left: 24px;
-      .biz-select-handle-input {
-        padding-left: 12px;
-      }
-    }
-    .ant-form-item-row .ant-form-item-control {
-      margin-bottom: 24px;
-      padding: 4px 0;
-    }
-    .ant-form-item-explain-error {
-      padding-left: 24px;
-    }
-  }
-  &-form-botton-box {
-    display: flex;
-    justify-content: flex-end;
-    margin-right: 24px;
-    > :nth-child(1) {
-      margin-right: 16px;
-      color: #fff;
-      background-color: #29bd52;
-      border-color: #29bd52;
-    }
-  }
-  &-form {
-    // .ant-form-item-has-error .biz-event-select {
-    //   border: 1px solid @error-color !important;
-    // }
-  }
-}
-.hoverable-form-item {
-  .ant-form-item-control {
-    &:hover {
-      background: #e8efff !important;
-    }
-  }
-}
-.event---1 .ant-form-item-label {
-  padding-bottom: 4px !important;
-}
+.modules-event-top-panel {
+  &-form-event {
+    margin-bottom: 0;
+    & .ant-form-item-label {
+      padding-left: 24px !important;
+      font-weight: 500;
+    }
+    &-select {
+      width: 208px;
+      margin-left: 24px;
+      .biz-select-handle-input {
+        padding-left: 12px;
+      }
+    }
+    .ant-form-item-row .ant-form-item-control {
+      margin-bottom: 24px;
+      padding: 4px 0;
+    }
+    .ant-form-item-explain-error {
+      padding-left: 24px;
+    }
+  }
+  &-form-botton-box {
+    display: flex;
+    justify-content: flex-end;
+    margin-right: 24px;
+    > :nth-child(1) {
+      margin-right: 16px;
+      color: #fff;
+      background-color: #29bd52;
+      border-color: #29bd52;
+    }
+  }
+
+  &-label-hasIcon {
+    .bsicon {
+      cursor: pointer;
+    }
+  }
+}
+.hoverable-form-item {
+  .ant-form-item-control {
+    &:hover {
+      background: #e8efff !important;
+    }
+  }
+}
+.event---1 .ant-form-item-label {
+  padding-bottom: 4px !important;
+}

package/es/style/image/ring.svg

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
-<circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
-  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
-</circle>
-<circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
-  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
-</circle>
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: rgb(255, 255, 255); display: block; shape-rendering: auto;" width="80px" height="80px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<circle cx="50" cy="50" r="32" stroke-width="4" stroke="#165dff" stroke-dasharray="50.26548245743669 50.26548245743669" fill="none" stroke-linecap="round">
+  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;360 50 50"></animateTransform>
+</circle>
+<circle cx="50" cy="50" r="27" stroke-width="4" stroke="#85adfc" stroke-dasharray="42.411500823462205 42.411500823462205" stroke-dashoffset="42.411500823462205" fill="none" stroke-linecap="round">
+  <animateTransform attributeName="transform" type="rotate" dur="1s" repeatCount="indefinite" keyTimes="0;1" values="0 50 50;-360 50 50"></animateTransform>
+</circle>
 <!-- [ldio] generated by https://loading.io/ --></svg>