@zgfe/modules-interval 1.0.23-zhongyuan.0 → 1.0.23-zhongyuan.2

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

@@ -1,69 +1,69 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-.ant-card-body {
-  padding: 0;
-}
-
-.interval-module-container {
-  width: 100%;
-  min-width: 1000px;
-  height: 100%;
-  background: #fafafb;
-  &-loading {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-  }
-  .interval-layout {
-    .biz-layout-top {
-      padding: 0 16px 16px;
-    }
-    .biz-layout-collapse-container {
-      height: 24px;
-    }
-    .biz-layout-collapse-handle {
-      height: 24px;
-    }
-  }
-  &-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: auto;
-  }
-
-  .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;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+.ant-card-body {
+  padding: 0;
+}
+
+.interval-module-container {
+  width: 100%;
+  min-width: 1000px;
+  height: 100%;
+  background: #fafafb;
+  &-loading {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+  }
+  .interval-layout {
+    .biz-layout-top {
+      padding: 0 16px 16px;
+    }
+    .biz-layout-collapse-container {
+      height: 24px;
+    }
+    .biz-layout-collapse-handle {
+      height: 24px;
+    }
+  }
+  &-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: auto;
+  }
+
+  .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;
+  }
+}

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

@@ -21,6 +21,7 @@ var classPrefix = 'top-panel-interval';
 var TopPanel = function TopPanel(props) {
   var _props$defaultValue, _props$defaultValue2, _props$defaultValue3, _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,
+    propsDefaultValue = props.propsDefaultValue,
     loading = props.loading,
     collapseRef = props.collapseRef,
     finalSearchData = props.finalSearchData;
@@ -38,7 +39,7 @@ var TopPanel = function TopPanel(props) {
     endEvent = _useState4[0],
     setEndEvent = _useState4[1];
   // 关联属性
-  var _useState5 = useState(false),
+  var _useState5 = useState(defaultValue !== null && defaultValue !== void 0 && defaultValue.associatedNextAttr ? true : false),
     _useState6 = _slicedToArray(_useState5, 2),
     relevancy = _useState6[0],
     setRelevancy = _useState6[1];
@@ -62,14 +63,23 @@ var TopPanel = function TopPanel(props) {
     inited = _useState12[0],
     setInited = _useState12[1];
   var formRef = React.useRef(null);
+
+  // 初始化设置细分属性
+  useEffect(function () {
+    if (formRef.current && propsDefaultValue && propsDefaultValue.dimension) {
+      var _formRef$current;
+      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('dimension', propsDefaultValue.dimension);
+    }
+  }, [formRef.current, propsDefaultValue]);
   function onSearch(values) {
     if (props.onChange) {
+      var _values$analysisSubje, _values$analysisSubje2, _values$analysisSubje3, _values$analysisSubje4;
       props.onChange(_objectSpread(_objectSpread({}, values), {}, {
-        analysisSubject: values.analysisSubject ? {
-          subjectId: values.analysisSubject.id,
-          subjectName: values.analysisSubject.subjectName,
-          subjectAlias: values.analysisSubject.subjectAlias,
-          unit: values.analysisSubject.unit
+        analysisSubject: values !== null && values !== void 0 && values.analysisSubject ? {
+          subjectId: values === null || values === void 0 ? void 0 : (_values$analysisSubje = values.analysisSubject) === null || _values$analysisSubje === void 0 ? void 0 : _values$analysisSubje.id,
+          subjectName: values === null || values === void 0 ? void 0 : (_values$analysisSubje2 = values.analysisSubject) === null || _values$analysisSubje2 === void 0 ? void 0 : _values$analysisSubje2.subjectName,
+          subjectAlias: values === null || values === void 0 ? void 0 : (_values$analysisSubje3 = values.analysisSubject) === null || _values$analysisSubje3 === void 0 ? void 0 : _values$analysisSubje3.subjectAlias,
+          unit: values === null || values === void 0 ? void 0 : (_values$analysisSubje4 = values.analysisSubject) === null || _values$analysisSubje4 === void 0 ? void 0 : _values$analysisSubje4.unit
         } : undefined
       }), true);
     }
@@ -106,12 +116,12 @@ var TopPanel = function TopPanel(props) {
       return;
     }
     setInited(false);
-    if (defaultValue.analysisSubject) {
+    if (defaultValue !== null && defaultValue !== void 0 && defaultValue.analysisSubject) {
       setAnalysisType('eventProp');
     } else {
       setAnalysisType('user');
     }
-    if (defaultValue.analysisSubject) {
+    if (defaultValue !== null && defaultValue !== void 0 && defaultValue.analysisSubject) {
       setCurrentSubject(subjectList.find(function (item) {
         var _defaultValue$analysi;
         return item.id === (defaultValue === null || defaultValue === void 0 ? void 0 : (_defaultValue$analysi = defaultValue.analysisSubject) === null || _defaultValue$analysi === void 0 ? void 0 : _defaultValue$analysi.subjectId);
@@ -190,7 +200,7 @@ var TopPanel = function TopPanel(props) {
     name: "analysisSubject",
     className: "panel-form-interval-item",
     rules: [{
-      validator: function validator(rule, value) {
+      validator: function validator(_rule, value) {
         if (!value) {
           return Promise.reject('请选择口径名称');
         }
@@ -203,12 +213,12 @@ var TopPanel = function TopPanel(props) {
     labelField: "subjectName",
     keyField: "id",
     onChange: function onChange(val) {
-      var _formRef$current, _formRef$current2, _formRef$current3;
+      var _formRef$current2, _formRef$current3, _formRef$current4;
       setCurrentSubject(val);
       setRelevancy(false);
-      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('start', undefined);
-      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('end', undefined);
-      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('dimension', undefined);
+      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('start', undefined);
+      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('end', undefined);
+      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('dimension', undefined);
     }
   })), analysisType === 'user' && /*#__PURE__*/React.createElement(Form.Item, {
     label: "",
@@ -260,9 +270,9 @@ var TopPanel = function TopPanel(props) {
     key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
     analysisType: analysisType,
     onChange: function onChange(evt) {
-      var _formRef$current4;
+      var _formRef$current5;
       setStartEvent(evt);
-      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('dimension', undefined);
+      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Space, {
     align: "baseline",
@@ -307,8 +317,8 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-pre"),
     onDelete: function onDelete() {
-      var _formRef$current5;
-      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedPreAttr', undefined);
+      var _formRef$current6;
+      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('associatedPreAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     className: "associated-label"
@@ -330,8 +340,8 @@ var TopPanel = function TopPanel(props) {
     enableDelete: true,
     key: "".concat(startEvent === null || startEvent === void 0 ? void 0 : startEvent.id, "-").concat(endEvent === null || endEvent === void 0 ? void 0 : endEvent.id, "-next"),
     onDelete: function onDelete() {
-      var _formRef$current6;
-      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('associatedNextAttr', undefined);
+      var _formRef$current7;
+      (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('associatedNextAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement("i", {
     style: {
@@ -340,9 +350,9 @@ var TopPanel = function TopPanel(props) {
       cursor: 'pointer'
     },
     onClick: function onClick() {
-      var _formRef$current7, _formRef$current8;
-      (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('associatedPreAttr', undefined);
-      (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.setFieldValue('associatedNextAttr', undefined);
+      var _formRef$current8, _formRef$current9;
+      (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.setFieldValue('associatedPreAttr', undefined);
+      (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : _formRef$current9.setFieldValue('associatedNextAttr', undefined);
       setRelevancy(false);
     },
     className: "bsicon qingchu"
@@ -373,11 +383,11 @@ var TopPanel = function TopPanel(props) {
   }, /*#__PURE__*/React.createElement(EventFilter, {
     subject: currentSubject,
     analysisType: analysisType,
-    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
+    key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-end"),
     onChange: function onChange(val) {
-      var _formRef$current9;
+      var _formRef$current10;
       setEndEvent(val);
-      (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : _formRef$current9.setFieldValue('dimension', undefined);
+      (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : _formRef$current10.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
@@ -392,8 +402,8 @@ var TopPanel = function TopPanel(props) {
     showCommonProp: true,
     enableDelete: true,
     onDelete: function onDelete() {
-      var _formRef$current10;
-      (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : _formRef$current10.setFieldValue('dimension', undefined);
+      var _formRef$current11;
+      (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : _formRef$current11.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u6A21\u578B",
@@ -411,8 +421,8 @@ var TopPanel = function TopPanel(props) {
     loading: loading || subjectLoading,
     type: "primary",
     onClick: function onClick() {
-      var _formRef$current11;
-      (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : _formRef$current11.submit();
+      var _formRef$current12;
+      (_formRef$current12 = formRef.current) === null || _formRef$current12 === void 0 ? void 0 : _formRef$current12.submit();
     }
   }, "\u67E5\u8BE2"))));
 };

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

@@ -44,7 +44,7 @@
         padding-left: 12px;
       }
       &:hover {
-        background-color: #e8efff;
+        background-color: #e7f3fe;
       }
     }
   }
@@ -66,7 +66,7 @@
       }
 
       .ant-space-item:nth-child(2):hover {
-        background-color: #e8efff;
+        background-color: #e7f3fe;
       }
     }
   }
@@ -110,7 +110,7 @@
       }
 
       > div:nth-child(1):hover {
-        background-color: #e8efff;
+        background-color: #e7f3fe;
       }
 
       .biz-attr-condition-group-handle {
@@ -135,7 +135,7 @@
       }
 
       .ant-space-item:hover {
-        background-color: #e8efff;
+        background-color: #e7f3fe;
       }
     }
 
@@ -145,7 +145,7 @@
       }
 
       .ant-form-item-control-input:hover {
-        background-color: #e8efff;
+        background-color: #e7f3fe;
       }
     }
   }
@@ -186,7 +186,7 @@
     }
 
     .ant-form-item-control-input:hover {
-      background-color: #e8efff;
+      background-color: #e7f3fe;
     }
 
     .associated-link {

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

@@ -42,6 +42,7 @@ export interface TopPanelProps {
      * 默认值
      */
     defaultValue?: SearchValue;
+    propsDefaultValue?: SearchValue;
     loading?: boolean;
     /**
      * 数据更新

package/dist/esm/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>
-<!-- [ldio] generated by https://loading.io/ --></svg>
+<?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>

package/dist/esm/style/index.less

@@ -1,67 +1,67 @@
-.interval-form-data {
-  &-table-td {
-    padding: 0 !important;
-
-    .ant-table-column-sorters {
-      justify-content: end !important;
-    }
-
-    &-show {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      min-width: 60px;
-      height: 48px;
-      cursor: pointer;
-
-      span {
-        width: 10px;
-        height: 10px;
-        border-radius: 50%;
-        cursor: pointer;
-      }
-    }
-
-    &-name {
-      display: flex;
-      align-items: center;
-
-      .bsicon {
-        margin-right: 4px;
-        color: #fd9f41;
-      }
-
-      &-content {
-        display: inline-block;
-        max-width: 300px;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        cursor: pointer;
-      }
-    }
-
-    &-link {
-      cursor: pointer;
-
-      &:hover {
-        color: #165dff;
-        text-decoration: underline;
-      }
-    }
-  }
-}
-.interval-drill {
-  display: block;
-  .bsicon {
-    display: none;
-    margin-right: 4px;
-  }
-  &:hover {
-    color: @primary-color;
-    cursor: pointer;
-    .bsicon {
-      display: inline;
-    }
-  }
-}
+.interval-form-data {
+  &-table-td {
+    padding: 0 !important;
+
+    .ant-table-column-sorters {
+      justify-content: end !important;
+    }
+
+    &-show {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      min-width: 60px;
+      height: 48px;
+      cursor: pointer;
+
+      span {
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        cursor: pointer;
+      }
+    }
+
+    &-name {
+      display: flex;
+      align-items: center;
+
+      .bsicon {
+        margin-right: 4px;
+        color: #fd9f41;
+      }
+
+      &-content {
+        display: inline-block;
+        max-width: 300px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        cursor: pointer;
+      }
+    }
+
+    &-link {
+      cursor: pointer;
+
+      &:hover {
+        color: #165dff;
+        text-decoration: underline;
+      }
+    }
+  }
+}
+.interval-drill {
+  display: block;
+  .bsicon {
+    display: none;
+    margin-right: 4px;
+  }
+  &:hover {
+    color: @primary-color;
+    cursor: pointer;
+    .bsicon {
+      display: inline;
+    }
+  }
+}

package/dist/esm/types.js

@@ -1,15 +1,15 @@
 import { createContext } from 'react';
 
-/**
- * 属性选择器 默认值
+/**
+ * 属性选择器 默认值
  */
 
-/**
- * 图表选择类型
+/**
+ * 图表选择类型
  */
 
-/**
- * series value
+/**
+ * series value
  */
 
 var defaultContext = {

package/dist/esm/utils/ajaxConfig.js

@@ -1,10 +1,10 @@
 import _ from 'lodash';
 
-/**
- * 接口option封装
- * @param url url
- * @param options  操作
- * @returns
+/**
+ * 接口option封装
+ * @param url url
+ * @param options  操作
+ * @returns
  */
 function setOptionWapper(url, options) {
   var reqOption = _.cloneDeep(options);

package/dist/esm/utils/formData.d.ts

@@ -38,9 +38,11 @@ export declare function formTableData(originalData: ChartData): {
     total: number;
     peopleNum: number;
     names: string[];
+    originalNames: string[];
 }[] | {
     key: number;
     time: string;
+    originalNames: string[];
     max: number;
     Q1: number;
     median: number;
@@ -61,12 +63,14 @@ export declare function formTableData(originalData: ChartData): {
         total: number;
         peopleNum: number;
         names: string[];
+        originalNames: string[];
     }[];
 }[] | undefined;
 type ChartData = {
     appData: {
         series?: {
             names: string[];
+            originalNames: string[];
             values: number[][];
             total: number[];
         }[];

package/dist/esm/utils/formData.js

@@ -12,6 +12,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import React from 'react';
+import { Tooltip } from 'antd';
 import { chartColors } from "../constants/color";
 import "../style/index.less";
 import { IconFont } from '@zgfe/business-lib';
@@ -46,7 +47,9 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     dataIndex: 'time',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
-      return /*#__PURE__*/React.createElement("span", null, " ", text);
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        title: text
+      }, /*#__PURE__*/React.createElement("span", null, " ", text));
     }
   }, {
     title: '最大值',
@@ -188,7 +191,8 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
             };
           }
           if (searchParam.dimension) {
-            params.params.groupValue = /\d{4}-\d{2}-\d{2}/.test(record.time || '') ? record.names ? record.names[0] : undefined : record.time;
+            params.params.groupValue = record.originalNames ? record.originalNames[0] : undefined;
+            params.params.groupValueEncry = searchParam.dimension.encryptionType > 0;
           }
           if (/\d{4}-\d{2}-\d{2}/.test(record.time || '')) {
             params.params.time.begin = record.time.split('|')[0];
@@ -236,6 +240,7 @@ function createNewArray(data) {
       return {
         key: i + 1,
         time: item.names[0],
+        originalNames: item.originalNames,
         max: item.total[0] || 0,
         Q1: item.total[1] || 0,
         median: item.total[2] || 0,
@@ -298,7 +303,8 @@ function getChildrenData(data, index) {
         perValue: values[i][5] || 0,
         total: values[i][6] || 0,
         peopleNum: values[i][7] || 0,
-        names: firstSeries.names
+        names: firstSeries.names,
+        originalNames: firstSeries.originalNames
       };
     });
   }