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

package/README.md

@@ -1,33 +1,35 @@
-# modules-interval
-
-## Getting Started
-
-Install dependencies,
-
-```bash
-$ npm i
-```
-
-Start the dev server,
-
-```bash
-$ npm start
-```
-
-Build documentation,
-
-```bash
-$ npm run docs:build
-```
-
-Run test,
-
-```bash
-$ npm test
-```
-
-Build library via `father`,
-
-```bash
-$ npm run build
-```
+# modules-interval
+
+## Getting Started
+
+Install dependencies,
+
+```bash
+$ npm i
+```
+
+Start the dev server,
+
+```bash
+$ npm start
+```
+
+Build documentation,
+
+```bash
+$ npm run docs:build
+```
+
+Run test,
+
+```bash
+$ npm test
+```
+
+Build library via `father`,
+
+```bash
+$ npm run build
+```
+
+update

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

@@ -1,40 +1,40 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-
-.mi-common-interval {
-  .ant-spin-nested-loading {
-    width: 100%;
-  }
-  &-loading-icon {
-    z-index: 1000;
-    display: inline-block;
-    width: 40px;
-    height: 40px;
-    background: url('../../../style/image/ring.svg') no-repeat;
-    background-size: contain;
-  }
-
-  &-none-text {
-    color: #354354;
-    font-size: 14px;
-  }
-
-  &-none-empty {
-    width: 88px;
-    height: 88px;
-    background-image: url('../../../style/image/empty.png');
-    background-repeat: no-repeat;
-    background-size: cover;
-  }
-
-  &-none-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-}
-.mi-common-interval-content {
-  width: 100%;
-  .ant-spin-text {
-    color: #ccc;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.mi-common-interval {
+  .ant-spin-nested-loading {
+    width: 100%;
+  }
+  &-loading-icon {
+    z-index: 1000;
+    display: inline-block;
+    width: 40px;
+    height: 40px;
+    background: url('../../../style/image/ring.svg') no-repeat;
+    background-size: contain;
+  }
+
+  &-none-text {
+    color: #354354;
+    font-size: 14px;
+  }
+
+  &-none-empty {
+    width: 88px;
+    height: 88px;
+    background-image: url('../../../style/image/empty.png');
+    background-repeat: no-repeat;
+    background-size: cover;
+  }
+
+  &-none-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+}
+.mi-common-interval-content {
+  width: 100%;
+  .ant-spin-text {
+    color: #ccc;
+  }
+}

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/eventFilter/styles/index.less

@@ -1,39 +1,39 @@
-.interval-box {
-  > :nth-child(1) {
-    display: flex;
-    gap: 16px;
-    align-items: center;
-    margin-bottom: 0 !important;
-    .biz-event-select,
-    .biz-attr-select {
-      width: 208px;
-    }
-
-    .shaixuan {
-      margin-top: 2px;
-      color: #9aa1a9;
-      font-size: 20px !important;
-      cursor: pointer;
-    }
-
-    .shaixuan:hover {
-      color: #165dff;
-    }
-
-    .disable {
-      color: #ccd0d4 !important;
-      cursor: not-allowed !important;
-    }
-
-    .switch-title {
-      margin-left: -8px;
-      color: var(--io-n-8, #354354);
-      font-weight: 400;
-      font-size: 14px;
-      font-family: PingFang SC;
-      font-style: normal;
-      line-height: normal;
-      letter-spacing: 1px;
-    }
-  }
-}
+.interval-box {
+  > :nth-child(1) {
+    display: flex;
+    gap: 16px;
+    align-items: center;
+    margin-bottom: 0 !important;
+    .biz-event-select,
+    .biz-attr-select {
+      width: 208px;
+    }
+
+    .shaixuan {
+      margin-top: 2px;
+      color: #9aa1a9;
+      font-size: 20px !important;
+      cursor: pointer;
+    }
+
+    .shaixuan:hover {
+      color: #165dff;
+    }
+
+    .disable {
+      color: #ccd0d4 !important;
+      cursor: not-allowed !important;
+    }
+
+    .switch-title {
+      margin-left: -8px;
+      color: var(--io-n-8, #354354);
+      font-weight: 400;
+      font-size: 14px;
+      font-family: PingFang SC;
+      font-style: normal;
+      line-height: normal;
+      letter-spacing: 1px;
+    }
+  }
+}

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/renderContent/styles/index.less

@@ -1,36 +1,36 @@
-.render-content-interval {
-  &-chart-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-
-    .echarts-for-react {
-      width: 100%;
-      background: #fff;
-      border: 1px solid var(--unnamed, #ecedf0);
-      border-radius: 8px;
-    }
-  }
-
-  &-MiNone {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 368px;
-    padding: 24px 16px;
-    border: 1px solid #ecedf0;
-    border-radius: 8px;
-  }
-
-  &-spin-container {
-    display: flex !important;
-    align-items: center;
-    justify-content: center;
-    min-height: 300px;
-    .biz-loading-wrapper {
-      width: 100%;
-    }
-  }
-}
+.render-content-interval {
+  &-chart-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+
+    .echarts-for-react {
+      width: 100%;
+      background: #fff;
+      border: 1px solid var(--unnamed, #ecedf0);
+      border-radius: 8px;
+    }
+  }
+
+  &-MiNone {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 368px;
+    padding: 24px 16px;
+    border: 1px solid #ecedf0;
+    border-radius: 8px;
+  }
+
+  &-spin-container {
+    display: flex !important;
+    align-items: center;
+    justify-content: center;
+    min-height: 300px;
+    .biz-loading-wrapper {
+      width: 100%;
+    }
+  }
+}

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

@@ -1,64 +1,71 @@
-.search-panel-interval {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 32px;
-  margin-bottom: 24px;
-
-  .biz-date-picker-wrap-list {
-    font-size: 14px;
-  }
-
-  &-search-right {
-    display: flex;
-  }
-
-  &-select {
-    width: 208px;
-    margin-left: 16px;
-
-    .biz-select-handle-input-multiple {
-      .ant-tag:not(:nth-child(-n + 3)) {
-        display: none;
-      }
-    }
-  }
-}
-
-.interval-select-overlay {
-  .biz-select-option.biz-select-option-multiple:hover:not(.disabled) {
-    color: var(--1, #021429);
-    background: var(--io-i-1, #e8efff);
-  }
-
-  .biz-select-overlay {
-    padding: 0;
-  }
-
-  .biz-select-list-panel {
-    display: grid;
-    gap: 8px;
-  }
-
-  .biz-select-option {
-    padding: 0 16px;
-    border-radius: 0;
-  }
-
-  .biz-select-option.biz-select-option-multiple.active:not(.disabled) {
-    color: var(--1, #021429);
-  }
-
-  .biz-select-option.biz-select-option-multiple:hover:not(.disabled) .biz-select-checkbox {
-    color: #ccd0d4;
-  }
-
-  .biz-select-option.biz-select-option-multiple.active:hover:not(.disabled) .biz-select-checkbox {
-    color: #165dff;
-  }
-
-  .biz-select-option.biz-select-option-multiple:active:not(.disabled) {
-    color: #165dff;
-    background: var(--io-i-1, #e8efff);
-  }
-}
+.search-panel-interval {
+  display: flex;
+  align-items: center;
+  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;
+  }
+
+  &-search-right {
+    display: flex;
+    gap: 16px;
+  }
+
+  &-select {
+    width: 208px;
+    .biz-select-handle-input-multiple {
+      .ant-tag:not(:nth-child(-n + 3)) {
+        display: none;
+      }
+    }
+  }
+}
+
+.interval-select-overlay {
+  .biz-select-option.biz-select-option-multiple:hover:not(.disabled) {
+    color: var(--1, #021429);
+    background: var(--io-i-1, #e8efff);
+  }
+
+  .biz-select-overlay {
+    padding: 0;
+  }
+
+  .biz-select-list-panel {
+    display: grid;
+    gap: 8px;
+  }
+
+  .biz-select-option {
+    padding: 0 16px;
+    border-radius: 0;
+  }
+
+  .biz-select-option.biz-select-option-multiple.active:not(.disabled) {
+    color: var(--1, #021429);
+  }
+
+  .biz-select-option.biz-select-option-multiple:hover:not(.disabled) .biz-select-checkbox {
+    color: #ccd0d4;
+  }
+
+  .biz-select-option.biz-select-option-multiple.active:hover:not(.disabled) .biz-select-checkbox {
+    color: #165dff;
+  }
+
+  .biz-select-option.biz-select-option-multiple:active:not(.disabled) {
+    color: #165dff;
+    background: var(--io-i-1, #e8efff);
+  }
+}

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]);