coolcare-lite-scada-component 1.0.41 → 1.0.43

package/es/element/EleSwitch/Component.js

@@ -22,6 +22,7 @@ var EleSwitchComponent = function EleSwitchComponent(_ref) {
     value = _useState2[0],
     setValue = _useState2[1];
   var payload = node === null || node === void 0 ? void 0 : node.getData();
+  var premission = payload === null || payload === void 0 ? void 0 : payload.premission;
   var configPoint = payload === null || payload === void 0 ? void 0 : (_payload$pointList = payload.pointList) === null || _payload$pointList === void 0 ? void 0 : _payload$pointList[0];
   var pointData = usePointWatch(configPoint, payload === null || payload === void 0 ? void 0 : (_payload$mittMeta = payload.mittMeta) === null || _payload$mittMeta === void 0 ? void 0 : _payload$mittMeta.namespace);
   var tooltipTitle = null;
@@ -50,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);
       }
     });

package/es/element/type.d.ts

@@ -131,6 +131,7 @@ declare namespace Ele {
     /** 点击选择器-是否禁止选择不可写的点位 */
     pointSelect_disabledUnWriteable?: boolean;
     mittMeta?: MittMeta;
+    payload?: string[];
   };
 
   export type Size = {

package/es/element/utils/pointWrite.js

@@ -99,12 +99,11 @@ function _getDevicePoint() {
   }));
   return _getDevicePoint.apply(this, arguments);
 }
-export function pointWrite(_x4) {
+export function pointWrite(_x4, _x5) {
   return _pointWrite.apply(this, arguments);
 }
 function _pointWrite() {
-  _pointWrite = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-    var _query$premission;
+  _pointWrite = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params, premission) {
     var query, deviceId, value, pointId, deviceInfo, pointInfo, writeFunction, res;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
@@ -116,13 +115,14 @@ function _pointWrite() {
           }
           return _context3.abrupt("return");
         case 3:
-          if (!((_query$premission = query.premission) === null || _query$premission === void 0 ? void 0 : _query$premission.split(',').includes('49'))) {
-            _context3.next = 6;
+          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 6:
+        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 +130,74 @@ function _pointWrite() {
               deviceId = parseInt(query.deviceId, 10);
             }
           }
-          _context3.next = 10;
+          _context3.next = 11;
           return fetchDeviceInfo(deviceId);
-        case 10:
+        case 11:
           deviceInfo = _context3.sent;
           if (deviceInfo) {
-            _context3.next = 13;
+            _context3.next = 14;
             break;
           }
           return _context3.abrupt("return", false);
-        case 13:
+        case 14:
           if ([0, 1].includes(deviceInfo.protocol)) {
-            _context3.next = 16;
+            _context3.next = 17;
             break;
           }
           message.info('暂不支持该协议网关的写入');
           return _context3.abrupt("return", false);
-        case 16:
+        case 17:
           if (params.pointId) {
-            _context3.next = 21;
+            _context3.next = 22;
             break;
           }
-          _context3.next = 19;
+          _context3.next = 20;
           return getDevicePoint(deviceId, params.identifierName);
-        case 19:
+        case 20:
           pointInfo = _context3.sent;
           if (pointInfo) {
             pointId = pointInfo.pointId;
           }
-        case 21:
+        case 22:
           writeFunction = deviceInfo.protocol === 0 ? ModbusMqttWritePointData : CommonMqttWritePointData;
-          _context3.prev = 22;
-          _context3.next = 25;
+          _context3.prev = 23;
+          _context3.next = 26;
           return writeFunction(_defineProperty({}, pointId, value));
-        case 25:
+        case 26:
           res = _context3.sent;
           if (!(res.data === '指令已下发')) {
-            _context3.next = 29;
+            _context3.next = 30;
             break;
           }
           message.success('指令已下发');
           return _context3.abrupt("return", true);
-        case 29:
+        case 30:
           if (res.success) {
-            _context3.next = 32;
+            _context3.next = 33;
             break;
           }
           message.error(res.message);
           return _context3.abrupt("return", false);
-        case 32:
+        case 33:
           if (!(res.data && pointId in res.data)) {
-            _context3.next = 35;
+            _context3.next = 36;
             break;
           }
           message.error('写入失败');
           return _context3.abrupt("return", false);
-        case 35:
-          _context3.next = 41;
+        case 36:
+          _context3.next = 42;
           break;
-        case 37:
-          _context3.prev = 37;
-          _context3.t0 = _context3["catch"](22);
+        case 38:
+          _context3.prev = 38;
+          _context3.t0 = _context3["catch"](23);
           console.error(_context3.t0);
           return _context3.abrupt("return", false);
-        case 41:
+        case 42:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[22, 37]]);
+    }, _callee3, null, [[23, 38]]);
   }));
   return _pointWrite.apply(this, arguments);
 }

package/es/pages/display/Player/index.js

@@ -555,7 +555,9 @@ var Player = function Player(_ref) {
       var _jsonConfig$cells2;
       jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$cells2 = jsonConfig.cells) === null || _jsonConfig$cells2 === void 0 ? void 0 : _jsonConfig$cells2.forEach(function (v) {
         if (v.data) {
+          var _query$premission;
           v.data.mittMeta = mittMeta;
+          v.data.premission = ((_query$premission = query.premission) === null || _query$premission === void 0 ? void 0 : _query$premission.split(',')) || [];
         }
       });
       graph.fromJSON(jsonConfig);

package/es/typings.d.ts

@@ -144,6 +144,10 @@ type PlayerQuery =
       token?: string;
       /** 刷新token */
       xToken?: string;
+      /** 项目 id */
+      projectId?: string;
+      /** 权限 */
+      premission: string
     };
 
 type WindowCommunicateMsg =

package/package.json

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