coolcare-lite-scada-component 1.0.11 → 1.0.13

package/es/components/FormBindPoint/FreedomScene.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React from "react";
 import { useMemo, useEffect } from 'react';
-import { Form, Button, Space, Typography, Input } from 'antd';
+import { Form, Button, Space, Typography, Input, Switch } from 'antd';
 import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import { useModel } from 'umi';
 import { cloneDeep } from 'lodash-es';
@@ -54,7 +54,8 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
       var data = cloneDeep(activeCell.getData());
       if ((_data$pointList = data.pointList) === null || _data$pointList === void 0 ? void 0 : _data$pointList.length) {
         form.setFieldsValue({
-          pointList: data.pointList
+          pointList: data.pointList,
+          unitShow: data.unintShow
         });
       } else if (typeof data.pointListLimit === 'number' && data.pointListLimit > 0) {
         form.setFieldsValue({
@@ -62,16 +63,19 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
             deviceId: undefined,
             pointId: undefined,
             identifierName: ''
-          }]
+          }],
+          unitShow: true
         });
       } else {
         form.setFieldsValue({
-          pointList: []
+          pointList: [],
+          unitShow: true
         });
       }
     } else {
       form.setFieldsValue({
-        pointList: []
+        pointList: [],
+        unitShow: true
       });
     }
   }, [activeCell, form]);
@@ -87,14 +91,17 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
   }, [activeCell]);
   var handleDeviceChange = function handleDeviceChange(deviceId, index) {
     var pointList = form.getFieldValue('pointList');
+    var unitShow = form.getFieldValue('unitShow');
     pointList[index].identifierName = undefined;
     pointList[index].pointId = undefined;
     form.setFieldsValue({
-      pointList: pointList
+      pointList: pointList,
+      unitShow: unitShow
     });
   };
   var onValuesChange = function onValuesChange(changedValues, _ref2) {
-    var pointList = _ref2.pointList;
+    var pointList = _ref2.pointList,
+      unitShow = _ref2.unitShow;
     if (!activeCell) return;
     var list = pointList.filter(function (v) {
       return v.identifierName;
@@ -108,7 +115,8 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
           identifierName: v.identifierName,
           pointId: v.pointId
         });
-      })
+      }),
+      unitShow: unitShow
     }, {
       deep: false
     });
@@ -202,6 +210,14 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
       block: true,
       icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
     }, "\u6DFB\u52A0\u70B9\u4F4D")) : null);
-  }));
+  }), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "unitShow",
+    label: "\u5355\u4F4D",
+    className: "!ml-3"
+  }, /*#__PURE__*/React.createElement(Switch, {
+    defaultChecked: true,
+    checkedChildren: "\u663E\u793A",
+    unCheckedChildren: "\u9690\u85CF"
+  })));
 };
 export default FreedomSceneFormBindPoint;

package/es/components/FormBindPoint/ProductionOrDeviceScene.js

@@ -16,7 +16,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import React from "react";
 import { useMemo, useEffect } from 'react';
-import { Form, Button, Space, Typography } from 'antd';
+import { Form, Button, Space, Typography, Switch } from 'antd';
 import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import { useModel } from 'umi';
 import { cloneDeep } from 'lodash-es';
@@ -55,22 +55,26 @@ var ProductionSceneFormBindPoint = function ProductionSceneFormBindPoint(_ref) {
       var data = cloneDeep(activeCell.getData());
       if ((_data$pointList = data.pointList) === null || _data$pointList === void 0 ? void 0 : _data$pointList.length) {
         form.setFieldsValue({
-          pointList: data.pointList
+          pointList: data.pointList,
+          unitShow: data.unitShow
         });
       } else if (typeof data.pointListLimit === 'number' && data.pointListLimit > 0) {
         form.setFieldsValue({
           pointList: [{
             identifierName: ''
-          }]
+          }],
+          unitShow: true
         });
       } else {
         form.setFieldsValue({
-          pointList: []
+          pointList: [],
+          unitShow: true
         });
       }
     } else {
       form.setFieldsValue({
-        pointList: []
+        pointList: [],
+        unitShow: true
       });
     }
   }, [activeCell, form]);
@@ -83,7 +87,8 @@ var ProductionSceneFormBindPoint = function ProductionSceneFormBindPoint(_ref) {
     return 0;
   }, [activeCell]);
   var onValuesChange = function onValuesChange(changedValues, _ref2) {
-    var pointList = _ref2.pointList;
+    var pointList = _ref2.pointList,
+      unitShow = _ref2.unitShow;
     if (activeCell) {
       var list = pointList.filter(function (v) {
         return v.identifierName;
@@ -95,7 +100,8 @@ var ProductionSceneFormBindPoint = function ProductionSceneFormBindPoint(_ref) {
           return _objectSpread(_objectSpread({}, (_payload === null || _payload === void 0 ? void 0 : (_payload$pointList = _payload.pointList) === null || _payload$pointList === void 0 ? void 0 : _payload$pointList[index]) || {}), {}, {
             identifierName: v.identifierName
           });
-        })
+        }),
+        unitShow: unitShow
       }, {
         deep: false
       });
@@ -167,6 +173,14 @@ var ProductionSceneFormBindPoint = function ProductionSceneFormBindPoint(_ref) {
       block: true,
       icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
     }, "\u6DFB\u52A0\u70B9\u4F4D")) : null);
-  }));
+  }), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "unitShow",
+    label: "\u5355\u4F4D",
+    className: "!ml-3"
+  }, /*#__PURE__*/React.createElement(Switch, {
+    defaultChecked: true,
+    checkedChildren: "\u663E\u793A",
+    unCheckedChildren: "\u9690\u85CF"
+  })));
 };
 export default ProductionSceneFormBindPoint;

package/es/element/ElePointList/Component.js

@@ -31,6 +31,10 @@ var ElePointPanelComponent = function ElePointPanelComponent(_ref2) {
   var fontStylesRef = useRef();
   var borderStyleRef = useRef();
   var fillStyleRef = useRef();
+  var _useState3 = useState(true),
+    _useState4 = _slicedToArray(_useState3, 2),
+    unitShow = _useState4[0],
+    setUnitShow = _useState4[1];
   var payload = node === null || node === void 0 ? void 0 : node.getData();
   if (window.scadaMode === 'edit') {
     fontStylesRef.current = payload === null || payload === void 0 ? void 0 : payload.fontStyles;
@@ -43,6 +47,8 @@ var ElePointPanelComponent = function ElePointPanelComponent(_ref2) {
     }
     var list = node.getData().pointList;
     setPointList(list);
+    var _unitShow = node.getData().unitShow;
+    setUnitShow(_unitShow == false ? false : true);
   }, [node]);
   useEffect(function () {
     var payload = node === null || node === void 0 ? void 0 : node.getData();
@@ -117,6 +123,10 @@ var ElePointPanelComponent = function ElePointPanelComponent(_ref2) {
         point: point
       })
     }, /*#__PURE__*/React.createElement("div", {
+      className: styles.deviceBox
+    }, /*#__PURE__*/React.createElement("div", {
+      className: styles.name
+    }, point.deviceName), /*#__PURE__*/React.createElement("div", {
       key: point.pointId,
       onClick: function onClick(e) {
         return handleClickPointItem(e, point);
@@ -129,7 +139,7 @@ var ElePointPanelComponent = function ElePointPanelComponent(_ref2) {
       className: styles.name
     }, (_point$pointName = point.pointName) !== null && _point$pointName !== void 0 ? _point$pointName : '-'), /*#__PURE__*/React.createElement("span", {
       className: styles.value
-    }, (_ref3 = point.pointEnumItemKey || point.value) !== null && _ref3 !== void 0 ? _ref3 : '-')));
+    }, (_ref3 = point.pointEnumItemKey || point.value) !== null && _ref3 !== void 0 ? _ref3 : '-', unitShow && point.unit))));
   }), (window.scadaMode === 'edit' || !pointList.length) && /*#__PURE__*/React.createElement("div", {
     className: styles.item
   }, /*#__PURE__*/React.createElement("span", {

package/es/element/ElePointList/index.css

@@ -20,3 +20,6 @@
 .value {
   color: #fff;
 }
+.deviceBox {
+  margin-bottom: 10px;
+}

package/es/element/PointCard/PointListCard/Component.js

@@ -27,13 +27,14 @@ var PointTooltipTitle = function PointTooltipTitle(_ref) {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", (point === null || point === void 0 ? void 0 : point.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", (_point$value = point === null || point === void 0 ? void 0 : point.value) !== null && _point$value !== void 0 ? _point$value : '-', " ", (_point$unit = point === null || point === void 0 ? void 0 : point.unit) !== null && _point$unit !== void 0 ? _point$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", (point === null || point === void 0 ? void 0 : point.updateTime) || '-'));
 };
 var PointItem = function PointItem(_ref2) {
-  var _ref3, _point$pointName;
+  var _ref3, _point$deviceName, _point$pointName;
   var point = _ref2.point,
     style = _ref2.style,
     valueStyles = _ref2.valueStyles,
     labelStyles = _ref2.labelStyles,
     bindEvents = _ref2.bindEvents,
-    eventNamespace = _ref2.eventNamespace;
+    eventNamespace = _ref2.eventNamespace,
+    unitShow = _ref2.unitShow;
   var eventHandles = useEleEventHandle({
     events: bindEvents,
     payload: {
@@ -65,7 +66,9 @@ var PointItem = function PointItem(_ref2) {
     style: _objectSpread({
       marginBottom: 4
     }, valueStyles)
-  }, 'value' in point ? (_ref3 = point.pointEnumItemKey || point.value) !== null && _ref3 !== void 0 ? _ref3 : '-' : '点位状态'), /*#__PURE__*/React.createElement("div", {
+  }, 'value' in point ? (_ref3 = point.pointEnumItemKey || point.value) !== null && _ref3 !== void 0 ? _ref3 : '-' + (unitShow && point.unit) : '点位状态'), /*#__PURE__*/React.createElement("div", {
+    style: labelStyles
+  }, 'value' in point ? (_point$deviceName = point === null || point === void 0 ? void 0 : point.deviceName) !== null && _point$deviceName !== void 0 ? _point$deviceName : '-' : '设备名称'), /*#__PURE__*/React.createElement("div", {
     style: labelStyles
   }, 'value' in point ? (_point$pointName = point === null || point === void 0 ? void 0 : point.pointName) !== null && _point$pointName !== void 0 ? _point$pointName : '-' : '点位名称')));
 };
@@ -93,12 +96,18 @@ var ElePointListCardComponent = function ElePointListCardComponent(_ref5) {
     setPointList = _useState2[1];
   var eventHandlerListRef = useRef([]);
   var payload = node === null || node === void 0 ? void 0 : node.getData();
+  var _useState3 = useState(true),
+    _useState4 = _slicedToArray(_useState3, 2),
+    unitShow = _useState4[0],
+    setUnitShow = _useState4[1];
   useEffect(function () {
     if (!payload) {
       return;
     }
     var list = payload.pointList;
     setPointList(list);
+    var _unitShow = payload.unitShow;
+    setUnitShow(_unitShow == false ? false : true);
   }, [payload]);
   useEffect(function () {
     if (window.scadaMode === 'edit') {
@@ -164,6 +173,7 @@ var ElePointListCardComponent = function ElePointListCardComponent(_ref5) {
     return /*#__PURE__*/React.createElement(PointItem, {
       key: point.identifierName,
       point: point,
+      unitShow: unitShow,
       style: {
         width: "".concat(100 / cols, "%")
       },

package/es/element/type.d.ts

@@ -113,6 +113,8 @@ declare namespace Ele {
     keepRatio?: boolean;
     /** 绑定的点位列表 */
     pointList?: BindPoint[];
+    /** 设置数据单位是否显示 */
+    unitShow: boolean;
     /** 最多可绑定的点位数量, 如果是 0 的话，则不可绑定点位,不显示绑定点位的表单, 如果是 undefined, 则不限制点位数量 */
     pointListLimit?: number;
     /** 元件内部文字样式 (edge 不支持) */

package/package.json

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