coolcare-lite-scada-component 1.0.4 → 1.0.5

package/es/components/ModalFanDevicePoint/index.js

@@ -12,7 +12,6 @@ import React from "react";
 import { Modal, Descriptions, Divider, Spin, message, Typography } from 'antd';
 import { useState, useEffect, useCallback } from 'react';
 import { SyncOutlined } from '@ant-design/icons';
-import { useModel } from 'umi';
 import emitter from "../../utils/events";
 import { pointValueFormat } from "../../utils/pointValueFormat";
 import { GetDevicePoint } from "../../services/gateway/Device";
@@ -20,14 +19,8 @@ var Link = Typography.Link;
 var ModalFanDevicePoint = function ModalFanDevicePoint(_ref) {
   var open = _ref.open,
     deviceId = _ref.deviceId,
-    onCancel = _ref.onCancel;
-  var _useModel = useModel('usePlayer', function (model) {
-      return {
-        mittMeta: model.mittMeta
-      };
-    }),
-    mittMeta = _useModel.mittMeta;
-
+    onCancel = _ref.onCancel,
+    mittMeta = _ref.mittMeta;
   // 制冷状态
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),

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

@@ -14,11 +14,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from "react";
-import { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef, useMemo } from 'react';
 import { Graph } from '@antv/x6';
 import { message } from 'antd';
 import { useSize } from 'ahooks';
-import { useModel } from 'umi';
 import { getInfoFromPointId, getMittMeta } from "../../../utils";
 import isInIframe from "../../../utils/isInIframe";
 import DialogHistory from "../../../components/DialogHistory";
@@ -35,8 +34,6 @@ var Player = function Player(_ref) {
   var graphRef = useRef(null);
   var wrapRef = useRef(null);
   var playerRef = useRef(null);
-  // const query = useQuery<PlayerQuery>();
-
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visibleDialogHistory = _useState2[0],
@@ -61,13 +58,10 @@ var Player = function Player(_ref) {
     _useState12 = _slicedToArray(_useState11, 2),
     activeDeviceId = _useState12[0],
     setActiveDeviceId = _useState12[1];
-  var _useModel = useModel('usePlayer', function (model) {
-      return {
-        setMittMeta: model.setMittMeta
-      };
-    }),
-    setMittMeta = _useModel.setMittMeta;
   var wrapSize = useSize(wrapRef);
+  var mittMeta = useMemo(function () {
+    return getMittMeta(query);
+  }, [query]);
   useEffect(function () {
     window.scadaMode = 'player';
     return function () {
@@ -176,14 +170,12 @@ var Player = function Player(_ref) {
         return _ref2.apply(this, arguments);
       };
     }();
-    var mittMeta = getMittMeta(query);
-    setMittMeta(mittMeta);
     var eventName = "show-point-history-".concat(mittMeta.namespace);
     emitter.on(eventName, handler);
     return function () {
       emitter.off(eventName, handler);
     };
-  }, [query, setMittMeta]);
+  }, [query, mittMeta]);
 
   // 监听显示点位写入弹窗事件
   useEffect(function () {
@@ -217,14 +209,12 @@ var Player = function Player(_ref) {
         return _ref3.apply(this, arguments);
       };
     }();
-    var mittMeta = getMittMeta(query);
-    setMittMeta(mittMeta);
     var eventName = "show-point-write-modal-".concat(mittMeta.namespace);
     emitter.on(eventName, handler);
     return function () {
       emitter.off(eventName, handler);
     };
-  }, [query, setMittMeta]);
+  }, [query, mittMeta]);
 
   // 监听显示风机设备点位弹窗事件
   useEffect(function () {
@@ -254,14 +244,12 @@ var Player = function Player(_ref) {
         return _ref5.apply(this, arguments);
       };
     }();
-    var mittMeta = getMittMeta(query);
-    setMittMeta(mittMeta);
     var eventName = "show-fan-device-point-modal-".concat(mittMeta.namespace);
     emitter.on(eventName, handler);
     return function () {
       emitter.off(eventName, handler);
     };
-  }, [query, setMittMeta]);
+  }, [query, mittMeta]);
   useEffect(function () {
     if (!playerRef.current) return;
     graphRef.current = new Graph({
@@ -294,7 +282,7 @@ var Player = function Player(_ref) {
         modifiers: ['ctrl', 'meta']
       }
     });
-  }, [query]);
+  }, [query, mittMeta]);
   useEffect(function () {
     var _jsonConfig$pageConfi2, _graphRef$current3;
     if (!wrapSize || !jsonConfig || !query) return;
@@ -320,8 +308,6 @@ var Player = function Player(_ref) {
 
   // scene === 'device' 加载设备点位数据
   useEffect(function () {
-    var mittMeta = getMittMeta(query);
-    setMittMeta(mittMeta);
     var fetchDevicePoints = /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(deviceId) {
         var res, pointList;
@@ -368,12 +354,10 @@ var Player = function Player(_ref) {
         clearInterval(timer);
       }
     };
-  }, [query, jsonConfig, setMittMeta]);
+  }, [query, jsonConfig, mittMeta]);
 
   // scene === 'freedom' 加载设备点位数据
   useEffect(function () {
-    var mittMeta = getMittMeta(query);
-    setMittMeta(mittMeta);
     var fetchDevicePoints = /*#__PURE__*/function () {
       var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(ids) {
         var res, pointList;
@@ -449,13 +433,11 @@ var Player = function Player(_ref) {
         clearInterval(timer);
       }
     };
-  }, [query, jsonConfig, setMittMeta]);
+  }, [query, jsonConfig, mittMeta]);
   useEffect(function () {
     var graph = graphRef.current;
     if (jsonConfig && graph && query) {
       var _jsonConfig$cells2;
-      var mittMeta = getMittMeta(query);
-      setMittMeta(mittMeta);
       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) {
           v.data.mittMeta = mittMeta;
@@ -470,7 +452,7 @@ var Player = function Player(_ref) {
         preserveAspectRatio: true // 是否保持长宽比。
       });
     }
-  }, [jsonConfig, query, setMittMeta]);
+  }, [jsonConfig, query, mittMeta]);
   return /*#__PURE__*/React.createElement("div", {
     ref: wrapRef,
     id: "scada-player-wrap"
@@ -480,6 +462,7 @@ var Player = function Player(_ref) {
   }), /*#__PURE__*/React.createElement(ModalFanDevicePoint, {
     deviceId: activeDeviceId,
     open: visibleModalFanDevicePoint,
+    mittMeta: mittMeta,
     onCancel: function onCancel() {
       return setVisibleModalFanDevicePoint(false);
     }

package/package.json

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

package/es/models/usePlayer.js

@@ -1,17 +0,0 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useState } from 'react';
-export default function usePlayer() {
-  var _useState = useState(),
-    _useState2 = _slicedToArray(_useState, 2),
-    mittMeta = _useState2[0],
-    setMittMeta = _useState2[1];
-  return {
-    mittMeta: mittMeta,
-    setMittMeta: setMittMeta
-  };
-}