coolcare-lite-scada-component 1.0.39 → 1.0.40

package/es/components/ModalChoosePoint/index.js

@@ -13,8 +13,6 @@ 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 { GetColdChainPermissionDevicePage } from "../../services/project/ProjectUserPermission";
-import { useModel } from 'umi';
 var Option = Select.Option;
 var tailLayout = {
   wrapperCol: {
@@ -41,15 +39,6 @@ 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 closeModal = function closeModal() {
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   };
@@ -98,45 +87,29 @@ 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;
-          return GetColdChainPermissionDevicePage({
-            companyId: companyId,
-            projectId: currentProject === null || currentProject === void 0 ? void 0 : currentProject.projectId,
-            isPermission: true
-          });
-        case 4:
-          res = _context2.sent;
-          _context2.next = 10;
-          break;
-        case 7:
-          _context2.next = 9;
+          _context2.next = 3;
           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]);
 
   /** 提交表单且数据验证成功后回调事件 */
   var onFinish = /*#__PURE__*/function () {

package/package.json

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