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

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/constants/code.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @description 异常状态码
+ */
+export declare const ERROR_RESPONESE_CODE: {
+    /**
+     * @description 刷新失败
+     */
+    REFRESH_FAIL: string;
+    /**
+     * @description 用户群或标签查询异常
+     */
+    EXCEPTION: string;
+};

package/dist/esm/constants/code.js

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

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

@@ -17,9 +17,11 @@ 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";
 var IntervalEventChart = function IntervalEventChart(props) {
   var _dataSource$appData2;
-  var params = props.params;
+  var params = props.params,
+    onChangeException = props.onChangeException;
   // 显示内容
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -66,12 +68,17 @@ var IntervalEventChart = function IntervalEventChart(props) {
         method: 'post',
         data: _objectSpread(_objectSpread({
           appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
-        }, params), obj)
+        }, params), obj),
+        intercept: false
       }).then(function (res) {
+        setLoading(false);
         if (!res) {
           return;
         }
-        setLoading(false);
+        if (res.code == ERROR_RESPONESE_CODE.EXCEPTION) {
+          onChangeException === null || onChangeException === void 0 ? void 0 : onChangeException();
+          return;
+        }
         setDataSource(res.data);
       }).catch(function () {
         setLoading(false);

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

@@ -41,7 +41,7 @@ var IntervalChart = function IntervalChart(props) {
         top: '10',
         left: '0',
         right: '0',
-        bottom: '68px',
+        bottom: props.onlyChart ? '0' : '68px',
         containLabel: true
       },
       xAxis: {

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
     })

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

@@ -4,30 +4,30 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
-/**
- * 判断当前细分属性是否为”城市“
- * @param name 属性名称
- * @returns true标识为：是城市
+/**
+ * 判断当前细分属性是否为”城市“
+ * @param name 属性名称
+ * @returns true标识为：是城市
  */
 export var judgeIsCity = function judgeIsCity(name) {
   var areaData = ['current_city', 'city'];
   return name && areaData.indexOf(name) !== -1 ? true : false;
 };
 
-/**
- * 判断当前细分属性，地图是否可选
- * @param name 属性名称
- * @returns true标识为：地图可选
+/**
+ * 判断当前细分属性，地图是否可选
+ * @param name 属性名称
+ * @returns true标识为：地图可选
  */
 export var judgeIsArea = function judgeIsArea(name) {
   var areaData = ['current_area', 'current_city', 'area', 'city'];
   return name && areaData.indexOf(name) !== -1 ? true : false;
 };
 
-/**
- * 获取当前属性的全部数据
- * @param param 属性的部分数据
- * @returns 属性的全部数据
+/**
+ * 获取当前属性的全部数据
+ * @param param 属性的部分数据
+ * @returns 属性的全部数据
  */
 export var getValue = function getValue(param, eventGroupList, eventEnvList, userPropList) {
   var res = undefined;
@@ -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
   }));
 });

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

@@ -6,48 +6,146 @@ 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 = {
-  id: 7565,
-  name: '测试6666',
-  type: 0,
+  appId: 52,
   enlarged: 0,
-  panelId: 400900,
+  hasPermission: true,
+  id: 488,
+  isPerfect: 1,
+  name: '间隔',
+  reqParam: {
+    data: {
+      appId: 52,
+      module: 'interval',
+      userGroup: [0],
+      start: {
+        id: 590,
+        name: 'pv',
+        deleted: 0
+      },
+      associatedPreAttr: {
+        realTime: true,
+        eventId: 590,
+        propCategory: 'eventProp',
+        alias: '',
+        id: 31415926,
+        label: '业务',
+        dimensionSub: 'event_attr',
+        type: 1,
+        key: 'eventProp-31415926',
+        isHidden: 0
+      },
+      associatedNextAttr: {
+        realTime: true,
+        eventId: 590,
+        propCategory: 'eventProp',
+        alias: '',
+        id: 3045,
+        label: 'page_title',
+        dimensionSub: 'event_attr',
+        type: 1,
+        key: 'eventProp-3045',
+        isHidden: 0
+      },
+      end: {
+        id: 590,
+        name: 'pv',
+        deleted: 0
+      },
+      dimension: {
+        id: 0,
+        alias: null,
+        category: 'fixed',
+        key: 'userProp-last_visit_time-0',
+        label: '最后一次访问时间',
+        name: 'last_visit_time',
+        propCategory: 'userProp',
+        type: 3,
+        realTime: false,
+        dimensionSub: 'last_visit_time'
+      },
+      analysisModel: 'commonInterval',
+      time: {
+        begin: '2024-11-15',
+        end: '2024-11-22',
+        relative: [7, 0],
+        unit: 'day'
+      },
+      platform: 0,
+      chartType: 'boxplot'
+    },
+    chosen_data: []
+  },
+  type: 0,
+  unExistEvent: '',
+  renderType: 'normal',
+  source: 'PANEL',
+  panelId: 87,
   panelType: 'edit',
   data: {
-    chartType: 'boxplot',
-    analysisIndex: 'per',
-    id: 7565,
-    name: '测试6666',
-    appId: 266,
-    platform: 0,
-    userGroup: [933, 935],
-    time: {
-      unit: 'day',
-      relative: [14, 0],
-      begin: '2023-08-04',
-      end: '2023-08-18'
+    appId: 52,
+    module: 'interval',
+    userGroup: [0],
+    start: {
+      id: 590,
+      name: 'pv',
+      deleted: 0
     },
-    dimension: {
+    associatedPreAttr: {
+      realTime: true,
+      eventId: 590,
       propCategory: 'eventProp',
-      value: 151045
+      alias: '',
+      id: 31415926,
+      label: '业务',
+      dimensionSub: 'event_attr',
+      type: 1,
+      key: 'eventProp-31415926',
+      isHidden: 0
     },
-    filters: {
-      relation: 'and',
-      conditions: [{
-        attrId: 151045,
-        propCategory: 'eventProp',
-        type: 1,
-        operator: 'equal',
-        values: ['55'],
-        dimensionSub: 'event_attr',
-        label: '应用名称',
-        attrName: '应用名称'
-      }]
-    }
-  }
+    associatedNextAttr: {
+      realTime: true,
+      eventId: 590,
+      propCategory: 'eventProp',
+      alias: '',
+      id: 3045,
+      label: 'page_title',
+      dimensionSub: 'event_attr',
+      type: 1,
+      key: 'eventProp-3045',
+      isHidden: 0
+    },
+    end: {
+      id: 590,
+      name: 'pv',
+      deleted: 0
+    },
+    dimension: {
+      id: 0,
+      alias: null,
+      category: 'fixed',
+      key: 'userProp-last_visit_time-0',
+      label: '最后一次访问时间',
+      name: 'last_visit_time',
+      propCategory: 'userProp',
+      type: 3,
+      realTime: false,
+      dimensionSub: 'last_visit_time'
+    },
+    analysisModel: 'commonInterval',
+    time: {
+      begin: '2024-11-15',
+      end: '2024-11-22',
+      relative: [7, 0],
+      unit: 'day'
+    },
+    platform: 0,
+    chartType: 'boxplot'
+  },
+  chosen_data: []
 };
 export default (function () {
   // 是否进入用户钻取页面
@@ -74,7 +172,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 266
+    defaultApp: 52
   }, 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/index.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 { DemoWrapper, setGlobalConfig } from '@zgfe/business-lib';
 import React, { useEffect, useState } from 'react';
-import { ModuleInterval } from "../../../index";
+import { ModuleInterval } from '@zgfe/modules-interval';
 import "./styles/index.less";
 import { requestConfig } from "../../../utils/ajaxConfig";
 import { Button } from 'antd';

package/dist/esm/modules/home/demo/scene.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 = {

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

@@ -63,6 +63,11 @@ var ModuleInterval = function ModuleInterval(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     subjectEnable = _useState16[0],
     setSubjectEnable = _useState16[1];
+  var _useState17 = useState(false),
+    _useState18 = _slicedToArray(_useState17, 2),
+    exception = _useState18[0],
+    setException = _useState18[1];
+
   // 初始化
   useEffect(function () {
     setLoading(true);
@@ -145,7 +150,9 @@ var ModuleInterval = function ModuleInterval(props) {
       changeLoading: setLoading,
       afterEditTarget: props.afterEditTarget,
       onUserDrill: props.onUserDrill,
-      onJumpWarning: props.onJumpWarning
+      onJumpWarning: props.onJumpWarning,
+      exception: exception,
+      setException: setException
     }
   }, /*#__PURE__*/React.createElement(EventContent, {
     defaultValue: props.defaultValue ? props.defaultValue.data : undefined,

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

@@ -71,7 +71,6 @@ export declare namespace IntervalProps {
         perValue?: number;
         peopleNum?: number;
         names?: string[];
-        originalNames?: string[];
         total?: number;
         children?: ColumnsDataType[];
     }

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

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

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

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

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

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

package/dist/esm/utils/formData.js

@@ -12,6 +12,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React from 'react';
+import { Tooltip } from 'antd';
 import { chartColors } from "../constants/color";
 import "../style/index.less";
 import { IconFont } from '@zgfe/business-lib';
@@ -27,10 +28,10 @@ function convertToHMS(seconds) {
   var s = remainingSeconds ? remainingSeconds + '秒' : '0秒';
   return h + m + s;
 }
-/**
- * 获取table的columns
- * @param columnData xAxis
- * @returns column fields
+/**
+ * 获取table的columns
+ * @param columnData xAxis
+ * @returns column fields
  */
 export function getColumns(eventGroupList, userPropList, eventEnvList, columnData, dataSource, userGroup, searchData, showList, onUserDrill, currentApp
 // onClickToDetailCallback: Function,
@@ -46,7 +47,9 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
     dataIndex: 'time',
     className: "".concat(classPrefix, "-table-td"),
     render: function render(text, record) {
-      return /*#__PURE__*/React.createElement("span", null, " ", text);
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        title: text
+      }, /*#__PURE__*/React.createElement("span", null, " ", text));
     }
   }, {
     title: '最大值',
@@ -205,22 +208,22 @@ export function getColumns(eventGroupList, userPropList, eventEnvList, columnDat
   return data;
 }
 
-/**
- * 获取属性的label
- * @param attrData 当前属性
- * @param eventGroupList 事件属性列表
- * @param userPropList 用户属性列表
- * @param eventEnvList 环境属性列表
- * @returns label
+/**
+ * 获取属性的label
+ * @param attrData 当前属性
+ * @param eventGroupList 事件属性列表
+ * @param userPropList 用户属性列表
+ * @param eventEnvList 环境属性列表
+ * @returns label
  */
 
-/**
- * 格式化表格数据
- * @param originalData 查询的数据
- * @param hasUserGroup 是否有多个用户群
- * @param attrNum 属性细分个数
- * @param showList 要展示的内容，如果没传，则展示全部
- * @returns
+/**
+ * 格式化表格数据
+ * @param originalData 查询的数据
+ * @param hasUserGroup 是否有多个用户群
+ * @param attrNum 属性细分个数
+ * @param showList 要展示的内容，如果没传，则展示全部
+ * @returns
  */
 export function formTableData(originalData) {
   var result = createNewArray(originalData);
@@ -307,10 +310,10 @@ function getChildrenData(data, index) {
   }
   return [];
 }
-/**
- * 获取查询结果
- * @param source 结果数据
- * @returns 获取查询结果
+/**
+ * 获取查询结果
+ * @param source 结果数据
+ * @returns 获取查询结果
  */
 export function getDefaultShow(source, data) {
   if (source.appData.series) {
@@ -332,11 +335,11 @@ export function getDefaultShow(source, data) {
   }
   return [];
 }
-/**
- * 获取显示事件对应的颜色
- * @param source 结果数据
- * @param showList 展示列表
- * @returns 展示列表对应的颜色
+/**
+ * 获取显示事件对应的颜色
+ * @param source 结果数据
+ * @param showList 展示列表
+ * @returns 展示列表对应的颜色
  */
 export function getShowColor(source, showList) {
   var colors = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-interval",
-  "version": "1.0.23-zhongyuan.1",
+  "version": "1.0.23-zhongyuan.3",
   "private": false,
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
@@ -42,7 +42,7 @@
     "@types/uuid": "^9.0.2",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "1.2.70-hxd.10",
+    "@zgfe/business-lib": "1.2.70-hxd.31",
     "antd": "^4.22.6",
     "dumi": "^1.1.0",
     "echarts": "^5.3.2",
@@ -59,7 +59,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e0ab09536ecccea2965d6c3e0e73ba24b31fea65",
+  "gitHead": "e8c97df2f4e849232f643a5b105e36f497101ba0",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }