fix: EC_ConfigurationView运行值加入运算

packages/extend-components/EC_ConfigurationView/package.json

@@ -36,6 +36,7 @@
         "@wisdom-components/ec_historyinfo": "1.2.23",
         "@wisdom-components/empty": "1.3.9",
         "@wisdom-components/mqttview": "1.3.6",
+        "@wisdom-components/loadbox": "1.1.4",
         "cross-env": "^7.0.3"
     }
 }

packages/extend-components/EC_ConfigurationView/src/index.js

@@ -176,8 +176,7 @@ const ConfigurationView = (props) => {
     let switchState;
     myDiagram.model.setDataProperty(node, 'realVal', realVal);
     if (node.switch === '是') {
-      switchState =
-        node.openVal.toString().split(',').indexOf(realVal.toString()) > -1 ? '开' : '关';
+      switchState = openValState(node.openVal, realVal) ? '开' : '关';
       myDiagram.model.setDataProperty(node, 'switchState', switchState);
     }
     if (!node.shType) return false;
@@ -313,6 +312,21 @@ const ConfigurationView = (props) => {
     return shRule;
   };
 
+  /** ***********************************运行值规则运算********************************* */
+  const openValState = (openVal, realVal) => {
+    const patt = /[><=]/gi;
+    if (openVal.match(patt)) {
+      const ruleStr = 'if(' + openVal + '){ return true } else { return false }';
+      try {
+        return new Function('x', 'X', ruleStr)(realVal, realVal);
+      } catch (err) {
+        return false;
+      }
+    } else {
+      return openVal.toString().split(',').indexOf(realVal.toString()) > -1;
+    }
+  };
+
   /** ***********************************MQTT控制结果回调********************************* */
   const controlData = (mqttDatas, code) => {
     const controlInfo = JSON.parse(mqttDatas);