coolcare-lite-scada-component 2.0.27 → 2.0.29

package/es/element/EleFan/Component.js

@@ -90,7 +90,7 @@ var EleFanComponent = function EleFanComponent(_ref) {
     className: styles.wrap
   }, /*#__PURE__*/React.createElement("img", {
     className: "".concat(styles['fan-img'], " ").concat(fanIsOn ? styles.on : ''),
-    src: "/fan.png"
+    src: "http://10.189.40.132:9000/iot/fan.png"
   })));
 };
 export default /*#__PURE__*/memo(EleFanComponent, reactShapeNodeAreEqual);

package/es/element/type.d.ts

@@ -39,11 +39,13 @@ declare namespace Ele {
     /** 打开链接 */
     | 'open-url'
     /** 点位值写入 */
-    | 'write-point';
+    | 'write-point'
+    /** 场景组态切换 */
+    | 'freedom-scene-switch';
   export type Event = {
     type: EventType;
     action: EventAction;
-    value?: string;
+    value?: any;
     payload?: any;
   };
 
@@ -142,4 +144,4 @@ declare namespace Ele {
     /** 12px | 12px 12px 12px 12px */
     margin?: `${number}px` | `${number}px ${number}px ${number}px ${number}px`;
   };
-}
+}

package/es/element/utils/handleEleEvent.js

@@ -53,6 +53,9 @@ export default function handleEleEvent() {
           return isString(v.identifierName);
         }));
         return;
+      case 'freedom-scene-switch':
+        emitter.emit("freedom-scene-switch-".concat(payload.namespace), event.value ? Number(event.value) : undefined);
+        return;
       default:
         return;
     }

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

@@ -27,10 +27,11 @@ import emitter from "../../../utils/events";
 import { GetDevicePoint } from "../../../services/gateway/Device";
 import "./index.css";
 /** 刷新频率 */
-var RefreshFrequency = 5 * 1000;
+var RefreshFrequency = 1.5 * 60 * 1000;
 var Player = function Player(_ref) {
   var jsonConfig = _ref.jsonConfig,
-    query = _ref.query;
+    query = _ref.query,
+    onEvent = _ref.onEvent;
   var graphRef = useRef(null);
   var wrapRef = useRef(null);
   var playerRef = useRef(null);
@@ -250,6 +251,43 @@ var Player = function Player(_ref) {
       emitter.off(eventName, handler);
     };
   }, [query, mittMeta]);
+
+  // 监听场景组态切换事件
+  useEffect(function () {
+    var handler = /*#__PURE__*/function () {
+      var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(scadaId) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              onEvent === null || onEvent === void 0 ? void 0 : onEvent({
+                event: 'freedom-scene-switch',
+                payload: {
+                  scadaId: scadaId
+                }
+              });
+              console.log('[186]-index.tsx', onEvent, {
+                event: 'freedom-scene-switch',
+                payload: {
+                  scadaId: scadaId
+                }
+              });
+            case 2:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }));
+      return function handler(_x4) {
+        return _ref6.apply(this, arguments);
+      };
+    }();
+    var mittMeta = getMittMeta(query);
+    var eventName = "freedom-scene-switch-".concat(mittMeta.namespace);
+    emitter.on(eventName, handler);
+    return function () {
+      emitter.off(eventName, handler);
+    };
+  }, [query, onEvent]);
   useEffect(function () {
     if (!playerRef.current) return;
     graphRef.current = new Graph({
@@ -308,23 +346,23 @@ var Player = function Player(_ref) {
   // scene === 'device' 加载设备点位数据
   useEffect(function () {
     var fetchDevicePoints = /*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(deviceId) {
+      var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(deviceId) {
         var res, pointList;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.next = 2;
+              _context5.next = 2;
               return GetDevicePoint({
                 deviceIdList: [deviceId]
               }, []);
             case 2:
-              res = _context4.sent;
+              res = _context5.sent;
               if (res.success) {
-                _context4.next = 6;
+                _context5.next = 6;
                 break;
               }
               message.error('设备点位数据获取失败');
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
             case 6:
               pointList = res.data || [];
               pointList.forEach(function (v) {
@@ -333,12 +371,12 @@ var Player = function Player(_ref) {
               });
             case 8:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4);
+        }, _callee5);
       }));
-      return function fetchDevicePoints(_x4) {
-        return _ref6.apply(this, arguments);
+      return function fetchDevicePoints(_x5) {
+        return _ref7.apply(this, arguments);
       };
     }();
     var timer;
@@ -358,23 +396,23 @@ var Player = function Player(_ref) {
   // scene === 'freedom' 加载设备点位数据
   useEffect(function () {
     var fetchDevicePoints = /*#__PURE__*/function () {
-      var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(ids) {
+      var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(ids) {
         var res, pointList;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context5.next = 2;
+              _context6.next = 2;
               return GetDevicePoint({
                 pointIdList: ids
               }, []);
             case 2:
-              res = _context5.sent;
+              res = _context6.sent;
               if (res.success) {
-                _context5.next = 6;
+                _context6.next = 6;
                 break;
               }
               message.error('设备点位数据获取失败');
-              return _context5.abrupt("return");
+              return _context6.abrupt("return");
             case 6:
               pointList = res.data || [];
               pointList.forEach(function (v) {
@@ -382,12 +420,12 @@ var Player = function Player(_ref) {
               });
             case 8:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5);
+        }, _callee6);
       }));
-      return function fetchDevicePoints(_x5) {
-        return _ref7.apply(this, arguments);
+      return function fetchDevicePoints(_x6) {
+        return _ref8.apply(this, arguments);
       };
     }();
     var timer;

package/es/pages/display/index.js

@@ -9,7 +9,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React from "react";
-import { useEffect, useState, useRef } from 'react';
+import { useEffect, useState } from 'react';
 import { message } from 'antd';
 import { queryToObject } from "../../utils";
 import { GetProductConfiguration } from "../../services/product/Product";
@@ -21,7 +21,8 @@ import ScadaEmpty from "./components/Empty";
 import styles from "./index.css";
 import { storeToken } from "../../utils/auth";
 var Display = function Display(_ref) {
-  var query_ = _ref.query_;
+  var query_ = _ref.query_,
+    onEvent = _ref.onEvent;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     jsonConfig = _useState2[0],
@@ -30,7 +31,7 @@ var Display = function Display(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var queryRef = useRef(query_ || queryToObject(window.location.href));
+  var q = query_ || queryToObject(window.location.href);
   useEffect(function () {
     if (query_) {
       // 被当成组件使用时(非 iframe ),设置接口请求的 prefix
@@ -42,11 +43,13 @@ var Display = function Display(_ref) {
 
   // 获取组态配置
   useEffect(function () {
-    var query = queryRef.current;
+    var query = query_ || queryToObject(window.location.href);
     if (!query) return;
     if (query.token && query.xToken) {
       storeToken(query.token, query.xToken);
     }
+
+    // 产品组态
     if (query.scene === 'product') {
       var fetchProductScadaConfig = /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -106,6 +109,8 @@ var Display = function Display(_ref) {
       }();
       fetchProductScadaConfig();
     }
+
+    // 设备组态
     if (query.scene === 'device') {
       var fetchDeviceScadaConfig = /*#__PURE__*/function () {
         var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
@@ -160,10 +165,12 @@ var Display = function Display(_ref) {
       }();
       fetchDeviceScadaConfig();
     }
+
+    // 场景组态
     if (query.scene === 'freedom') {
       var _fetchDeviceScadaConfig = /*#__PURE__*/function () {
         var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-          var _data$list, _yield$GetCompanyConf, success, data, scadaConfig;
+          var _data$list, _configJSON$cells, _yield$GetCompanyConf, success, data, scadaConfig, configJSON;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
@@ -187,25 +194,39 @@ var Display = function Display(_ref) {
                 return _context3.abrupt("return");
               case 10:
                 scadaConfig = data.list[0].config;
+                configJSON = JSON.parse(scadaConfig || '{}'); // 修复后端保存数据时，因json数据种存在"%"而导致的"%"数据丢失问题
+                if (configJSON === null || configJSON === void 0 ? void 0 : (_configJSON$cells = configJSON.cells) === null || _configJSON$cells === void 0 ? void 0 : _configJSON$cells.length) {
+                  configJSON === null || configJSON === void 0 ? void 0 : configJSON.cells.forEach(function (item) {
+                    var _item$attrs, _item$attrs$body, _item$attrs2, _item$attrs2$body, _item$attrs2$body$ref, _item$attrs3, _item$attrs3$body, _item$attrs5, _item$attrs5$body, _item$attrs6, _item$attrs6$body, _item$attrs6$body$ref, _item$attrs7, _item$attrs7$body;
+                    if ((item === null || item === void 0 ? void 0 : (_item$attrs = item.attrs) === null || _item$attrs === void 0 ? void 0 : (_item$attrs$body = _item$attrs.body) === null || _item$attrs$body === void 0 ? void 0 : _item$attrs$body.refWidth) && (item === null || item === void 0 ? void 0 : (_item$attrs2 = item.attrs) === null || _item$attrs2 === void 0 ? void 0 : (_item$attrs2$body = _item$attrs2.body) === null || _item$attrs2$body === void 0 ? void 0 : (_item$attrs2$body$ref = _item$attrs2$body.refWidth) === null || _item$attrs2$body$ref === void 0 ? void 0 : _item$attrs2$body$ref.indexOf('%')) === -1 && !isNaN(Number(item === null || item === void 0 ? void 0 : (_item$attrs3 = item.attrs) === null || _item$attrs3 === void 0 ? void 0 : (_item$attrs3$body = _item$attrs3.body) === null || _item$attrs3$body === void 0 ? void 0 : _item$attrs3$body.refWidth))) {
+                      var _item$attrs4, _item$attrs4$body;
+                      item.attrs.body.refWidth = "".concat(item === null || item === void 0 ? void 0 : (_item$attrs4 = item.attrs) === null || _item$attrs4 === void 0 ? void 0 : (_item$attrs4$body = _item$attrs4.body) === null || _item$attrs4$body === void 0 ? void 0 : _item$attrs4$body.refWidth, "%");
+                    }
+                    if ((item === null || item === void 0 ? void 0 : (_item$attrs5 = item.attrs) === null || _item$attrs5 === void 0 ? void 0 : (_item$attrs5$body = _item$attrs5.body) === null || _item$attrs5$body === void 0 ? void 0 : _item$attrs5$body.refHeight) && (item === null || item === void 0 ? void 0 : (_item$attrs6 = item.attrs) === null || _item$attrs6 === void 0 ? void 0 : (_item$attrs6$body = _item$attrs6.body) === null || _item$attrs6$body === void 0 ? void 0 : (_item$attrs6$body$ref = _item$attrs6$body.refHeight) === null || _item$attrs6$body$ref === void 0 ? void 0 : _item$attrs6$body$ref.indexOf('%')) === -1 && !isNaN(Number(item === null || item === void 0 ? void 0 : (_item$attrs7 = item.attrs) === null || _item$attrs7 === void 0 ? void 0 : (_item$attrs7$body = _item$attrs7.body) === null || _item$attrs7$body === void 0 ? void 0 : _item$attrs7$body.refHeight))) {
+                      var _item$attrs8, _item$attrs8$body;
+                      item.attrs.body.refHeight = "".concat(item === null || item === void 0 ? void 0 : (_item$attrs8 = item.attrs) === null || _item$attrs8 === void 0 ? void 0 : (_item$attrs8$body = _item$attrs8.body) === null || _item$attrs8$body === void 0 ? void 0 : _item$attrs8$body.refHeight, "%");
+                    }
+                  });
+                }
                 if (scadaConfig) {
                   setJsonConfig(JSON.parse((scadaConfig || '{}').replaceAll('https://coolcare-scada.oss-cn-shanghai.aliyuncs.com/', 'http://10.189.40.132:9000/iot/').replaceAll('https://front-end-assets.oss-cn-shanghai.aliyuncs.com/', 'http://10.189.40.132:9000/iot/')));
                 }
-                _context3.next = 18;
+                _context3.next = 20;
                 break;
-              case 14:
-                _context3.prev = 14;
+              case 16:
+                _context3.prev = 16;
                 _context3.t0 = _context3["catch"](0);
                 console.error(_context3.t0);
                 message.error('组态配置获取失败');
-              case 18:
-                _context3.prev = 18;
+              case 20:
+                _context3.prev = 20;
                 setLoading(false);
-                return _context3.finish(18);
-              case 21:
+                return _context3.finish(20);
+              case 23:
               case "end":
                 return _context3.stop();
             }
-          }, _callee3, null, [[0, 14, 18, 21]]);
+          }, _callee3, null, [[0, 16, 20, 23]]);
         }));
         return function _fetchDeviceScadaConfig() {
           return _ref4.apply(this, arguments);
@@ -213,7 +234,7 @@ var Display = function Display(_ref) {
       }();
       _fetchDeviceScadaConfig();
     }
-  }, []);
+  }, [query_]);
   useEffect(function () {
     window.addEventListener('message', function (e) {
       var data = e.data;
@@ -230,9 +251,10 @@ var Display = function Display(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: styles.wrap,
     id: "scada-body"
-  }, !!queryRef.current && /*#__PURE__*/React.createElement(Player, {
+  }, !!q && /*#__PURE__*/React.createElement(Player, {
     jsonConfig: jsonConfig,
-    query: queryRef.current
+    query: q,
+    onEvent: onEvent
   }), !loading && !jsonConfig && /*#__PURE__*/React.createElement(ScadaEmpty, null));
 };
 export default Display;

package/es/pages/editor/PanelRight/components/FormBindEvent/index.js

@@ -35,6 +35,9 @@ var actionOptions = [{
 }, {
   label: '点位写入',
   value: 'write-point'
+}, {
+  label: '场景组态切换',
+  value: 'freedom-scene-switch'
 }];
 var formLayout = {
   wrapperCol: {
@@ -170,16 +173,30 @@ var FormBindEvent = function FormBindEvent() {
         shouldUpdate: true
       }, function (_ref5) {
         var getFieldValue = _ref5.getFieldValue;
-        return getFieldValue(['events', index, 'action']) === 'open-url' && /*#__PURE__*/React.createElement(Form.Item, _extends({}, field, {
-          key: "".concat(field.key, "value"),
-          label: "\u94FE\u63A5\xA0",
-          name: [field.name, 'value'],
-          fieldKey: [field.fieldKey, 'value'],
-          rules: [{
-            required: true,
-            message: '请输入'
-          }]
-        }), /*#__PURE__*/React.createElement(Input, null));
+        if (getFieldValue(['events', index, 'action']) === 'open-url') {
+          return /*#__PURE__*/React.createElement(Form.Item, _extends({}, field, {
+            key: "".concat(field.key, "value"),
+            label: "\u94FE\u63A5\xA0",
+            name: [field.name, 'value'],
+            fieldKey: [field.fieldKey, 'value'],
+            rules: [{
+              required: true,
+              message: '请输入'
+            }]
+          }), /*#__PURE__*/React.createElement(Input, null));
+        }
+        if (getFieldValue(['events', index, 'action']) === 'freedom-scene-switch') {
+          return /*#__PURE__*/React.createElement(Form.Item, _extends({}, field, {
+            key: "".concat(field.key, "value"),
+            label: "\u573A\u666FID\xA0",
+            name: [field.name, 'value'],
+            fieldKey: [field.fieldKey, 'value'],
+            rules: [{
+              required: true,
+              message: '请输入'
+            }]
+          }), /*#__PURE__*/React.createElement(Input, null));
+        }
       }));
     }), /*#__PURE__*/React.createElement(Form.Item, {
       wrapperCol: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "2.0.27",
+  "version": "2.0.29",
   "scripts": {
     "start": "umi dev",
     "build:prod": "UMI_ENV=prod umi build",
@@ -13,7 +13,7 @@
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
     "analyze": "ANALYZE=1 umi build",
-    "deploy:prod": "docker build -t xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2024-11-12-2 . && docker push xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2024-11-12-2"
+    "deploy:prod": "docker build -t xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2024-12-1 . && docker push xiiman-docker.pkg.coding.net/coolcare-lite/coolcare-scada/yimin:master-2024-12-1"
   },
   "main": "./es/componentIndex.js",
   "module": "./es/componentIndex.js",