@zgfe/modules-interval 1.0.11-zhongbang.8 → 1.0.23-zhongyuan.1

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

@@ -23,6 +23,8 @@ import TopPanel from "../topPanel";
 import { message } from 'antd';
 var CancelToken = Request.CancelToken;
 var cancel;
+var refresh = false;
+var timer = 0;
 var classPrefix = 'interval-content';
 var EventContent = function EventContent(props) {
   // 最后的查询数据（防止图表在还没查询时就改变了类型）
@@ -31,7 +33,8 @@ var EventContent = function EventContent(props) {
     finalSearchData = _useState2[0],
     setFinalSearchData = _useState2[1];
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    route = _useContext.route;
   // 查询的结果数据
   var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -64,17 +67,19 @@ var EventContent = function EventContent(props) {
     setSearchData = _useContext2.setSearchData,
     eventGroupList = _useContext2.eventGroupList,
     eventEnvList = _useContext2.eventEnvList,
-    userPropList = _useContext2.userPropList;
+    userPropList = _useContext2.userPropList,
+    setRefreshLoading = _useContext2.setRefreshLoading,
+    panelId = _useContext2.panelId;
   var _useContext3 = useContext(BizTargetFromPanelContext),
     handleSearch = _useContext3.handleSearch;
-  var _useState15 = useState(),
-    _useState16 = _slicedToArray(_useState15, 2),
-    searchTimer = _useState16[0],
-    setSearchTimer = _useState16[1];
   var collapseRef = useRef();
   // 初始化
   useEffect(function () {
-    setLoading(false);
+    if (props.defaultValue) {
+      setEventId(props.defaultValue.id);
+    } else {
+      setLoading(false);
+    }
   }, [props.defaultValue]);
   useEffect(function () {
     if (searchData && searchData.dimension) {
@@ -86,14 +91,19 @@ var EventContent = function EventContent(props) {
       }
     }
     if (!searchData || !searchData.analysisModel) return;
-    if (searchTimer) clearTimeout(searchTimer);
-    setSearchTimer(setTimeout(function () {
-      fetchRequest();
-    }, 300));
+    if (timer) clearTimeout(timer);
+    var flag = true;
+    timer = setTimeout(function () {
+      if (flag) {
+        fetchRequest();
+      }
+    }, 500);
     return function () {
-      clearTimeout(searchTimer);
+      // 清理异步任务
+      if (timer) clearTimeout(timer);
+      flag = false;
     };
-  }, [searchData, eventId]);
+  }, [searchData]);
   useEffect(function () {
     handleSearch && handleSearch(loading);
   }, [loading]);
@@ -106,7 +116,7 @@ var EventContent = function EventContent(props) {
       return;
     }
     setEventData(undefined);
-    setLoading(true);
+    if (!refresh) setLoading(true);
     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('您查询的属性不一致，暂不支持查询');
@@ -115,13 +125,16 @@ var EventContent = function EventContent(props) {
     props.onChange && props.onChange(searchData);
     ajax(Apis.dataList, {
       method: 'post',
-      data: _objectSpread({
+      data: _objectSpread(_objectSpread({
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
-      }, params),
+      }, params), {}, {
+        refresh: refresh
+      }),
       cancelToken: new CancelToken(function executor(c) {
         cancel = c;
       })
     }).then(function (res) {
+      setRefreshLoading(false);
       if (!res) {
         setLoading(false);
         return;
@@ -137,6 +150,18 @@ var EventContent = function EventContent(props) {
     });
   };
 
+  // 立即刷新
+  var refreshHandle = function refreshHandle() {
+    refresh = true;
+    setRefreshLoading(true);
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(function () {
+      fetchRequest();
+      refresh = false;
+      clearTimeout(timer);
+    }, 500);
+  };
+
   // 改变时间和图表类型
   var onChangeContent = function onChangeContent(data) {
     setSearchData(function (value) {
@@ -164,19 +189,21 @@ var EventContent = function EventContent(props) {
     setSearchData(function (_searchData) {
       return _objectSpread(_objectSpread({}, data), {}, {
         time: _searchData.time,
-        platform: _searchData.platform,
+        platform: _searchData.platform || 0,
         userGroup: data.analysisSubject ? undefined : data.userGroup,
         analysisSubject: data.analysisSubject ? data.analysisSubject : undefined
       });
     });
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TopBar, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-header")
+  }, /*#__PURE__*/React.createElement("span", null, !panelId && route && route.query && route.query.title ? route.query.title : '间隔分析'), /*#__PURE__*/React.createElement(TopBar, {
     searchData: searchData,
     loading: loading,
     eventData: eventData,
     platformChange: platformChange,
     onJumpWarning: props.onJumpWarning
-  }), /*#__PURE__*/React.createElement(BizLayout, {
+  })), /*#__PURE__*/React.createElement(BizLayout, {
     showTitle: false,
     hasCollapse: true,
     className: "interval-layout",
@@ -199,7 +226,8 @@ var EventContent = function EventContent(props) {
     eventId: eventId,
     eventData: eventData,
     enableSelectChart: enableSelectChart,
-    onChange: onChangeContent
+    onChange: onChangeContent,
+    refreshHandle: refreshHandle
   }), /*#__PURE__*/React.createElement(ContentPanel, {
     loading: loading,
     isCity: isCity,

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

@@ -1,7 +1,25 @@
-.interval-content {
-  &-options {
-    display: flex;
-    justify-content: flex-end;
-    margin-bottom: 16px;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+.interval-content {
+  &-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 16px;
+    background: #fafafb;
+    > span {
+      color: var(--io-N-, #021429);
+      font-weight: 500;
+      font-size: 16px;
+      font-family: 'PingFang SC';
+      font-style: normal;
+      line-height: 20px; /* 125% */
+      letter-spacing: 0.016px;
+      white-space: nowrap;
+    }
+  }
+  &-options {
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 16px;
+  }
+}

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

@@ -48,6 +48,7 @@ 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,11 +80,11 @@ 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$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$dimension13, _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,
-    userGroup: params.userGroup,
+    userGroup: params === null || params === void 0 ? void 0 : params.userGroup,
     start: searchCondition(params === null || params === void 0 ? void 0 : params.start),
     end: searchCondition(params === null || params === void 0 ? void 0 : params.end),
     dimension: params !== null && params !== void 0 && (_params$dimension = params.dimension) !== null && _params$dimension !== void 0 && _params$dimension.propCategory ? {
@@ -93,7 +93,8 @@ 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
+      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
     } : 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,

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

@@ -35,7 +35,7 @@ export default (function () {
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 266
+    defaultApp: 461
   }, 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/edit.js

@@ -22,7 +22,7 @@ var defaultValue = {
     id: 7565,
     name: '测试6666',
     appId: 266,
-    platform: 1,
+    platform: 0,
     userGroup: [933, 935],
     time: {
       unit: 'day',

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

@@ -32,7 +32,8 @@ export default (function () {
     console.log('onUserDrill:111', data, searchData);
   };
   return /*#__PURE__*/React.createElement(DemoWrapper, {
-    needMeta: true
+    needMeta: true,
+    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);

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

@@ -1,33 +1,33 @@
-/*滚动条凹槽的颜色，还可以设置边框属性 */
-::-webkit-scrollbar-track-piece {
-  background-color: #fff;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-
-/*滚动条的宽度*/
-::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-
-/*滚动条的设置*/
-::-webkit-scrollbar-thumb {
-  background-color: #cacdd4;
-  background-clip: padding-box;
-  border: 2px solid #fff;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-
-/*滚动条鼠标移上去*/
-::-webkit-scrollbar-thumb:hover {
-  // background-color: #bbb;
-}
-
-::-webkit-scrollbar-track-piece {
-  width: 6px;
-  height: 6px;
-}
+/*滚动条凹槽的颜色，还可以设置边框属性 */
+::-webkit-scrollbar-track-piece {
+  background-color: #fff;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
+
+/*滚动条的宽度*/
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+/*滚动条的设置*/
+::-webkit-scrollbar-thumb {
+  background-color: #cacdd4;
+  background-clip: padding-box;
+  border: 2px solid #fff;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
+
+/*滚动条鼠标移上去*/
+::-webkit-scrollbar-thumb:hover {
+  // background-color: #bbb;
+}
+
+::-webkit-scrollbar-track-piece {
+  width: 6px;
+  height: 6px;
+}

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

@@ -12,12 +12,12 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useContext, useEffect, useState } from 'react';
 import { Spin } from 'antd';
-import { BizGlobalDataContext, BizTargetFromPanel } from '@zgfe/business-lib';
+import { BizGlobalDataContext, BizTargetFromPanel, ajax } from '@zgfe/business-lib';
 import "./styles/index.less";
 import { IntervalContext } from "../../types";
 import { getInitDate } from "../../constants/initData";
 import EventContent from "../content";
-import { chartTypes } from "../../constants";
+import { Apis, chartTypes } from "../../constants";
 var classPrefix = 'interval-module-container';
 var ModuleInterval = function ModuleInterval(props) {
   // 属性
@@ -26,7 +26,8 @@ var ModuleInterval = function ModuleInterval(props) {
     eventGroupList = _useContext.eventGroupList,
     eventEnvList = _useContext.eventEnvList,
     userPropList = _useContext.userPropList,
-    userGroupList = _useContext.userGroupList;
+    userGroupList = _useContext.userGroupList,
+    useBizStoreLoading = _useContext.useBizStoreLoading;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     searchData = _useState2[0],
@@ -36,40 +37,57 @@ var ModuleInterval = function ModuleInterval(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  // 指标标题
-  var _useState5 = useState(),
+  // 刷新loading
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    title = _useState6[0],
-    setTitle = _useState6[1];
+    refreshLoading = _useState6[0],
+    setRefreshLoading = _useState6[1];
+  // 指标标题
   var _useState7 = useState(),
     _useState8 = _slicedToArray(_useState7, 2),
-    panelId = _useState8[0],
-    setPanelId = _useState8[1];
+    title = _useState8[0],
+    setTitle = _useState8[1];
   var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    elementId = _useState10[0],
-    setElementId = _useState10[1];
+    panelId = _useState10[0],
+    setPanelId = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    showList = _useState12[0],
-    setShowList = _useState12[1];
-  var _useState13 = useState(false),
-    _useState14 = _slicedToArray(_useState13, 1),
-    subjectEnable = _useState14[0];
+    elementId = _useState12[0],
+    setElementId = _useState12[1];
+  var _useState13 = useState(),
+    _useState14 = _slicedToArray(_useState13, 2),
+    showList = _useState14[0],
+    setShowList = _useState14[1];
+  var _useState15 = useState(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    subjectEnable = _useState16[0],
+    setSubjectEnable = _useState16[1];
   // 初始化
   useEffect(function () {
-    if (!props.defaultValue) {
-      initSearch();
-    } else {
-      var _props$defaultValue$d, _props$defaultValue$d2;
-      setShowList(props.defaultValue.chosen_data);
-      setPanelId(props.defaultValue.panelId);
-      setElementId(props.defaultValue.id);
-      setTitle(props.defaultValue.name);
-      setSearchData(_objectSpread(_objectSpread({}, props.defaultValue.data), {}, {
-        userGroup: ((_props$defaultValue$d = props.defaultValue.data) === null || _props$defaultValue$d === void 0 ? void 0 : _props$defaultValue$d.userGroup) || ((_props$defaultValue$d2 = props.defaultValue.data) === null || _props$defaultValue$d2 === void 0 ? void 0 : _props$defaultValue$d2.user_group) || [0]
-      }));
-    }
+    setLoading(true);
+    ajax(Apis.querySubjectDisplay, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      if (!res) return;
+      setSubjectEnable(res.data);
+      // 设置初始值
+      if (!props.defaultValue) {
+        initSearch();
+      } else {
+        setShowList(props.defaultValue.chosen_data);
+        setPanelId(props.defaultValue.panelId);
+        setElementId(props.defaultValue.id);
+        setTitle(props.defaultValue.name);
+        setSearchData(props.defaultValue.data);
+      }
+      setTimeout(function () {
+        setLoading(false);
+      });
+    });
   }, []);
 
   // 查询条件初始化
@@ -77,13 +95,14 @@ var ModuleInterval = function ModuleInterval(props) {
     setSearchData({
       userGroup: (userGroupList === null || userGroupList === void 0 ? void 0 : userGroupList.length) > 0 ? [userGroupList[0].id] : [0],
       time: getInitDate(props.includeToday),
-      chartType: 'boxplot'
+      chartType: 'boxplot',
+      platform: 0
     });
   };
   useEffect(function () {
     if (props.onChange) props.onChange(searchData);
   }, [searchData]);
-  if (loading) {
+  if (loading || useBizStoreLoading) {
     return /*#__PURE__*/React.createElement("div", {
       className: classPrefix
     }, /*#__PURE__*/React.createElement(Spin, {
@@ -108,10 +127,10 @@ var ModuleInterval = function ModuleInterval(props) {
     styleOptions: chartTypes,
     afterEditTarget: props.afterEditTarget,
     children: ""
-  }), !panelId && /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-header-title")
-  }, "\u95F4\u9694\u5206\u6790"), /*#__PURE__*/React.createElement(IntervalContext.Provider, {
+  }), /*#__PURE__*/React.createElement(IntervalContext.Provider, {
     value: {
+      refreshLoading: refreshLoading,
+      setRefreshLoading: setRefreshLoading,
       panelId: panelId,
       elementId: elementId,
       eventGroupList: eventGroupList,

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

@@ -1,66 +1,69 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-.ant-card-body {
-  padding: 0;
-}
-
-.interval-module-container {
-  width: 100%;
-  min-width: 1000px;
-  height: 100%;
-  background: #fafafb;
-  &-loading {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-  }
-  .interval-layout {
-    .biz-layout-collapse-container {
-      height: 24px;
-    }
-    .biz-layout-collapse-handle {
-      height: 24px;
-    }
-  }
-  &-header-title {
-    height: 48px;
-    padding: 0px 24px;
-    color: #021429;
-    font-weight: 500;
-    font-size: 16px;
-    line-height: 48px;
-    background: #fff;
-  }
-
-  .biz-layout-top {
-    margin-top: 2px;
-    padding-top: 0;
-
-    .biz-user-group-header {
-      .ant-space-item {
-        color: #5f6085;
-      }
-    }
-  }
-
-  .ant-spin-container {
-    width: 100%;
-    height: auto;
-  }
-
-  .biz-select-option:not(.biz-select-option-multiple),
-  .biz-attr-select-option {
-    &.active {
-      background: @primary-color !important;
-    }
-  }
-
-  // 设置下拉框最大高度
-  .biz-select-overlay {
-    max-height: 300px;
-  }
-
-  .biz-layout-panel-content {
-    height: auto;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+.ant-card-body {
+  padding: 0;
+}
+
+.interval-module-container {
+  width: 100%;
+  min-width: 1000px;
+  height: 100%;
+  background: #fafafb;
+  &-loading {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+  }
+  .interval-layout {
+    .biz-layout-top {
+      padding: 0 16px 16px;
+    }
+    .biz-layout-collapse-container {
+      height: 24px;
+    }
+    .biz-layout-collapse-handle {
+      height: 24px;
+    }
+  }
+  &-header-title {
+    height: 48px;
+    padding: 0px 24px;
+    color: #021429;
+    font-weight: 500;
+    font-size: 16px;
+    line-height: 48px;
+    background: #fff;
+  }
+
+  .biz-layout-top {
+    margin-top: 2px;
+    padding-top: 0;
+
+    .biz-user-group-header {
+      .ant-space-item {
+        color: #5f6085;
+      }
+    }
+  }
+
+  .ant-spin-container {
+    width: 100%;
+    height: auto;
+  }
+
+  .biz-select-option:not(.biz-select-option-multiple),
+  .biz-attr-select-option {
+    &.active {
+      background: @primary-color !important;
+    }
+  }
+
+  // 设置下拉框最大高度
+  .biz-select-overlay {
+    max-height: 300px;
+  }
+
+  .biz-layout-panel-content {
+    height: auto;
+  }
+}

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

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