coolcare-lite-scada-component 2.0.14 → 2.0.16

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();
@@ -62,7 +68,7 @@ var ElePointPanelComponent = function ElePointPanelComponent(_ref2) {
       var eventHandler = function eventHandler(pointData) {
         setPointList(function (prev) {
           return prev.map(function (v) {
-            if (v.identifierName === point.identifierName) {
+            if (v.pointId === point.pointId) {
               return _objectSpread(_objectSpread({}, v), pointData);
             }
             return v;
@@ -89,7 +95,8 @@ var ElePointPanelComponent = function ElePointPanelComponent(_ref2) {
     handleEleEvent((payload === null || payload === void 0 ? void 0 : payload.events) || [], 'click', e, {
       points: [{
         identifierName: point.identifierName,
-        deviceId: point.deviceId
+        deviceId: point.deviceId,
+        pointId: point.pointId
       }],
       namespace: (_payload$mittMeta$nam = payload === null || payload === void 0 ? void 0 : (_payload$mittMeta = payload.mittMeta) === null || _payload$mittMeta === void 0 ? void 0 : _payload$mittMeta.namespace) !== null && _payload$mittMeta$nam !== void 0 ? _payload$mittMeta$nam : 0
     });
@@ -99,7 +106,8 @@ var ElePointPanelComponent = function ElePointPanelComponent(_ref2) {
     handleEleEvent((payload === null || payload === void 0 ? void 0 : payload.events) || [], 'contextmenu', e, {
       points: [{
         identifierName: point.identifierName,
-        deviceId: point.deviceId
+        deviceId: point.deviceId,
+        pointId: point.pointId
       }],
       namespace: (_payload$mittMeta$nam2 = payload === null || payload === void 0 ? void 0 : (_payload$mittMeta2 = payload.mittMeta) === null || _payload$mittMeta2 === void 0 ? void 0 : _payload$mittMeta2.namespace) !== null && _payload$mittMeta$nam2 !== void 0 ? _payload$mittMeta$nam2 : 0
     });
@@ -110,12 +118,16 @@ var ElePointPanelComponent = function ElePointPanelComponent(_ref2) {
   }, window.scadaMode === 'player' && pointList.map(function (point) {
     var _point$pointName, _ref3;
     return /*#__PURE__*/React.createElement(Tooltip, {
-      key: point.identifierName,
+      key: point.pointId,
       title: /*#__PURE__*/React.createElement(PointTooltipTitle, {
         point: point
       })
     }, /*#__PURE__*/React.createElement("div", {
-      key: point.identifierName,
+      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);
       },
@@ -127,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$unit2, _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: {
@@ -57,7 +58,9 @@ var PointItem = function PointItem(_ref2) {
     style: _objectSpread({
       marginBottom: 4
     }, valueStyles)
-  }, 'value' in point ? ((_ref3 = point.pointEnumItemKey || point.value) !== null && _ref3 !== void 0 ? _ref3 : '-') + ((_point$unit2 = point.unit) !== null && _point$unit2 !== void 0 ? _point$unit2 : '') : '点位状态'), /*#__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 : '-' : '点位名称')));
 };
@@ -85,12 +88,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') {
@@ -156,6 +165,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

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

package/es/global.css

@@ -160,3 +160,7 @@ body svg {
 .secondary-collapse.ant-collapse .ant-collapse-arrow {
   font-size: 10px !important;
 }
+button {
+  background-color: transparent !important;
+  padding: 0 !important;
+}