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

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

@@ -1,138 +1,138 @@
-.mi-interval-table {
-  width: 100%;
-  margin-top: 16px;
-
-  .ant-table {
-    border-radius: 8px;
-  }
-  .ant-table-cell-with-append .ant-table-row-expand-icon {
-    left: 16px !important;
-    color: #9aa1a9;
-    border: 1px solid #9aa1a9;
-  }
-  .ant-table-row-expand-icon::before {
-    height: 1.4px !important;
-  }
-  .ant-table-row-expand-icon::after {
-    width: 1.4px !important;
-  }
-  .ant-table-cell {
-    height: 50px;
-    padding: 0 16px !important;
-  }
-
-  .ant-pagination {
-    margin-top: 24px !important;
-  }
-
-  .ant-table-tbody > tr > td {
-    border-bottom: 0.1px solid #e6e7ea;
-  }
-
-  .ant-table .ant-table-container .ant-table-thead > tr > th {
-    background-color: #f2f3f4 !important;
-  }
-
-  &-table-header {
-    display: flex;
-    justify-content: space-between;
-    height: 50px;
-    padding: 0 16px;
-    line-height: 50px;
-    background: #fafafb;
-    border: 1px solid var(--gray-6, #ecedf0);
-    border-bottom: none;
-    border-radius: 8px 8px 0 0;
-
-    > :nth-child(2) {
-      display: flex;
-      margin-top: 9px;
-      div {
-        display: flex;
-        align-items: center;
-        height: 32px;
-        padding: 0 16px;
-        line-height: 32px;
-        background: #fff;
-        border: 1px solid #f2f3f4;
-        border-radius: 4px;
-        cursor: pointer;
-        .xiazai1 {
-          margin-right: 4px;
-          font-size: 16px !important;
-        }
-      }
-      div:hover {
-        color: #165dff;
-        border: 1px solid #165dff;
-      }
-    }
-  }
-
-  .ant-table {
-    border-radius: 0 0 8px 8px;
-  }
-
-  .ant-table-cell-with-append {
-    padding-left: 20px;
-
-    .ant-table-row-expand-icon {
-      position: absolute;
-      left: 0;
-      margin-top: 0;
-    }
-  }
-}
-
-.event-table-sql-modal {
-  .ant-modal-header {
-    position: relative;
-    z-index: 1;
-    height: 82px;
-    background: transparent;
-  }
-
-  .ant-modal-body {
-    padding: 0 24px 18px 24px;
-  }
-
-  .ant-modal-close-x {
-    margin-top: 13px;
-    margin-right: 8px;
-  }
-
-  img {
-    width: 100%;
-  }
-
-  .qingchu {
-    font-weight: 500;
-    font-size: 22px !important;
-  }
-
-  .modal-bg {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: auto;
-  }
-
-  .hljs {
-    padding: 16px;
-    background: #fafafb;
-  }
-
-  .copy-box {
-    position: absolute;
-    top: 98px;
-    right: 40px;
-    padding: 0 8px;
-    background: #f2f3f4;
-    border-radius: 4px;
-
-    .fuzhi1 {
-      margin-right: 8px;
-    }
-  }
-}
+.mi-interval-table {
+  width: 100%;
+  margin-top: 16px;
+
+  .ant-table {
+    border-radius: 8px;
+  }
+  .ant-table-cell-with-append .ant-table-row-expand-icon {
+    left: 16px !important;
+    color: #9aa1a9;
+    border: 1px solid #9aa1a9;
+  }
+  .ant-table-row-expand-icon::before {
+    height: 1.4px !important;
+  }
+  .ant-table-row-expand-icon::after {
+    width: 1.4px !important;
+  }
+  .ant-table-cell {
+    height: 50px;
+    padding: 0 16px !important;
+  }
+
+  .ant-pagination {
+    margin-top: 24px !important;
+  }
+
+  .ant-table-tbody > tr > td {
+    border-bottom: 0.1px solid #e6e7ea;
+  }
+
+  .ant-table .ant-table-container .ant-table-thead > tr > th {
+    background-color: #f2f3f4 !important;
+  }
+
+  &-table-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 0 16px;
+    line-height: 50px;
+    background: #fafafb;
+    border: 1px solid var(--gray-6, #ecedf0);
+    border-bottom: none;
+    border-radius: 8px 8px 0 0;
+
+    > :nth-child(2) {
+      display: flex;
+      margin-top: 9px;
+      div {
+        display: flex;
+        align-items: center;
+        height: 32px;
+        padding: 0 16px;
+        line-height: 32px;
+        background: #fff;
+        border: 1px solid #f2f3f4;
+        border-radius: 4px;
+        cursor: pointer;
+        .xiazai1 {
+          margin-right: 4px;
+          font-size: 16px !important;
+        }
+      }
+      div:hover {
+        color: #165dff;
+        border: 1px solid #165dff;
+      }
+    }
+  }
+
+  .ant-table {
+    border-radius: 0 0 8px 8px;
+  }
+
+  .ant-table-cell-with-append {
+    padding-left: 20px;
+
+    .ant-table-row-expand-icon {
+      position: absolute;
+      left: 0;
+      margin-top: 0;
+    }
+  }
+}
+
+.event-table-sql-modal {
+  .ant-modal-header {
+    position: relative;
+    z-index: 1;
+    height: 82px;
+    background: transparent;
+  }
+
+  .ant-modal-body {
+    padding: 0 24px 18px 24px;
+  }
+
+  .ant-modal-close-x {
+    margin-top: 13px;
+    margin-right: 8px;
+  }
+
+  img {
+    width: 100%;
+  }
+
+  .qingchu {
+    font-weight: 500;
+    font-size: 22px !important;
+  }
+
+  .modal-bg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: auto;
+  }
+
+  .hljs {
+    padding: 16px;
+    background: #fafafb;
+  }
+
+  .copy-box {
+    position: absolute;
+    top: 98px;
+    right: 40px;
+    padding: 0 8px;
+    background: #f2f3f4;
+    border-radius: 4px;
+
+    .fuzhi1 {
+      margin-right: 8px;
+    }
+  }
+}

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

@@ -1,16 +1,16 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-
-.modules-interval-topbar {
-  display: flex;
-  justify-content: flex-end;
-  margin: 8px 0;
-  &-panel {
-    margin-right: 16px;
-  }
-  &-scene {
-    margin-right: 16px;
-  }
-  &-earlywarning {
-    margin-right: 16px;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.modules-interval-topbar {
+  display: flex;
+  justify-content: flex-end;
+  margin: 8px 0;
+  &-panel {
+    margin-right: 16px;
+  }
+  &-scene {
+    margin-right: 16px;
+  }
+  &-earlywarning {
+    margin-right: 16px;
+  }
+}

package/dist/esm/constants/apis.js

@@ -2,12 +2,12 @@ var Apis = {
   dataList: '/interval/intervalData',
   getEventDataSql: '/dataSql/getEventDataSql',
   eventDownloadReport: '/interval/downLoadintervalData',
-  /**
-   * 用户下钻
+  /**
+   * 用户下钻
    */
   userDrill: '/interval/userDrill',
-  /**
-   * 主体下钻
+  /**
+   * 主体下钻
    */
   subjectDrill: '/interval/eventDrill',
   querySubjectDisplay: '/analysisSubject/querySubDisplay'

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/constants/fields.js

@@ -126,8 +126,8 @@ export var addSceneFields = [{
   }]
 }];
 
-/**
- * 维度对象
+/**
+ * 维度对象
  */
 export var indexObject = {
   number: '人数',
@@ -139,8 +139,8 @@ export var indexObject = {
   median: '中位数'
 };
 
-/**
- * 内置指标
+/**
+ * 内置指标
  */
 export var BuiltinIndicators = {
   id: -2,

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

@@ -3,6 +3,8 @@ import "./index.less";
 var CustomTooltip = function CustomTooltip(_ref) {
   var payload = _ref.payload,
     series = _ref.series;
+  console.log(payload, series, 'payload, series');
+
   // 初始化，判断showList是否有值，如果没值，取结果的前10条
   useEffect(function () {}, []);
   function convertToHMS(seconds) {
@@ -13,14 +15,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 +30,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,15 +11,18 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import 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;
+  var params = props.params,
+    onChangeException = props.onChangeException;
   // 显示内容
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -49,6 +52,7 @@ 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);
@@ -56,7 +60,8 @@ var IntervalEventChart = function IntervalEventChart(props) {
       setShowList(app);
       setDataSourceList(arr);
     }
-  }, [params === null || params === void 0 ? void 0 : params.displaySetup, dataSource]);
+    setDataSource(dataSource);
+  }, [params === null || params === void 0 ? void 0 : params.displaySetup, props.dataSource]);
   var fetchResult = function fetchResult() {
     var _obj$start, _obj$end, _params$start, _params$end;
     var obj = searchDataParams(params);
@@ -66,12 +71,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);
@@ -84,9 +94,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", {

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;