v2

src/Windows/WindowsApp.vue

@@ -172,7 +172,7 @@ export default class WindowsApp extends Vue {
 
 
     created() {
-        /*var localURL = window.location.hash;
+        var localURL = window.location.hash;
         if (localURL.indexOf("?") != -1) {
             //var url = localURL.substr(1); //for test
             var url = localURL.substr(3); //for build
@@ -185,16 +185,16 @@ export default class WindowsApp extends Vue {
             var data = JSON.parse(httpData);
             console.log(data);
             this.EditData = data;
-        }*/
+        }
 
-        var localURL = location.search;
+        /*var localURL = location.search;
         if (localURL.indexOf("?") != -1) {
             var url = localURL.substr(1);
             var httpData = unescape(url);
             //var jsondata = decodeURI(url);
             var data = JSON.parse(httpData);
             this.EditData = data;
-        }
+        }*/
 
     }
 

src/components/Config/BoolConfig.vue

@@ -9,7 +9,7 @@
         </div>
 
 
-        <div class="columns" style="padding: 5px;">
+        <div class="columns" style="padding: 5px; display: flex; justify-content: center;">
 
           <toggle-button v-model="switchValue"
                          :sync="true"
@@ -22,9 +22,8 @@
 
         </div>
 
-        <div class="colmumns">
+        <div>
             <WidgetParams
-                    class="column"
                     style="padding-top: 0px;padding-bottom: 5px;"
                     ref="WidgetGetParams"
                     action="get"
@@ -32,9 +31,8 @@
             ></WidgetParams>
 
         </div>
-        <div class="colmumns">
+        <div>
             <WidgetParams
-                    class="column"
                     ref="WidgetSetParams"
                     action="set"
                     @updataVariables="viewSetLoad"
@@ -97,7 +95,6 @@
         isShowGetPath: boolean = false;
         isShowSetPath: boolean = false;
         isOpen: boolean = true;
-        fontSize:number =  25;
         activeColor:string = '';
         EditPathPoke:string = '';
         isSetPoke: boolean = false;
@@ -108,7 +105,7 @@
         switchValue:boolean = false;
         checkActiveSample:boolean = true;
 
-        EditPathPoke : string =  "";
+        //EditPathPoke : string =  "";
 
 
         config: WidgetConfig = {
@@ -128,7 +125,6 @@
                 index:this.refIndex,
             },
             props:{
-                fontSize:this.fontSize,
                 title:'',
                 titleSize:'',
             },
@@ -201,10 +197,17 @@
 
 
         openWindows(){
+            /*var fragment = window.location.origin;
+            var JsonData = JSON.stringify(this.EditData);
+            var url =fragment+"/WindowsAppIndex.html/?";
+            window.open(url+JsonData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');*/
+
             var fragment = window.location.origin;
             var JsonData = JSON.stringify(this.EditData);
+            var httpData = encodeURIComponent(JsonData);
             var url =fragment+"/WindowsAppIndex.html/?";
-            window.open(url+JsonData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+            window.open(url+httpData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+
         }
 
         del(){
@@ -212,10 +215,14 @@
         }
 
         updateSwitchValue(){
-            if(this.getConfigValue == true|| this.getConfigValue == false){
+            console.log("switch");
+            console.log(this.getConfigValue);
+            if(this.getConfigValue == true|| this.getConfigValue == false || this.getConfigValue == 0 || this.getConfigValue == 1){
                 this.checkActiveSample = false;
 
                 this.switchValue = Boolean(this.getConfigValue);
+                console.log("this");
+                console.log(this.switchValue);
             }
 
         }
@@ -358,6 +365,7 @@
         pathPoke() {
             this.config.data.url = this.EditData.edit.url;
             this.EditPathPoke = this.EditData.edit.url;
+            //this.EditData.params.PokedPath = this.EditPathPoke;
             var pokepath = this.config.data.url;
             //axios.defaults.timeout =  1000;
             axios.get(pokepath).then(response => {
@@ -464,15 +472,29 @@
         }
 
         async viewSetLoad(Args: UpdatePayload,checkParent:boolean) {
+            console.log("arm");
+            console.log("arm");
+            console.log("arm");
 
             if(checkParent == false){
                 // this.config.data.userInputData = Args.variables;
 
                 if(Object.prototype.toString.call( Args.variables) == '[object Undefined]' ){
-                    this.userSetInputData.set(this.setLabel,this.switchValue);
+                    if(Object.prototype.toString.call(this.getConfigValue) == '[object Number]'){
+                        var switchTempValue = Number(this.switchValue);
+                        this.userSetInputData.set(this.setLabel,switchTempValue);
+                    }else{
+                        this.userSetInputData.set(this.setLabel,this.switchValue);
+                    }
                 }else{
-                    this.userSetInputData = Args.variables;
-                    this.userSetInputData.set(this.setLabel,this.switchValue);
+                    if(Object.prototype.toString.call(this.getConfigValue) == '[object Number]'){
+                        var switchTempValue = Number(this.switchValue);
+                        this.userSetInputData = Args.variables;
+                        this.userSetInputData.set(this.setLabel,switchTempValue);
+                    }else{
+                        this.userSetInputData = Args.variables;
+                        this.userSetInputData.set(this.setLabel,this.switchValue);
+                    }
                 }
 
                 this.setPathwithVar = this.pathProcessor.FillPathWithVar(this.userSetInputData, this.config.data.set.url);

src/components/Config/Config.vue

@@ -201,11 +201,18 @@ export default class Config extends Widget {
 
 
     openWindows(){
-        var fragment = window.location.origin;
+        /*var fragment = window.location.origin;
         console.log(fragment);
         var JsonData = JSON.stringify(this.EditData);
         var url =fragment+"/WindowsAppIndex.html/?";
-        window.open(url+JsonData, "WidgetWindow",'height=500, width=500, top=50, left=50, toolbar=no');
+        window.open(url+JsonData, "WidgetWindow",'height=500, width=500, top=50, left=50, toolbar=no');*/
+
+        var fragment = window.location.origin;
+        var JsonData = JSON.stringify(this.EditData);
+        var httpData = encodeURIComponent(JsonData);
+        var url =fragment+"/WindowsAppIndex.html/?";
+        window.open(url+httpData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+
     }
 
   del(){

src/components/Method/Method.vue

@@ -143,10 +143,17 @@ export default class Method extends Widget {
   }
 
     openWindows(){
+        /*var fragment = window.location.origin;
+        var JsonData = JSON.stringify(this.EditData);
+        var url =fragment+"/WindowsAppIndex.html/?";
+        window.open(url+JsonData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');*/
+
         var fragment = window.location.origin;
         var JsonData = JSON.stringify(this.EditData);
+        var httpData = encodeURIComponent(JsonData);
         var url =fragment+"/WindowsAppIndex.html/?";
-        window.open(url+JsonData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+        window.open(url+httpData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+
     }
 
     updateUI() {

src/components/Navigation/Navigation.vue

@@ -164,10 +164,17 @@
 
         openWindows(){
             //windows.open -> another single page application
+            /*var fragment = window.location.origin;
+            var JsonData = JSON.stringify(this.EditData);
+            var url =fragment+"/WindowsAppIndex.html/?";
+            window.open(url+JsonData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');*/
+
             var fragment = window.location.origin;
             var JsonData = JSON.stringify(this.EditData);
+            var httpData = encodeURIComponent(JsonData);
             var url =fragment+"/WindowsAppIndex.html/?";
-            window.open(url+JsonData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+            window.open(url+httpData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+
 
         }
 

src/components/State/BoolState.vue

@@ -165,10 +165,17 @@
 
 
         openWindows(){
+           /* var fragment = window.location.origin;
+            var JsonData = JSON.stringify(this.EditData);
+            var url =fragment+"/WindowsAppIndex.html/?";
+            window.open(url+JsonData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');*/
+
             var fragment = window.location.origin;
             var JsonData = JSON.stringify(this.EditData);
+            var httpData = encodeURIComponent(JsonData);
             var url =fragment+"/WindowsAppIndex.html/?";
-            window.open(url+JsonData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+            window.open(url+httpData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+
 
         }
 

src/components/State/State.vue

@@ -163,10 +163,18 @@ export default class State extends Widget {
 
 
     openWindows(){
+
         var fragment = window.location.origin;
         var JsonData = JSON.stringify(this.EditData);
+        var httpData = encodeURIComponent(JsonData);
+        var url =fragment+"/WindowsAppIndex.html/?";
+        window.open(url+httpData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+
+
+        /*var fragment = window.location.origin;
+        var JsonData = JSON.stringify(this.EditData);
         var url =fragment+"/WindowsAppIndex.html/?";
-        window.open(url+JsonData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+        window.open(url+JsonData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');*/
 
     }
 
@@ -320,11 +328,15 @@ export default class State extends Widget {
   }
 
   colourViewLoad(){
+        console.log(this.StatusValue);
        var stateFile = JSON.parse(this.EditData.props.StateFile);
        var stateIndicator = JSON.parse(this.EditData.props.StateIndicator);
+       console.log(stateIndicator);
 
        this.stateKey = stateIndicator[this.StatusValue];
+       console.log(this.stateKey);
        this.activeColor = stateFile[this.stateKey];
+       console.log(this.activeColor);
        if(this.activeColor == undefined){
            this.activeColor = '#bbb';
        }

src/components/Status/LabelStatus.vue

@@ -318,6 +318,9 @@
             console.log(this.EditData);
             this.config.data.url = this.EditData.edit.url;
             this.EditPathPoke = this.EditData.edit.url;
+            console.log("isj");
+            console.log(this.EditPathPoke);
+            console.log(this.EditData.params);
 
             const urlRegExp = /(?<=\/)\w*(?=\/)/g;
             const result = this.config.data.url.match(urlRegExp);

vue.config.js

@@ -16,10 +16,13 @@ module.exports = {
     devServer: {
       proxy: {
         "/": {
-          target: "http://192.168.0.3:8001",
+          target: "http://192.168.0.3:8002",
           secure: false,
           changeOrigin: true
         }
       }
     }
   };
+
+//{"Idle":"Idle","Pre1":"prepare1","Pre2":"prepare2","Pre3":"prepare3","Pre4":"prepare4","Ready":"Ready","Error":"Error","Fire":"Fire"}
+//{"Idle":"yellow","prepare1":"#ff8020","prepare2":"#ffa020","prepare3":"#ffc020","prepare4":"#ffff20","Ready":"green","error":"red","Fire":"blue" }