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

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

@@ -18,7 +18,9 @@ import _ from 'lodash';
 var classPrefix = 'interval-box';
 var EventFilter = function EventFilter(props) {
   var _useContext = useContext(BizGlobalDataContext),
-    eventIdMap = _useContext.eventIdMap;
+    eventIdMap = _useContext.eventIdMap,
+    envs = _useContext.envs,
+    currentApp = _useContext.currentApp;
   // 筛选条件个数
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -95,8 +97,8 @@ var EventFilter = function EventFilter(props) {
       return;
     }
     // 最多可添加10条属性筛选
-    if (count >= 10) {
-      message.error('最多可添加 10 条属性筛选');
+    if (count >= ((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 10)) {
+      message.error("\u6700\u591A\u53EF\u6DFB\u52A0 ".concat((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 10, " \u6761\u5C5E\u6027\u7B5B\u9009"));
       return;
     }
     setIsAdd(true);
@@ -141,6 +143,18 @@ var EventFilter = function EventFilter(props) {
     }
     props.onChange && props.onChange(_event);
   }, [bizAttributeSelectorValue, filter, event, relevancy]);
+
+  // const [eventAttrs, setEventAttrs] = useState<any[]>([]);
+  // useEffect(() => {
+  //   if (event) {
+  //     (async () => {
+  //       const eventAttrs: any =
+  //         (await eventApi.fetchEventAttrs(event?.id as number, currentApp?.appId)) || [];
+  //       setEventAttrs(eventAttrs);
+  //     })();
+  //   }
+  // }, [event.id]);
+
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BizEventSelector, {
@@ -152,26 +166,26 @@ var EventFilter = function EventFilter(props) {
     value: {
       event: event
     },
-    onChange: onChangeEvent,
-    filter: function filter(event) {
-      if (!props.subject) return true;
-      var propMatch = false;
-      for (var i = 0; i < event.attrList.length; i++) {
-        var _props$subject;
-        var attr = event.attrList[i];
-        if (attr.label === ((_props$subject = props.subject) === null || _props$subject === void 0 ? void 0 : _props$subject.subjectName)) {
-          propMatch = true;
-          break;
-        }
-      }
-      return propMatch;
-    },
+    onChange: onChangeEvent
+    // filter={(event) => {
+    //   if (!props.subject) return true;
+    //   let propMatch = false;
+    //   for (let i = 0; i < event.attrList.length; i++) {
+    //     const attr = event.attrList[i];
+    //     if (attr.label === props.subject?.subjectName) {
+    //       propMatch = true;
+    //       break;
+    //     }
+    //   }
+    //   return propMatch;
+    // }}
+    ,
     placeholder: "\u8BF7\u9009\u62E9\u4E8B\u4EF6"
   }), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tooltip, {
     placement: "top",
-    title: !eventOverview ? '请先选择目标事件' : count < 10 ? '添加属性筛选' : '最多可添加 10 条属性筛选'
+    title: !eventOverview ? '请先选择目标事件' : count < ((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 10) ? '添加属性筛选' : "\u6700\u591A\u53EF\u6DFB\u52A0 ".concat((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 10, " \u6761\u5C5E\u6027\u7B5B\u9009")
   }, /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(count >= 10 || event.id === -1 || !eventOverview ? 'disable' : ''),
+    className: "".concat(count >= ((envs === null || envs === void 0 ? void 0 : envs.propertyNum) || 10) || event.id === -1 || !eventOverview ? 'disable' : ''),
     type: "shaixuan",
     onClick: function onClick() {
       return onAdd();

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

@@ -12,19 +12,21 @@ import "./styles/index.less";
 import IntervalEventChart from "../../modules/chart";
 var classPrefix = 'render-content-interval';
 var ContentPanel = function ContentPanel(props) {
+  var _props$searchData;
   var loading = props.loading,
     eventData = props.eventData,
     searchData = props.searchData;
   var _useContext = useContext(IntervalContext),
     refreshLoading = _useContext.refreshLoading;
   // 显示内容
-  var _useState = useState(props.showList || []),
+  var _useState = useState(((_props$searchData = props.searchData) === null || _props$searchData === void 0 ? void 0 : _props$searchData.displaySetup) || []),
     _useState2 = _slicedToArray(_useState, 2),
     showList = _useState2[0],
     setShowList = _useState2[1];
   useEffect(function () {
-    setShowList(props.showList);
-  }, [eventData]);
+    var _props$searchData2;
+    setShowList(((_props$searchData2 = props.searchData) === null || _props$searchData2 === void 0 ? void 0 : _props$searchData2.displaySetup) || []);
+  }, [props === null || props === void 0 ? void 0 : props.searchData]);
 
   // 表格筛选，取前10个
   var onChangeShow = function onChangeShow(names) {
@@ -45,6 +47,7 @@ var ContentPanel = function ContentPanel(props) {
   }, searchData ? /*#__PURE__*/React.createElement(IntervalEventChart, {
     type: "boxplot",
     dataSource: eventData,
+    eventOldData: props.eventOldData,
     params: searchData,
     onChangeShow: onChangeShow
   }) : /*#__PURE__*/React.createElement("div", {

package/dist/esm/components/renderContent/styles/index.css

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

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

@@ -4,6 +4,7 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
+    min-height: 300px;
 
     .echarts-for-react {
       width: 100%;

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

@@ -8,6 +8,7 @@ export interface RenderContentProps {
      * 查询结果
      */
     eventData?: ResponseDataProps;
+    eventOldData?: ResponseDataProps;
     /**
      * 查询条件
      */
@@ -15,7 +16,10 @@ export interface RenderContentProps {
     /**
      * 显示列表
      */
-    showList: string[];
+    showList?: {
+        label: string;
+        value: number;
+    }[];
     /**
      * 是否是城市
      */
@@ -27,5 +31,8 @@ export interface RenderContentProps {
     /**
      * 改变显示内容
      */
-    onChangeShow?: (data: string[]) => void;
+    onChangeShow?: (data: {
+        label: string;
+        value: number;
+    }[]) => void;
 }

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

@@ -10,7 +10,7 @@ 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 { BizSelect, IconFont, BizDatePickerV2 } from '@zgfe/business-lib';
+import { BizSelect, IconFont, BizDatePickerV2, BizGlobalDataContext } 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";
@@ -24,6 +24,8 @@ var SearchPanel = function SearchPanel(props) {
     includeToday = _useContext.includeToday,
     searchData = _useContext.searchData,
     refreshLoading = _useContext.refreshLoading;
+  var _useContext2 = useContext(BizGlobalDataContext),
+    envs = _useContext2.envs;
   // 当前时间段
   var _useState = useState(props.time || getInitDate(includeToday)),
     _useState2 = _slicedToArray(_useState, 2),
@@ -45,7 +47,7 @@ var SearchPanel = function SearchPanel(props) {
   var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
     displaySetupSliceList = _useState10[0],
-    setDisplaySetupSliceList = _useState10[1];
+    setDisplaySetupSliceList = _useState10[1]; // 选中的显示设置
   // 查询维度
   var _useState11 = useState({
       analysisIndex: 'number'
@@ -55,11 +57,13 @@ var SearchPanel = function SearchPanel(props) {
     setDimension = _useState12[1];
   // 初始化表格表头和内容
   useEffect(function () {
-    if (props !== null && props !== void 0 && props.eventData) {
-      var arr = extractNames(props === null || props === void 0 ? void 0 : props.eventData);
+    if (props !== null && props !== void 0 && props.eventOldData) {
+      var _props$searchData;
+      var arr = extractNames(props === null || props === void 0 ? void 0 : props.eventOldData);
       setDisplaySetupLIst(arr);
+      setDisplaySetupSliceList(props === null || props === void 0 ? void 0 : (_props$searchData = props.searchData) === null || _props$searchData === void 0 ? void 0 : _props$searchData.displaySetup);
     }
-  }, [props === null || props === void 0 ? void 0 : props.eventData]);
+  }, [props === null || props === void 0 ? void 0 : props.searchData, props === null || props === void 0 ? void 0 : props.eventOldData]);
   // 初始化
   useEffect(function () {
     if (props.chartType && props.chartType !== chart.value) {
@@ -95,10 +99,7 @@ var SearchPanel = function SearchPanel(props) {
   // 显示设置选择
   var onDimensionChange = function onDimensionChange(val) {
     if (val) {
-      props.onChange && props.onChange({
-        time: time,
-        displaySetup: val
-      });
+      props.onChangeShow && props.onChangeShow(val);
       setDisplaySetupSliceList(val);
     }
   };
@@ -108,6 +109,9 @@ var SearchPanel = function SearchPanel(props) {
     dateTypeList: [DatePickerTypes.Unit.day, DatePickerTypes.Unit.week, DatePickerTypes.Unit.month, DatePickerTypes.Unit.custom],
     value: time,
     includeToday: true,
+    selectRange: envs && envs.timeRangeOpen ? envs.timeRangeOpen : 36,
+    timeRangeOpen: envs && envs.timeRangeOpen ? envs.timeRangeOpen : 36,
+    selectRangeUnit: envs && envs.timeRangeOpen ? 'months' : 'days',
     onChange: onChangeTime
   }), /*#__PURE__*/React.createElement(BizSelect, {
     multiple: true,
@@ -118,7 +122,7 @@ var SearchPanel = function SearchPanel(props) {
     placeholder: "\u8BF7\u9009\u62E9\u663E\u793A\u8BBE\u7F6E",
     enableSearch: true,
     options: displaySetupList,
-    value: displaySetupSliceList.length > 0 ? displaySetupSliceList : displaySetupList.slice(0, 4),
+    value: displaySetupSliceList,
     labelField: "label",
     keyField: "value"
   })), /*#__PURE__*/React.createElement(Button, {

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

@@ -1,5 +1,5 @@
 import { DatePickerTypes } from '@zgfe/business-lib/es/datePicker/types';
-import { EventChartTypes, ResponseDataProps } from '../../types';
+import { EventChartTypes, ResponseDataProps, SearchValue } from '../../types';
 import { ReactNode } from 'react';
 /**
  * 右边的查询组件
@@ -19,6 +19,7 @@ export interface SearchPanelProps {
      */
     displaySetup?: DisplaySetup[];
     eventData?: ResponseDataProps;
+    eventOldData?: ResponseDataProps;
     /**
      * 地图类型是否可选
      */
@@ -43,6 +44,8 @@ export interface SearchPanelProps {
      * 内容改变回调
      */
     onChange?: (data: SearchPanelProps) => void;
+    searchData?: SearchValue;
+    onChangeShow?: (data: DisplaySetup[]) => void;
 }
 export interface DisplaySetup {
     value: number;

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

@@ -35,7 +35,8 @@ var EventTable = function EventTable(props) {
     eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou,
     eventEnvList = _useContext.eventEnvList,
     userPropList = _useContext.userPropList,
-    authority = _useContext.authority;
+    authority = _useContext.authority,
+    showProdDownload = _useContext.showProdDownload;
   var _useContext2 = useContext(IntervalContext),
     panelName = _useContext2.panelName,
     onUserDrill = _useContext2.onUserDrill;
@@ -107,7 +108,7 @@ var EventTable = function EventTable(props) {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-table-header")
-  }, /*#__PURE__*/React.createElement("span", null, "\u6307\u6807\u8BE6\u60C5"), authority[100059] && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("span", null, "\u6307\u6807\u8BE6\u60C5"), authority[100059] && showProdDownload && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     onClick: download
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "xiazai1"

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

@@ -6,6 +6,10 @@ export interface TopBarProps {
      */
     searchData?: SearchValue;
     loading?: boolean;
+    showList?: {
+        label: string;
+        value: number;
+    }[];
     eventData?: ResponseDataProps;
     onJumpWarning: IntervalProps.Props['onJumpWarning'];
     platformChange: (data: number) => void;

package/dist/esm/constants/code.js

@@ -1,13 +1,13 @@
-/**
- * @description 异常状态码
+/**
+ * @description 异常状态码
  */
 export var ERROR_RESPONESE_CODE = {
-  /**
-   * @description 刷新失败
+  /**
+   * @description 刷新失败
    */
   REFRESH_FAIL: '100080',
-  /**
-   * @description 用户群或标签查询异常
+  /**
+   * @description 用户群或标签查询异常
    */
   EXCEPTION: '100081'
 };

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

@@ -13,14 +13,14 @@ var CustomTooltip = function CustomTooltip(_ref) {
   }
   // 根据payload中的数据定义弹窗内容
   var marker = payload === null || payload === void 0 ? void 0 : payload.marker;
-  var value = payload === null || payload === void 0 ? void 0 : payload.value;
+  var value = payload === null || payload === void 0 ? void 0 : payload.data;
   return /*#__PURE__*/React.createElement("div", {
     className: "custom-tooltip-chart"
   }, /*#__PURE__*/React.createElement("div", {
     className: "custom-tooltip-name"
   }, payload.name, " "), /*#__PURE__*/React.createElement("div", {
     className: "custom-tooltip-div"
-  }, (series === null || series === void 0 ? void 0 : series.names[0]) && /*#__PURE__*/React.createElement("div", {
+  }, payload.seriesName && /*#__PURE__*/React.createElement("div", {
     className: "tooltip-marker"
   }, /*#__PURE__*/React.createElement("div", {
     dangerouslySetInnerHTML: {
@@ -28,7 +28,7 @@ var CustomTooltip = function CustomTooltip(_ref) {
     }
   }), /*#__PURE__*/React.createElement("div", {
     className: "tooltip-span"
-  }, series.names[0])), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+  }, payload.seriesName)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
     className: "tooltip-span"
   }, "\u6700\u5927\u503C\uFF1A"), /*#__PURE__*/React.createElement("div", null, convertToHMS(value[5]))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
     className: "tooltip-span"

package/dist/esm/modules/chart/customTooltip1.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import './index.less';
+declare const CustomTooltip: React.FC<{
+    payload: any[];
+    series: any[];
+}>;
+export default CustomTooltip;

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

@@ -0,0 +1,46 @@
+import React from 'react';
+import "./index.less";
+var CustomTooltip = function CustomTooltip(_ref) {
+  var payload = _ref.payload,
+    series = _ref.series;
+  // 初始化，判断showList是否有值，如果没值，取结果的前10条
+  function convertToHMS(seconds) {
+    var hours = Math.floor(seconds / 3600);
+    var minutes = Math.floor(seconds % 3600 / 60);
+    var remainingSeconds = seconds % 60;
+    return ('00' + hours).slice(-2) + ':' + ('00' + minutes).slice(-2) + ':' + ('00' + remainingSeconds).slice(-2);
+  }
+  // 根据payload中的数据定义弹窗内容
+  // const marker = payload?.marker;
+
+  // const value = payload?.value;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, payload.map(function (o, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "custom-tooltip-chart",
+      key: index
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "custom-tooltip-name"
+    }, o.name, " "), /*#__PURE__*/React.createElement("div", {
+      className: "custom-tooltip-div"
+    }, o.seriesName && /*#__PURE__*/React.createElement("div", {
+      className: "tooltip-marker"
+    }, /*#__PURE__*/React.createElement("div", {
+      dangerouslySetInnerHTML: {
+        __html: o === null || o === void 0 ? void 0 : o.marker
+      }
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "tooltip-span"
+    }, o.seriesName)), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+      className: "tooltip-span"
+    }, "\u6700\u5927\u503C\uFF1A"), /*#__PURE__*/React.createElement("div", null, convertToHMS(o.value[5]))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+      className: "tooltip-span"
+    }, "\u4E0A\u56DB\u5206\u4F4D\uFF1A"), convertToHMS(o.value[2])), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+      className: "tooltip-span"
+    }, "\u4E2D\u4F4D\u6570\uFF1A"), convertToHMS(o.value[3])), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+      className: "tooltip-span"
+    }, "\u4E0B\u56DB\u5206\u4F4D\uFF1A"), convertToHMS(o.value[4])), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+      className: "tooltip-span"
+    }, "\u6700\u5C0F\u503C\uFF1A"), convertToHMS(o.value[1]))));
+  }));
+};
+export default CustomTooltip;

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

@@ -0,0 +1,52 @@
+.custom-tooltip-chart {
+  display: inline-block;
+  flex-direction: column;
+  flex-shrink: 0;
+  gap: 4px;
+  align-items: flex-start;
+  width: 146px;
+  height: 100%;
+  padding: 8px;
+  color: var(--io-n, #021429);
+  font-weight: 500;
+  font-size: 12px;
+  font-style: normal;
+  border-radius: 10px;
+  box-shadow: 0px 4px 10px 0px #0000001a;
+}
+.custom-tooltip-chart .custom-tooltip-name {
+  color: var(--io-n, #021429);
+  font-weight: 500;
+  font-size: 12px;
+  font-family: PingFang SC;
+  font-style: normal;
+  line-height: normal;
+}
+.custom-tooltip-chart .custom-tooltip-div {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  width: 100%;
+  height: 100%;
+  padding: 0px 8px;
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.04);
+}
+.custom-tooltip-chart .custom-tooltip-div .tooltip-span {
+  display: block;
+  color: var(--3, #5f6085);
+  font-weight: 400;
+  font-size: 12px;
+  font-family: PingFang SC;
+  font-style: normal;
+  line-height: normal;
+}
+.custom-tooltip-chart .custom-tooltip-div > div {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.custom-tooltip-chart .custom-tooltip-div .tooltip-marker {
+  justify-content: flex-start;
+}

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

@@ -11,13 +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 React, { useContext, useEffect, useState } from 'react';
-import { BizEmpty, BizGlobalDataContext, BizLoading, ajax } from '@zgfe/business-lib';
+import { BizEmpty, BizGlobalDataContext, ajax } from '@zgfe/business-lib';
 import { EventTable, MiNone } from "../../components";
 import { extractNames, getDefaultShow } from "../../utils/formData";
 import { Apis } from "../../constants";
 import IntervalChart from "./intervalChart";
 import { searchDataParams } from "../content/utils";
 import { ERROR_RESPONESE_CODE } from "../../constants/code";
+import { Spin } from 'antd';
 var IntervalEventChart = function IntervalEventChart(props) {
   var _dataSource$appData2;
   var params = props.params,
@@ -27,20 +28,16 @@ var IntervalEventChart = function IntervalEventChart(props) {
     _useState2 = _slicedToArray(_useState, 2),
     showList = _useState2[0],
     setShowList = _useState2[1];
-  var _useState3 = useState([]),
+  var _useState3 = useState(props.dataSource),
     _useState4 = _slicedToArray(_useState3, 2),
-    dataSourceList = _useState4[0],
-    setDataSourceList = _useState4[1];
-  var _useState5 = useState(props.dataSource),
-    _useState6 = _slicedToArray(_useState5, 2),
-    dataSource = _useState6[0],
-    setDataSource = _useState6[1];
+    dataSource = _useState4[0],
+    setDataSource = _useState4[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    loading = _useState8[0],
-    setLoading = _useState8[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
   useEffect(function () {
     // 没有dataSource时（看板列表访问），请求查询
     if (!props.dataSource) {
@@ -51,14 +48,17 @@ var IntervalEventChart = function IntervalEventChart(props) {
   // 初始化，判断showList是否有值，如果没值，取结果的前10条
   useEffect(function () {
     var _dataSource$appData, _dataSource$appData$s;
+    var dataSource = props.dataSource;
     if ((dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData = dataSource.appData) === null || _dataSource$appData === void 0 ? void 0 : (_dataSource$appData$s = _dataSource$appData.series) === null || _dataSource$appData$s === void 0 ? void 0 : _dataSource$appData$s.length) > 0) {
-      var _extractNames;
-      var arr = params !== null && params !== void 0 && params.displaySetup ? params === null || params === void 0 ? void 0 : params.displaySetup : (_extractNames = extractNames(dataSource)) === null || _extractNames === void 0 ? void 0 : _extractNames.splice(0, 4);
+      var _extractNames, _extractNames2;
+      var arr = params !== null && params !== void 0 && params.displaySetup ? params === null || params === void 0 ? void 0 : params.displaySetup : props !== null && props !== void 0 && props.eventOldData ? (_extractNames = extractNames(props === null || props === void 0 ? void 0 : props.eventOldData)) === null || _extractNames === void 0 ? void 0 : _extractNames.splice(0, 4) : (_extractNames2 = extractNames(dataSource)) === null || _extractNames2 === void 0 ? void 0 : _extractNames2.splice(0, 4);
       var app = getDefaultShow(dataSource, arr);
       setShowList(app);
-      setDataSourceList(arr);
+      setDataSource(app);
+    } else {
+      setDataSource(dataSource);
     }
-  }, [params === null || params === void 0 ? void 0 : params.displaySetup, dataSource]);
+  }, [params === null || params === void 0 ? void 0 : params.displaySetup, props.dataSource, params]);
   var fetchResult = function fetchResult() {
     var _obj$start, _obj$end, _params$start, _params$end;
     var obj = searchDataParams(params);
@@ -79,7 +79,11 @@ var IntervalEventChart = function IntervalEventChart(props) {
           onChangeException === null || onChangeException === void 0 ? void 0 : onChangeException();
           return;
         }
-        setDataSource(res.data);
+        var resultApp = res.data;
+        if (params !== null && params !== void 0 && params.showList) {
+          resultApp = getDefaultShow(res.data, params === null || params === void 0 ? void 0 : params.showList);
+        }
+        setDataSource(resultApp);
       }).catch(function () {
         setLoading(false);
       });
@@ -91,9 +95,10 @@ var IntervalEventChart = function IntervalEventChart(props) {
     if (props.onChangeShow) props.onChangeShow(names);
   };
   if (loading) {
-    return /*#__PURE__*/React.createElement(BizLoading, {
-      className: "mi-common-interval-content"
-    }, /*#__PURE__*/React.createElement("div", null));
+    return /*#__PURE__*/React.createElement(Spin, {
+      tip: "",
+      size: "default"
+    }, "\u6570\u636E\u6B63\u5728\u52AA\u529B\u52A0\u8F7D\u4E2D\uFF0C\u8BF7\u7A0D\u7B49~");
   }
   if (dataSource !== null && dataSource !== void 0 && dataSource.appData.delEvent) {
     return /*#__PURE__*/React.createElement("div", {
@@ -122,11 +127,10 @@ var IntervalEventChart = function IntervalEventChart(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IntervalChart, {
     dataSource: dataSource,
     showList: showList,
-    dataSourceList: dataSourceList,
     params: params,
     onlyChart: props.onlyChart
   }), !props.onlyChart && /*#__PURE__*/React.createElement(EventTable, {
-    dataSource: dataSource,
+    dataSource: props === null || props === void 0 ? void 0 : props.eventOldData,
     searchData: params,
     showList: [],
     changeShow: onChangeShow

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

@@ -1,5 +1,5 @@
 .custom-tooltip-chart {
-  display: flex;
+  display: inline-block;
   flex-direction: column;
   flex-shrink: 0;
   gap: 4px;

package/dist/esm/modules/chart/intervalChart copy.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { eventChartProps } from './types';
+declare const IntervalChart: React.FC<eventChartProps.Props>;
+export default IntervalChart;