coolcare-lite-scada-component 1.0.18 → 1.0.20

package/es/components/DialogHistory/index.js

@@ -192,7 +192,16 @@ var DialogHistory = function DialogHistory(_ref) {
                         name: dataItem.ts,
                         value: dataItem.val
                       };
-                    })
+                    }),
+                    markPoint: {
+                      data: [{
+                        type: 'max',
+                        name: '最大值'
+                      }, {
+                        type: 'min',
+                        name: '最小值'
+                      }]
+                    }
                   });
                 });
 

package/es/element/EleSwitch/Component.js

@@ -37,7 +37,7 @@ var EleSwitchComponent = function EleSwitchComponent(_ref) {
       icon: /*#__PURE__*/React.createElement(ExclamationCircleOutlined, null),
       content: "确定执行操作吗？",
       getContainer: function getContainer() {
-        return document.getElementById("switch-".concat(pointData === null || pointData === void 0 ? void 0 : pointData.deviceId));
+        return document.getElementById("scada-body");
       },
       onOk: function onOk() {
         if (window.scadaMode === 'edit' || !configPoint || !(payload === null || payload === void 0 ? void 0 : payload.pointWriteable)) {

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

@@ -26,9 +26,8 @@ import ModalFanDevicePoint from "../../../components/ModalFanDevicePoint";
 import emitter from "../../../utils/events";
 import { GetDevicePoint } from "../../../services/gateway/Device";
 import "./index.css";
-/** 刷新频率 */
-var RefreshFrequency = 1.5 * 60 * 1000;
 var Player = function Player(_ref) {
+  var _jsonConfig$pageConfi;
   var jsonConfig = _ref.jsonConfig,
     query = _ref.query,
     onEvent = _ref.onEvent;
@@ -63,6 +62,9 @@ var Player = function Player(_ref) {
   var mittMeta = useMemo(function () {
     return getMittMeta(query);
   }, [query]);
+
+  /** 刷新频率 */
+  var RefreshFrequency = ((jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi === void 0 ? void 0 : _jsonConfig$pageConfi.refreshFrequency) || 1.5 * 60) * 1000;
   useEffect(function () {
     window.scadaMode = 'player';
     return function () {
@@ -71,11 +73,11 @@ var Player = function Player(_ref) {
   }, []);
   useEffect(function () {
     if (jsonConfig) {
-      var _jsonConfig$pageConfi, _window$parent;
+      var _jsonConfig$pageConfi2, _window$parent;
       var msg = {
         event: 'scada-config-loaded',
         payload: {
-          dimensions: (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi === void 0 ? void 0 : _jsonConfig$pageConfi.dimensions) || {
+          dimensions: (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi2 = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi2 === void 0 ? void 0 : _jsonConfig$pageConfi2.dimensions) || {
             width: 341,
             height: 500
           },
@@ -321,13 +323,13 @@ var Player = function Player(_ref) {
     });
   }, [query, mittMeta]);
   useEffect(function () {
-    var _jsonConfig$pageConfi2, _graphRef$current3;
+    var _jsonConfig$pageConfi3, _graphRef$current3;
     if (!wrapSize || !jsonConfig || !query) return;
-    if (query.zoomMode === 'width' && (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi2 = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi2 === void 0 ? void 0 : _jsonConfig$pageConfi2.dimensions)) {
+    if (query.zoomMode === 'width' && (jsonConfig === null || jsonConfig === void 0 ? void 0 : (_jsonConfig$pageConfi3 = jsonConfig.pageConfig) === null || _jsonConfig$pageConfi3 === void 0 ? void 0 : _jsonConfig$pageConfi3.dimensions)) {
       var _graphRef$current;
-      var _jsonConfig$pageConfi3 = jsonConfig.pageConfig.dimensions,
-        width = _jsonConfig$pageConfi3.width,
-        height = _jsonConfig$pageConfi3.height;
+      var _jsonConfig$pageConfi4 = jsonConfig.pageConfig.dimensions,
+        width = _jsonConfig$pageConfi4.width,
+        height = _jsonConfig$pageConfi4.height;
       var scale = wrapSize.width / width;
       (_graphRef$current = graphRef.current) === null || _graphRef$current === void 0 ? void 0 : _graphRef$current.resize(width * scale, height * scale);
     } else {

package/es/pages/display/index.js

@@ -249,7 +249,8 @@ var Display = function Display(_ref) {
     });
   }, []);
   return /*#__PURE__*/React.createElement("div", {
-    className: styles.wrap
+    className: styles.wrap,
+    id: "scada-body"
   }, !!q && /*#__PURE__*/React.createElement(Player, {
     jsonConfig: jsonConfig,
     query: q,

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

@@ -42,7 +42,8 @@ var LayerForm = function LayerForm() {
         backgroundColor = values.backgroundColor,
         borderRadius = values.borderRadius,
         backgroundImage = values.backgroundImage,
-        dimensionsSelectValue = values.dimensionsSelectValue;
+        dimensionsSelectValue = values.dimensionsSelectValue,
+        refreshFrequency = values.refreshFrequency;
       var width = values.width,
         height = values.height;
       if (dimensionsSelectValue !== '自定义') {
@@ -64,7 +65,8 @@ var LayerForm = function LayerForm() {
         title: title,
         backgroundColor: backgroundColor,
         backgroundImage: backgroundImage,
-        borderRadius: borderRadius
+        borderRadius: borderRadius,
+        refreshFrequency: refreshFrequency
       }));
     }, {
       leading: false,
@@ -138,6 +140,14 @@ var LayerForm = function LayerForm() {
     autoComplete: "off",
     onValuesChange: onFormChange
   }, /*#__PURE__*/React.createElement(Form.Item, {
+    name: "refreshFrequency",
+    label: "\u5237\u65B0\u9891\u7387"
+  }, /*#__PURE__*/React.createElement(InputNumber, {
+    min: 5,
+    max: 999,
+    defaultValue: 90,
+    addonBefore: "秒"
+  })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "dimensionsSelectValue",
     label: "\u5206\u8FA8\u7387"
   }, /*#__PURE__*/React.createElement(Select, {

package/package.json

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