@zgfe/modules-interval 1.0.23-zhongyuan.1 → 1.0.23-zhongyuan.10

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

@@ -4,30 +4,106 @@ 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, { useEffect, useState } from 'react';
-import ReactECharts from 'echarts-for-react';
+import React, { useEffect, useRef, useState } from 'react';
 import * as echarts from 'echarts';
 import { renderToString } from 'react-dom/server';
 import CustomTooltip from "./customTooltip";
 import { chartColors } from "../../constants";
 import { getRandomColor } from "../../constants/color";
 import { convertDateArray } from "../../utils/formData";
+var _currentAxisBreaks = [{
+  start: 5000,
+  end: 100000,
+  gap: '1.5%'
+}, {
+  start: 105000,
+  end: 3100000,
+  gap: '1.5%'
+}];
 var IntervalChart = function IntervalChart(props) {
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
-    option = _useState2[0],
-    setOption = _useState2[1];
+    optionECharts = _useState2[0],
+    setOptionECharts = _useState2[1];
+  // 获取实例
+  var chartRef = useRef(null);
+  var _useState3 = useState(null),
+    _useState4 = _slicedToArray(_useState3, 2),
+    chartInstance = _useState4[0],
+    setChartInstance = _useState4[1]; // echart实列
+  useEffect(function () {
+    var aDom = echarts.init(chartRef.current);
+    setChartInstance(aDom);
+  }, []);
   useEffect(function () {
     var _props$showList, _seriesData$series;
+    // chartRef && chartRef.current.getEchartsInstance().clear();
     var seriesData = props === null || props === void 0 ? void 0 : (_props$showList = props.showList) === null || _props$showList === void 0 ? void 0 : _props$showList.appData;
     var params = props === null || props === void 0 ? void 0 : props.params;
     var eCharts = {
       tooltip: {
         trigger: 'item',
+        // tooltip 跟随鼠标
+        // position: function (point, params, dom, rect, size) {
+        //   return [point[0] + 10, point[1] - 10];
+        // },
+        // ========== 核心：重写position函数，防止tooltip溢出屏幕 ==========
+        position: function position(point, params, dom, rect, size) {
+          // 获取tooltip DOM元素的实际宽高（自定义HTML的尺寸）
+          var tooltipWidth = dom.offsetWidth || 200; // 默认宽度200px
+          var tooltipHeight = dom.offsetHeight || 150; // 默认高度150px
+
+          // 获取屏幕可视区域的宽高
+          var screenWidth = document.documentElement.clientWidth;
+          var screenHeight = document.documentElement.clientHeight;
+
+          // 鼠标当前坐标
+          var mouseX = point[0];
+          var mouseY = point[1];
+
+          // 计算tooltip的候选位置（初始：鼠标右侧+10px，鼠标上方-10px）
+          var targetX = mouseX + 10;
+          var targetY = mouseY - 10;
+
+          // 1. 右边界检测：如果tooltip超出屏幕右侧，显示在鼠标左侧
+          if (targetX + tooltipWidth > screenWidth) {
+            targetX = mouseX - tooltipWidth - 10;
+          }
+
+          // 2. 左边界检测：如果tooltip超出屏幕左侧，强制显示在屏幕左侧
+          if (targetX < 0) {
+            targetX = 10;
+          }
+
+          // 3. 下边界检测：如果tooltip超出屏幕下方，显示在鼠标下方
+          if (targetY + tooltipHeight > screenHeight) {
+            targetY = mouseY + 10;
+          }
+
+          // 4. 上边界检测：如果tooltip超出屏幕上方，强制显示在屏幕上方
+          if (targetY < 0) {
+            targetY = 10;
+          }
+
+          // 返回最终调整后的位置
+          return [targetX, targetY];
+        },
         axisPointer: {
           type: 'shadow'
+        },
+        confine: true,
+        // 开启边界限制（ECharts内置，配合自定义position双重保障）
+        formatter: function formatter(params) {
+          return renderToString( /*#__PURE__*/React.createElement(CustomTooltip, {
+            series: undefined,
+            payload: params
+          }));
         }
+        // formatter: (params: any) => {
+        //   return renderToString(<CustomTooltip1 series={seriesData?.series} payload={params} />);
+        // },
       },
+
       legend: {
         bottom: 0,
         icon: 'circle',
@@ -41,7 +117,7 @@ var IntervalChart = function IntervalChart(props) {
         top: '10',
         left: '0',
         right: '0',
-        bottom: '68px',
+        bottom: props.onlyChart ? '0' : '68px',
         containLabel: true
       },
       xAxis: {
@@ -63,23 +139,40 @@ var IntervalChart = function IntervalChart(props) {
 
         axisLabel: {
           color: '#67727F' // 设置文字颜色
+        },
+
+        axisPointer: {
+          type: 'shadow'
         }
       },
-
       yAxis: {
-        type: 'value',
-        splitLine: {
-          show: true,
-          lineStyle: {
-            type: 'dashed' // 设置线条类型为虚线
-          }
-        },
+        // type: 'value',
+        // splitLine: {
+        //   show: true,
+        //   lineStyle: {
+        //     type: 'dashed', // 设置线条类型为虚线
+        //   },
+        // },
+        // axisLabel: {
+        //   color: '#67727F', // 设置文字颜色
+        // },
+        // breaks: _currentAxisBreaks,
+        // breakArea: {
+        //   itemStyle: {
+        //     opacity: 1,
+        //   },
+        //   zigzagZ: 200,
+        // },
 
-        axisLabel: {
-          color: '#67727F' // 设置文字颜色
+        type: 'value',
+        breaks: _currentAxisBreaks,
+        breakArea: {
+          itemStyle: {
+            opacity: 1
+          },
+          zigzagZ: 200
         }
       },
-
       dataZoom: [{
         type: 'inside',
         start: 0,
@@ -106,23 +199,29 @@ var IntervalChart = function IntervalChart(props) {
           datasetIndex: 1,
           name: seriesData === null || seriesData === void 0 ? void 0 : (_seriesData$series$i = seriesData.series[i]) === null || _seriesData$series$i === void 0 ? void 0 : _seriesData$series$i.names[0],
           data: seriesData === null || seriesData === void 0 ? void 0 : (_seriesData$series$i2 = seriesData.series[i]) === null || _seriesData$series$i2 === void 0 ? void 0 : _seriesData$series$i2.values,
-          tooltip: {
-            show: true,
-            // 单独配置series中的tooltip为显示
-            extraCssText: 'border: none;padding:0;border-radius:10px;background: rgba(250, 251, 253, 0.8)',
-            // 添加自定义的CSS样式，去掉边框
-            formatter: function formatter(params) {
-              var tooltipString = renderToString( /*#__PURE__*/React.createElement(CustomTooltip, {
-                series: seriesData === null || seriesData === void 0 ? void 0 : seriesData.series[i],
-                payload: params
-              }));
-              return tooltipString;
-            }
+          showBackground: true,
+          // 关键修改：背景改为透明
+          backgroundStyle: {
+            color: 'rgba(0,0,0,0.2)'
           },
           emphasis: {
+            focus: 'series',
+            blurScope: 'coordinateSystem',
             itemStyle: {
               borderColor: color // 设置盒子的颜色
             }
+
+            // tooltip: {
+            //   show: true, // 单独配置series中的tooltip为显示
+            //   extraCssText:
+            //     'border: none;padding:0;border-radius:10px;background: rgba(250, 251, 253, 0.8)', // 添加自定义的CSS样式，去掉边框
+            //   formatter: (params: any) => {
+            //     const tooltipString = renderToString(
+            //       <CustomTooltip series={seriesData?.series[i]} payload={params} />,
+            //     );
+            //     return tooltipString;
+            //   },
+            // },
           },
 
           itemStyle: {
@@ -131,15 +230,202 @@ var IntervalChart = function IntervalChart(props) {
         };
       })
     };
-    setOption(eCharts);
+    setOptionECharts(eCharts);
   }, [props === null || props === void 0 ? void 0 : props.showList]);
-  return /*#__PURE__*/React.createElement(ReactECharts, {
+  useEffect(function () {
+    chartInstance && chartInstance.setOption(optionECharts);
+  }, [optionECharts]);
+  useEffect(function () {
+    setTimeout(function () {
+      chartInstance && chartInstance.on('axisbreakchanged', function (params) {
+        updateCollapseButton(params);
+      });
+      // =========================
+      // 关键修改：结合 dataZoom 的可见索引范围
+      // =========================
+
+      // 当前 x 轴可见的起止 dataIndex（受 dataZoom 控制）
+      var baseOption = chartInstance && chartInstance.getOption();
+      var totalCategoryCount = baseOption && baseOption.xAxis[0].data.length;
+      var visibleStartIndex = 0;
+      var visibleEndIndex = totalCategoryCount - 1;
+
+      // 根据 dataZoom 的 start / end 百分比更新可见索引范围[web:28]
+      function updateVisibleRangeFromDataZoom(params) {
+        var startPercent;
+        var endPercent;
+        if (params && params.batch && params.batch.length) {
+          // 事件中 batch 数组形式
+          startPercent = params.batch[0].start;
+          endPercent = params.batch[0].end;
+        } else if (params) {
+          startPercent = params.start;
+          endPercent = params.end;
+        }
+        if (startPercent == null || endPercent == null) {
+          return;
+        }
+        var optionNow = chartInstance && chartInstance.getOption();
+        var axisData = optionNow.xAxis[0].data || [];
+        var total = axisData.length || 1;
+        visibleStartIndex = Math.round(startPercent / 100 * (total - 1));
+        visibleEndIndex = Math.round(endPercent / 100 * (total - 1));
+        if (visibleStartIndex < 0) visibleStartIndex = 0;
+        if (visibleEndIndex > total - 1) visibleEndIndex = total - 1;
+      }
+
+      // 初始化一次可见范围（用当前 option 中 dataZoom 的配置）
+      if (baseOption && baseOption.dataZoom && baseOption && baseOption.dataZoom.length) {
+        updateVisibleRangeFromDataZoom(baseOption.dataZoom[0]);
+      }
+
+      // 监听 dataZoom 事件，更新可见范围
+      chartInstance && chartInstance.on('dataZoom', function (params) {
+        updateVisibleRangeFromDataZoom(params);
+      });
+
+      // 封装鼠标移动时的计算逻辑
+      function handleMouseMove(params) {
+        var pointInPixel = [params.offsetX, params.offsetY];
+
+        // 检查是否在网格区域内
+        if (!chartInstance && chartInstance.containPixel('grid', pointInPixel)) {
+          chartInstance && chartInstance.dispatchAction({
+            type: 'hideTip'
+          });
+          return;
+        }
+
+        // 使用当前坐标系（考虑 dataZoom / axisBreak）将像素坐标转为数据坐标[web:19]
+        var pointInGrid = chartInstance && chartInstance.convertFromPixel({
+          xAxisIndex: 0,
+          yAxisIndex: 0
+        }, pointInPixel);
+        if (!pointInGrid) {
+          chartInstance && chartInstance.dispatchAction({
+            type: 'hideTip'
+          });
+          return;
+        }
+        var xIndex = Math.round(pointInGrid[0]);
+        var optionNow = chartInstance && chartInstance.getOption();
+        var series = optionNow.series || [];
+        var seriesCount = series.length;
+
+        // 如果当前 xIndex 不在 dataZoom 可见范围内，直接不显示 tooltip
+        if (xIndex < visibleStartIndex || xIndex > visibleEndIndex) {
+          chartInstance && chartInstance.dispatchAction({
+            type: 'hideTip'
+          });
+          return;
+        }
+
+        // 获取当前网格区域信息（会随 dataZoom / resize 变化）
+        var gridModel = chartInstance && chartInstance.getModel().getComponent('grid', 0);
+        var gridRect = gridModel.coordinateSystem.getRect();
+
+        // 当前可见类目数量（只按 dataZoom 可见区计算宽度）
+        var visibleCategoryCount = visibleEndIndex - visibleStartIndex + 1;
+        if (visibleCategoryCount <= 0) {
+          chartInstance && chartInstance.dispatchAction({
+            type: 'hideTip'
+          });
+          return;
+        }
+
+        // 每个可见类目在当前网格中的宽度
+        var categoryWidth = gridRect.width / visibleCategoryCount;
+
+        // 当前类目的起点 = grid 起点 + (xIndex - visibleStartIndex) * 每类宽度
+        var categoryStartX = gridRect.x + (xIndex - visibleStartIndex) * categoryWidth;
+
+        // 鼠标在当前类目内的相对 X 位置
+        var relativeX = params.offsetX - categoryStartX;
+
+        // 计算每个 series 对应的“柱子”宽度（背景区域同样分配）
+        var barWidth = categoryWidth / seriesCount;
+
+        // 鼠标当前所在的系列下标（按背景区域来划分）
+        var seriesIndex = Math.floor(relativeX / barWidth);
+
+        // 索引有效性判断
+        var categoryTotal = optionNow.xAxis[0].data.length;
+        if (seriesIndex >= 0 && seriesIndex < seriesCount && xIndex >= 0 && xIndex < categoryTotal) {
+          // 显示跟随鼠标的 tooltip（包括柱子上方的背景区域）
+          chartInstance && chartInstance.dispatchAction({
+            type: 'showTip',
+            seriesIndex: seriesIndex,
+            dataIndex: xIndex,
+            position: [params.offsetX + 10, params.offsetY - 10]
+          });
+        } else {
+          chartInstance && chartInstance.dispatchAction({
+            type: 'hideTip'
+          });
+        }
+      }
+
+      // 添加鼠标移动监听，计算鼠标位置对应的具体柱子（考虑 dataZoom 后的新显示）
+      chartInstance && chartInstance.getZr().on('mousemove', function (params) {
+        handleMouseMove(params);
+      });
+      chartInstance && chartInstance.getZr().on('mouseout', function () {
+        chartInstance && chartInstance.dispatchAction({
+          type: 'hideTip'
+        });
+      });
+    }, 0);
+  }, [chartInstance]);
+  function updateCollapseButton(params) {
+    // If there is any axis break expanded, we need to show the collapse button.
+    var needReset = false;
+    for (var i = 0; i < params.breaks.length; i++) {
+      var changedBreakItem = params.breaks[i];
+      if (changedBreakItem.isExpanded) {
+        needReset = true;
+        break;
+      }
+    }
+    setOptionECharts({
+      // Draw the collapse button.
+      graphic: [{
+        elements: [{
+          type: 'rect',
+          ignore: !needReset,
+          name: 'collapseAxisBreakBtn',
+          top: 5,
+          left: 5,
+          shape: {
+            r: 3,
+            width: 140,
+            height: 24
+          },
+          style: {
+            fill: '#eee',
+            stroke: '#999',
+            lineWidth: 1
+          },
+          textContent: {
+            type: 'text',
+            style: {
+              text: 'Collapse Axis Breaks',
+              fontSize: 13,
+              fontWeight: 'bold'
+            }
+          },
+          textConfig: {
+            position: 'inside'
+          }
+        }]
+      }]
+    });
+  }
+  return /*#__PURE__*/React.createElement("div", {
+    ref: chartRef,
     style: {
-      height: '431px',
-      padding: 24
-    },
-    option: option,
-    echarts: echarts
+      width: '100%',
+      height: '400px'
+    }
   });
 };
 export default IntervalChart;

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

@@ -34,5 +34,10 @@ export declare namespace eventChartProps {
          * 改变显示内容
          */
         onChangeShow?: (data: string[]) => void;
+        /**
+         *
+         * 指标异常回调
+         */
+        onChangeException?: () => void;
     }
 }

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

@@ -1,15 +1,15 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { ajax, BizGlobalDataContext, BizLayout, BizTargetFromPanelContext } from '@zgfe/business-lib';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import Request from 'umi-request';
@@ -21,11 +21,15 @@ import { judgeIsCity, judgeIsArea, getValue, searchDataParams } from "./utils";
 import { ContentPanel, SearchPanel } from "../../components";
 import TopPanel from "../topPanel";
 import { message } from 'antd';
+import { ERROR_RESPONESE_CODE } from "../../constants/code";
 var CancelToken = Request.CancelToken;
 var cancel;
 var refresh = false;
 var timer = 0;
 var classPrefix = 'interval-content';
+var RESPONESE_CODE = _objectSpread({
+  SUCCESS: '100000'
+}, ERROR_RESPONESE_CODE);
 var EventContent = function EventContent(props) {
   // 最后的查询数据（防止图表在还没查询时就改变了类型）
   var _useState = useState(props.value),
@@ -69,7 +73,8 @@ var EventContent = function EventContent(props) {
     eventEnvList = _useContext2.eventEnvList,
     userPropList = _useContext2.userPropList,
     setRefreshLoading = _useContext2.setRefreshLoading,
-    panelId = _useContext2.panelId;
+    panelId = _useContext2.panelId,
+    setException = _useContext2.setException;
   var _useContext3 = useContext(BizTargetFromPanelContext),
     handleSearch = _useContext3.handleSearch;
   var collapseRef = useRef();
@@ -91,6 +96,7 @@ var EventContent = function EventContent(props) {
       }
     }
     if (!searchData || !searchData.analysisModel) return;
+    if (!refresh) setLoading(true);
     if (timer) clearTimeout(timer);
     var flag = true;
     timer = setTimeout(function () {
@@ -111,14 +117,18 @@ var EventContent = function EventContent(props) {
   // 查询
   var fetchRequest = function fetchRequest() {
     var _searchData$start, _searchData$end, _searchData$associate, _searchData$associate2, _searchData$associate3;
+    if (typeof cancel == 'function') {
+      cancel();
+      cancel = undefined;
+    }
     if ((searchData === null || searchData === void 0 ? void 0 : (_searchData$start = searchData.start) === null || _searchData$start === void 0 ? void 0 : _searchData$start.id) === null || (searchData === null || searchData === void 0 ? void 0 : (_searchData$end = searchData.end) === null || _searchData$end === void 0 ? void 0 : _searchData$end.id) === null) {
-      setLoading(false);
+      loadingHandle();
       return;
     }
-    setEventData(undefined);
-    if (!refresh) setLoading(true);
+    if (!refresh) loadingHandle();
+    setException(false);
     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);
+      loadingHandle();
       return message.error('您查询的属性不一致，暂不支持查询');
     }
     var params = searchDataParams(searchData);
@@ -128,28 +138,47 @@ var EventContent = function EventContent(props) {
       data: _objectSpread(_objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }, params), {}, {
+        snapshotId: searchData === null || searchData === void 0 ? void 0 : searchData.snapshotId,
         refresh: refresh
       }),
+      intercept: false,
       cancelToken: new CancelToken(function executor(c) {
         cancel = c;
       })
     }).then(function (res) {
-      setRefreshLoading(false);
-      if (!res) {
-        setLoading(false);
+      // 根据接口 code 判断后续的处理逻辑, 优先处理异常错误code
+      // EXCEPTION 可能发生在正常查询及刷新中
+      if ((res === null || res === void 0 ? void 0 : res.code) == RESPONESE_CODE.EXCEPTION) {
+        setException(true);
+        loadingHandle();
+        return;
+      }
+      // 处理其他非成功情况
+      if (res.code != RESPONESE_CODE.SUCCESS) {
+        message.error(res === null || res === void 0 ? void 0 : res.msg);
+        loadingHandle();
         return;
       }
       var result = res.data;
       setEventData(result);
       setFinalSearchData(_objectSpread({}, searchData));
-      setTimeout(function () {
-        setLoading(false);
-      }, 0);
+      loadingHandle();
     }).catch(function () {
-      setLoading(false);
+      loadingHandle();
     });
   };
 
+  // 关闭loading
+  var loadingHandle = function loadingHandle() {
+    // 使用setTimeout放到宏任务队列中
+    // 预防在loading关闭时，数据还在变动中，这会导致渲染展示的还是上次查询的数据
+    setTimeout(function () {
+      setLoading && setLoading(false);
+      setRefreshLoading && setRefreshLoading(false);
+      refresh = false;
+    }, 0);
+  };
+
   // 立即刷新
   var refreshHandle = function refreshHandle() {
     refresh = true;
@@ -190,8 +219,8 @@ var EventContent = function EventContent(props) {
       return _objectSpread(_objectSpread({}, data), {}, {
         time: _searchData.time,
         platform: _searchData.platform || 0,
-        userGroup: data.analysisSubject ? undefined : data.userGroup,
-        analysisSubject: data.analysisSubject ? data.analysisSubject : undefined
+        userGroup: data !== null && data !== void 0 && data.analysisSubject ? undefined : data.userGroup,
+        analysisSubject: data !== null && data !== void 0 && data.analysisSubject ? data === null || data === void 0 ? void 0 : data.analysisSubject : undefined
       });
     });
   };
@@ -212,6 +241,7 @@ var EventContent = function EventContent(props) {
       collapseRef: collapseRef,
       onChange: onChangeSearch,
       defaultValue: searchData,
+      propsDefaultValue: props.defaultValue,
       loading: loading,
       finalSearchData: finalSearchData
     })
@@ -232,7 +262,7 @@ var EventContent = function EventContent(props) {
     loading: loading,
     isCity: isCity,
     eventData: eventData,
-    searchData: finalSearchData,
+    searchData: searchData,
     showList: showList,
     onChangeShow: onChangeShow
   }))));

package/dist/esm/modules/content/utils.d.ts

@@ -48,7 +48,6 @@ export declare function searchDataParams(params: any): {
         userAttr: any;
         eventAttr: any;
         event: any;
-        encryptionType: any;
     } | null;
     associatedPreAttr: any;
     associatedNextAttr: any;

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

@@ -80,7 +80,7 @@ export function searchCondition(params) {
   };
 }
 export function searchDataParams(params) {
-  var _params$dimension, _params$dimension2, _params$dimension3, _params$dimension4, _params$dimension5, _params$dimension6, _params$dimension7, _params$dimension8, _params$dimension9, _params$dimension10, _params$dimension11, _params$dimension12, _params$dimension13, _params$associatedPre, _params$associatedNex;
+  var _params$dimension, _params$dimension2, _params$dimension3, _params$dimension4, _params$dimension5, _params$dimension6, _params$dimension7, _params$dimension8, _params$dimension9, _params$dimension10, _params$dimension11, _params$dimension12, _params$associatedPre, _params$associatedNex;
   return {
     time: _objectSpread({}, params === null || params === void 0 ? void 0 : params.time),
     platform: (params === null || params === void 0 ? void 0 : params.platform) || 0,
@@ -93,13 +93,12 @@ export function searchDataParams(params) {
       attrId: params === null || params === void 0 ? void 0 : (_params$dimension6 = params.dimension) === null || _params$dimension6 === void 0 ? void 0 : _params$dimension6.id,
       userAttr: (params === null || params === void 0 ? void 0 : (_params$dimension7 = params.dimension) === null || _params$dimension7 === void 0 ? void 0 : _params$dimension7.propCategory) === 'userProp' ? params === null || params === void 0 ? void 0 : (_params$dimension8 = params.dimension) === null || _params$dimension8 === void 0 ? void 0 : _params$dimension8.name : null,
       eventAttr: (params === null || params === void 0 ? void 0 : (_params$dimension9 = params.dimension) === null || _params$dimension9 === void 0 ? void 0 : _params$dimension9.propCategory) === 'eventProp' ? params === null || params === void 0 ? void 0 : (_params$dimension10 = params.dimension) === null || _params$dimension10 === void 0 ? void 0 : _params$dimension10.label : null,
-      event: (params === null || params === void 0 ? void 0 : (_params$dimension11 = params.dimension) === null || _params$dimension11 === void 0 ? void 0 : _params$dimension11.propCategory) !== 'envProp' ? params === null || params === void 0 ? void 0 : (_params$dimension12 = params.dimension) === null || _params$dimension12 === void 0 ? void 0 : _params$dimension12.eventId : null,
-      encryptionType: params === null || params === void 0 ? void 0 : (_params$dimension13 = params.dimension) === null || _params$dimension13 === void 0 ? void 0 : _params$dimension13.encryptionType
+      event: (params === null || params === void 0 ? void 0 : (_params$dimension11 = params.dimension) === null || _params$dimension11 === void 0 ? void 0 : _params$dimension11.propCategory) !== 'envProp' ? params === null || params === void 0 ? void 0 : (_params$dimension12 = params.dimension) === null || _params$dimension12 === void 0 ? void 0 : _params$dimension12.eventId : null
     } : null,
     associatedPreAttr: params === null || params === void 0 ? void 0 : (_params$associatedPre = params.associatedPreAttr) === null || _params$associatedPre === void 0 ? void 0 : _params$associatedPre.id,
     associatedNextAttr: params === null || params === void 0 ? void 0 : (_params$associatedNex = params.associatedNextAttr) === null || _params$associatedNex === void 0 ? void 0 : _params$associatedNex.id,
     analysisModel: params.analysisModel,
-    analysisSubject: params.analysisSubject
+    analysisSubject: params === null || params === void 0 ? void 0 : params.analysisSubject
   };
 }
 export function transformData(data) {

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

@@ -6,7 +6,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
 import { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
-import { ModuleInterval } from "../../../index";
+import { ModuleInterval } from '@zgfe/modules-interval';
 import { requestConfig } from "../../../utils/ajaxConfig";
 import { Button } from 'antd';
 var defaultValue = null;
@@ -33,9 +33,10 @@ export default (function () {
   var onUserDrill = function onUserDrill(data, searchData) {
     console.log('onUserDrill:', data, searchData);
   };
+  var onJumpWarning = function onJumpWarning() {};
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 461
+    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);
@@ -43,6 +44,7 @@ export default (function () {
   }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleInterval, {
     defaultValue: searchParams,
     afterEditTarget: afterEditTarget,
-    onUserDrill: onUserDrill
+    onUserDrill: onUserDrill,
+    onJumpWarning: onJumpWarning
   }));
 });