@zgfe/modules-interval 1.0.0-interval.4 → 1.0.0-interval.40

package/dist/esm/modules/topPanel/index.js

@@ -1,3 +1,9 @@
+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 _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); }
@@ -9,20 +15,22 @@ import { Form, Button } from 'antd';
 import { BizAttributeSelector, BizUserGroupHeader } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
-var classPrefix = 'top-panel';
+var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
+  var _defaultValue$associa, _defaultValue$associa2, _finalSearchData$asso, _finalSearchData$asso2, _defaultValue$associa3, _finalSearchData$asso3, _defaultValue$associa4, _finalSearchData$asso4, _defaultValue$associa5, _finalSearchData$asso5, _defaultValue$associa6, _finalSearchData$asso6, _defaultValue$associa7, _finalSearchData$asso7, _defaultValue$associa8, _finalSearchData$asso8, _defaultValue$associa9, _finalSearchData$asso9, _defaultValue$associa10, _finalSearchData$asso10, _defaultValue$dimensi, _finalSearchData$dime, _defaultValue$dimensi2, _finalSearchData$dime2, _defaultValue$dimensi3, _finalSearchData$dime3, _defaultValue$dimensi4, _finalSearchData$dime4;
   var defaultValue = props.defaultValue,
-    ajaxFlag = props.ajaxFlag,
+    loading = props.loading,
+    collapseRef = props.collapseRef,
     finalSearchData = props.finalSearchData,
     fetchRequest = props.fetchRequest;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useState = useState(-100),
+  var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     startId = _useState2[0],
     setStartId = _useState2[1];
-  var _useState3 = useState(-100),
+  var _useState3 = useState(null),
     _useState4 = _slicedToArray(_useState3, 2),
     endId = _useState4[0],
     setEndId = _useState4[1];
@@ -31,89 +39,99 @@ var TopPanel = function TopPanel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     relevancy = _useState6[0],
     setRelevancy = _useState6[1];
-  // 筛选条件值
+  var _useState7 = useState(true),
+    _useState8 = _slicedToArray(_useState7, 2),
+    relevancyFl = _useState8[0],
+    setRelevancyFl = _useState8[1];
   var _ref = defaultValue,
-    id = _ref.id,
-    name = _ref.name,
-    dimension = _ref.dimension,
-    filters = _ref.filters,
     userGroup = _ref.userGroup;
   // 细分属性初始值
-  var _useState7 = useState(),
-    _useState8 = _slicedToArray(_useState7, 2),
-    bizAttributeSelectorValue = _useState8[0],
-    setBizAttributeSelectorValue = _useState8[1];
+  var _useState9 = useState(),
+    _useState10 = _slicedToArray(_useState9, 2),
+    bizAttributeSelectorValue = _useState10[0],
+    setBizAttributeSelectorValue = _useState10[1];
   // 用户组和事件变更
   var onValuesChange = function onValuesChange(data, allData) {
     var _data = {};
+    setRelevancyFl(false);
     if (allData.start) {
-      if (allData.start.id !== -100) {
+      if (allData.start.id !== null) {
+        var _allData$start;
         _data = allData.start;
         setStartId(allData.start.id);
-        if (allData.start.relevancy !== undefined) {
-          // form.setFieldsValue({
-          //   associatedPreAttr: undefined,
-          //   associatedNextAttr: undefined,
-          // });
-        }
-        setRelevancy(allData.start.relevancy);
+        setRelevancy(allData === null || allData === void 0 ? void 0 : (_allData$start = allData.start) === null || _allData$start === void 0 ? void 0 : _allData$start.relevancy);
+      } else {
+        setRelevancyFl(true);
       }
     }
     if (allData.end) {
-      if (allData.end.id !== -100) {
+      if (allData.end.id !== null) {
         _data = allData.end;
         setEndId(allData.end.id);
+      } else {
+        setRelevancyFl(true);
       }
     }
     if (allData.userGroup) {
-      _data.userGroup = [];
-      allData.userGroup.map(function (item) {
-        _data.userGroup && _data.userGroup.push(item);
-      });
+      _data.userGroup = allData.userGroup;
       if (_data.userGroup.length <= 0) _data.userGroup = [0];
     }
-    if (data.start) {
-      // 事件id不变，不自动请求
-      if (finalSearchData && finalSearchData.id && data.start.id === finalSearchData.id) {
-        ajaxFlag = false;
-      } else {
-        ajaxFlag = true;
-      }
-    }
-    if (data.end) {
-      // 事件id不变，不自动请求
-      if (finalSearchData && finalSearchData.id && data.end.id === finalSearchData.id) {
-        ajaxFlag = false;
-      } else {
-        ajaxFlag = true;
-      }
-    }
-    props.onChange(allData, ajaxFlag);
+    props.onChange(allData, (finalSearchData === null || finalSearchData === void 0 ? void 0 : finalSearchData.chartType) === 'boxplot' ? true : false);
   };
-
-  // 重置
   var resetting = function resetting() {
     form.resetFields();
     form.setFieldsValue({
       userGroup: [0],
-      start: {},
-      end: {},
+      start: undefined,
+      end: undefined,
       dimension: undefined,
+      filters: undefined,
       associatedPreAttr: undefined,
       associatedNextAttr: undefined
     });
+    setRelevancy(false);
     props.onChange({
       userGroup: [0],
+      start: undefined,
+      end: undefined,
       id: undefined,
-      name: undefined,
       filters: undefined,
-      dimension: undefined
+      name: undefined,
+      dimension: undefined,
+      associatedPreAttr: undefined,
+      associatedNextAttr: undefined
     }, true);
   };
   // 细分属性
-  var onChangeAttr = function onChangeAttr(attr) {
+  var onChangeAttr = function onChangeAttr(attr, type) {
     if (attr === undefined) {
       // 删除细分属性
+      switch (type) {
+        case 'associatedPreAttr':
+          form.setFieldsValue({
+            associatedPreAttr: undefined
+          });
+          props.onChange({
+            associatedPreAttr: undefined
+          }, true);
+          break;
+        case 'associatedNextAttr':
+          form.setFieldsValue({
+            associatedNextAttr: undefined
+          });
+          props.onChange({
+            associatedNextAttr: undefined
+          }, true);
+          break;
+        case 'dimension':
+          form.setFieldsValue({
+            dimension: undefined
+          });
+          props.onChange({
+            dimension: undefined
+          }, true);
+          break;
+      }
       setBizAttributeSelectorValue(undefined);
     } else {
       var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
@@ -129,49 +147,55 @@ var TopPanel = function TopPanel(props) {
     form: form,
     component: "div",
     colon: false,
-    className: "panel-form",
+    className: "panel-form-interval",
     layout: "vertical",
     initialValues: {
-      userGroup: userGroup ? userGroup.map(function (item) {
-        return {
-          id: item
-        };
-      }) : [{
-        id: 0
-      }],
-      start: {
-        id: id,
-        name: name,
-        dimension: dimension,
-        filters: filters
-      },
-      end: {
-        id: id,
-        name: name,
-        dimension: dimension,
-        filters: filters
-      }
+      userGroup: userGroup ? userGroup : [0],
+      start: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.start), {}, {
+        relevancy: defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa = defaultValue.associated_next_attr) !== null && _defaultValue$associa !== void 0 && _defaultValue$associa.event_id && defaultValue !== null && defaultValue !== void 0 && (_defaultValue$associa2 = defaultValue.associated_pre_attr) !== null && _defaultValue$associa2 !== void 0 && _defaultValue$associa2.event_id || finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso = finalSearchData.associatedNextAttr) !== null && _finalSearchData$asso !== void 0 && _finalSearchData$asso.eventId && finalSearchData !== null && finalSearchData !== void 0 && (_finalSearchData$asso2 = finalSearchData.associatedPreAttr) !== null && _finalSearchData$asso2 !== void 0 && _finalSearchData$asso2.eventId ? true : false
+      }),
+      end: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.end,
+      associatedNextAttr: _objectSpread(_objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associatedNextAttr), defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_next_attr), {}, {
+        dimensionSub: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa3 = defaultValue.associated_next_attr) === null || _defaultValue$associa3 === void 0 ? void 0 : _defaultValue$associa3.dimension_sub) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso3 = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso3 === void 0 ? void 0 : _finalSearchData$asso3.dimensionSub),
+        isHidden: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa4 = defaultValue.associated_next_attr) === null || _defaultValue$associa4 === void 0 ? void 0 : _defaultValue$associa4.is_hidden) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso4 = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso4 === void 0 ? void 0 : _finalSearchData$asso4.isHidden),
+        propCategory: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa5 = defaultValue.associated_next_attr) === null || _defaultValue$associa5 === void 0 ? void 0 : _defaultValue$associa5.prop_category) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso5 = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso5 === void 0 ? void 0 : _finalSearchData$asso5.propCategory),
+        eventId: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa6 = defaultValue.associated_next_attr) === null || _defaultValue$associa6 === void 0 ? void 0 : _defaultValue$associa6.event_id) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso6 = finalSearchData.associatedNextAttr) === null || _finalSearchData$asso6 === void 0 ? void 0 : _finalSearchData$asso6.eventId)
+      }),
+      associatedPreAttr: _objectSpread(_objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associatedPreAttr), defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.associated_pre_attr), {}, {
+        dimensionSub: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa7 = defaultValue.associated_pre_attr) === null || _defaultValue$associa7 === void 0 ? void 0 : _defaultValue$associa7.dimension_sub) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso7 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso7 === void 0 ? void 0 : _finalSearchData$asso7.dimensionSub),
+        isHidden: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa8 = defaultValue.associated_pre_attr) === null || _defaultValue$associa8 === void 0 ? void 0 : _defaultValue$associa8.is_hidden) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso8 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso8 === void 0 ? void 0 : _finalSearchData$asso8.isHidden),
+        propCategory: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa9 = defaultValue.associated_pre_attr) === null || _defaultValue$associa9 === void 0 ? void 0 : _defaultValue$associa9.prop_category) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso9 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso9 === void 0 ? void 0 : _finalSearchData$asso9.propCategory),
+        eventId: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$associa10 = defaultValue.associated_pre_attr) === null || _defaultValue$associa10 === void 0 ? void 0 : _defaultValue$associa10.event_id) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$asso10 = finalSearchData.associatedPreAttr) === null || _finalSearchData$asso10 === void 0 ? void 0 : _finalSearchData$asso10.eventId)
+      }),
+      dimension: _objectSpread(_objectSpread({}, defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.dimension), {}, {
+        dimensionSub: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi = defaultValue.dimension) === null || _defaultValue$dimensi === void 0 ? void 0 : _defaultValue$dimensi.dimension_sub) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$dime = finalSearchData.dimension) === null || _finalSearchData$dime === void 0 ? void 0 : _finalSearchData$dime.dimensionSub),
+        isHidden: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi2 = defaultValue.dimension) === null || _defaultValue$dimensi2 === void 0 ? void 0 : _defaultValue$dimensi2.is_hidden) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$dime2 = finalSearchData.dimension) === null || _finalSearchData$dime2 === void 0 ? void 0 : _finalSearchData$dime2.isHidden),
+        propCategory: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi3 = defaultValue.dimension) === null || _defaultValue$dimensi3 === void 0 ? void 0 : _defaultValue$dimensi3.prop_category) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$dime3 = finalSearchData.dimension) === null || _finalSearchData$dime3 === void 0 ? void 0 : _finalSearchData$dime3.propCategory),
+        eventId: (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$dimensi4 = defaultValue.dimension) === null || _defaultValue$dimensi4 === void 0 ? void 0 : _defaultValue$dimensi4.event_id) || (finalSearchData === null || finalSearchData === void 0 ? void 0 : (_finalSearchData$dime4 = finalSearchData.dimension) === null || _finalSearchData$dime4 === void 0 ? void 0 : _finalSearchData$dime4.eventId)
+      })
     },
     scrollToFirstError: true,
     onValuesChange: onValuesChange
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "",
     name: "userGroup",
-    className: "space-item",
+    className: "space-item interval-item",
     style: {
       paddingLeft: 0
     }
   }, /*#__PURE__*/React.createElement(BizUserGroupHeader, {
+    enableTags: true,
     max: 1
-  })), /*#__PURE__*/React.createElement(Form.Item, {
+  })), /*#__PURE__*/React.createElement("div", {
+    ref: collapseRef,
+    className: "collapseRefs"
+  }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5F00\u59CB\u4E8B\u4EF6",
     name: "start"
   }, /*#__PURE__*/React.createElement(EventFilter, {
+    relevancyFl: relevancyFl,
     relevancy: true
   })), relevancy ? /*#__PURE__*/React.createElement(Form.Item, {
-    style: {
-      marginBottom: 0
-    },
     className: "associated"
   }, /*#__PURE__*/React.createElement("span", {
     className: "associated-link"
@@ -197,7 +221,7 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
-      onChangeAttr(undefined);
+      onChangeAttr(undefined, 'associatedPreAttr');
     }
   })), /*#__PURE__*/React.createElement("span", {
     className: "associated-label"
@@ -215,14 +239,28 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
-      onChangeAttr(undefined);
+      onChangeAttr(undefined, 'associatedNextAttr');
     }
-  }))) : '', /*#__PURE__*/React.createElement(Form.Item, {
+  })), /*#__PURE__*/React.createElement("i", {
+    style: {
+      lineHeight: '32px',
+      marginLeft: '28px',
+      cursor: 'pointer'
+    },
+    onClick: function onClick() {
+      onChangeAttr(undefined, 'associatedPreAttr');
+      onChangeAttr(undefined, 'associatedNextAttr');
+      setRelevancy(false);
+      setRelevancyFl(true);
+    },
+    className: "bsicon qingchu"
+  })) : '', /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u7ED3\u675F\u4E8B\u4EF6",
     name: "end"
   }, /*#__PURE__*/React.createElement(EventFilter, null)), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
-    name: "dimension"
+    name: "dimension",
+    className: "dimension-interval"
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
     enableEventProp: true,
     enableUserProp: true,
@@ -232,19 +270,19 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
-      onChangeAttr(undefined);
+      onChangeAttr(undefined, 'dimension');
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-form-botton-box")
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting
-  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button
-  // disabled={ajaxFlag}
-  , {
+  }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
+    loading: loading,
+    disabled: loading || !startId || !endId || relevancy && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr) && !(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr),
     type: "primary",
     onClick: function onClick() {
       fetchRequest(true);
     }
-  }, "\u67E5\u8BE2")));
+  }, "\u67E5\u8BE2"))));
 };
 export default TopPanel;

package/dist/esm/modules/topPanel/styles/index.less

@@ -1,7 +1,7 @@
 @import '../../../assets/icons/iconfont.css';
 @import '../../../assets/business/iconfont.css';
 
-.top-panel {
+.top-panel-interval {
   &-form-botton-box {
     display: flex;
     justify-content: flex-end;
@@ -17,17 +17,148 @@
   }
 }
 
-.panel-form {
+.panel-form-interval {
+  .interval-item {
+    margin-top: -2px;
+    .ant-space-vertical {
+      gap: 0px !important;
+      width: 100%;
+      .ant-space-item:nth-child(1) {
+        padding: 0 12px;
+      }
+
+      .ant-space-item:nth-child(2) {
+        display: flex;
+        align-items: center;
+        height: 42px;
+        margin-top: 4px;
+        padding: 0 12px;
+      }
+
+      .ant-space-item:nth-child(2):hover {
+        background-color: #e8efff;
+      }
+    }
+  }
+
+  .biz-user-group-header {
+    padding: 0;
+    background-color: #fff;
+  }
+
+  .space-item {
+    .ant-space-item {
+      .biz-user-group {
+        width: 100%;
+        min-width: 208px;
+      }
+    }
+
+    .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
+      display: none;
+    }
+  }
+
+  .collapseRefs {
+    .ant-form-item {
+      margin-bottom: 16px;
+    }
+
+    .ant-form-item-control-input {
+      display: flex;
+      align-items: center;
+    }
+
+    .ant-form-item-label {
+      padding-left: 24px;
+      font-weight: 500;
+    }
+
+    .interval-box {
+      > div:nth-child(1) {
+        padding: 4px 24px;
+      }
+
+      > div:nth-child(1):hover {
+        background-color: #e8efff;
+      }
+
+      .biz-attr-condition-group-handle {
+        margin-right: 0;
+        margin-left: 32px;
+      }
+
+      .biz-attr-condition-group-container {
+        gap: 0px !important;
+      }
+
+      .biz-attr-condition-group-container-item {
+        max-width: calc(100% + 32px) !important;
+        margin-top: 4px;
+        padding: 4px 56px;
+        .ant-space-item {
+          width: auto;
+          max-width: auto;
+          margin-left: 0px;
+          padding: 0;
+        }
+      }
+
+      .ant-space-item:hover {
+        background-color: #e8efff;
+      }
+    }
+
+    .dimension-interval {
+      .ant-form-item-control-input {
+        padding: 4px 24px;
+      }
+
+      .ant-form-item-control-input:hover {
+        background-color: #e8efff;
+      }
+    }
+  }
+
   .biz-event-select {
     width: 208px;
   }
 
   > .ant-form-item {
-    margin-bottom: 12px;
-    padding-left: 24px;
+    margin-bottom: 16px;
+    .biz-user-group-val {
+      color: #021429;
+    }
   }
 
   .associated {
+    margin-top: -10px;
+    margin-bottom: 12px;
+
+    .qingchu {
+      color: #9aa1a9;
+    }
+
+    .qingchu:hover {
+      color: @error-color;
+    }
+
+    .ant-form-item-control-input {
+      padding: 4px 24px;
+
+      .ant-form-item-control-input {
+        padding: 0;
+      }
+
+      .ant-form-item {
+        margin-bottom: 0;
+      }
+    }
+
+    .ant-form-item-control-input:hover {
+      background-color: #e8efff;
+    }
+
     .associated-link {
       display: block;
       line-height: 32px;
@@ -53,15 +184,3 @@
     }
   }
 }
-
-.space-item {
-  .ant-space-item {
-    .biz-user-group {
-      max-width: 208px;
-    }
-  }
-
-  .ant-space-horizontal .ant-space-item:nth-child(2) .tianjia {
-    display: none;
-  }
-}

package/dist/esm/modules/topPanel/types.d.ts

@@ -1,6 +1,7 @@
 import { AttrConditionTypes } from '@zgfe/business-lib';
 import { bizAttributeSelectorValueProp, SearchValue } from '../../types';
 export interface start {
+    eventId?: number;
     id?: number;
     name?: string;
     relevancy?: boolean;
@@ -10,7 +11,7 @@ export interface FormDataProps {
     /**
      * 用户群
      */
-    userGroup?: number[];
+    userGroup?: any[];
     /**
      * 事件、属性、属性细分
      */
@@ -35,6 +36,7 @@ export interface TopPanelProps {
      * 默认值
      */
     defaultValue?: SearchValue;
+    loading?: boolean;
     /**
      * 数据更新
      */
@@ -51,4 +53,5 @@ export interface TopPanelProps {
      * 请求数据方法
      */
     fetchRequest: (flag?: boolean) => void;
+    collapseRef?: any;
 }

package/dist/esm/style/index.less

@@ -1,7 +1,11 @@
-.event-form-data {
+.interval-form-data {
   &-table-td {
     padding: 0 !important;
 
+    .ant-table-column-sorters {
+      justify-content: end !important;
+    }
+
     &-show {
       display: flex;
       align-items: center;
@@ -9,6 +13,7 @@
       min-width: 60px;
       height: 48px;
       cursor: pointer;
+
       span {
         width: 10px;
         height: 10px;
@@ -20,6 +25,7 @@
     &-name {
       display: flex;
       align-items: center;
+
       .bsicon {
         margin-right: 4px;
         color: #fd9f41;
@@ -37,6 +43,7 @@
 
     &-link {
       cursor: pointer;
+
       &:hover {
         color: #165dff;
         text-decoration: underline;

package/dist/esm/types.d.ts

@@ -1,12 +1,21 @@
 import { AttrConditionTypes } from '@zgfe/business-lib';
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
 import { ReactNode } from 'react';
-import { FormDataProps } from './modules/topPanel/types';
+import { FormDataProps, start } from './modules/topPanel/types';
 /**
  * 属性选择器 默认值
  */
 export interface bizAttributeSelectorValueProp {
     propCategory?: string;
+    prop_category?: string;
+    dimension_sub?: string;
+    dimensionSub?: string;
+    label?: string;
+    is_hidden?: string;
+    isHidden?: string;
+    real_time?: string;
+    event_id?: string;
+    eventId?: string;
     category?: string;
     value?: number | string;
     key?: number | string;
@@ -56,6 +65,7 @@ export interface SearchValue {
      * @description   用户群id
      */
     userGroup?: number[];
+    user_group?: number[];
     /**
      * 事件、属性、属性细分
      */
@@ -89,10 +99,24 @@ export interface SearchValue {
      *
      */
     associatedPreAttr?: bizAttributeSelectorValueProp;
+    associated_pre_attr?: bizAttributeSelectorValueProp;
     /**
      * @description  关联属性-结束
      */
+    associated_next_attr?: bizAttributeSelectorValueProp;
     associatedNextAttr?: bizAttributeSelectorValueProp;
+    /**
+     * @description  开始事件
+     */
+    start?: start;
+    /**
+     * @description  结束事件
+     */
+    end?: start;
+    /**
+     * @description  分类
+     */
+    module?: string;
 }
 export interface UserDrillParamsProp {
     /**
@@ -124,7 +148,7 @@ export interface UserDrillParamsProp {
      */
     module?: string;
 }
-export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map';
+export type EventChartTypes = 'line' | 'bar' | 'pie' | 'map' | 'boxplot';
 /**
  * 图表选择类型
  */
@@ -135,7 +159,7 @@ export interface ChartItemProp {
     disabled?: boolean;
 }
 export interface ChartData {
-    app_data: {
+    appData: {
         series?: {
             names: string[];
             values: number[][];
@@ -145,7 +169,7 @@ export interface ChartData {
     };
 }
 export interface ResponseDataProps {
-    app_data: any;
+    appData: any;
     xAxis?: string[];
     x_axis?: string[];
     series: SeriesProps[];