@zgfe/modules-interval 1.0.10-qirui.4 → 1.0.10-zbfix.1

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, ajax } from '@zgfe/business-lib';
+import { BizGlobalDataContext, BizTargetFromPanel } from '@zgfe/business-lib';
 import "./styles/index.less";
-import { IntervalContext } from "../../types";
+import { EventContext } from "../../types";
 import { getInitDate } from "../../constants/initData";
 import EventContent from "../content";
-import { Apis, chartTypes } from "../../constants";
+import { chartTypes } from "../../constants";
 var classPrefix = 'interval-module-container';
 var ModuleInterval = function ModuleInterval(props) {
   // 属性
@@ -36,52 +36,43 @@ var ModuleInterval = function ModuleInterval(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  // 指标标题
-  var _useState5 = useState(),
+  var _useState5 = useState(true),
     _useState6 = _slicedToArray(_useState5, 2),
-    title = _useState6[0],
-    setTitle = _useState6[1];
+    pageLoading = _useState6[0],
+    setPageLoading = _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),
+    elementId = _useState12[0],
+    setElementId = _useState12[1];
+  var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    subjectEnable = _useState14[0],
-    setSubjectEnable = _useState14[1];
+    showList = _useState14[0],
+    setShowList = _useState14[1];
   // 初始化
   useEffect(function () {
-    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);
-      });
-    });
+    setPageLoading(true);
+    // 设置初始值
+    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 () {
+      setPageLoading(false);
+    }, 0);
   }, []);
 
   // 查询条件初始化
@@ -89,21 +80,20 @@ 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: 'line'
     });
   };
-  useEffect(function () {
-    if (props.onChange) props.onChange(searchData);
-  }, [searchData]);
-  if (loading) {
-    return /*#__PURE__*/React.createElement("div", {
-      className: classPrefix
-    }, /*#__PURE__*/React.createElement(Spin, {
-      className: "".concat(classPrefix, "-loading")
-    }));
+
+  // 改变loading
+  var changeLoading = function changeLoading(flag) {
+    setLoading(flag);
+  };
+  if (pageLoading) {
+    return /*#__PURE__*/React.createElement(Spin, null);
   }
-  return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+  return /*#__PURE__*/React.createElement(Spin, {
+    spinning: loading,
+    wrapperClassName: classPrefix
   }, /*#__PURE__*/React.createElement(BizTargetFromPanel, {
     value: panelId ? {
       panelId: panelId,
@@ -112,7 +102,7 @@ var ModuleInterval = function ModuleInterval(props) {
         name: title,
         params: _objectSpread({
           app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-          module: 'interval'
+          module: 'event'
         }, searchData)
       }
     } : undefined,
@@ -122,7 +112,7 @@ var ModuleInterval = function ModuleInterval(props) {
     children: ""
   }), !panelId && /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-header-title")
-  }, "\u95F4\u9694\u5206\u6790"), /*#__PURE__*/React.createElement(IntervalContext.Provider, {
+  }, "\u95F4\u9694\u5206\u6790"), /*#__PURE__*/React.createElement(EventContext.Provider, {
     value: {
       panelId: panelId,
       elementId: elementId,
@@ -131,21 +121,18 @@ var ModuleInterval = function ModuleInterval(props) {
       userPropList: userPropList,
       searchData: searchData,
       setSearchData: setSearchData,
-      subjectEnable: subjectEnable,
       panelName: title,
       includeToday: props.includeToday,
-      enableAddScene: props.defaultValue && props.defaultValue.enableAddScene === false ? false : true,
-      changeLoading: setLoading,
+      changeLoading: changeLoading,
       afterEditTarget: props.afterEditTarget,
-      onUserDrill: props.onUserDrill,
-      onJumpWarning: props.onJumpWarning
+      onUserDrill: props.onUserDrill
     }
   }, /*#__PURE__*/React.createElement(EventContent, {
     defaultValue: props.defaultValue ? props.defaultValue.data : undefined,
     value: searchData,
     show: showList,
+    urlParam: props.urlParam,
     onUserDrill: props.onUserDrill,
-    onJumpWarning: props.onJumpWarning,
     onChange: setSearchData,
     initSearch: initSearch
   })));

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

@@ -8,12 +8,6 @@
   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;

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

@@ -1,11 +1,12 @@
 /// <reference types="react" />
-import { SearchValue, IntervalDrillParams } from '../../types';
-export declare namespace IntervalProps {
+import { SearchValue, UserDrillParamsProp } from '../../types';
+export declare namespace EventProps {
     interface Props {
         /**
          * @description   默认查询值
          */
         defaultValue?: Value;
+        urlParam?: SearchValue;
         /**
          * @description   看板是否可禁用, true禁用
          */
@@ -22,9 +23,7 @@ export declare namespace IntervalProps {
         /**
          * 用户钻取
          */
-        onUserDrill: (data: IntervalDrillParams, isSubject: boolean) => void;
-        onJumpWarning: (data: Record<string, any>, searchData: SearchValue) => void;
-        onChange?: (data: SearchValue) => void;
+        onUserDrill: (data: UserDrillParamsProp, searchData: SearchValue) => void;
     }
     interface Value {
         /**
@@ -70,8 +69,6 @@ export declare namespace IntervalProps {
         min?: number;
         perValue?: number;
         peopleNum?: number;
-        names?: string[];
-        total?: number;
         children?: ColumnsDataType[];
     }
 }

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

@@ -1,2 +1,2 @@
-export var IntervalProps;
-(function (_IntervalProps) {})(IntervalProps || (IntervalProps = {}));
+export var EventProps;
+(function (_EventProps) {})(EventProps || (EventProps = {}));