@zgfe/modules-interval 1.0.11-zhongbang.8 → 1.0.23-zhongyuan.0

package/README.md

@@ -31,3 +31,5 @@ Build library via `father`,
 ```bash
 $ npm run build
 ```
+
+update

package/dist/esm/components/eventFilter/index.js

@@ -11,12 +11,14 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Tooltip, message } from 'antd';
-import React, { useEffect, useRef, useState } from 'react';
-import { BizEventSelector, IconFont, BizAttrConditionGroup } from '@zgfe/business-lib';
+import React, { useContext, useEffect, useRef, useState } from 'react';
+import { BizEventSelector, IconFont, BizAttrConditionGroup, BizGlobalDataContext } from '@zgfe/business-lib';
 import "./styles/index.less";
 import _ from 'lodash';
 var classPrefix = 'interval-box';
 var EventFilter = function EventFilter(props) {
+  var _useContext = useContext(BizGlobalDataContext),
+    eventIdMap = _useContext.eventIdMap;
   // 筛选条件个数
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -174,7 +176,7 @@ var EventFilter = function EventFilter(props) {
     onClick: function onClick() {
       return onAdd();
     }
-  })))), (filter || isAdd) && /*#__PURE__*/React.createElement("div", {
+  })))), event && event.id && eventIdMap && eventIdMap[event.id] && (filter || isAdd) && /*#__PURE__*/React.createElement("div", {
     className: "".concat(count > 0 ? 'attr-box-show' : '', " top")
   }, /*#__PURE__*/React.createElement(BizAttrConditionGroup, {
     ref: conditionRef,

package/dist/esm/components/renderContent/index.js

@@ -5,17 +5,18 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { Spin } from 'antd';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useContext } from 'react';
 import { MiNone, MiSpin } from '..';
+import { IntervalContext } from "../../types";
 import "./styles/index.less";
 import IntervalEventChart from "../../modules/chart";
 var classPrefix = 'render-content-interval';
 var ContentPanel = function ContentPanel(props) {
-  var _eventData$appData, _eventData$appData$se;
   var loading = props.loading,
     eventData = props.eventData,
     searchData = props.searchData;
-
+  var _useContext = useContext(IntervalContext),
+    refreshLoading = _useContext.refreshLoading;
   // 显示内容
   var _useState = useState(props.showList || []),
     _useState2 = _slicedToArray(_useState, 2),
@@ -30,7 +31,7 @@ var ContentPanel = function ContentPanel(props) {
     setShowList(names);
     if (props.onChangeShow) props.onChangeShow(names);
   };
-  if (loading) {
+  if (loading || refreshLoading) {
     return /*#__PURE__*/React.createElement(Spin, {
       className: "".concat(classPrefix, "-spin-container"),
       tip: "\u67E5\u8BE2\u4E2D...",
@@ -41,7 +42,7 @@ var ContentPanel = function ContentPanel(props) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-chart-container")
-  }, eventData && (_eventData$appData = eventData.appData) !== null && _eventData$appData !== void 0 && (_eventData$appData$se = _eventData$appData.series) !== null && _eventData$appData$se !== void 0 && _eventData$appData$se.length ? /*#__PURE__*/React.createElement(IntervalEventChart, {
+  }, searchData ? /*#__PURE__*/React.createElement(IntervalEventChart, {
     type: "boxplot",
     dataSource: eventData,
     params: searchData,

package/dist/esm/components/searchPanel/index.js

@@ -10,16 +10,20 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { BizDatePicker, BizSelect } from '@zgfe/business-lib';
+import { BizSelect, IconFont, BizDatePickerV2 } from '@zgfe/business-lib';
+import { DatePickerTypes } from '@zgfe/business-lib/es/datePickerV2/types';
 import React, { useContext, useEffect, useState } from 'react';
 import { chartTypeOptions, getInitDate } from "../../constants";
 import { IntervalContext } from "../../types";
+import { Button } from 'antd';
 import "./styles/index.less";
 import { extractNames } from "../../utils/formData";
 var classPrefix = 'search-panel-interval';
 var SearchPanel = function SearchPanel(props) {
   var _useContext = useContext(IntervalContext),
-    includeToday = _useContext.includeToday;
+    includeToday = _useContext.includeToday,
+    searchData = _useContext.searchData,
+    refreshLoading = _useContext.refreshLoading;
   // 当前时间段
   var _useState = useState(props.time || getInitDate(includeToday)),
     _useState2 = _slicedToArray(_useState, 2),
@@ -100,12 +104,8 @@ var SearchPanel = function SearchPanel(props) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex'
-    }
-  }, /*#__PURE__*/React.createElement(BizDatePicker, {
-    dateTypeList: ['day', 'week', 'month', 'custom'],
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizDatePickerV2, {
+    dateTypeList: [DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month, DatePickerTypes.Unit.custom],
     value: time,
     includeToday: true,
     onChange: onChangeTime
@@ -121,6 +121,16 @@ var SearchPanel = function SearchPanel(props) {
     value: displaySetupSliceList.length > 0 ? displaySetupSliceList : displaySetupList.slice(0, 4),
     labelField: "label",
     keyField: "value"
-  })));
+  })), /*#__PURE__*/React.createElement(Button, {
+    className: "".concat(classPrefix, "-refresh"),
+    disabled: !(searchData !== null && searchData !== void 0 && searchData.start && searchData !== null && searchData !== void 0 && searchData.end),
+    loading: refreshLoading,
+    icon: /*#__PURE__*/React.createElement(IconFont, {
+      type: "zhongxinjiazai"
+    }),
+    onClick: function onClick() {
+      return props.refreshHandle && props.refreshHandle();
+    }
+  }, "\u5237\u65B0"));
 };
 export default SearchPanel;

package/dist/esm/components/searchPanel/styles/index.less

@@ -4,6 +4,14 @@
   justify-content: space-between;
   height: 32px;
   margin-bottom: 24px;
+  &-refresh {
+    display: flex !important;
+    gap: 4px;
+  }
+  > :nth-child(1) {
+    display: flex;
+    gap: 16px;
+  }
 
   .biz-date-picker-wrap-list {
     font-size: 14px;
@@ -11,12 +19,11 @@
 
   &-search-right {
     display: flex;
+    gap: 16px;
   }
 
   &-select {
     width: 208px;
-    margin-left: 16px;
-
     .biz-select-handle-input-multiple {
       .ant-tag:not(:nth-child(-n + 3)) {
         display: none;

package/dist/esm/components/searchPanel/types.d.ts

@@ -5,6 +5,7 @@ import { ReactNode } from 'react';
  * 右边的查询组件
  */
 export interface SearchPanelProps {
+    refreshHandle?: Function;
     /**
      * @description  维度类型
      */

package/dist/esm/components/table/index.js

@@ -71,7 +71,7 @@ var EventTable = function EventTable(props) {
     var _dataSource$appData;
     var _searchData$userGroup = searchData.userGroup,
       userGroup = _searchData$userGroup === void 0 ? [0] : _searchData$userGroup;
-    var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData = dataSource.appData) === null || _dataSource$appData === void 0 ? void 0 : _dataSource$appData.x_axis) || [], dataSource, userGroup, searchData, showList, onUserDrill);
+    var _getColumns = getColumns(eventGroupList, userPropList, eventEnvList, (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData = dataSource.appData) === null || _dataSource$appData === void 0 ? void 0 : _dataSource$appData.x_axis) || [], dataSource, userGroup, searchData, showList, onUserDrill, currentApp);
     return _getColumns;
   }, [dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData2 = dataSource.appData) === null || _dataSource$appData2 === void 0 ? void 0 : _dataSource$appData2.x_axis, showList, sortTable, panelName]);
 

package/dist/esm/components/topBar/index.js

@@ -12,10 +12,10 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Button } from 'antd';
 import React, { useContext, useEffect, useState } from 'react';
-import { BizAddToPanel, BizAddToScene, BizGlobalDataContext } from '@zgfe/business-lib';
+import { BizAddToPanel, BizAddToScene, BizGlobalDataContext, BizPlatformSelector } from '@zgfe/business-lib';
 import "./styles/index.less";
 import { IntervalContext } from "../../types";
-import { chartTypes, platformOption } from "../../constants/fields";
+import { chartTypes } from "../../constants/fields";
 import { appVersionType } from '@zgfe/business-lib/es/context';
 var classPrefix = 'modules-interval-topbar';
 var TopBar = function TopBar(props) {
@@ -65,7 +65,6 @@ var TopBar = function TopBar(props) {
   }, [props.eventData]);
   // 保存
   var _onOk = function onOk(type, val) {
-    // console.log('onOk', type, val);
     closeHandle(type);
     if (afterEditTarget) afterEditTarget(type, val);
   };
@@ -129,15 +128,12 @@ var TopBar = function TopBar(props) {
     }
   }, "\u8BBE\u7F6E\u6D41\u5931\u9884\u8B66") : null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-platform")
-  }, platformOption.map(function (item) {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "".concat(selectPlatform === item.key ? 'active' : ''),
-      key: item.key,
-      onClick: function onClick() {
-        setselectPlatform(item.key);
-        platformChange(item.key);
-      }
-    }, item.value);
+  }, /*#__PURE__*/React.createElement(BizPlatformSelector, {
+    value: selectPlatform,
+    onChange: function onChange(val) {
+      setselectPlatform(val.key);
+      platformChange(val.key);
+    }
   })));
 };
 export default TopBar;

package/dist/esm/components/topBar/styles/index.less

@@ -4,7 +4,6 @@
   display: flex;
   justify-content: flex-end;
   margin: 8px 0;
-  padding-right: 24px;
   &-panel {
     margin-right: 16px;
   }
@@ -14,37 +13,4 @@
   &-earlywarning {
     margin-right: 16px;
   }
-  &-platform {
-    display: flex;
-    height: 32px;
-    line-height: 32px;
-    > div {
-      position: relative;
-      padding: 0 16px;
-      font-size: 14px;
-      background: #fff;
-      border: 1px solid #ecedf0;
-      cursor: pointer;
-    }
-    > div:hover,
-    .active {
-      z-index: 1;
-      color: #165dff;
-      background: #e8efff;
-      border: 1px solid #165dff;
-    }
-    > :nth-child(1) {
-      border-radius: 4px 0 0 4px;
-    }
-    > :nth-child(2) {
-      margin-left: -1px;
-    }
-    > :nth-child(3) {
-      margin-left: -1px;
-    }
-    > :nth-child(4) {
-      margin-left: -1px;
-      border-radius: 0 4px 4px 0;
-    }
-  }
 }

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

@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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';
-import { BizGlobalDataContext, BizLoading, ajax } from '@zgfe/business-lib';
+import { BizEmpty, BizGlobalDataContext, BizLoading, ajax } from '@zgfe/business-lib';
 import { EventTable, MiNone } from "../../components";
 import { extractNames, getDefaultShow } from "../../utils/formData";
 import { Apis } from "../../constants";
@@ -41,7 +41,7 @@ var IntervalEventChart = function IntervalEventChart(props) {
     setLoading = _useState8[1];
   useEffect(function () {
     // 没有dataSource时（看板列表访问），请求查询
-    if (!props.dataSource || (params === null || params === void 0 ? void 0 : params.module) === 'interval') {
+    if (!props.dataSource) {
       fetchResult();
     }
   }, []);
@@ -64,9 +64,9 @@ var IntervalEventChart = function IntervalEventChart(props) {
       setLoading(true);
       ajax(Apis.dataList, {
         method: 'post',
-        data: _objectSpread({
+        data: _objectSpread(_objectSpread({
           appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
-        }, obj)
+        }, params), obj)
       }).then(function (res) {
         if (!res) {
           return;
@@ -88,6 +88,25 @@ var IntervalEventChart = function IntervalEventChart(props) {
       className: "mi-common-interval-content"
     }, /*#__PURE__*/React.createElement("div", null));
   }
+  if (dataSource !== null && dataSource !== void 0 && dataSource.appData.delEvent) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex',
+        minHeight: 345,
+        justifyContent: 'center',
+        alignItems: 'center'
+      }
+    }, /*#__PURE__*/React.createElement(BizEmpty, {
+      imageStyle: {
+        height: 58
+      },
+      description: /*#__PURE__*/React.createElement("span", {
+        style: {
+          color: '#9AA1A9'
+        }
+      }, "\u4E8B\u4EF6\u5DF2\u88AB\u5220\u9664\u65E0\u6CD5\u67E5\u770B\uFF0C\u8BF7\u91CD\u65B0\u8BBE\u7F6E")
+    }));
+  }
   if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$appData2 = dataSource.appData) !== null && _dataSource$appData2 !== void 0 && _dataSource$appData2.series.length)) {
     return /*#__PURE__*/React.createElement(MiNone, {
       label: !dataSource ? '请选择条件进行查询' : '暂无数据'

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

@@ -23,6 +23,8 @@ import TopPanel from "../topPanel";
 import { message } from 'antd';
 var CancelToken = Request.CancelToken;
 var cancel;
+var refresh = false;
+var timer = 0;
 var classPrefix = 'interval-content';
 var EventContent = function EventContent(props) {
   // 最后的查询数据（防止图表在还没查询时就改变了类型）
@@ -31,7 +33,8 @@ var EventContent = function EventContent(props) {
     finalSearchData = _useState2[0],
     setFinalSearchData = _useState2[1];
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    route = _useContext.route;
   // 查询的结果数据
   var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -64,17 +67,19 @@ var EventContent = function EventContent(props) {
     setSearchData = _useContext2.setSearchData,
     eventGroupList = _useContext2.eventGroupList,
     eventEnvList = _useContext2.eventEnvList,
-    userPropList = _useContext2.userPropList;
+    userPropList = _useContext2.userPropList,
+    setRefreshLoading = _useContext2.setRefreshLoading,
+    panelId = _useContext2.panelId;
   var _useContext3 = useContext(BizTargetFromPanelContext),
     handleSearch = _useContext3.handleSearch;
-  var _useState15 = useState(),
-    _useState16 = _slicedToArray(_useState15, 2),
-    searchTimer = _useState16[0],
-    setSearchTimer = _useState16[1];
   var collapseRef = useRef();
   // 初始化
   useEffect(function () {
-    setLoading(false);
+    if (props.defaultValue) {
+      setEventId(props.defaultValue.id);
+    } else {
+      setLoading(false);
+    }
   }, [props.defaultValue]);
   useEffect(function () {
     if (searchData && searchData.dimension) {
@@ -86,14 +91,19 @@ var EventContent = function EventContent(props) {
       }
     }
     if (!searchData || !searchData.analysisModel) return;
-    if (searchTimer) clearTimeout(searchTimer);
-    setSearchTimer(setTimeout(function () {
-      fetchRequest();
-    }, 300));
+    if (timer) clearTimeout(timer);
+    var flag = true;
+    timer = setTimeout(function () {
+      if (flag) {
+        fetchRequest();
+      }
+    }, 500);
     return function () {
-      clearTimeout(searchTimer);
+      // 清理异步任务
+      if (timer) clearTimeout(timer);
+      flag = false;
     };
-  }, [searchData, eventId]);
+  }, [searchData]);
   useEffect(function () {
     handleSearch && handleSearch(loading);
   }, [loading]);
@@ -106,7 +116,7 @@ var EventContent = function EventContent(props) {
       return;
     }
     setEventData(undefined);
-    setLoading(true);
+    if (!refresh) setLoading(true);
     if (searchData !== null && searchData !== void 0 && (_searchData$associate = searchData.associatedNextAttr) !== null && _searchData$associate !== void 0 && _searchData$associate.type && (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate2 = searchData.associatedPreAttr) === null || _searchData$associate2 === void 0 ? void 0 : _searchData$associate2.type) !== (searchData === null || searchData === void 0 ? void 0 : (_searchData$associate3 = searchData.associatedNextAttr) === null || _searchData$associate3 === void 0 ? void 0 : _searchData$associate3.type)) {
       setLoading(false);
       return message.error('您查询的属性不一致，暂不支持查询');
@@ -115,13 +125,16 @@ var EventContent = function EventContent(props) {
     props.onChange && props.onChange(searchData);
     ajax(Apis.dataList, {
       method: 'post',
-      data: _objectSpread({
+      data: _objectSpread(_objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
-      }, params),
+      }, params), {}, {
+        refresh: refresh
+      }),
       cancelToken: new CancelToken(function executor(c) {
         cancel = c;
       })
     }).then(function (res) {
+      setRefreshLoading(false);
       if (!res) {
         setLoading(false);
         return;
@@ -137,6 +150,18 @@ var EventContent = function EventContent(props) {
     });
   };
 
+  // 立即刷新
+  var refreshHandle = function refreshHandle() {
+    refresh = true;
+    setRefreshLoading(true);
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(function () {
+      fetchRequest();
+      refresh = false;
+      clearTimeout(timer);
+    }, 500);
+  };
+
   // 改变时间和图表类型
   var onChangeContent = function onChangeContent(data) {
     setSearchData(function (value) {
@@ -164,19 +189,21 @@ var EventContent = function EventContent(props) {
     setSearchData(function (_searchData) {
       return _objectSpread(_objectSpread({}, data), {}, {
         time: _searchData.time,
-        platform: _searchData.platform,
+        platform: _searchData.platform || 0,
         userGroup: data.analysisSubject ? undefined : data.userGroup,
         analysisSubject: data.analysisSubject ? data.analysisSubject : undefined
       });
     });
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-header")
+  }, /*#__PURE__*/React.createElement("span", null, !panelId && route && route.query && route.query.title ? route.query.title : '间隔分析'), /*#__PURE__*/React.createElement(TopBar, {
     searchData: searchData,
     loading: loading,
     eventData: eventData,
     platformChange: platformChange,
     onJumpWarning: props.onJumpWarning
-  }), /*#__PURE__*/React.createElement(BizLayout, {
+  })), /*#__PURE__*/React.createElement(BizLayout, {
     showTitle: false,
     hasCollapse: true,
     className: "interval-layout",
@@ -199,7 +226,8 @@ var EventContent = function EventContent(props) {
     eventId: eventId,
     eventData: eventData,
     enableSelectChart: enableSelectChart,
-    onChange: onChangeContent
+    onChange: onChangeContent,
+    refreshHandle: refreshHandle
   }), /*#__PURE__*/React.createElement(ContentPanel, {
     loading: loading,
     isCity: isCity,

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

@@ -1,4 +1,22 @@
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
 .interval-content {
+  &-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 16px;
+    background: #fafafb;
+    > span {
+      color: var(--io-N-, #021429);
+      font-weight: 500;
+      font-size: 16px;
+      font-family: 'PingFang SC';
+      font-style: normal;
+      line-height: 20px; /* 125% */
+      letter-spacing: 0.016px;
+      white-space: nowrap;
+    }
+  }
   &-options {
     display: flex;
     justify-content: flex-end;

package/dist/esm/modules/content/utils.js

@@ -84,7 +84,7 @@ export function searchDataParams(params) {
   return {
     time: _objectSpread({}, params === null || params === void 0 ? void 0 : params.time),
     platform: (params === null || params === void 0 ? void 0 : params.platform) || 0,
-    userGroup: params.userGroup,
+    userGroup: params === null || params === void 0 ? void 0 : params.userGroup,
     start: searchCondition(params === null || params === void 0 ? void 0 : params.start),
     end: searchCondition(params === null || params === void 0 ? void 0 : params.end),
     dimension: params !== null && params !== void 0 && (_params$dimension = params.dimension) !== null && _params$dimension !== void 0 && _params$dimension.propCategory ? {

package/dist/esm/modules/home/demo/create.js

@@ -35,7 +35,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 266
+    defaultApp: 461
   }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return setIsDetail(false);

package/dist/esm/modules/home/demo/edit.js

@@ -22,7 +22,7 @@ var defaultValue = {
     id: 7565,
     name: '测试6666',
     appId: 266,
-    platform: 1,
+    platform: 0,
     userGroup: [933, 935],
     time: {
       unit: 'day',

package/dist/esm/modules/home/demo/index.js

@@ -32,7 +32,8 @@ export default (function () {
     console.log('onUserDrill:111', data, searchData);
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
-    needMeta: true
+    needMeta: true,
+    defaultApp: 3
   }, isDetail ? /*#__PURE__*/React.createElement("div", null, JSON.stringify(detailParams), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return setIsDetail(false);

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

@@ -12,12 +12,12 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
 import { Spin } from 'antd';
-import { BizGlobalDataContext, BizTargetFromPanel } from '@zgfe/business-lib';
+import { BizGlobalDataContext, BizTargetFromPanel, ajax } from '@zgfe/business-lib';
 import "./styles/index.less";
 import { IntervalContext } from "../../types";
 import { getInitDate } from "../../constants/initData";
 import EventContent from "../content";
-import { chartTypes } from "../../constants";
+import { Apis, chartTypes } from "../../constants";
 var classPrefix = 'interval-module-container';
 var ModuleInterval = function ModuleInterval(props) {
   // 属性
@@ -26,7 +26,8 @@ var ModuleInterval = function ModuleInterval(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],
@@ -36,40 +37,57 @@ var ModuleInterval = function ModuleInterval(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  // 指标标题
-  var _useState5 = useState(),
+  // 刷新loading
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    title = _useState6[0],
-    setTitle = _useState6[1];
+    refreshLoading = _useState6[0],
+    setRefreshLoading = _useState6[1];
+  // 指标标题
   var _useState7 = useState(),
     _useState8 = _slicedToArray(_useState7, 2),
-    panelId = _useState8[0],
-    setPanelId = _useState8[1];
+    title = _useState8[0],
+    setTitle = _useState8[1];
   var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    elementId = _useState10[0],
-    setElementId = _useState10[1];
+    panelId = _useState10[0],
+    setPanelId = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    showList = _useState12[0],
-    setShowList = _useState12[1];
-  var _useState13 = useState(false),
-    _useState14 = _slicedToArray(_useState13, 1),
-    subjectEnable = _useState14[0];
+    elementId = _useState12[0],
+    setElementId = _useState12[1];
+  var _useState13 = useState(),
+    _useState14 = _slicedToArray(_useState13, 2),
+    showList = _useState14[0],
+    setShowList = _useState14[1];
+  var _useState15 = useState(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    subjectEnable = _useState16[0],
+    setSubjectEnable = _useState16[1];
   // 初始化
   useEffect(function () {
-    if (!props.defaultValue) {
-      initSearch();
-    } else {
-      var _props$defaultValue$d, _props$defaultValue$d2;
-      setShowList(props.defaultValue.chosen_data);
-      setPanelId(props.defaultValue.panelId);
-      setElementId(props.defaultValue.id);
-      setTitle(props.defaultValue.name);
-      setSearchData(_objectSpread(_objectSpread({}, props.defaultValue.data), {}, {
-        userGroup: ((_props$defaultValue$d = props.defaultValue.data) === null || _props$defaultValue$d === void 0 ? void 0 : _props$defaultValue$d.userGroup) || ((_props$defaultValue$d2 = props.defaultValue.data) === null || _props$defaultValue$d2 === void 0 ? void 0 : _props$defaultValue$d2.user_group) || [0]
-      }));
-    }
+    setLoading(true);
+    ajax(Apis.querySubjectDisplay, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      if (!res) return;
+      setSubjectEnable(res.data);
+      // 设置初始值
+      if (!props.defaultValue) {
+        initSearch();
+      } else {
+        setShowList(props.defaultValue.chosen_data);
+        setPanelId(props.defaultValue.panelId);
+        setElementId(props.defaultValue.id);
+        setTitle(props.defaultValue.name);
+        setSearchData(props.defaultValue.data);
+      }
+      setTimeout(function () {
+        setLoading(false);
+      });
+    });
   }, []);
 
   // 查询条件初始化
@@ -77,13 +95,14 @@ var ModuleInterval = function ModuleInterval(props) {
     setSearchData({
       userGroup: (userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.length) > 0 ? [userGroupList[0].id] : [0],
       time: getInitDate(props.includeToday),
-      chartType: 'boxplot'
+      chartType: 'boxplot',
+      platform: 0
     });
   };
   useEffect(function () {
     if (props.onChange) props.onChange(searchData);
   }, [searchData]);
-  if (loading) {
+  if (loading || useBizStoreLoading) {
     return /*#__PURE__*/React.createElement("div", {
       className: classPrefix
     }, /*#__PURE__*/React.createElement(Spin, {
@@ -108,10 +127,10 @@ var ModuleInterval = function ModuleInterval(props) {
     styleOptions: chartTypes,
     afterEditTarget: props.afterEditTarget,
     children: ""
-  }), !panelId && /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-header-title")
-  }, "\u95F4\u9694\u5206\u6790"), /*#__PURE__*/React.createElement(IntervalContext.Provider, {
+  }), /*#__PURE__*/React.createElement(IntervalContext.Provider, {
     value: {
+      refreshLoading: refreshLoading,
+      setRefreshLoading: setRefreshLoading,
       panelId: panelId,
       elementId: elementId,
       eventGroupList: eventGroupList,

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

@@ -15,6 +15,9 @@
     height: 100%;
   }
   .interval-layout {
+    .biz-layout-top {
+      padding: 0 16px 16px;
+    }
     .biz-layout-collapse-container {
       height: 24px;
     }

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

@@ -10,9 +10,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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, useState } from 'react';
-import { Form, Button, Radio, Space, Switch } from 'antd';
-import { BizAttributeSelector, BizSelect, BizUserGroupHeader } from '@zgfe/business-lib';
+import React, { useContext, useEffect, useState } from 'react';
+import { Form, Button, Radio, Space, Switch, Tooltip } from 'antd';
+import { BizAttributeSelector, BizGlobalDataContext, BizSelect, BizUserGroupHeader, IconFont, useSubject } from '@zgfe/business-lib';
 import EventFilter from "../../components/eventFilter";
 import "./styles/index.less";
 import { AnalysisMode } from "./types";
@@ -24,6 +24,8 @@ var TopPanel = function TopPanel(props) {
     loading = props.loading,
     collapseRef = props.collapseRef,
     finalSearchData = props.finalSearchData;
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -40,8 +42,11 @@ var TopPanel = function TopPanel(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     relevancy = _useState6[0],
     setRelevancy = _useState6[1];
-  var _useContext = useContext(IntervalContext),
-    subjectEnable = _useContext.subjectEnable;
+  var _useSubject = useSubject(),
+    subjectList = _useSubject.subjectList,
+    subjectLoading = _useSubject.loading;
+  var _useContext2 = useContext(IntervalContext),
+    subjectEnable = _useContext2.subjectEnable;
   var _ref = defaultValue || {},
     userGroup = _ref.userGroup;
   var _useState7 = useState('user'),
@@ -52,6 +57,10 @@ var TopPanel = function TopPanel(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     currentSubject = _useState10[0],
     setCurrentSubject = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    inited = _useState12[0],
+    setInited = _useState12[1];
   var formRef = React.useRef(null);
   function onSearch(values) {
     if (props.onChange) {
@@ -90,6 +99,27 @@ var TopPanel = function TopPanel(props) {
       associatedNextAttr: undefined
     }, true);
   };
+  useEffect(function () {
+    if (subjectLoading) return;
+    if (!defaultValue) {
+      setInited(true);
+      return;
+    }
+    setInited(false);
+    if (defaultValue.analysisSubject) {
+      setAnalysisType('eventProp');
+    } else {
+      setAnalysisType('user');
+    }
+    if (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);
+      }));
+    }
+    setInited(true);
+  }, [subjectLoading]);
+  if (!inited) return null;
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     ref: formRef,
@@ -127,11 +157,21 @@ var TopPanel = function TopPanel(props) {
     scrollToFirstError: true,
     onFinish: onSearch
   }, subjectEnable && /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u5206\u6790\u4E3B\u4F53",
+    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('https://docs.zhugeio.com/datamanager/Statistical_caliber.html', '_blank');
+      }
+    }))),
     className: "panel-form-interval-item"
   }, /*#__PURE__*/React.createElement(BizSelect, {
     options: [{
-      label: '用户',
+      label: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) != 'user' ? '主体' : '用户',
       value: 'user'
     }, {
       label: '事件属性',
@@ -145,6 +185,31 @@ var TopPanel = function TopPanel(props) {
       setAnalysisType(val.value);
       resetting();
     }
+  })), analysisType === 'eventProp' && /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u53E3\u5F84\u540D\u79F0",
+    name: "analysisSubject",
+    className: "panel-form-interval-item",
+    rules: [{
+      validator: function validator(rule, value) {
+        if (!value) {
+          return Promise.reject('请选择口径名称');
+        }
+        return Promise.resolve();
+      }
+    }]
+  }, /*#__PURE__*/React.createElement(BizSelect, {
+    options: subjectList,
+    aliasField: "subjectAlias",
+    labelField: "subjectName",
+    keyField: "id",
+    onChange: function onChange(val) {
+      var _formRef$current, _formRef$current2, _formRef$current3;
+      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);
+    }
   })), analysisType === 'user' && /*#__PURE__*/React.createElement(Form.Item, {
     label: "",
     name: "userGroup",
@@ -195,9 +260,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$current;
+      var _formRef$current4;
       setStartEvent(evt);
-      (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.setFieldValue('dimension', undefined);
+      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Space, {
     align: "baseline",
@@ -242,8 +307,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$current2;
-      (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.setFieldValue('associatedPreAttr', undefined);
+      var _formRef$current5;
+      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedPreAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     className: "associated-label"
@@ -265,8 +330,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$current3;
-      (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.setFieldValue('associatedNextAttr', undefined);
+      var _formRef$current6;
+      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('associatedNextAttr', undefined);
     }
   }))), /*#__PURE__*/React.createElement("i", {
     style: {
@@ -275,9 +340,9 @@ var TopPanel = function TopPanel(props) {
       cursor: 'pointer'
     },
     onClick: function onClick() {
-      var _formRef$current4, _formRef$current5;
-      (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : _formRef$current4.setFieldValue('associatedPreAttr', undefined);
-      (_formRef$current5 = formRef.current) === null || _formRef$current5 === void 0 ? void 0 : _formRef$current5.setFieldValue('associatedNextAttr', undefined);
+      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);
       setRelevancy(false);
     },
     className: "bsicon qingchu"
@@ -310,9 +375,9 @@ var TopPanel = function TopPanel(props) {
     analysisType: analysisType,
     key: "".concat(currentSubject === null || currentSubject === void 0 ? void 0 : currentSubject.subjectName, "-start"),
     onChange: function onChange(val) {
-      var _formRef$current6;
+      var _formRef$current9;
       setEndEvent(val);
-      (_formRef$current6 = formRef.current) === null || _formRef$current6 === void 0 ? void 0 : _formRef$current6.setFieldValue('dimension', undefined);
+      (_formRef$current9 = formRef.current) === null || _formRef$current9 === void 0 ? void 0 : _formRef$current9.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6309\u5C5E\u6027\u7EC6\u5206",
@@ -327,8 +392,8 @@ var TopPanel = function TopPanel(props) {
     showCommonProp: true,
     enableDelete: true,
     onDelete: function onDelete() {
-      var _formRef$current7;
-      (_formRef$current7 = formRef.current) === null || _formRef$current7 === void 0 ? void 0 : _formRef$current7.setFieldValue('dimension', undefined);
+      var _formRef$current10;
+      (_formRef$current10 = formRef.current) === null || _formRef$current10 === void 0 ? void 0 : _formRef$current10.setFieldValue('dimension', undefined);
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5206\u6790\u6A21\u578B",
@@ -343,11 +408,11 @@ var TopPanel = function TopPanel(props) {
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
-    loading: loading,
+    loading: loading || subjectLoading,
     type: "primary",
     onClick: function onClick() {
-      var _formRef$current8;
-      (_formRef$current8 = formRef.current) === null || _formRef$current8 === void 0 ? void 0 : _formRef$current8.submit();
+      var _formRef$current11;
+      (_formRef$current11 = formRef.current) === null || _formRef$current11 === void 0 ? void 0 : _formRef$current11.submit();
     }
   }, "\u67E5\u8BE2"))));
 };

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

@@ -14,6 +14,12 @@
       border-color: #29bd52;
     }
   }
+
+  &-label-hasIcon {
+    .bsicon {
+      cursor: pointer;
+    }
+  }
 }
 
 .panel-form-interval {

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

@@ -9,7 +9,7 @@ import { DisplaySetup } from '../components/searchPanel/types';
  * @param columnData xAxis
  * @returns column fields
  */
-export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], dataSource: ResponseDataProps, userGroup: number[], searchData: SearchValue, showList: string[], onUserDrill: IntervalProps.Props['onUserDrill']): ColumnsType<IntervalProps.ColumnsDataType>;
+export declare function getColumns(eventGroupList: EventGroup[] | undefined, userPropList: UserProp[] | undefined, eventEnvList: EnvProp[] | undefined, columnData: string[], dataSource: ResponseDataProps, userGroup: number[], searchData: SearchValue, showList: string[], onUserDrill: IntervalProps.Props['onUserDrill'], currentApp?: any): ColumnsType<IntervalProps.ColumnsDataType>;
 /**
  * 获取属性的label
  * @param attrData 当前属性
@@ -48,7 +48,7 @@ export declare function formTableData(originalData: ChartData): {
     min: number;
     perValue: number;
     total: number;
-    peopleNum: number;
+    peopleNum: string;
     children: {
         key: string;
         time: string;

package/dist/esm/utils/formData.js

@@ -32,7 +32,7 @@ function convertToHMS(seconds) {
  * @param columnData xAxis
  * @returns column fields
  */
-export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList, onUserDrill
+export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList, onUserDrill, currentApp
 // onClickToDetailCallback: Function,
 ) {
   var _dataSource$appData, _dataSource$appData$s, _searchData$dimension;
@@ -154,7 +154,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
       return /*#__PURE__*/React.createElement("span", null, " ", convertToHMS(text));
     }
   }, {
-    title: searchData.analysisSubject ? "".concat(searchData.analysisSubject.subjectAlias || searchData.analysisSubject.subjectName, "\u6570") : '人数',
+    title: searchData.analysisSubject ? "".concat(searchData.analysisSubject.subjectAlias || searchData.analysisSubject.subjectName, "\u6570") : "".concat(currentApp.type != 'user' ? currentApp.unit : '人', "\u6570"),
     width: 148,
     ellipsis: true,
     align: 'right',
@@ -166,6 +166,7 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     key: 'peopleNum',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
+      if (text == '-') return text;
       return /*#__PURE__*/React.createElement("span", {
         className: "interval-drill",
         onClick: function onClick() {
@@ -242,7 +243,7 @@ function createNewArray(data) {
         min: item.total[4] || 0,
         perValue: item.total[5] || 0,
         total: item.total[6] || 0,
-        peopleNum: item.total[7] || 0,
+        peopleNum: '-',
         children: getChildrenData(data, i)
       };
     });

package/package.json

@@ -1,28 +1,26 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.11-zhongbang.8",
+  "version": "1.0.23-zhongyuan.0",
+  "module": "dist/esm/index.js",
+  "typings": "dist/esm/index.d.ts",
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
+  "files": [
+    "dist"
+  ],
   "scripts": {
-    "start": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
     "build": "father build",
     "deploy": "npm run docs:build && npm run docs:deploy",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "prepublishOnly": "npm run build",
     "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
     "pub": "lerna publish",
-    "test:coverage": "umi-test --coverage",
-    "prepublishOnly": "npm run build"
-  },
-  "files": [
-    "dist"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "module": "dist/esm/index.js",
-  "typings": "dist/esm/index.d.ts",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
+    "start": "dumi dev",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
@@ -47,20 +45,22 @@
     "@types/uuid": "^9.0.2",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.11-zhongbang.1",
-    "@zgfe/modules-demo-manage": "^1.0.1",
+    "@zgfe/business-lib": "1.2.70-hxd.1",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
     "echarts-for-react": "^3.0.2",
     "father-build": "^1.17.2",
     "gh-pages": "^3.0.0",
-    "lerna": "5.1.8",
+    "lerna": "^5.1.8",
     "lint-staged": "^10.0.7",
     "lodash": "^4.17.21",
     "prettier": "^2.2.1",
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "5ab172fb8b3dd2d1d3b0e9a796960bd5e3b71759"
+  "gitHead": "c1029ad4038cc39d49878a4ced941e120ec59982",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  }
 }