coolcare-lite-scada-component 1.0.44 → 1.0.46

package/es/element/EleSwitch/Component.js

@@ -51,7 +51,7 @@ var EleSwitchComponent = function EleSwitchComponent(_ref) {
           pointId: 'pointId' in configPoint ? configPoint.pointId : undefined,
           deviceId: 'deviceId' in configPoint ? configPoint.deviceId : undefined,
           value: val ? checkedValue : unCheckedValue
-        }, premission);
+        });
         setValue(val);
       }
     });
@@ -64,7 +64,7 @@ var EleSwitchComponent = function EleSwitchComponent(_ref) {
     }
   }, [pointData === null || pointData === void 0 ? void 0 : pointData.value, payload === null || payload === void 0 ? void 0 : payload.checkedValue]);
   return /*#__PURE__*/React.createElement("div", {
-    className: styles.wrap,
+    className: "".concat(styles.wrap, " ").concat(premission.includes("49") ? "" : styles.hide),
     id: "switch-".concat(pointData === null || pointData === void 0 ? void 0 : pointData.deviceId)
   }, /*#__PURE__*/React.createElement(Tooltip, {
     title: tooltipTitle

package/es/element/EleSwitch/index.css

@@ -4,3 +4,6 @@
   cursor: pointer;
   user-select: none;
 }
+.hide {
+  display: none;
+}

package/es/element/utils/pointWrite.js

@@ -99,11 +99,11 @@ function _getDevicePoint() {
   }));
   return _getDevicePoint.apply(this, arguments);
 }
-export function pointWrite(_x4, _x5) {
+export function pointWrite(_x4) {
   return _pointWrite.apply(this, arguments);
 }
 function _pointWrite() {
-  _pointWrite = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params, premission) {
+  _pointWrite = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
     var query, deviceId, value, pointId, deviceInfo, pointInfo, writeFunction, res;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
@@ -115,14 +115,6 @@ function _pointWrite() {
           }
           return _context3.abrupt("return");
         case 3:
-          console.log(premission);
-          if (!(premission === null || premission === void 0 ? void 0 : premission.includes('49'))) {
-            _context3.next = 7;
-            break;
-          }
-          message.error('您没有点位写入权限');
-          return _context3.abrupt("return");
-        case 7:
           // eslint-disable-next-line prefer-const
           deviceId = params.deviceId, value = params.value, pointId = params.pointId; // 如果没有 deviceId（device 场景下），则从 url query 里获取
           if (!deviceId) {
@@ -130,74 +122,74 @@ function _pointWrite() {
               deviceId = parseInt(query.deviceId, 10);
             }
           }
-          _context3.next = 11;
+          _context3.next = 7;
           return fetchDeviceInfo(deviceId);
-        case 11:
+        case 7:
           deviceInfo = _context3.sent;
           if (deviceInfo) {
-            _context3.next = 14;
+            _context3.next = 10;
             break;
           }
           return _context3.abrupt("return", false);
-        case 14:
+        case 10:
           if ([0, 1].includes(deviceInfo.protocol)) {
-            _context3.next = 17;
+            _context3.next = 13;
             break;
           }
           message.info('暂不支持该协议网关的写入');
           return _context3.abrupt("return", false);
-        case 17:
+        case 13:
           if (params.pointId) {
-            _context3.next = 22;
+            _context3.next = 18;
             break;
           }
-          _context3.next = 20;
+          _context3.next = 16;
           return getDevicePoint(deviceId, params.identifierName);
-        case 20:
+        case 16:
           pointInfo = _context3.sent;
           if (pointInfo) {
             pointId = pointInfo.pointId;
           }
-        case 22:
+        case 18:
           writeFunction = deviceInfo.protocol === 0 ? ModbusMqttWritePointData : CommonMqttWritePointData;
-          _context3.prev = 23;
-          _context3.next = 26;
+          _context3.prev = 19;
+          _context3.next = 22;
           return writeFunction(_defineProperty({}, pointId, value));
-        case 26:
+        case 22:
           res = _context3.sent;
           if (!(res.data === '指令已下发')) {
-            _context3.next = 30;
+            _context3.next = 26;
             break;
           }
           message.success('指令已下发');
           return _context3.abrupt("return", true);
-        case 30:
+        case 26:
           if (res.success) {
-            _context3.next = 33;
+            _context3.next = 29;
             break;
           }
           message.error(res.message);
           return _context3.abrupt("return", false);
-        case 33:
+        case 29:
           if (!(res.data && pointId in res.data)) {
-            _context3.next = 36;
+            _context3.next = 32;
             break;
           }
           message.error('写入失败');
           return _context3.abrupt("return", false);
-        case 36:
-          _context3.next = 42;
+        case 32:
+          _context3.next = 38;
           break;
-        case 38:
-          _context3.prev = 38;
-          _context3.t0 = _context3["catch"](23);
+        case 34:
+          _context3.prev = 34;
+          _context3.t0 = _context3["catch"](19);
           console.error(_context3.t0);
           return _context3.abrupt("return", false);
-        case 42:
+        case 38:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[23, 38]]);
+    }, _callee3, null, [[19, 34]]);
   }));
   return _pointWrite.apply(this, arguments);
 }

package/package.json

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