merge : dev branch

Samsung · Apr 20, 2021 · 4b13ec0 · 4b13ec0
2 parents cf27741 + a0ee309
commit 4b13ec0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/101-SmartThings.js b/101-SmartThings.js
@@ -695,31 +695,28 @@ module.exports = function (RED) {
                         var argObj={};
 
                         rule.args.forEach(arg=>{
-
+                            var argValue=arg.value;
+
                             if(arg.argType=='jsonata'){
-                                arg.value = RED.util.evaluateJSONataExpression(arg.value,msg);
+                                argValue = RED.util.evaluateJSONataExpression(argValue,msg);
                             }else{
-                                arg.value = RED.util.evaluateNodeProperty(arg.value,arg.argType,NODE,msg);
+                                argValue = RED.util.evaluateNodeProperty(argValue,arg.argType,NODE,msg);
                             }
-
-
-
                             if(arg.type != 'object'||arg.argType=='json'){
                                 arg.type = arg.type || '';
                                 if(arg.type.toLowerCase().indexOf('integer')>-1||arg.type.toLowerCase().indexOf('number')>-1) {
-                                    cmd.arguments.push(Number(arg.value));
+                                    cmd.arguments.push(Number(argValue));
                                 }else if(arg.type === 'json'){
-                                    cmd.arguments.push(JSON.parse(arg.value));
+                                    cmd.arguments.push(JSON.parse(argValue));
                                 }else{
-                                    cmd.arguments.push(arg.value);
+                                    cmd.arguments.push(argValue);
                                 }
                             }else{
-                                var argValue;
                                 arg.propType=arg.propType || '';
                                 if(arg.propType.toLowerCase().indexOf('integer')>-1||arg.propType.toLowerCase().indexOf('number')>-1) {
-                                    argValue = Number(arg.value);
+                                    argValue = Number(argValue);
                                 }else{
-                                    argValue = arg.value;
+                                    argValue = argValue;
                                 }
                                 argObj[arg.propId]=argValue;
                             }

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ npm install node-red-contrib-samsung-automation-studio-nodes
 ## Compatibility
 Node-RED version: v1.0.6  
 Node-RED version: v1.1.2  
-Node-RED version: v1.2.2
+Node-RED version: v1.2.2  
 Node-RED version: v1.2.9
 
 ## Browser Compatibility

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-samsung-automation-studio-nodes",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Samsung Automation Studio Nodes for Node-RED",
   "keywords": [
     "SmartThings",