@zgfe/modules-interval 1.0.0-interval.8 → 1.0.0

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

@@ -11,14 +11,14 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
-import { BizGlobalDataContext, ajax } from '@zgfe/business-lib';
+import { BizGlobalDataContext, BizLoading, ajax } from '@zgfe/business-lib';
 import { EventTable, MiNone } from "../../components";
 import { extractNames, getDefaultShow } from "../../utils/formData";
 import { Apis } from "../../constants";
-import { Spin } from 'antd';
 import IntervalChart from "./intervalChart";
-var EventChart = function EventChart(props) {
-  var _dataSource$appData;
+import { searchDataParams } from "../content/utils";
+var IntervalEventChart = function IntervalEventChart(props) {
+  var _dataSource$appData2;
   var params = props.params;
   // 显示内容
   var _useState = useState(),
@@ -41,35 +41,42 @@ var EventChart = function EventChart(props) {
     setLoading = _useState8[1];
   useEffect(function () {
     // 没有dataSource时（看板列表访问），请求查询
-    if (!props.dataSource) {
+    if (!props.dataSource || (params === null || params === void 0 ? void 0 : params.module) === 'interval') {
       fetchResult();
     }
   }, []);
 
   // 初始化，判断showList是否有值，如果没值，取结果的前10条
   useEffect(function () {
-    var _extractNames;
-    var arr = params !== null && params !== void 0 && params.displaySetup ? params === null || params === void 0 ? void 0 : params.displaySetup : (_extractNames = extractNames(dataSource)) === null || _extractNames === void 0 ? void 0 : _extractNames.splice(0, 4);
-    var app = getDefaultShow(dataSource, arr);
-    setShowList(app);
-    setDataSourceList(arr);
-  }, [params === null || params === void 0 ? void 0 : params.displaySetup]);
+    var _dataSource$appData, _dataSource$appData$s;
+    if ((dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$appData = dataSource.appData) === null || _dataSource$appData === void 0 ? void 0 : (_dataSource$appData$s = _dataSource$appData.series) === null || _dataSource$appData$s === void 0 ? void 0 : _dataSource$appData$s.length) > 0) {
+      var _extractNames;
+      var arr = params !== null && params !== void 0 && params.displaySetup ? params === null || params === void 0 ? void 0 : params.displaySetup : (_extractNames = extractNames(dataSource)) === null || _extractNames === void 0 ? void 0 : _extractNames.splice(0, 4);
+      var app = getDefaultShow(dataSource, arr);
+      setShowList(app);
+      setDataSourceList(arr);
+    }
+  }, [params === null || params === void 0 ? void 0 : params.displaySetup, dataSource]);
   var fetchResult = function fetchResult() {
-    setLoading(true);
-    ajax(Apis.dataList, {
-      method: 'post',
-      data: _objectSpread({
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
-      }, params)
-    }).then(function (res) {
-      if (!res) {
-        return;
-      }
-      setDataSource(res.data);
-    }).catch(function () {
-      setLoading(false);
-    });
+    var _obj$start, _obj$end, _params$start, _params$end;
+    var obj = searchDataParams(params);
+    if (obj !== null && obj !== void 0 && (_obj$start = obj.start) !== null && _obj$start !== void 0 && _obj$start.eventId && obj !== null && obj !== void 0 && (_obj$end = obj.end) !== null && _obj$end !== void 0 && _obj$end.eventId || params !== null && params !== void 0 && (_params$start = params.start) !== null && _params$start !== void 0 && _params$start.eventId && params !== null && params !== void 0 && (_params$end = params.end) !== null && _params$end !== void 0 && _params$end.eventId) {
+      setLoading(true);
+      ajax(Apis.dataList, {
+        method: 'post',
+        data: _objectSpread({
+          appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+        }, obj)
+      }).then(function (res) {
+        if (!res) {
+          return;
+        }
+        setLoading(false);
+        setDataSource(res.data);
+      }).catch(function () {
+        setLoading(false);
+      });
+    }
   };
 
   // 表格筛选，取前10个
@@ -77,13 +84,13 @@ var EventChart = function EventChart(props) {
     if (props.onChangeShow) props.onChangeShow(names);
   };
   if (loading) {
-    return /*#__PURE__*/React.createElement(Spin, {
-      className: "spin-container"
-    });
+    return /*#__PURE__*/React.createElement(BizLoading, {
+      className: "mi-common-interval-content"
+    }, /*#__PURE__*/React.createElement("div", null));
   }
-  if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$appData = dataSource.appData) !== null && _dataSource$appData !== void 0 && _dataSource$appData.series.length)) {
+  if (!dataSource || !(dataSource !== null && dataSource !== void 0 && (_dataSource$appData2 = dataSource.appData) !== null && _dataSource$appData2 !== void 0 && _dataSource$appData2.series.length)) {
     return /*#__PURE__*/React.createElement(MiNone, {
-      label: "\u6682\u65E0\u6570\u636E"
+      label: !dataSource ? '请选择条件进行查询' : '暂无数据'
     });
   }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IntervalChart, {
@@ -91,11 +98,11 @@ var EventChart = function EventChart(props) {
     showList: showList,
     dataSourceList: dataSourceList,
     params: params
-  }), /*#__PURE__*/React.createElement(EventTable, {
+  }), (params === null || params === void 0 ? void 0 : params.chartType) === 'line' ? /*#__PURE__*/React.createElement(EventTable, {
     dataSource: dataSource,
     searchData: params,
     showList: [],
     changeShow: onChangeShow
-  }));
+  }) : null);
 };
-export default EventChart;
+export default IntervalEventChart;

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

@@ -1,4 +1,4 @@
-.custom-tooltip {
+.custom-tooltip-chart {
   display: flex;
   flex-direction: column;
   flex-shrink: 0;
@@ -6,43 +6,53 @@
   align-items: flex-start;
   width: 146px;
   height: 100%;
+  padding: 8px;
   color: var(--io-n, #021429);
   font-weight: 500;
   font-size: 12px;
   font-style: normal;
-  background: rgba(250, 251, 253, 0.8);
+  // background: rgba(250, 251, 253, 0.8);
   border-radius: 10px;
-  box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
-  backdrop-filter: blur(2px);
+  box-shadow: 0px 4px 10px 0px #0000001a;
 
-  > div:nth-child(2) {
+  .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-div {
     display: flex;
     flex-direction: column;
-    gap: 7px;
+    gap: 6px;
     width: 100%;
     height: 100%;
-    padding: 4px 8px;
+    padding: 0px 8px;
     background: #fff;
     border-radius: 4px;
     box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.04);
+
+    .tooltip-span {
+      display: block;
+      color: var(--3, #5f6085);
+      font-weight: 400;
+      font-size: 12px;
+      font-family: PingFang SC;
+      font-style: normal;
+      line-height: normal;
+    }
+
     > div {
       display: flex;
       align-items: center;
       justify-content: space-between;
     }
 
-    > div:nth-child(1) {
+    .tooltip-marker {
       justify-content: flex-start;
     }
   }
-
-  .tooltip-span {
-    display: block;
-    color: var(--3, #5f6085);
-    font-weight: 400;
-    font-size: 12px;
-    font-family: PingFang SC;
-    font-style: normal;
-    line-height: normal;
-  }
 }

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

@@ -30,8 +30,13 @@ var IntervalChart = function IntervalChart(props) {
       },
       legend: {
         bottom: 0,
-        type: 'scroll'
+        icon: 'circle',
+        type: 'scroll',
+        itemWidth: 10,
+        // 设置图例的宽度为10px
+        itemHeight: 10 // 设置图例的高度为10px
       },
+
       grid: {
         top: '10',
         left: '0',
@@ -79,14 +84,16 @@ var IntervalChart = function IntervalChart(props) {
         type: 'inside',
         start: 0,
         end: 20,
+        right: 3,
         height: 20 // 设置内置的dataZoom的高度
       }, {
-        show: true,
+        show: (params === null || params === void 0 ? void 0 : params.module) === 'interval' ? false : true,
         type: 'slider',
         bottom: '38px',
         xAxisIndex: [0],
         start: 0,
         end: 20,
+        right: 3,
         height: 20 // 设置滑动条的高度
       }],
 
@@ -102,7 +109,7 @@ var IntervalChart = function IntervalChart(props) {
           tooltip: {
             show: true,
             // 单独配置series中的tooltip为显示
-            extraCssText: 'border: none;',
+            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, {

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

@@ -26,7 +26,6 @@ var CancelToken = Request.CancelToken;
 var cancel;
 var classPrefix = 'interval-content';
 var EventContent = function EventContent(props) {
-  // console.log('EventContent', props);
   // 最后的查询数据（防止图表在还没查询时就改变了类型）
   var _useState = useState(props.value),
     _useState2 = _slicedToArray(_useState, 2),
@@ -93,7 +92,7 @@ var EventContent = function EventContent(props) {
     var flag = true;
     timer = setTimeout(function () {
       if (flag) {
-        fetchRequest();
+        fetchRequest(false);
       }
     }, 500);
     return function () {
@@ -112,21 +111,25 @@ var EventContent = function EventContent(props) {
   }, [ajaxFlag]);
   // 查询
   var fetchRequest = function fetchRequest(flag) {
-    var _searchData$associate, _searchData$associate2, _searchData$associate3;
+    var _searchData$start, _searchData$end, _searchData$associate, _searchData$associate2, _searchData$associate3;
     if (flag !== undefined) setAjaxFlag(flag);
     if (!ajaxFlag) return;
-    setLoading(true);
+    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);
+      return;
+    }
     setEventData(undefined);
+    setLoading(true);
     // 取消上次未完成的请求
-    if (typeof cancel === 'function') {
-      cancel();
-    }
+    // if (typeof cancel === 'function') {
+    //   cancel();
+    // }
     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);
       return message.error('您查询的属性不一致，暂不支持查询');
     }
     var params = searchDataParams(searchData);
     props.onChange && props.onChange(searchData);
-    // console.log(77771111, searchData, params);
     ajax(Apis.dataList, {
       method: 'post',
       data: _objectSpread({
@@ -153,10 +156,10 @@ var EventContent = function EventContent(props) {
 
   // 改变时间和图表类型
   var onChangeContent = function onChangeContent(data) {
-    setAjaxFlag(true);
     setSearchData(function (value) {
       return _objectSpread(_objectSpread({}, value), data);
     });
+    setAjaxFlag(true);
   };
 
   // 改变显示内容
@@ -166,35 +169,40 @@ var EventContent = function EventContent(props) {
 
   // 平台变更
   var platformChange = function platformChange(data) {
-    setAjaxFlag(true);
-    setSearchData(function (_searchData) {
-      return _objectSpread(_objectSpread({}, _searchData), {}, {
+    setSearchData(function (value) {
+      return _objectSpread(_objectSpread({}, value), {}, {
         platform: data
       });
     });
+    setTimeout(function () {
+      setAjaxFlag(true);
+    }, 100);
   };
 
   // TopPanel组件数值变更
   var onChangeSearch = function onChangeSearch(data, flag) {
-    setAjaxFlag(false);
     data.id ? setEventId(data.id) : setEventId(-1);
     setSearchData(function (_searchData) {
       return _objectSpread(_objectSpread({}, _searchData), data);
     });
+    setAjaxFlag(false);
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
     searchData: searchData,
+    loading: loading,
     eventData: eventData,
     platformChange: platformChange,
     onUserDrill: props.onUserDrill
   }), /*#__PURE__*/React.createElement(BizLayout, {
     showTitle: false,
     hasCollapse: true,
+    className: "interval-layout",
     collapseRef: collapseRef,
     topPanel: /*#__PURE__*/React.createElement(TopPanel, {
       collapseRef: collapseRef,
       onChange: onChangeSearch,
       defaultValue: searchData,
+      urlParam: props.urlParam,
       ajaxFlag: ajaxFlag,
       loading: loading,
       finalSearchData: finalSearchData,

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

@@ -9,6 +9,7 @@ export declare namespace EventContentProps {
          * 默认值
          */
         value: SearchValue;
+        urlParam?: SearchValue;
         /**
          * 展示列表
          */

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

@@ -26,11 +26,7 @@ export declare function searchCondition(params: any): {
     condition: any;
 };
 export declare function searchDataParams(params: any): {
-    time: {
-        dimensionDate: any;
-        beginDate: any;
-        endDate: any;
-    };
+    time: any;
     platform: any;
     userGroup: any;
     start: {
@@ -56,3 +52,4 @@ export declare function searchDataParams(params: any): {
     associatedPreAttr: any;
     associatedNextAttr: any;
 };
+export declare function transformData(data: any[][]): string[];

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

@@ -1,3 +1,9 @@
+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); }
 /**
  * 判断当前细分属性是否为”城市“
  * @param name 属性名称
@@ -46,7 +52,7 @@ export var getValue = function getValue(param, eventGroupList, eventEnvList, use
       if (attr.key === key) res = attr;
     });
   }
-  console.log('获取当前属性的全部数据', res);
+  // console.log('获取当前属性的全部数据', res);
   return res;
 };
 export function searchCondition(params) {
@@ -74,13 +80,9 @@ export function searchCondition(params) {
   };
 }
 export function searchDataParams(params) {
-  var _params$time, _params$time2, _params$time3, _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;
+  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: {
-      dimensionDate: params === null || params === void 0 ? void 0 : (_params$time = params.time) === null || _params$time === void 0 ? void 0 : _params$time.unit,
-      beginDate: params === null || params === void 0 ? void 0 : (_params$time2 = params.time) === null || _params$time2 === void 0 ? void 0 : _params$time2.begin,
-      endDate: params === null || params === void 0 ? void 0 : (_params$time3 = params.time) === null || _params$time3 === void 0 ? void 0 : _params$time3.end
-    },
+    time: _objectSpread({}, params === null || params === void 0 ? void 0 : params.time),
     platform: (params === null || params === void 0 ? void 0 : params.platform) || 0,
     userGroup: params.userGroup,
     start: searchCondition(params === null || params === void 0 ? void 0 : params.start),
@@ -96,4 +98,12 @@ export function searchDataParams(params) {
     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
   };
+}
+export function transformData(data) {
+  return data[0].map(function (group) {
+    var _group$, _group$2;
+    var labelGroup = (_group$ = group[1]) === null || _group$ === void 0 ? void 0 : _group$.id;
+    var labelId = (_group$2 = group[2]) === null || _group$2 === void 0 ? void 0 : _group$2.layerLabelId;
+    return "".concat(labelGroup, ":").concat(labelId);
+  });
 }

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

@@ -24,6 +24,10 @@ export default (function () {
     _useState6 = _slicedToArray(_useState5, 2),
     searchParams = _useState6[0],
     setSearchParams = _useState6[1];
+  var _useState7 = useState(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    urlParam = _useState8[0],
+    setUrlParam = _useState8[1];
   useEffect(function () {
     setGlobalConfig(requestConfig);
   }, []);
@@ -42,6 +46,7 @@ export default (function () {
     }
   }, "\u8FD4\u56DE")) : /*#__PURE__*/React.createElement(ModuleInterval, {
     defaultValue: searchParams,
+    urlParam: urlParam,
     afterEditTarget: afterEditTarget,
     onUserDrill: onUserDrill
   }));

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

@@ -18,7 +18,7 @@ import { EventContext } from "../../types";
 import { getInitDate } from "../../constants/initData";
 import EventContent from "../content";
 import { chartTypes } from "../../constants";
-var classPrefix = 'interval-container';
+var classPrefix = 'interval-module-container';
 var ModuleInterval = function ModuleInterval(props) {
   // 属性
   var _useContext = useContext(BizGlobalDataContext),
@@ -131,6 +131,7 @@ var ModuleInterval = function ModuleInterval(props) {
     defaultValue: props.defaultValue ? props.defaultValue.data : undefined,
     value: searchData,
     show: showList,
+    urlParam: props.urlParam,
     onUserDrill: props.onUserDrill,
     onChange: setSearchData,
     initSearch: initSearch

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

@@ -3,12 +3,19 @@
   padding: 0;
 }
 
-.interval-container {
+.interval-module-container {
   width: 100%;
   min-width: 1000px;
   height: 100%;
   background: #fafafb;
-
+  .interval-layout {
+    .biz-layout-collapse-container {
+      height: 24px;
+    }
+    .biz-layout-collapse-handle {
+      height: 24px;
+    }
+  }
   &-header-title {
     height: 48px;
     padding: 0px 24px;
@@ -32,7 +39,7 @@
 
   .ant-spin-container {
     width: 100%;
-    height: 100%;
+    height: auto;
   }
 
   .biz-select-option:not(.biz-select-option-multiple),

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

@@ -6,6 +6,7 @@ export declare namespace EventProps {
          * @description   默认查询值
          */
         defaultValue?: Value;
+        urlParam?: SearchValue;
         /**
          * @description 是否包含今天
          * @default false