coolcare-lite-scada-component 1.0.29 → 1.0.30

package/es/components/DialogHistory/index.js

@@ -77,6 +77,10 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
     _useState12 = _slicedToArray(_useState11, 2),
     haveAlarm = _useState12[0],
     setHaveAlarm = _useState12[1];
+  var _useState13 = useState(undefined),
+    _useState14 = _slicedToArray(_useState13, 2),
+    deviceId = _useState14[0],
+    setDeviceId = _useState14[1];
   var closeModal = function closeModal() {
     form.resetFields();
     setLoading(false);
@@ -91,7 +95,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
   /** 获取点位历史数据 */
   var fetchPointHistory = useCallback(/*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(idList, ranges, interval) {
-      var diff, res, data, series, yAxisData, xAxisData;
+      var diff, res, data, series, yAxisData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -147,7 +151,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
                 // 图形处理
                 series = [];
                 yAxisData = [];
-                xAxisData = [];
+                setDeviceId(data[0].deviceId);
                 if (data.every(function (v) {
                   var _v$pointDataList;
                   return ((_v$pointDataList = v.pointDataList) === null || _v$pointDataList === void 0 ? void 0 : _v$pointDataList.length) === 0 || !v.pointDataList;
@@ -157,7 +161,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
                   setIsNoData(false);
                 }
                 data.forEach(function (item) {
-                  var _item$pointAlarmTimeF, _item$pointDataList, _item$pointDataList2;
+                  var _item$pointAlarmTimeF, _item$pointDataList;
                   // @ts-ignore
                   if ((_item$pointAlarmTimeF = item.pointAlarmTimeFrameList) === null || _item$pointAlarmTimeF === void 0 ? void 0 : _item$pointAlarmTimeF.length) {
                     setHaveAlarm(true);
@@ -220,12 +224,6 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
                     }
                     yAxisData.push(yAxis);
                   }
-                  // 配置x坐标轴数据
-                  if ((_item$pointDataList = item.pointDataList) === null || _item$pointDataList === void 0 ? void 0 : _item$pointDataList.length) {
-                    xAxisData = item.pointDataList.map(function (pointDataItem) {
-                      return pointDataItem.ts;
-                    });
-                  }
                   // 配置曲线数据
                   series.push({
                     animation: false,
@@ -238,7 +236,7 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
                     smooth: false,
                     showAllSymbol: true,
                     symbolSize: 1.5,
-                    data: (_item$pointDataList2 = item.pointDataList) === null || _item$pointDataList2 === void 0 ? void 0 : _item$pointDataList2.map(function (dataItem) {
+                    data: (_item$pointDataList = item.pointDataList) === null || _item$pointDataList === void 0 ? void 0 : _item$pointDataList.map(function (dataItem) {
                       return [new Date(dataItem.ts).getTime(), dataItem.val];
                     }),
                     markPoint: {
@@ -303,7 +301,6 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
                     splitLine: {
                       show: false
                     }
-                    // data: xAxisData,
                   },
                   series: series
                 });
@@ -467,6 +464,8 @@ var DialogPointHistory = function DialogPointHistory(_ref) {
         return _toConsumableArray(new Set([].concat(_toConsumableArray(pre), _toConsumableArray(val))));
       });
     },
+    currentDeviceId: deviceId,
+    currentPointList: pointIdList,
     companyId: companyId,
     projectId: projectId,
     onCancel: function onCancel() {

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 { GetDevicePoint } from "../../services/gateway/Device";
+import { GetDevicePage, GetDevicePoint } from "../../services/gateway/Device";
 import { GetColdChainPermissionDevicePage } from "../../services/project/ProjectUserPermission";
-import { useQuery } from "../../hooks";
+import { useModel } from 'umi';
 var Option = Select.Option;
 var tailLayout = {
   wrapperCol: {
@@ -27,7 +27,8 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     onSubmit = _ref.onSubmit,
     onCancel = _ref.onCancel,
     companyId = _ref.companyId,
-    projectId = _ref.projectId;
+    currentDeviceId = _ref.currentDeviceId,
+    currentPointList = _ref.currentPointList;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -41,9 +42,16 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     pointList = _useState4[0],
     setPointList = _useState4[1];
-  var query = useQuery();
+  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() {
-    form.resetFields();
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   };
 
@@ -91,31 +99,45 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
-          _context2.next = 3;
+          if (!(platform === 'project')) {
+            _context2.next = 7;
+            break;
+          }
+          _context2.next = 4;
           return GetColdChainPermissionDevicePage({
             companyId: companyId,
-            projectId: projectId,
+            projectId: currentProject === null || currentProject === void 0 ? void 0 : currentProject.projectId,
             isPermission: true
           });
-        case 3:
+        case 4:
+          res = _context2.sent;
+          _context2.next = 10;
+          break;
+        case 7:
+          _context2.next = 9;
+          return GetDevicePage({
+            companyId: companyId
+          });
+        case 9:
           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 = 10;
+          _context2.next = 16;
           break;
-        case 7:
-          _context2.prev = 7;
+        case 13:
+          _context2.prev = 13;
           _context2.t0 = _context2["catch"](0);
           message.error('获取设备列表失败');
-        case 10:
+        case 16:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[0, 7]]);
-  })), [companyId, projectId]);
+    }, _callee2, null, [[0, 13]]);
+  })), [companyId, platform, currentProject]);
 
   /** 提交表单且数据验证成功后回调事件 */
   var onFinish = /*#__PURE__*/function () {
@@ -145,6 +167,13 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       fetchDeviceList();
     }
   }, [visible, deviceList.length]);
+  useEffect(function () {
+    if (currentDeviceId) {
+      fetchPointList(currentDeviceId);
+      form.setFieldValue("deviceId", currentDeviceId);
+      form.setFieldValue("pointIdList", currentPointList);
+    }
+  }, [currentDeviceId]);
   return /*#__PURE__*/React.createElement(Modal, {
     title: '选择属性',
     closable: false,
@@ -152,8 +181,8 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     maskClosable: true,
     footer: null,
     onCancel: closeModal,
-    open: visible,
-    getContainer: false
+    visible: visible,
+    wrapClassName: 'form-modal'
   }, /*#__PURE__*/React.createElement(Form, {
     layout: "vertical",
     form: form,
@@ -165,22 +194,18 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: "deviceId",
     label: "\u8BBE\u5907",
-    className: "temperatureSelect",
     rules: [{
       required: true,
       message: '请选择'
     }]
   }, /*#__PURE__*/React.createElement(Select, {
     placeholder: "\u8BF7\u9009\u62E9",
+    defaultValue: currentDeviceId,
     onChange: function onChange(value) {
       fetchPointList(value);
       form.setFieldsValue({
         pointIdList: []
       });
-    },
-    showSearch: true,
-    getPopupContainer: function getPopupContainer() {
-      return document.querySelector(".temperatureSelect") || document.body;
     }
   }, deviceList.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
@@ -199,18 +224,14 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       rules: [{
         required: true,
         message: '请选择'
-      }],
-      className: "temperature2Select"
+      }]
     }, /*#__PURE__*/React.createElement(Select, {
       allowClear: true,
       mode: 'multiple',
       showSearch: true,
       optionFilterProp: "label",
       placeholder: "\u8BF7\u9009\u62E9",
-      disabled: !getFieldValue('deviceId'),
-      getPopupContainer: function getPopupContainer() {
-        return document.querySelector(".temperature2Select") || document.body;
-      }
+      disabled: !getFieldValue('deviceId')
     }, 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.29",
+  "version": "1.0.30",
   "scripts": {
     "start": "umi dev",
     "build:prod": "UMI_ENV=prod umi build",