@zgfe/modules-event 0.1.5-event.23 → 0.1.5-event.25

package/es/modules/content/index.js

@@ -63,18 +63,14 @@ var EventContent = function EventContent(props) {
     handleSearch = _useContext3.handleSearch;
   var collapseRef = useRef();
   var chartRef = useRef();
-  var _useState11 = useState([]),
+  var _useState11 = useState('user'),
     _useState12 = _slicedToArray(_useState11, 2),
-    allSubjectList = _useState12[0],
-    setAllSubjectList = _useState12[1];
-  var _useState13 = useState('user'),
+    analysisSubjectType = _useState12[0],
+    setAnalysisSubjectType = _useState12[1];
+  var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    analysisSubjectType = _useState14[0],
-    setAnalysisSubjectType = _useState14[1];
-  var _useState15 = useState(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    subDisplay = _useState16[0],
-    setSubDisplay = _useState16[1];
+    subDisplay = _useState14[0],
+    setSubDisplay = _useState14[1];
   useEffect(function () {
     if (timer) clearTimeout(timer);
     var flag = true;
@@ -103,24 +99,8 @@ var EventContent = function EventContent(props) {
     }).then(function (res) {
       if (!res) return;
       setSubDisplay(res.data);
-      if (res.data) queryAllSubject();
     });
   }
-  var queryAllSubject = function queryAllSubject() {
-    ajax(Apis.queryAllSubjectApi, {
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
-      }
-    }).then(function (res) {
-      if (!res) return;
-      res === null || res === void 0 ? void 0 : res.data.forEach(function (item) {
-        item.name = item.subjectAlias || item.subjectName;
-        item.subjectId = item.id;
-      });
-      setAllSubjectList(res.data);
-    });
-  };
   var fetchRequest = function fetchRequest(flag) {
     if (JSON.stringify(searchData) === JSON.stringify(finalSearchData)) {
       return;
@@ -237,7 +217,6 @@ var EventContent = function EventContent(props) {
       ajaxFlag: ajaxFlag,
       subDisplay: subDisplay,
       setIsCity: setIsCity,
-      allSubjectList: allSubjectList,
       setEnableSelectChart: setEnableSelectChart,
       finalSearchData: finalSearchData,
       fetchRequest: fetchRequest,

package/es/modules/topPanel/index.js

@@ -6,7 +6,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useEffect } from 'react';
 import { Form, Button } from 'antd';
-import { BizUserGroupHeader, BizSelect } from '@zgfe/business-lib';
+import { BizUserGroupHeader, BizSelect, useSubject } from '@zgfe/business-lib';
 import EventFilter from '../../components/eventFilter';
 import './styles/index.less';
 var classPrefix = 'top-panel';
@@ -17,7 +17,6 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     fetchRequest = props.fetchRequest,
     setIsCity = props.setIsCity,
     setEnableSelectChart = props.setEnableSelectChart,
-    allSubjectList = props.allSubjectList,
     subDisplay = props.subDisplay;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -35,6 +34,9 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     inited = _useState8[0],
     setInited = _useState8[1];
+  var _useSubject = useSubject(),
+    subjectList = _useSubject.subjectList,
+    subjectLoading = _useSubject.loading;
   var countChange = function countChange(count) {
     setmarginStyle(count > 0 ? true : false);
   };
@@ -59,7 +61,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
     }
     _data.analysisSubject = allData.analysisSubject ? {
-      subjectId: allData.analysisSubject.subjectId,
+      subjectId: allData.analysisSubject.id,
       subjectName: allData.analysisSubject.subjectName,
       subjectAlias: allData.analysisSubject.subjectAlias,
       unit: allData.analysisSubject.unit
@@ -155,10 +157,10 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
     className: "".concat(classPrefix, "-form-event")
   }, /*#__PURE__*/React.createElement(BizSelect, {
     className: "".concat(classPrefix, "-form-event-select"),
-    options: allSubjectList || [],
-    labelField: "name",
-    keyField: "id",
-    onChange: function onChange() {}
+    options: subjectList,
+    aliasField: "subjectAlias",
+    labelField: "subjectName",
+    keyField: "id"
   })), /*#__PURE__*/React.createElement("div", {
     ref: ref
   }, /*#__PURE__*/React.createElement(Form.Item, {
@@ -176,6 +178,7 @@ var TopPanel = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, /*#__PURE__*/React.createElement(Button, {
     onClick: resetting
   }, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(Button, {
+    loading: subjectLoading,
     disabled: ajaxFlag || searchDisabled,
     type: "primary",
     onClick: function onClick() {

package/es/modules/topPanel/types.d.ts

@@ -8,6 +8,7 @@ interface filterConditions {
     dimension?: bizAttributeSelectorValueProp;
 }
 interface analysisSubject {
+    id?: number;
     subjectId?: number;
     name?: string;
     unit?: string;
@@ -40,7 +41,6 @@ export interface TopPanelProps {
     fetchRequest: (flag?: boolean) => void;
     setIsCity?: Function;
     setEnableSelectChart?: Function;
-    allSubjectList?: any[];
     analysisSubjectType?: analysisSubjectType;
     onChangeSubjectType: (type: string) => void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/modules-event",
-    "version": "0.1.5-event.23",
+    "version": "0.1.5-event.25",
     "scripts": {
         "start": "dumi dev",
         "docs:build": "dumi build",
@@ -36,7 +36,7 @@
         "@types/lodash": "^4.14.191",
         "@umijs/fabric": "^2.8.1",
         "@umijs/test": "^3.0.5",
-        "@zgfe/business-lib": "1.1.89-qirui.3",
+        "@zgfe/business-lib": "1.1.89-qirui.10",
         "antd": "^4.22.6",
         "dumi": "^1.1.0",
         "echarts": "^5.3.2",
@@ -49,7 +49,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "af8220d843b1e435ceccefbc3e972a2cdbe53759",
+    "gitHead": "5143b69def15dfe9fb9346ef2c9bee23ed8a88f7",
     "dependencies": {
         "react-copy-to-clipboard": "^5.1.0",
         "react-highlight": "^0.15.0"