coolcare-lite-scada-component 1.0.30 → 1.0.32

package/es/components/ModalChoosePoint/index.js

@@ -12,9 +12,9 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React from "react";
 import { useCallback, useEffect, useState } from 'react';
 import { Modal, Button, Form, Space, message, Select } from 'antd';
-import { GetDevicePage, GetDevicePoint } from "../../services/gateway/Device";
+import { GetDevicePoint } from "../../services/gateway/Device";
 import { GetColdChainPermissionDevicePage } from "../../services/project/ProjectUserPermission";
-import { useModel } from 'umi';
+import { useQuery } from "../../hooks";
 var Option = Select.Option;
 var tailLayout = {
   wrapperCol: {
@@ -28,7 +28,8 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     onCancel = _ref.onCancel,
     companyId = _ref.companyId,
     currentDeviceId = _ref.currentDeviceId,
-    currentPointList = _ref.currentPointList;
+    currentPointList = _ref.currentPointList,
+    projectId = _ref.projectId;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -42,15 +43,7 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     pointList = _useState4[0],
     setPointList = _useState4[1];
-  var _useModel = useModel('@@initialState', function (model) {
-      var _model$initialState, _model$initialState2;
-      return {
-        platform: (_model$initialState = model.initialState) === null || _model$initialState === void 0 ? void 0 : _model$initialState.platform,
-        currentProject: (_model$initialState2 = model.initialState) === null || _model$initialState2 === void 0 ? void 0 : _model$initialState2.currentProject
-      };
-    }),
-    platform = _useModel.platform,
-    currentProject = _useModel.currentProject;
+  var query = useQuery();
   var closeModal = function closeModal() {
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   };
@@ -99,46 +92,31 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
-          if (!(platform === 'project')) {
-            _context2.next = 7;
-            break;
-          }
-          _context2.next = 4;
+          _context2.next = 3;
           return GetColdChainPermissionDevicePage({
             companyId: companyId,
-            projectId: currentProject === null || currentProject === void 0 ? void 0 : currentProject.projectId,
+            projectId: projectId,
             isPermission: true
           });
-        case 4:
-          res = _context2.sent;
-          _context2.next = 10;
-          break;
-        case 7:
-          _context2.next = 9;
-          return GetDevicePage({
-            companyId: companyId
-          });
-        case 9:
+        case 3:
           res = _context2.sent;
-        case 10:
           if (res.success) {
             setDeviceList(((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || []);
           } else {
             message.error(res.message);
           }
-          _context2.next = 16;
+          _context2.next = 10;
           break;
-        case 13:
-          _context2.prev = 13;
+        case 7:
+          _context2.prev = 7;
           _context2.t0 = _context2["catch"](0);
           message.error('获取设备列表失败');
-        case 16:
+        case 10:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[0, 13]]);
-  })), [companyId, platform, currentProject]);
-
+    }, _callee2, null, [[0, 7]]);
+  })), [companyId, projectId]);
   /** 提交表单且数据验证成功后回调事件 */
   var onFinish = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(val) {
@@ -181,8 +159,8 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     maskClosable: true,
     footer: null,
     onCancel: closeModal,
-    visible: visible,
-    wrapClassName: 'form-modal'
+    open: visible,
+    getContainer: false
   }, /*#__PURE__*/React.createElement(Form, {
     layout: "vertical",
     form: form,
@@ -194,6 +172,7 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: "deviceId",
     label: "\u8BBE\u5907",
+    className: "temperatureSelect",
     rules: [{
       required: true,
       message: '请选择'
@@ -206,6 +185,9 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       form.setFieldsValue({
         pointIdList: []
       });
+    },
+    getPopupContainer: function getPopupContainer() {
+      return document.querySelector(".temperatureSelect") || document.body;
     }
   }, deviceList.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
@@ -231,7 +213,10 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       showSearch: true,
       optionFilterProp: "label",
       placeholder: "\u8BF7\u9009\u62E9",
-      disabled: !getFieldValue('deviceId')
+      disabled: !getFieldValue('deviceId'),
+      getPopupContainer: function getPopupContainer() {
+        return document.querySelector(".temperature2Select") || document.body;
+      }
     }, pointList.map(function (item) {
       return /*#__PURE__*/React.createElement(Option, {
         value: item.pointId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "scripts": {
     "start": "umi dev",
     "build:prod": "UMI_ENV=prod umi build",