coolcare-lite-scada-component 4.0.12 → 4.1.1

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, useState } from 'react';
-import { Form, Button, Space, Typography, Input, Switch, Select } from 'antd';
+import { Form, Button, Space, Typography, Input, InputNumber, Switch, Select } from 'antd';
 import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import { useModel } from 'umi';
 import { cloneDeep } from 'lodash-es';
@@ -44,7 +44,8 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
     pointItemTool = _ref.pointItemTool,
     pointListLimitOverride = _ref.pointListLimit,
     _ref$pointItemToolPla = _ref.pointItemToolPlacement,
-    pointItemToolPlacement = _ref$pointItemToolPla === void 0 ? 'header' : _ref$pointItemToolPla;
+    pointItemToolPlacement = _ref$pointItemToolPla === void 0 ? 'header' : _ref$pointItemToolPla,
+    enableDecimalConfig = _ref.enableDecimalConfig;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -150,7 +151,10 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
           dataType: v.dataType,
           meterId: v.meterId,
           valueType: v.indicatorNo ? 'indicator' : 'point',
-          indicatorNo: v.indicatorNo
+          indicatorNo: v.indicatorNo,
+          decimalEnabled: v.decimalEnabled,
+          decimalPlaces: v.decimalPlaces,
+          decimalTrailingZeros: v.decimalTrailingZeros
         });
       }),
       unitShow: unitShow
@@ -364,7 +368,41 @@ var FreedomSceneFormBindPoint = function FreedomSceneFormBindPoint(_ref) {
           label: 'name',
           value: 'id'
         }
-      })), pointItemToolPlacement === 'afterBindField' && typeof pointItemTool === 'function' && pointItemTool(index)));
+      })), pointItemToolPlacement === 'afterBindField' && typeof pointItemTool === 'function' && pointItemTool(index)), enableDecimalConfig && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, _extends({}, restField, {
+        label: "\u663E\u793A\u5C0F\u6570",
+        name: [name, 'decimalEnabled'],
+        valuePropName: "checked",
+        className: "!ml-3"
+      }), /*#__PURE__*/React.createElement(Switch, {
+        checkedChildren: "\u663E\u793A",
+        unCheckedChildren: "\u9690\u85CF"
+      })), /*#__PURE__*/React.createElement(Form.Item, {
+        noStyle: true,
+        shouldUpdate: function shouldUpdate(prev, next) {
+          var _prev$pointList, _prev$pointList$index, _next$pointList, _next$pointList$index;
+          return ((_prev$pointList = prev.pointList) === null || _prev$pointList === void 0 ? void 0 : (_prev$pointList$index = _prev$pointList[index]) === null || _prev$pointList$index === void 0 ? void 0 : _prev$pointList$index.decimalEnabled) !== ((_next$pointList = next.pointList) === null || _next$pointList === void 0 ? void 0 : (_next$pointList$index = _next$pointList[index]) === null || _next$pointList$index === void 0 ? void 0 : _next$pointList$index.decimalEnabled);
+        }
+      }, function () {
+        return form.getFieldValue(['pointList', index, 'decimalEnabled']) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, _extends({}, restField, {
+          label: "\u5C0F\u6570\u4F4D\u6570",
+          name: [name, 'decimalPlaces'],
+          initialValue: 2,
+          className: "!ml-3"
+        }), /*#__PURE__*/React.createElement(InputNumber, {
+          min: 0,
+          max: 6,
+          precision: 0
+        })), /*#__PURE__*/React.createElement(Form.Item, _extends({}, restField, {
+          label: "\u662F\u5426\u8865\u96F6",
+          name: [name, 'decimalTrailingZeros'],
+          initialValue: true,
+          valuePropName: "checked",
+          className: "!ml-3"
+        }), /*#__PURE__*/React.createElement(Switch, {
+          checkedChildren: "\u8865\u96F6",
+          unCheckedChildren: "\u4E0D\u8865\u96F6"
+        }))) : null;
+      })));
     }), pointListLimit > fields.length ? /*#__PURE__*/React.createElement(Form.Item, {
       wrapperCol: {
         span: 15,

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, Switch } from 'antd';
+import { Form, Button, InputNumber, Space, Typography, Switch } from 'antd';
 import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import { useModel } from 'umi';
 import { cloneDeep } from 'lodash-es';
@@ -41,7 +41,8 @@ var ProductionSceneFormBindPoint = function ProductionSceneFormBindPoint(_ref) {
     pointItemTool = _ref.pointItemTool,
     pointListLimitOverride = _ref.pointListLimit,
     _ref$pointItemToolPla = _ref.pointItemToolPlacement,
-    pointItemToolPlacement = _ref$pointItemToolPla === void 0 ? 'header' : _ref$pointItemToolPla;
+    pointItemToolPlacement = _ref$pointItemToolPla === void 0 ? 'header' : _ref$pointItemToolPla,
+    enableDecimalConfig = _ref.enableDecimalConfig;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -105,7 +106,10 @@ var ProductionSceneFormBindPoint = function ProductionSceneFormBindPoint(_ref) {
         pointList: list.map(function (v, index) {
           var _payload$pointList;
           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
+            identifierName: v.identifierName,
+            decimalEnabled: v.decimalEnabled,
+            decimalPlaces: v.decimalPlaces,
+            decimalTrailingZeros: v.decimalTrailingZeros
           });
         }),
         unitShow: unitShow
@@ -164,7 +168,41 @@ var ProductionSceneFormBindPoint = function ProductionSceneFormBindPoint(_ref) {
         deviceId: query.scene === 'device' ? Number(query.deviceId) : undefined,
         disabledUnWriteable: payload === null || payload === void 0 ? void 0 : payload.pointSelect_disabledUnWriteable,
         productId: query.scene === 'product' ? Number(query.productId) : undefined
-      })), pointItemToolPlacement === 'afterBindField' && typeof pointItemTool === 'function' && pointItemTool(index));
+      })), pointItemToolPlacement === 'afterBindField' && typeof pointItemTool === 'function' && pointItemTool(index), enableDecimalConfig && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, _extends({}, restField, {
+        label: "\u663E\u793A\u5C0F\u6570",
+        name: [name, 'decimalEnabled'],
+        valuePropName: "checked",
+        className: "!ml-3"
+      }), /*#__PURE__*/React.createElement(Switch, {
+        checkedChildren: "\u663E\u793A",
+        unCheckedChildren: "\u9690\u85CF"
+      })), /*#__PURE__*/React.createElement(Form.Item, {
+        noStyle: true,
+        shouldUpdate: function shouldUpdate(prev, next) {
+          var _prev$pointList, _prev$pointList$index, _next$pointList, _next$pointList$index;
+          return ((_prev$pointList = prev.pointList) === null || _prev$pointList === void 0 ? void 0 : (_prev$pointList$index = _prev$pointList[index]) === null || _prev$pointList$index === void 0 ? void 0 : _prev$pointList$index.decimalEnabled) !== ((_next$pointList = next.pointList) === null || _next$pointList === void 0 ? void 0 : (_next$pointList$index = _next$pointList[index]) === null || _next$pointList$index === void 0 ? void 0 : _next$pointList$index.decimalEnabled);
+        }
+      }, function () {
+        return form.getFieldValue(['pointList', index, 'decimalEnabled']) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, _extends({}, restField, {
+          label: "\u5C0F\u6570\u4F4D\u6570",
+          name: [name, 'decimalPlaces'],
+          initialValue: 2,
+          className: "!ml-3"
+        }), /*#__PURE__*/React.createElement(InputNumber, {
+          min: 0,
+          max: 6,
+          precision: 0
+        })), /*#__PURE__*/React.createElement(Form.Item, _extends({}, restField, {
+          label: "\u662F\u5426\u8865\u96F6",
+          name: [name, 'decimalTrailingZeros'],
+          initialValue: true,
+          valuePropName: "checked",
+          className: "!ml-3"
+        }), /*#__PURE__*/React.createElement(Switch, {
+          checkedChildren: "\u8865\u96F6",
+          unCheckedChildren: "\u4E0D\u8865\u96F6"
+        }))) : null;
+      })));
     }), pointListLimit > fields.length ? /*#__PURE__*/React.createElement(Form.Item, {
       wrapperCol: {
         span: 15,

package/es/components/FormBindPoint/index.js

@@ -6,18 +6,21 @@ var FormBindPoint = function FormBindPoint(_ref) {
   var onChange = _ref.onChange,
     pointItemTool = _ref.pointItemTool,
     pointListLimit = _ref.pointListLimit,
-    pointItemToolPlacement = _ref.pointItemToolPlacement;
+    pointItemToolPlacement = _ref.pointItemToolPlacement,
+    enableDecimalConfig = _ref.enableDecimalConfig;
   var query = useQuery();
   return /*#__PURE__*/React.createElement(React.Fragment, null, ['product', 'device'].includes(query.scene) && /*#__PURE__*/React.createElement(ProductionOrDeviceScene, {
     onChange: onChange,
     pointItemTool: pointItemTool,
     pointListLimit: pointListLimit,
-    pointItemToolPlacement: pointItemToolPlacement
+    pointItemToolPlacement: pointItemToolPlacement,
+    enableDecimalConfig: enableDecimalConfig
   }), query.scene === 'freedom' && /*#__PURE__*/React.createElement(FreedomScene, {
     onChange: onChange,
     pointItemTool: pointItemTool,
     pointListLimit: pointListLimit,
-    pointItemToolPlacement: pointItemToolPlacement
+    pointItemToolPlacement: pointItemToolPlacement,
+    enableDecimalConfig: enableDecimalConfig
   }));
 };
 export default FormBindPoint;

package/es/components/ImageUploader/index.js

@@ -19,6 +19,12 @@ import { useState } from 'react';
 import { Button, Upload, message, notification } from 'antd';
 import { UploadOutlined, LoadingOutlined } from '@ant-design/icons';
 import { Upload as uploadFile } from "../../services/common/Uploader";
+var MINIO_INTERNAL_URL = 'http://minio:9000';
+
+/** 只保存 OSS 路径，避免将容器内部地址写入图片配置。 */
+var normalizeUploadUrl = function normalizeUploadUrl(url) {
+  return url.startsWith(MINIO_INTERNAL_URL) ? url.slice(MINIO_INTERNAL_URL.length) : url;
+};
 /** 计算图片大小 */
 var calculateSize = function calculateSize(file) {
   return new Promise(function (resolve) {
@@ -81,7 +87,8 @@ var ImageUploader = function ImageUploader(_ref) {
         duration: 10,
         description: /*#__PURE__*/React.createElement("div", null, "\u6587\u4EF6\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7 ", size, "M, \u5EFA\u8BAE\u538B\u7F29\u540E\u518D\u4E0A\u4F20\u3002", ' ', /*#__PURE__*/React.createElement("a", {
           target: "_blank",
-          href: "https://squoosh.app/"
+          href: "https://squoosh.app/",
+          rel: "noreferrer"
         }, "\u56FE\u7247\u5728\u7EBF\u538B\u7F29"))
       });
     }
@@ -89,7 +96,7 @@ var ImageUploader = function ImageUploader(_ref) {
   };
   var customUploadRequest = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options) {
-      var onSuccess, onError, file, size, _yield$uploadFile, success, data, _t;
+      var onSuccess, onError, file, size, _yield$uploadFile, code, data, url, _t;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.p = _context.n) {
           case 0:
@@ -108,19 +115,20 @@ var ImageUploader = function ImageUploader(_ref) {
             });
           case 3:
             _yield$uploadFile = _context.v;
-            success = _yield$uploadFile.success;
+            code = _yield$uploadFile.code;
             data = _yield$uploadFile.data;
-            if (success && (data === null || data === void 0 ? void 0 : data.length)) {
+            if (String(code) === '200' && typeof data === 'string' && data.length > 0) {
+              url = normalizeUploadUrl(data);
               onChange === null || onChange === void 0 ? void 0 : onChange({
-                url: data[0],
+                url: url,
                 size: size,
                 name: file.name
               });
               // @ts-ignore
               onSuccess({}, // @ts-ignore
               _objectSpread(_objectSpread({}, options.file), {}, {
-                uid: data[0],
-                url: data[0]
+                uid: url,
+                url: url
               }));
             } else {
               onError === null || onError === void 0 ? void 0 : onError(new Error('文件上传失败'));

package/es/element/EleGauge/Component.js

@@ -16,6 +16,7 @@ import { Tooltip } from 'antd';
 import { usePointWatch, useEleEventHandle } from "../../hooks";
 import { reactShapeNodeAreEqual } from "../utils";
 import ECharts from "../../components/ECharts";
+import { formatPointDisplayValue } from "../../utils/pointValueFormat";
 import styles from "./index.css";
 var EleGaugeComponent = function EleGaugeComponent(_ref) {
   var _payload$pointList, _payload$mittMeta, _payload$mittMeta$nam, _payload$mittMeta2;
@@ -100,15 +101,16 @@ var EleGaugeComponent = function EleGaugeComponent(_ref) {
         optionsCopy.series.min = (_extraData$minValue = extraData === null || extraData === void 0 ? void 0 : extraData.minValue) !== null && _extraData$minValue !== void 0 ? _extraData$minValue : 0;
         optionsCopy.series.data[0].value = pointData.value;
         optionsCopy.series.data[0].name = (extraData === null || extraData === void 0 ? void 0 : extraData.label) || '';
+        var displayValue = formatPointDisplayValue(pointData.value, configPoint);
         if (extraData === null || extraData === void 0 ? void 0 : extraData.isShowUnit) {
-          optionsCopy.series.detail.formatter = "{value}".concat(pointData.unit);
+          optionsCopy.series.detail.formatter = "".concat(displayValue).concat(pointData.unit);
         } else {
-          optionsCopy.series.detail.formatter = "{value}";
+          optionsCopy.series.detail.formatter = "".concat(displayValue);
         }
         return optionsCopy;
       });
     }
-  }, [pointData, node]);
+  }, [pointData, node, configPoint]);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.wrap,
     onClick: function onClick(e) {

package/es/element/EleGauge/PropsSet/index.js

@@ -20,7 +20,8 @@ var PropsSet = function PropsSet() {
     header: "\u7ED1\u5B9A\u70B9\u4F4D",
     key: "1"
   }, /*#__PURE__*/React.createElement(FormBindPoint, {
-    onChange: forceUpdate
+    onChange: forceUpdate,
+    enableDecimalConfig: true
   })), /*#__PURE__*/React.createElement(Panel, {
     header: "\u5176\u4ED6",
     key: "2"

package/es/element/ElePointList/Component.js

@@ -14,12 +14,14 @@ import React from "react";
 import { memo, useState, useEffect, useRef } from 'react';
 import { Tooltip } from 'antd';
 import emitter from "../../utils/events";
+import { formatPointDisplayValue } from "../../utils/pointValueFormat";
 import { reactShapeNodeAreEqual, handleEleEvent } from "../utils";
 import styles from "./index.css";
 var PointTooltipTitle = function PointTooltipTitle(_ref) {
-  var _point$value, _point$unit;
+  var _point$unit;
   var point = _ref.point;
-  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 displayValue = formatPointDisplayValue(point === null || point === void 0 ? void 0 : point.value, point);
+  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", displayValue !== null && displayValue !== void 0 ? displayValue : '-', " ", (_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 ElePointPanelComponent = function ElePointPanelComponent(_ref2) {
   var node = _ref2.node;
@@ -139,7 +141,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 : '-', unitShow && point.unit))));
+    }, (_ref3 = point.pointEnumItemKey || formatPointDisplayValue(point.value, point)) !== 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/PropsSet/index.js

@@ -19,7 +19,8 @@ var PropsSet = function PropsSet() {
     header: "\u7ED1\u5B9A\u70B9\u4F4D",
     key: "1"
   }, /*#__PURE__*/React.createElement(FormBindPoint, {
-    onChange: forceUpdate
+    onChange: forceUpdate,
+    enableDecimalConfig: true
   })));
 };
 export default PropsSet;

package/es/element/ElePointValue/Component.js

@@ -18,6 +18,7 @@ import styles from "./index.css";
 import IconFont from "../../components/IconFont";
 import { useRequest } from 'ahooks';
 import { GetDeviceInfo } from "../../services/gateway/Device";
+import { formatPointDisplayValue } from "../../utils/pointValueFormat";
 var directionClassNameMap = {
   top: 'flex-col',
   left: 'flex-row',
@@ -74,6 +75,7 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
       unit: ['kWh', 't', 'm³', 't', 't'][pointData.type - 1]
     });
   }
+  var displayValue = formatPointDisplayValue(typeof value === 'string' && value !== '' ? Number(value) : value, configPoint);
   var pointValue = '';
   if (window.scadaMode === 'edit') {
     pointValue = '点位值';
@@ -82,7 +84,7 @@ var ElePointValueComponent = function ElePointValueComponent(_ref) {
     if (configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions) {
       pointValue = getValueByExpression(value, configPoint === null || configPoint === void 0 ? void 0 : configPoint.expressions);
     }
-    pointValue = ((_pointData6 = pointData) === null || _pointData6 === void 0 ? void 0 : _pointData6.pointEnumItemKey) || (typeof value == 'number' ? value.toFixed(1) : value);
+    pointValue = ((_pointData6 = pointData) === null || _pointData6 === void 0 ? void 0 : _pointData6.pointEnumItemKey) || displayValue;
   }
   var tooltipTitle = null;
   if (!configPoint) {

package/es/element/ElePointValue/PropsSet/index.js

@@ -24,7 +24,8 @@ var PropsSet = function PropsSet() {
     header: "\u7ED1\u5B9A\u70B9\u4F4D",
     key: "1"
   }, /*#__PURE__*/React.createElement(FormBindPoint, {
-    onChange: forceUpdate
+    onChange: forceUpdate,
+    enableDecimalConfig: true
   })), /*#__PURE__*/React.createElement(Panel, {
     header: "\u5168\u5C40",
     key: "2"

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

@@ -11,6 +11,7 @@ import { RightOutlined } from '@ant-design/icons';
 import Icon from "../../../components/Icon";
 import emitter from "../../../utils/events";
 import { usePointWatch, useEleEventHandle } from "../../../hooks";
+import { formatPointDisplayValue } from "../../../utils/pointValueFormat";
 import { reactShapeNodeAreEqual, getValueByExpression } from "../../utils";
 import styles from "./index.css";
 var defaultIconColor = '#5b6b73';
@@ -32,6 +33,7 @@ var ElePointCardComponent = function ElePointCardComponent(_ref) {
     }
   });
   var pointData = usePointWatch(configPoint, payload === null || payload === void 0 ? void 0 : (_payload$mittMeta2 = payload.mittMeta) === null || _payload$mittMeta2 === void 0 ? void 0 : _payload$mittMeta2.namespace);
+  var displayValue = formatPointDisplayValue(pointData === null || pointData === void 0 ? void 0 : pointData.value, configPoint);
   var onClickBtn = function onClickBtn(e) {
     var _payload$mittMeta$nam2, _payload$mittMeta3;
     e.stopPropagation();
@@ -57,8 +59,8 @@ var ElePointCardComponent = function ElePointCardComponent(_ref) {
   if (!configPoint) {
     tooltipTitle = '未绑定点位';
   } else {
-    var _pointData$value, _pointData$unit;
-    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", (_pointData$value = pointData === null || pointData === void 0 ? void 0 : pointData.value) !== null && _pointData$value !== void 0 ? _pointData$value : '-', " ", (_pointData$unit = pointData === null || pointData === void 0 ? void 0 : pointData.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.updateTime) || '-'));
+    var _pointData$unit;
+    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", displayValue !== null && displayValue !== void 0 ? displayValue : '-', " ", (_pointData$unit = pointData === null || pointData === void 0 ? void 0 : pointData.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.updateTime) || '-'));
   }
   return /*#__PURE__*/React.createElement(Tooltip, {
     title: tooltipTitle
@@ -95,7 +97,7 @@ var ElePointCardComponent = function ElePointCardComponent(_ref) {
     style: {
       marginRight: 4
     }
-  }, (_ref2 = (pointData === null || pointData === void 0 ? void 0 : pointData.pointEnumItemKey) || (pointData === null || pointData === void 0 ? void 0 : pointData.value)) !== null && _ref2 !== void 0 ? _ref2 : '-'), /*#__PURE__*/React.createElement("span", {
+  }, (_ref2 = (pointData === null || pointData === void 0 ? void 0 : pointData.pointEnumItemKey) || displayValue) !== null && _ref2 !== void 0 ? _ref2 : '-'), /*#__PURE__*/React.createElement("span", {
     className: styles.unit
   }, (pointData === null || pointData === void 0 ? void 0 : pointData.unit) || '')), /*#__PURE__*/React.createElement("button", {
     onClick: onClickBtn,

package/es/element/PointCard/PointCard1/PropsSet/index.js

@@ -22,7 +22,8 @@ var PropsSet = function PropsSet() {
     header: "\u7ED1\u5B9A\u70B9\u4F4D",
     key: "1"
   }, /*#__PURE__*/React.createElement(FormBindPoint, {
-    onChange: forceUpdate
+    onChange: forceUpdate,
+    enableDecimalConfig: true
   })), /*#__PURE__*/React.createElement(Panel, {
     header: "\u56FE\u6807",
     key: "2"

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

@@ -19,15 +19,17 @@ import { memo, useState, useEffect, useRef } from 'react';
 import { Tooltip } from 'antd';
 import emitter from "../../../utils/events";
 import { useEleEventHandle } from "../../../hooks";
+import { formatPointDisplayValue } from "../../../utils/pointValueFormat";
 import { reactShapeNodeAreEqual } from "../../utils";
 import styles from "./index.css";
 var PointTooltipTitle = function PointTooltipTitle(_ref) {
-  var _point$value, _point$unit;
+  var _point$unit;
   var point = _ref.point;
-  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 displayValue = formatPointDisplayValue(point === null || point === void 0 ? void 0 : point.value, point);
+  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", displayValue !== null && displayValue !== void 0 ? displayValue : '-', " ", (_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$deviceName, _point$pointName;
+  var _point$deviceName, _point$pointName;
   var point = _ref2.point,
     style = _ref2.style,
     valueStyles = _ref2.valueStyles,
@@ -35,6 +37,7 @@ var PointItem = function PointItem(_ref2) {
     bindEvents = _ref2.bindEvents,
     eventNamespace = _ref2.eventNamespace,
     unitShow = _ref2.unitShow;
+  var displayValue = formatPointDisplayValue(point === null || point === void 0 ? void 0 : point.value, point);
   var eventHandles = useEleEventHandle({
     events: bindEvents,
     payload: {
@@ -66,16 +69,16 @@ var PointItem = function PointItem(_ref2) {
     style: _objectSpread({
       marginBottom: 4
     }, valueStyles)
-  }, 'value' in point ? "".concat((_ref3 = point.pointEnumItemKey || point.value) !== null && _ref3 !== void 0 ? _ref3 : '-', " ").concat(unitShow && point.unit) : '点位状态'), /*#__PURE__*/React.createElement("div", {
+  }, 'value' in point ? "".concat(point.pointEnumItemKey || displayValue || '-').concat(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 : '-' : '点位名称')));
 };
-var PointItemPlaceholder = function PointItemPlaceholder(_ref4) {
-  var style = _ref4.style,
-    valueStyles = _ref4.valueStyles,
-    labelStyles = _ref4.labelStyles;
+var PointItemPlaceholder = function PointItemPlaceholder(_ref3) {
+  var style = _ref3.style,
+    valueStyles = _ref3.valueStyles,
+    labelStyles = _ref3.labelStyles;
   return /*#__PURE__*/React.createElement("div", {
     style: style,
     className: styles.item
@@ -87,9 +90,9 @@ var PointItemPlaceholder = function PointItemPlaceholder(_ref4) {
     style: labelStyles
   }, "\u70B9\u4F4D\u540D\u79F0"));
 };
-var ElePointListCardComponent = function ElePointListCardComponent(_ref5) {
+var ElePointListCardComponent = function ElePointListCardComponent(_ref4) {
   var _payload$title, _payload$title2;
-  var node = _ref5.node;
+  var node = _ref4.node;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     pointList = _useState2[0],

package/es/element/PointCard/PointListCard/PropsSet/index.js

@@ -23,7 +23,8 @@ var PropsSet = function PropsSet() {
     header: "\u7ED1\u5B9A\u70B9\u4F4D",
     key: "1"
   }, /*#__PURE__*/React.createElement(FormBindPoint, {
-    onChange: forceUpdate
+    onChange: forceUpdate,
+    enableDecimalConfig: true
   })), /*#__PURE__*/React.createElement(Panel, {
     header: "\u5168\u5C40",
     key: "2"

package/es/element/PointControl/PointControl1/Component.js

@@ -16,6 +16,7 @@ import { Tooltip } from 'antd';
 import { PlusCircleFilled, MinusCircleFilled } from '@ant-design/icons';
 import { usePointWatch, useEleEventHandle } from "../../../hooks";
 import { reactShapeNodeAreEqual, pointWriteDebounce } from "../../utils";
+import { formatPointDisplayValue } from "../../../utils/pointValueFormat";
 import styles from "./index.css";
 export var defaultIconName = 'zhileng';
 var ElePointControl1Component = function ElePointControl1Component(_ref) {
@@ -39,6 +40,7 @@ var ElePointControl1Component = function ElePointControl1Component(_ref) {
     }
   });
   var pointData = usePointWatch(configPoint, payload === null || payload === void 0 ? void 0 : (_payload$mittMeta2 = payload.mittMeta) === null || _payload$mittMeta2 === void 0 ? void 0 : _payload$mittMeta2.namespace);
+  var displayValue = formatPointDisplayValue(pointValue, configPoint);
   useEffect(function () {
     setPointValue(pointData === null || pointData === void 0 ? void 0 : pointData.value);
   }, [pointData]);
@@ -46,8 +48,8 @@ var ElePointControl1Component = function ElePointControl1Component(_ref) {
   if (!configPoint) {
     tooltipTitle = '未绑定点位';
   } else {
-    var _pointData$value, _pointData$unit;
-    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", (_pointData$value = pointData === null || pointData === void 0 ? void 0 : pointData.value) !== null && _pointData$value !== void 0 ? _pointData$value : '-', " ", (_pointData$unit = pointData === null || pointData === void 0 ? void 0 : pointData.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.updateTime) || '-'));
+    var _formatPointDisplayVa, _pointData$unit;
+    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", (_formatPointDisplayVa = formatPointDisplayValue(pointData === null || pointData === void 0 ? void 0 : pointData.value, configPoint)) !== null && _formatPointDisplayVa !== void 0 ? _formatPointDisplayVa : '-', ' ', (_pointData$unit = pointData === null || pointData === void 0 ? void 0 : pointData.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.updateTime) || '-'));
   }
   var pointValueStyle = _objectSpread(_objectSpread({}, payload === null || payload === void 0 ? void 0 : (_payload$pointValue = payload.pointValue) === null || _payload$pointValue === void 0 ? void 0 : _payload$pointValue.fontStyles), payload === null || payload === void 0 ? void 0 : (_payload$pointValue2 = payload.pointValue) === null || _payload$pointValue2 === void 0 ? void 0 : _payload$pointValue2.margin_padding);
   var handleClick = function handleClick(e, type) {
@@ -104,7 +106,7 @@ var ElePointControl1Component = function ElePointControl1Component(_ref) {
     }
   }), /*#__PURE__*/React.createElement("div", {
     style: pointValueStyle
-  }, pointValue !== null && pointValue !== void 0 ? pointValue : '-'), /*#__PURE__*/React.createElement(PlusCircleFilled, {
+  }, displayValue !== null && displayValue !== void 0 ? displayValue : '-'), /*#__PURE__*/React.createElement(PlusCircleFilled, {
     onClick: function onClick(e) {
       return handleClick(e, 'plus');
     },

package/es/element/PointControl/PointControl1/PropsSet/index.js

@@ -19,7 +19,9 @@ var PropsSet = function PropsSet() {
   }, /*#__PURE__*/React.createElement(Panel, {
     header: "\u7ED1\u5B9A\u70B9\u4F4D",
     key: "1"
-  }, /*#__PURE__*/React.createElement(FormBindPoint, null)), /*#__PURE__*/React.createElement(Panel, {
+  }, /*#__PURE__*/React.createElement(FormBindPoint, {
+    enableDecimalConfig: true
+  })), /*#__PURE__*/React.createElement(Panel, {
     header: "\u5168\u5C40",
     key: "2"
   }, /*#__PURE__*/React.createElement(GlobalPropsSet, null)), /*#__PURE__*/React.createElement(Panel, {

package/es/element/PointControl/PointControl3/Component.js

@@ -17,6 +17,7 @@ import Icon from "../../../components/Icon";
 import { usePointWatch, useEleEventHandle } from "../../../hooks";
 import Switch from "../../../components/Switch";
 import { isNumber } from "../../../utils";
+import { formatPointDisplayValue } from "../../../utils/pointValueFormat";
 import { pointWrite } from "../../utils/pointWrite";
 import { reactShapeNodeAreEqual, getValueByExpression } from "../../utils";
 import styles from "./index.css";
@@ -43,6 +44,7 @@ var ElePointControl3Component = function ElePointControl3Component(_ref) {
     }
   });
   var pointData = usePointWatch(configPoint, payload === null || payload === void 0 ? void 0 : (_payload$mittMeta2 = payload.mittMeta) === null || _payload$mittMeta2 === void 0 ? void 0 : _payload$mittMeta2.namespace);
+  var displayValue = formatPointDisplayValue(pointData === null || pointData === void 0 ? void 0 : pointData.value, configPoint);
   var iconColor = (payload === null || payload === void 0 ? void 0 : payload.icon.color) || defaultIconColor;
   if (payload === null || payload === void 0 ? void 0 : payload.icon.colorExpressions) {
     var expressionValue = getValueByExpression(pointData === null || pointData === void 0 ? void 0 : pointData.value, payload === null || payload === void 0 ? void 0 : payload.icon.colorExpressions);
@@ -54,8 +56,8 @@ var ElePointControl3Component = function ElePointControl3Component(_ref) {
   if (!configPoint) {
     tooltipTitle = '未绑定点位';
   } else {
-    var _pointData$value, _pointData$unit;
-    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", (_pointData$value = pointData === null || pointData === void 0 ? void 0 : pointData.value) !== null && _pointData$value !== void 0 ? _pointData$value : '-', " ", (_pointData$unit = pointData === null || pointData === void 0 ? void 0 : pointData.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.updateTime) || '-'));
+    var _pointData$unit;
+    tooltipTitle = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u540D\u79F0\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.pointName) || '-'), /*#__PURE__*/React.createElement("div", null, "\u70B9\u4F4D\u503C\uFF1A", displayValue !== null && displayValue !== void 0 ? displayValue : '-', " ", (_pointData$unit = pointData === null || pointData === void 0 ? void 0 : pointData.unit) !== null && _pointData$unit !== void 0 ? _pointData$unit : '-'), /*#__PURE__*/React.createElement("div", null, "\u66F4\u65B0\u65F6\u95F4\uFF1A", (pointData === null || pointData === void 0 ? void 0 : pointData.updateTime) || '-'));
   }
   var subTitle = function subTitle() {
     var _payload$subTitle, _payload$subTitle2, _payload$subTitle3, _ref2, _payload$subTitle4;
@@ -64,7 +66,7 @@ var ElePointControl3Component = function ElePointControl3Component(_ref) {
     }
     return /*#__PURE__*/React.createElement("div", {
       style: _objectSpread(_objectSpread({}, payload === null || payload === void 0 ? void 0 : (_payload$subTitle2 = payload.subTitle) === null || _payload$subTitle2 === void 0 ? void 0 : _payload$subTitle2.fontStyles), payload === null || payload === void 0 ? void 0 : (_payload$subTitle3 = payload.subTitle) === null || _payload$subTitle3 === void 0 ? void 0 : _payload$subTitle3.margin_padding)
-    }, /*#__PURE__*/React.createElement("span", null, (_ref2 = (payload === null || payload === void 0 ? void 0 : (_payload$subTitle4 = payload.subTitle) === null || _payload$subTitle4 === void 0 ? void 0 : _payload$subTitle4.text) || (pointData === null || pointData === void 0 ? void 0 : pointData.pointEnumItemKey) || (pointData === null || pointData === void 0 ? void 0 : pointData.value)) !== null && _ref2 !== void 0 ? _ref2 : '副标题'));
+    }, /*#__PURE__*/React.createElement("span", null, (_ref2 = (payload === null || payload === void 0 ? void 0 : (_payload$subTitle4 = payload.subTitle) === null || _payload$subTitle4 === void 0 ? void 0 : _payload$subTitle4.text) || (pointData === null || pointData === void 0 ? void 0 : pointData.pointEnumItemKey) || displayValue) !== null && _ref2 !== void 0 ? _ref2 : '副标题'));
   };
   var handleSwitchChange = function handleSwitchChange(val, e) {
     var _payload$switch;

package/es/element/PointControl/PointControl3/PropsSet/index.js

@@ -23,7 +23,8 @@ var PropsSet = function PropsSet() {
     header: "\u7ED1\u5B9A\u70B9\u4F4D",
     key: "1"
   }, /*#__PURE__*/React.createElement(FormBindPoint, {
-    onChange: forceUpdate
+    onChange: forceUpdate,
+    enableDecimalConfig: true
   })), /*#__PURE__*/React.createElement(Panel, {
     header: "\u56FE\u6807",
     key: "2"

package/es/element/type.d.ts

@@ -64,6 +64,9 @@ declare namespace Ele {
         dataType?: string;
         deviceType?: string;
         meterId?: string;
+        decimalEnabled?: boolean;
+        decimalPlaces?: number;
+        decimalTrailingZeros?: boolean;
       }
     | {
         // 单个产品(scene === 'product')或设备(scene === 'device')的时候绑定点位的数据结构
@@ -71,6 +74,9 @@ declare namespace Ele {
         identifierName: string;
         /** 范围表达式 */
         expressions?: RangeExpression[];
+        decimalEnabled?: boolean;
+        decimalPlaces?: number;
+        decimalTrailingZeros?: boolean;
       };
 
   /** 文字样式 */

package/es/pages/editor/PanelTop/Save/index.js

@@ -64,7 +64,7 @@ var Save = function Save(_ref) {
               }, (_window$graph = window.graph) === null || _window$graph === void 0 ? void 0 : _window$graph.toJSON())),
               configChangeLog: JSON.stringify(configChangePayload),
               configHasChanged: configChangePayload.hasChanged,
-              operationUserId: operationUserId,
+              operationUserId: operatorUserId,
               graphSnapshot: graphSnapshot
             });
         }

package/es/services/common/Uploader.js

@@ -11,8 +11,7 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 // @ts-ignore
 /* eslint-disable */
 import request from "../request";
-
-/** 上传图片 POST /api/CommonMicro/Uploader/Upload */
+/** 上传图片，使用 yimin 的 EnergyMicro 接口。 */
 export function Upload(_x, _x2) {
   return _Upload.apply(this, arguments);
 }
@@ -29,7 +28,7 @@ function _Upload() {
               formData.append(ele, item);
             }
           });
-          return _context.a(2, request('/api/CommonMicro/Uploader/Upload', _objectSpread({
+          return _context.a(2, request('/api/EnergyMicro/upload', _objectSpread({
             method: 'POST',
             // headers: {
             //   'Content-Type': 'multipart/form-data',

package/es/services/request.js

@@ -34,8 +34,8 @@ var codeMessage = {
 
 /** 判断是否已显示登录过期 Modal ,防止同时多个请求，显示多个 Modal 的情况 */
 var isShowLoginOverdueModal = false;
-/**
- * 异常处理程序
+/**
+ * 异常处理程序
  */
 var errorHandler = function errorHandler(error) {
   var data = error.data,
@@ -216,7 +216,7 @@ requestClient.interceptors.request.use(function (url, options) {
 /** 响应拦截器 */
 requestClient.interceptors.response.use(/*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(response, options) {
-    var _response$headers, _response$headers2, xAccessToken, accessToken, data, _data$code, errorText;
+    var _response$headers, _response$headers2, _data$success, xAccessToken, accessToken, data, succeeded, _data$code, errorText;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -249,7 +249,8 @@ requestClient.interceptors.response.use(/*#__PURE__*/function () {
           return response.clone().json();
         case 4:
           data = _context2.v;
-          if (!data.success) {
+          succeeded = (_data$success = data.success) !== null && _data$success !== void 0 ? _data$success : data.code === 200;
+          if (!succeeded) {
             if (Object.keys(codeMessage).includes((_data$code = data.code) === null || _data$code === void 0 ? void 0 : _data$code.toString())) {
               errorText = codeMessage[data.code];
               notification.error({

package/es/utils/pointValueFormat.js

@@ -1,4 +1,17 @@
 import { isNumber } from "./type";
+/**
+ * 格式化数值型点位的展示文本。
+ * 只用于渲染，不应将结果用于表达式判断、状态计算或点位写入。
+ */
+export function formatPointDisplayValue(value, config) {
+  var _config$decimalPlaces;
+  if (typeof value !== 'number' || !(config === null || config === void 0 ? void 0 : config.decimalEnabled)) {
+    return value;
+  }
+  var decimalPlaces = Math.min(6, Math.max(0, Math.trunc((_config$decimalPlaces = config.decimalPlaces) !== null && _config$decimalPlaces !== void 0 ? _config$decimalPlaces : 2)));
+  var fixedValue = value.toFixed(decimalPlaces);
+  return config.decimalTrailingZeros === false ? String(Number(fixedValue)) : fixedValue;
+}
 
 /** 格式化点位数据 */
 export function pointValueFormat(point) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "4.0.12",
+  "version": "4.1.1",
   "scripts": {
     "start": "cross-env PORT=8000 UMI_ENV=prod umi dev",
     "build:prod": "cross-env UMI_ENV=prod umi build",