fix: 千分增加千分分割

3d353831 · 李纪文 · 0f1459f8 · 3d353831 · 3d353831
Commit 3d353831 authored May 10, 2023 by 李纪文
Show whitespace changes
Inline Side-by-side

Showing with 22 additions and 4 deletions

HistoryModel.js ...xtend-components/EC_ConfigurationView/src/HistoryModel.js +11 -2

RealModel.js ...s/extend-components/EC_ConfigurationView/src/RealModel.js +11 -2

No files found.
--- a/packages/extend-components/EC_ConfigurationView/src/HistoryModel.js
+++ b/packages/extend-components/EC_ConfigurationView/src/HistoryModel.js
@@ -164,10 +164,19 @@ const ConfigurationView = (props) => {
          }
          break;
        case 'valCase': // 实时值模型
+          const division = node.division || false;
          if (node.shType === '值显示') {
-            myDiagram.model.setDataProperty(node, 'showVal', realVal < 0 ? 0 : realVal);
+            myDiagram.model.setDataProperty(
+              node,
+              'showVal',
+              realVal < 0 ? 0 : division ? realVal.toLocaleString() : realVal,
+            );
          } else {
-            myDiagram.model.setDataProperty(node, 'showVal', realVal);
+            myDiagram.model.setDataProperty(
+              node,
+              'showVal',
+              division ? realVal.toLocaleString() : realVal,
+            );
          }
          if (node.stateName) return false;
          shRule = ruleOperation(node, realVal);

--- a/packages/extend-components/EC_ConfigurationView/src/RealModel.js
+++ b/packages/extend-components/EC_ConfigurationView/src/RealModel.js
@@ -193,10 +193,19 @@ const ConfigurationView = (props) => {
          }
          break;
        case 'valCase': // 实时值模型
+          const division = node.division || false;
          if (node.shType === '值显示') {
-            myDiagram.model.setDataProperty(node, 'showVal', realVal < 0 ? 0 : realVal);
+            myDiagram.model.setDataProperty(
+              node,
+              'showVal',
+              realVal < 0 ? 0 : division ? realVal.toLocaleString() : realVal,
+            );
          } else {
-            myDiagram.model.setDataProperty(node, 'showVal', realVal);
+            myDiagram.model.setDataProperty(
+              node,
+              'showVal',
+              division ? realVal.toLocaleString() : realVal,
+            );
          }
          // 颜色规则
          if (node.stateName) return false;