coolcare-lite-scada-component 2.0.13 → 2.0.15

package/es/components/FormBindPoint/FreedomScene.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React from "react";
 import { useMemo, useEffect } from 'react';
-import { Form, Button, Space, Typography, Input } from 'antd';
+import { Form, Button, Space, Typography, Input, Switch } from 'antd';
 import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import { useModel } from 'umi';
 import { cloneDeep } from 'lodash-es';
@@ -54,7 +54,8 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
       var data = cloneDeep(activeCell.getData());
       if ((_data$pointList = data.pointList) === null || _data$pointList === void 0 ? void 0 : _data$pointList.length) {
         form.setFieldsValue({
-          pointList: data.pointList
+          pointList: data.pointList,
+          unitShow: data.unintShow
         });
       } else if (typeof data.pointListLimit === 'number' && data.pointListLimit > 0) {
         form.setFieldsValue({
@@ -62,16 +63,19 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
             deviceId: undefined,
             pointId: undefined,
             identifierName: ''
-          }]
+          }],
+          unitShow: true
         });
       } else {
         form.setFieldsValue({
-          pointList: []
+          pointList: [],
+          unitShow: true
         });
       }
     } else {
       form.setFieldsValue({
-        pointList: []
+        pointList: [],
+        unitShow: true
       });
     }
   }, [activeCell, form]);
@@ -87,14 +91,17 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
   }, [activeCell]);
   var handleDeviceChange = function handleDeviceChange(deviceId, index) {
     var pointList = form.getFieldValue('pointList');
+    var unitShow = form.getFieldValue('unitShow');
     pointList[index].identifierName = undefined;
     pointList[index].pointId = undefined;
     form.setFieldsValue({
-      pointList: pointList
+      pointList: pointList,
+      unitShow: unitShow
     });
   };
   var onValuesChange = function onValuesChange(changedValues, _ref2) {
-    var pointList = _ref2.pointList;
+    var pointList = _ref2.pointList,
+      unitShow = _ref2.unitShow;
     if (!activeCell) return;
     var list = pointList.filter(function (v) {
       return v.identifierName;
@@ -108,7 +115,8 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
           identifierName: v.identifierName,
           pointId: v.pointId
         });
-      })
+      }),
+      unitShow: unitShow
     }, {
       deep: false
     });
@@ -202,6 +210,14 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
       block: true,
       icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
     }, "\u6DFB\u52A0\u70B9\u4F4D")) : null);
-  }));
+  }), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "unitShow",
+    label: "\u5355\u4F4D",
+    className: "!ml-3"
+  }, /*#__PURE__*/React.createElement(Switch, {
+    defaultChecked: true,
+    checkedChildren: "\u663E\u793A",
+    unCheckedChildren: "\u9690\u85CF"
+  })));
 };
 export default FreedomSceneFormBindPoint;

package/es/components/FormBindPoint/ProductionOrDeviceScene.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React from "react";
 import { useMemo, useEffect } from 'react';
-import { Form, Button, Space, Typography } from 'antd';
+import { Form, Button, Space, Typography, Switch } from 'antd';
 import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import { useModel } from 'umi';
 import { cloneDeep } from 'lodash-es';
@@ -55,22 +55,26 @@ var ProductionSceneFormBindPoint = function ProductionSceneFormBindPoint(_ref) {
       var data = cloneDeep(activeCell.getData());
       if ((_data$pointList = data.pointList) === null || _data$pointList === void 0 ? void 0 : _data$pointList.length) {
         form.setFieldsValue({
-          pointList: data.pointList
+          pointList: data.pointList,
+          unitShow: data.unitShow
         });
       } else if (typeof data.pointListLimit === 'number' && data.pointListLimit > 0) {
         form.setFieldsValue({
           pointList: [{
             identifierName: ''
-          }]
+          }],
+          unitShow: true
         });
       } else {
         form.setFieldsValue({
-          pointList: []
+          pointList: [],
+          unitShow: true
         });
       }
     } else {
       form.setFieldsValue({
-        pointList: []
+        pointList: [],
+        unitShow: true
       });
     }
   }, [activeCell, form]);
@@ -83,7 +87,8 @@ var ProductionSceneFormBindPoint = function ProductionSceneFormBindPoint(_ref) {
     return 0;
   }, [activeCell]);
   var onValuesChange = function onValuesChange(changedValues, _ref2) {
-    var pointList = _ref2.pointList;
+    var pointList = _ref2.pointList,
+      unitShow = _ref2.unitShow;
     if (activeCell) {
       var list = pointList.filter(function (v) {
         return v.identifierName;
@@ -95,7 +100,8 @@ var ProductionSceneFormBindPoint = function ProductionSceneFormBindPoint(_ref) {
           return _objectSpread(_objectSpread({}, (_payload === null || _payload === void 0 ? void 0 : (_payload$pointList = _payload.pointList) === null || _payload$pointList === void 0 ? void 0 : _payload$pointList[index]) || {}), {}, {
             identifierName: v.identifierName
           });
-        })
+        }),
+        unitShow: unitShow
       }, {
         deep: false
       });
@@ -167,6 +173,14 @@ var ProductionSceneFormBindPoint = function ProductionSceneFormBindPoint(_ref) {
       block: true,
       icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
     }, "\u6DFB\u52A0\u70B9\u4F4D")) : null);
-  }));
+  }), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "unitShow",
+    label: "\u5355\u4F4D",
+    className: "!ml-3"
+  }, /*#__PURE__*/React.createElement(Switch, {
+    defaultChecked: true,
+    checkedChildren: "\u663E\u793A",
+    unCheckedChildren: "\u9690\u85CF"
+  })));
 };
 export default ProductionSceneFormBindPoint;

package/es/components/ImageUploader/index.js

@@ -88,7 +88,7 @@ var ImageUploader = function ImageUploader(_ref) {
   };
   var customUploadRequest = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
-      var onSuccess, onError, file, size, _yield$uploadFile, success, data;
+      var onSuccess, onError, file, size, _yield$uploadFile, code, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -107,19 +107,19 @@ var ImageUploader = function ImageUploader(_ref) {
             });
           case 7:
             _yield$uploadFile = _context.sent;
-            success = _yield$uploadFile.success;
+            code = _yield$uploadFile.code;
             data = _yield$uploadFile.data;
-            if (success && (data === null || data === void 0 ? void 0 : data.length)) {
+            if (code == 200 && data) {
               onChange === null || onChange === void 0 ? void 0 : onChange({
-                url: data[0],
+                url: data,
                 size: size,
                 name: file.name
               });
               // @ts-ignore
               onSuccess({}, // @ts-ignore
               _objectSpread(_objectSpread({}, options.file), {}, {
-                uid: data[0],
-                url: data[0]
+                uid: data,
+                url: data
               }));
             } else {
               onError === null || onError === void 0 ? void 0 : onError(new Error('文件上传失败'));