Commit 358a38b6 authored by XieXiaohan's avatar XieXiaohan

add broadcast

parent 2684739d
...@@ -134,6 +134,7 @@ import { GridItemData, GridLayout, GridItem } from "vue-grid-layout"; ...@@ -134,6 +134,7 @@ import { GridItemData, GridLayout, GridItem } from "vue-grid-layout";
import { WidgetRef } from "./models/WidgetRef"; import { WidgetRef } from "./models/WidgetRef";
import { WidgetConfig, AllWidgetConfig } from "./models/WidgetConfig"; import { WidgetConfig, AllWidgetConfig } from "./models/WidgetConfig";
import { Action, UpdatePayload } from "./models/UpdatePayload"; import { Action, UpdatePayload } from "./models/UpdatePayload";
import StrMapObjChange from "@/models/StrMapObjChange";
import { Widget } from "./models/widget"; import { Widget } from "./models/widget";
...@@ -146,6 +147,7 @@ import { Widget } from "./models/widget"; ...@@ -146,6 +147,7 @@ import { Widget } from "./models/widget";
export default class WindowsApp extends Vue { export default class WindowsApp extends Vue {
pathProcessor = new PathProcessor(); pathProcessor = new PathProcessor();
strMapObjChange = new StrMapObjChange();
//EditPathPoke : string = ''; //EditPathPoke : string = '';
isShowParams: boolean = true; isShowParams: boolean = true;
userInputData = new Map<string, string>(); userInputData = new Map<string, string>();
...@@ -191,8 +193,10 @@ export default class WindowsApp extends Vue { ...@@ -191,8 +193,10 @@ export default class WindowsApp extends Vue {
if (localURL.indexOf("?") != -1) { if (localURL.indexOf("?") != -1) {
var url = localURL.substr(1); var url = localURL.substr(1);
var httpData = unescape(url); var httpData = unescape(url);
console.log(httpData);
//var jsondata = decodeURI(url); //var jsondata = decodeURI(url);
var data = JSON.parse(httpData); var data = JSON.parse(httpData);
console.log(data);
this.EditData = data; this.EditData = data;
}*/ }*/
...@@ -208,6 +212,17 @@ export default class WindowsApp extends Vue { ...@@ -208,6 +212,17 @@ export default class WindowsApp extends Vue {
this.setVariableList( this.setVariableList(
this.pathProcessor.extractVarFromPath(this.EditData.params.PokedPath) this.pathProcessor.extractVarFromPath(this.EditData.params.PokedPath)
); );
console.log(this.EditData.params.shouldUpdate);
if(this.EditData.params.shouldUpdate == true){
console.log("wind in");
console.log(this.EditData.params.userInputData);
//this.EditData.params.userInputData = this.strMapObjChange.objToStrMap(this.EditData.params.userInputData);
//console.log(this.EditData.params.userInputData);
this.setVariableInput(this.strMapObjChange.objToStrMap(this.EditData.params.userInputData));
this.EditData.params.shouldUpdate = false;
//this.apply();
}
} }
...@@ -252,6 +267,9 @@ export default class WindowsApp extends Vue { ...@@ -252,6 +267,9 @@ export default class WindowsApp extends Vue {
target: ["self"] target: ["self"]
}; };
this.EditData.params.Args = Args; this.EditData.params.Args = Args;
this.getVariableValues();
this.EditData.params.userInputData = this.userInputData;
console.log(this.EditData.params.userInputData);
//this.EditData.params.tempUserInputData = this.tempUserInputData; //this.EditData.params.tempUserInputData = this.tempUserInputData;
window.opener.UpdateWidget(this.EditData); window.opener.UpdateWidget(this.EditData);
...@@ -267,6 +285,15 @@ export default class WindowsApp extends Vue { ...@@ -267,6 +285,15 @@ export default class WindowsApp extends Vue {
} }
setVariableInput(parentUserInputData:Map<string, string>)
{
for (var key of parentUserInputData.keys()) {
this.tempUserInputData[key] = parentUserInputData.get(key) as string;
}
this.EditData.params.tempUserInputData = this.tempUserInputData;
}
setVariableList(path: string[]) { setVariableList(path: string[]) {
...@@ -274,6 +301,7 @@ export default class WindowsApp extends Vue { ...@@ -274,6 +301,7 @@ export default class WindowsApp extends Vue {
path.forEach(element => { path.forEach(element => {
this.userInputData.set(element, ''); this.userInputData.set(element, '');
}); });
//this.EditData.params.userInputData = this.userInputData;
this.$forceUpdate(); this.$forceUpdate();
} }
......
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
pathId: string = ""; pathId: string = "";
userGetInputData = new Map<string, string>(); userGetInputData = new Map<string, string>();
userSetInputData = new Map<string, string>(); userSetInputData = new Map<string, string>();
userInputData = new Map<string, string>();
getPathwithVar: string = ""; getPathwithVar: string = "";
setPathwithVar: string = ""; setPathwithVar: string = "";
isShowGetPath: boolean = false; isShowGetPath: boolean = false;
...@@ -134,6 +135,8 @@ ...@@ -134,6 +135,8 @@
Args : {}, Args : {},
tempUserInputData:{}, tempUserInputData:{},
setLabel:'', setLabel:'',
shouldUpdate:false,
userInputData:this.userInputData,
}, },
}; };
...@@ -385,9 +388,8 @@ ...@@ -385,9 +388,8 @@
} }
parentUpdate(payload: UpdatePayload): void { parentUpdate(payload: UpdatePayload): void {
var shouldUpdate:boolean = false;
this.userGetInputData = this.strMapObjChange.strMapToObj( this.userGetInputData = this.strMapObjChange.strMapToObj(
(this.$refs.WidgetGetParams as WidgetParams).getVariableValues()); this.userGetInputData);
var temp = this.userGetInputData; var temp = this.userGetInputData;
temp = this.strMapObjChange.objToStrMap(temp); temp = this.strMapObjChange.objToStrMap(temp);
this.userGetInputData = temp; this.userGetInputData = temp;
...@@ -396,13 +398,15 @@ ...@@ -396,13 +398,15 @@
if(key == keyofpayload && ((this.userGetInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string))) if(key == keyofpayload && ((this.userGetInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string)))
{ {
this.userGetInputData.set(key,payload.variables.get(keyofpayload) as string); this.userGetInputData.set(key,payload.variables.get(keyofpayload) as string);
shouldUpdate = true; this.EditData.params.shouldUpdate = true;
this.EditData.params.Args.variables = this.userGetInputData;
this.viewGetLoad(this.EditData.params.Args);
} }
}); });
}); });this.EditData.params.userInputData = this.strMapObjChange.strMapToObj(this.userGetInputData);
this.userSetInputData = this.strMapObjChange.strMapToObj( this.userSetInputData = this.strMapObjChange.strMapToObj(
(this.$refs.WidgetSetParams as WidgetParams).getVariableValues()); this.userSetInputData);
temp = this.userSetInputData; temp = this.userSetInputData;
temp = this.strMapObjChange.objToStrMap(temp); temp = this.strMapObjChange.objToStrMap(temp);
this.userSetInputData = temp; this.userSetInputData = temp;
...@@ -411,16 +415,10 @@ ...@@ -411,16 +415,10 @@
if(key == keyofpayload && ((this.userSetInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string))) if(key == keyofpayload && ((this.userSetInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string)))
{ {
this.userSetInputData.set(key,payload.variables.get(keyofpayload) as string); this.userSetInputData.set(key,payload.variables.get(keyofpayload) as string);
this.viewSetLoad(this.EditData.params.Args);
} }
}); });
}); });
if(shouldUpdate)
{
(this.$refs.WidgetGetParams as WidgetParams).setVariableInput(this.userGetInputData);
(this.$refs.WidgetSetParams as WidgetParams).setVariableInput(this.userSetInputData);
this.updateUI();
}
} }
......
...@@ -102,6 +102,7 @@ export default class Config extends Widget { ...@@ -102,6 +102,7 @@ export default class Config extends Widget {
pathId: string = ""; pathId: string = "";
userGetInputData = new Map<string, string>(); userGetInputData = new Map<string, string>();
userSetInputData = new Map<string, string>(); userSetInputData = new Map<string, string>();
userInputData = new Map<string, string>();
getPathwithVar: string = ""; getPathwithVar: string = "";
setPathwithVar: string = ""; setPathwithVar: string = "";
isShowGetPath: boolean = false; isShowGetPath: boolean = false;
...@@ -146,6 +147,8 @@ export default class Config extends Widget { ...@@ -146,6 +147,8 @@ export default class Config extends Widget {
Args : {}, Args : {},
tempUserInputData:{}, tempUserInputData:{},
setLabel:'', setLabel:'',
shouldUpdate:false,
userInputData:this.userInputData,
}, },
}; };
...@@ -359,6 +362,7 @@ export default class Config extends Widget { ...@@ -359,6 +362,7 @@ export default class Config extends Widget {
this.samplePoke(response.data); this.samplePoke(response.data);
this.updateUI(); this.updateUI();
}).catch(err => { }).catch(err => {
this.EditData.params.PokedPath = this.config.data.url;
this.openWindows(); this.openWindows();
}); });
} }
...@@ -371,9 +375,8 @@ export default class Config extends Widget { ...@@ -371,9 +375,8 @@ export default class Config extends Widget {
} }
parentUpdate(payload: UpdatePayload): void { parentUpdate(payload: UpdatePayload): void {
var shouldUpdate:boolean = false;
this.userGetInputData = this.strMapObjChange.strMapToObj( this.userGetInputData = this.strMapObjChange.strMapToObj(
(this.$refs.WidgetGetParams as WidgetParams).getVariableValues()); this.userGetInputData);
var temp = this.userGetInputData; var temp = this.userGetInputData;
temp = this.strMapObjChange.objToStrMap(temp); temp = this.strMapObjChange.objToStrMap(temp);
this.userGetInputData = temp; this.userGetInputData = temp;
...@@ -382,13 +385,15 @@ export default class Config extends Widget { ...@@ -382,13 +385,15 @@ export default class Config extends Widget {
if(key == keyofpayload && ((this.userGetInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string))) if(key == keyofpayload && ((this.userGetInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string)))
{ {
this.userGetInputData.set(key,payload.variables.get(keyofpayload) as string); this.userGetInputData.set(key,payload.variables.get(keyofpayload) as string);
shouldUpdate = true; this.EditData.params.shouldUpdate = true;
this.EditData.params.Args.variables = this.userGetInputData;
this.viewGetLoad(this.EditData.params.Args);
} }
}); });
}); });this.EditData.params.userInputData = this.strMapObjChange.strMapToObj(this.userGetInputData);
this.userSetInputData = this.strMapObjChange.strMapToObj( this.userSetInputData = this.strMapObjChange.strMapToObj(
(this.$refs.WidgetSetParams as WidgetParams).getVariableValues()); this.userSetInputData);
temp = this.userSetInputData; temp = this.userSetInputData;
temp = this.strMapObjChange.objToStrMap(temp); temp = this.strMapObjChange.objToStrMap(temp);
this.userSetInputData = temp; this.userSetInputData = temp;
...@@ -397,20 +402,15 @@ export default class Config extends Widget { ...@@ -397,20 +402,15 @@ export default class Config extends Widget {
if(key == keyofpayload && ((this.userSetInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string))) if(key == keyofpayload && ((this.userSetInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string)))
{ {
this.userSetInputData.set(key,payload.variables.get(keyofpayload) as string); this.userSetInputData.set(key,payload.variables.get(keyofpayload) as string);
this.viewSetLoad(this.EditData.params.Args);
} }
}); });
}); });
if(shouldUpdate)
{
(this.$refs.WidgetGetParams as WidgetParams).setVariableInput(this.userGetInputData);
(this.$refs.WidgetSetParams as WidgetParams).setVariableInput(this.userSetInputData);
this.updateUI();
}
} }
async getData(url: string) { async getData(url: string) {
console.log("in");
var apiLoad = url; var apiLoad = url;
await axios.get(apiLoad, { await axios.get(apiLoad, {
headers: { headers: {
...@@ -419,14 +419,18 @@ export default class Config extends Widget { ...@@ -419,14 +419,18 @@ export default class Config extends Widget {
} }
}).then(response => { }).then(response => {
this.setUserData = response.data.CFET2CORE_SAMPLE_VAL; this.setUserData = response.data.CFET2CORE_SAMPLE_VAL;
console.log(this.setUserData);
if(this.setUserData == undefined) if(this.setUserData == undefined)
{ {
this.setUserData = "undefined"; this.setUserData = "undefined";
} }
}).catch(err => {
this.setUserData = "undefined";
}); });
} }
async setData(url: string) { async setData(url: string) {
console.log("in");
var apiLoad = url; var apiLoad = url;
console.log(url); console.log(url);
await axios.post(apiLoad, { await axios.post(apiLoad, {
......
...@@ -92,6 +92,8 @@ export default class Method extends Widget { ...@@ -92,6 +92,8 @@ export default class Method extends Widget {
action:'invoke', action:'invoke',
Args : {}, Args : {},
tempUserInputData:{}, tempUserInputData:{},
shouldUpdate:false,
userInputData:this.userInputData,
}, },
}; };
...@@ -258,30 +260,32 @@ export default class Method extends Widget { ...@@ -258,30 +260,32 @@ export default class Method extends Widget {
} }
parentUpdate(payload: UpdatePayload): void { parentUpdate(payload: UpdatePayload): void {
var shouldUpdate:boolean = false console.log(this.EditData.params.userInputData);
console.log(payload);
this.userInputData = this.strMapObjChange.strMapToObj( this.userInputData = this.strMapObjChange.strMapToObj(
(this.$refs.WidgetParams as WidgetParams).getVariableValues()); this.EditData.params.userInputData);
//this.userInputData = this.EditData.params.userInputData;
var temp = this.userInputData; var temp = this.userInputData;
temp = this.strMapObjChange.objToStrMap(temp); temp = this.strMapObjChange.objToStrMap(temp);
this.userInputData = temp; this.userInputData = temp;
console.log(this.userInputData);
this.userInputData.forEach((value , key) =>{ this.userInputData.forEach((value , key) =>{
payload.variables.forEach((valueofpayload,keyofpayload)=>{ payload.variables.forEach((valueofpayload,keyofpayload)=>{
if(key == keyofpayload && ((this.userInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string))) if(key == keyofpayload && ((this.userInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string)))
{ {
this.userInputData.set(key,payload.variables.get(keyofpayload) as string); this.userInputData.set(key,payload.variables.get(keyofpayload) as string);
shouldUpdate = true; console.log(this.userInputData);
} this.EditData.params.shouldUpdate = true;
}); this.EditData.params.Args.variables = this.userInputData;
}); this.pathwithVar = this.pathProcessor.FillPathWithVar(
// this.config.data.userInputData,
if(shouldUpdate) this.userInputData,
{ this.config.data.url
(this.$refs.WidgetParams as WidgetParams).setVariableInput(this.userInputData);
//this.updateUI();
(this.$refs.WidgetParams as WidgetParams).setVariableList(
this.pathProcessor.extractVarFromPath(this.config.data.url)
); );
this.getData(this.pathwithVar);
} }
});
});this.EditData.params.userInputData = this.strMapObjChange.strMapToObj(this.userInputData);
} }
refresh() { refresh() {
...@@ -289,6 +293,7 @@ export default class Method extends Widget { ...@@ -289,6 +293,7 @@ export default class Method extends Widget {
} }
async getData(url: string) { async getData(url: string) {
console.log(url);
var apiLoad = url; var apiLoad = url;
await axios.put(apiLoad, { await axios.put(apiLoad, {
headers: { headers: {
......
...@@ -104,6 +104,8 @@ ...@@ -104,6 +104,8 @@
action:'get', action:'get',
Args : {}, Args : {},
tempUserInputData:{}, tempUserInputData:{},
shouldUpdate:false,
userInputData:this.userInputData,
//userInputData:this.userInputData, //userInputData:this.userInputData,
}, },
}; };
...@@ -244,7 +246,7 @@ ...@@ -244,7 +246,7 @@
//test //test
this.colourViewLoad(); this.colourViewLoad();
this.EditData.params.PokedPath = this.config.data.url; this.EditData.params.PokedPath = this.config.data.url;
//this.openWindows(); this.openWindows();
}); });
//var url = this.config.data.url; //var url = this.config.data.url;
...@@ -284,30 +286,30 @@ ...@@ -284,30 +286,30 @@
} }
parentUpdate(payload: UpdatePayload): void { parentUpdate(payload: UpdatePayload): void {
var shouldUpdate:boolean = false;
this.userInputData = this.strMapObjChange.strMapToObj( this.userInputData = this.strMapObjChange.strMapToObj(
(this.$refs.WidgetParams as WidgetParams).getVariableValues()); this.EditData.params.userInputData);
//this.userInputData = this.EditData.params.userInputData;
var temp = this.userInputData; var temp = this.userInputData;
temp = this.strMapObjChange.objToStrMap(temp); temp = this.strMapObjChange.objToStrMap(temp);
this.userInputData = temp; this.userInputData = temp;
console.log(this.userInputData);
this.userInputData.forEach((value , key) =>{ this.userInputData.forEach((value , key) =>{
payload.variables.forEach((valueofpayload,keyofpayload)=>{ payload.variables.forEach((valueofpayload,keyofpayload)=>{
if(key == keyofpayload && ((this.userInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string))) if(key == keyofpayload && ((this.userInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string)))
{ {
this.userInputData.set(key,payload.variables.get(keyofpayload) as string); this.userInputData.set(key,payload.variables.get(keyofpayload) as string);
shouldUpdate = true; console.log(this.userInputData);
} this.EditData.params.shouldUpdate = true;
}); this.EditData.params.Args.variables = this.userInputData;
}); this.pathwithVar = this.pathProcessor.FillPathWithVar(
// this.config.data.userInputData,
if(shouldUpdate) this.userInputData,
{ this.config.data.url
(this.$refs.WidgetParams as WidgetParams).setVariableInput(this.userInputData);
//this.updateUI();
(this.$refs.WidgetParams as WidgetParams).setVariableList(
this.pathProcessor.extractVarFromPath(this.config.data.url)
); );
this.getData(this.pathwithVar);
} }
});
});this.EditData.params.userInputData = this.strMapObjChange.strMapToObj(this.userInputData);
} }
refresh() { refresh() {
......
...@@ -102,6 +102,8 @@ export default class State extends Widget { ...@@ -102,6 +102,8 @@ export default class State extends Widget {
action:'get', action:'get',
Args : {}, Args : {},
tempUserInputData:{}, tempUserInputData:{},
shouldUpdate:false,
userInputData:this.userInputData,
//userInputData:this.userInputData, //userInputData:this.userInputData,
}, },
}; };
...@@ -243,7 +245,7 @@ export default class State extends Widget { ...@@ -243,7 +245,7 @@ export default class State extends Widget {
}).catch(err => { }).catch(err => {
this.colourViewLoad(); this.colourViewLoad();
this.EditData.params.PokedPath = this.config.data.url; this.EditData.params.PokedPath = this.config.data.url;
//this.openWindows(); this.openWindows();
}); });
//var url = this.config.data.url; //var url = this.config.data.url;
...@@ -283,30 +285,30 @@ export default class State extends Widget { ...@@ -283,30 +285,30 @@ export default class State extends Widget {
} }
parentUpdate(payload: UpdatePayload): void { parentUpdate(payload: UpdatePayload): void {
var shouldUpdate:boolean = false;
this.userInputData = this.strMapObjChange.strMapToObj( this.userInputData = this.strMapObjChange.strMapToObj(
(this.$refs.WidgetParams as WidgetParams).getVariableValues()); this.EditData.params.userInputData);
//this.userInputData = this.EditData.params.userInputData;
var temp = this.userInputData; var temp = this.userInputData;
temp = this.strMapObjChange.objToStrMap(temp); temp = this.strMapObjChange.objToStrMap(temp);
this.userInputData = temp; this.userInputData = temp;
console.log(this.userInputData);
this.userInputData.forEach((value , key) =>{ this.userInputData.forEach((value , key) =>{
payload.variables.forEach((valueofpayload,keyofpayload)=>{ payload.variables.forEach((valueofpayload,keyofpayload)=>{
if(key == keyofpayload && ((this.userInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string))) if(key == keyofpayload && ((this.userInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string)))
{ {
this.userInputData.set(key,payload.variables.get(keyofpayload) as string); this.userInputData.set(key,payload.variables.get(keyofpayload) as string);
shouldUpdate = true; console.log(this.userInputData);
} this.EditData.params.shouldUpdate = true;
}); this.EditData.params.Args.variables = this.userInputData;
}); this.pathwithVar = this.pathProcessor.FillPathWithVar(
// this.config.data.userInputData,
if(shouldUpdate) this.userInputData,
{ this.config.data.url
(this.$refs.WidgetParams as WidgetParams).setVariableInput(this.userInputData);
//this.updateUI();
(this.$refs.WidgetParams as WidgetParams).setVariableList(
this.pathProcessor.extractVarFromPath(this.config.data.url)
); );
this.getData(this.pathwithVar);
} }
});
});this.EditData.params.userInputData = this.strMapObjChange.strMapToObj(this.userInputData);
} }
refresh() { refresh() {
......
...@@ -134,6 +134,9 @@ ...@@ -134,6 +134,9 @@
action:'get', action:'get',
Args : {}, Args : {},
tempUserInputData:{}, tempUserInputData:{},
shouldUpdate:false,
userInputData:this.userInputData,
}, },
}; };
...@@ -281,10 +284,7 @@ ...@@ -281,10 +284,7 @@
//app //app
getConfig(): [WidgetConfig,object] { getConfig(): [WidgetConfig,object] {
// this.config.data.userInputData =(this.$refs.WidgetParams as WidgetParams).getVariableValues();
/*this.config.data.userInputData = this.strMapObjChange.strMapToObj(
(this.$refs.WidgetParams as WidgetParams).getVariableValues()
);*/
return [this.config,this.EditData]; return [this.config,this.EditData];
} }
...@@ -322,17 +322,20 @@ ...@@ -322,17 +322,20 @@
console.log(this.EditPathPoke); console.log(this.EditPathPoke);
console.log(this.EditData.params); console.log(this.EditData.params);
const urlRegExp = /(?<=\/)\w*(?=\/)/g; /*const urlRegExp = /(?<=\/)\w*(?=\/)/g;
const result = this.config.data.url.match(urlRegExp); const result = this.config.data.url.match(urlRegExp);
this.message = this.message.replace(".*", "/"+result[0]+"/.*"); this.message = this.message.replace(".*", "/"+result[0]+"/.*");
console.log(this.message); console.log(this.message);*/
var pokepath = this.EditData.edit.url; var pokepath = this.EditData.edit.url;
console.log(pokepath);
window.$axios.get(pokepath).then(response => { window.$axios.get(pokepath).then(response => {
console.log("in");
this.samplePoke(response.data); this.samplePoke(response.data);
this.updateUI(); this.updateUI();
}).catch(err => { }).catch(err => {
console.log("catch");
this.EditData.params.PokedPath = this.config.data.url; this.EditData.params.PokedPath = this.config.data.url;
this.openWindows(); this.openWindows();
}); });
...@@ -370,30 +373,40 @@ ...@@ -370,30 +373,40 @@
//app //app
parentUpdate(payload: UpdatePayload): void { parentUpdate(payload: UpdatePayload): void {
var shouldUpdate:boolean = false // var shouldUpdate:boolean = false
this.userInputData = this.strMapObjChange.strMapToObj( this.userInputData = this.strMapObjChange.strMapToObj(
(this.$refs.WidgetParams as WidgetParams).getVariableValues()); this.EditData.params.userInputData);
//this.userInputData = this.EditData.params.userInputData;
var temp = this.userInputData; var temp = this.userInputData;
temp = this.strMapObjChange.objToStrMap(temp); temp = this.strMapObjChange.objToStrMap(temp);
this.userInputData = temp; this.userInputData = temp;
console.log(this.userInputData);
this.userInputData.forEach((value , key) =>{ this.userInputData.forEach((value , key) =>{
payload.variables.forEach((valueofpayload,keyofpayload)=>{ payload.variables.forEach((valueofpayload,keyofpayload)=>{
if(key == keyofpayload && ((this.userInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string))) if(key == keyofpayload && ((this.userInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string)))
{ {
this.userInputData.set(key,payload.variables.get(keyofpayload) as string); this.userInputData.set(key,payload.variables.get(keyofpayload) as string);
shouldUpdate = true; console.log(this.userInputData);
this.EditData.params.shouldUpdate = true;
this.EditData.params.Args.variables = this.userInputData;
this.pathwithVar = this.pathProcessor.FillPathWithVar(
// this.config.data.userInputData,
this.userInputData,
this.config.data.url
);
this.getData(this.pathwithVar);
} }
}); });
}); });this.EditData.params.userInputData = this.strMapObjChange.strMapToObj(this.userInputData);
if(shouldUpdate) /*if(shouldUpdate)
{ {
(this.$refs.WidgetParams as WidgetParams).setVariableInput(this.userInputData); (this.$refs.WidgetParams as WidgetParams).setVariableInput(this.userInputData);
//this.updateUI(); //this.updateUI();
(this.$refs.WidgetParams as WidgetParams).setVariableList( (this.$refs.WidgetParams as WidgetParams).setVariableList(
this.pathProcessor.extractVarFromPath(this.config.data.url) this.pathProcessor.extractVarFromPath(this.config.data.url)
); );
} }*/
} }
//app //app
......
...@@ -133,6 +133,8 @@ export default class Status extends Widget { ...@@ -133,6 +133,8 @@ export default class Status extends Widget {
action:'get', action:'get',
Args : {}, Args : {},
tempUserInputData:{}, tempUserInputData:{},
shouldUpdate:false,
userInputData:this.userInputData,
}, },
}; };
...@@ -372,8 +374,6 @@ export default class Status extends Widget { ...@@ -372,8 +374,6 @@ export default class Status extends Widget {
this.EditData.params.PokedPath = this.config.data.url; this.EditData.params.PokedPath = this.config.data.url;
this.openWindows(); this.openWindows();
});*/ });*/
console.log('defaults.timeout');
console.log(window);
window.$axios.get(pokepath).then(response => { window.$axios.get(pokepath).then(response => {
this.samplePoke(response.data); this.samplePoke(response.data);
this.updateUI(); this.updateUI();
...@@ -419,30 +419,30 @@ export default class Status extends Widget { ...@@ -419,30 +419,30 @@ export default class Status extends Widget {
//app //app
parentUpdate(payload: UpdatePayload): void { parentUpdate(payload: UpdatePayload): void {
var shouldUpdate:boolean = false
this.userInputData = this.strMapObjChange.strMapToObj( this.userInputData = this.strMapObjChange.strMapToObj(
(this.$refs.WidgetParams as WidgetParams).getVariableValues()); this.EditData.params.userInputData);
var temp = this.userInputData; var temp = this.userInputData;
temp = this.strMapObjChange.objToStrMap(temp); temp = this.strMapObjChange.objToStrMap(temp);
this.userInputData = temp; this.userInputData = temp;
console.log(this.userInputData);
this.userInputData.forEach((value , key) =>{ this.userInputData.forEach((value , key) =>{
payload.variables.forEach((valueofpayload,keyofpayload)=>{ payload.variables.forEach((valueofpayload,keyofpayload)=>{
if(key == keyofpayload && ((this.userInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string))) if(key == keyofpayload && ((this.userInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string)))
{ {
this.userInputData.set(key,payload.variables.get(keyofpayload) as string); this.userInputData.set(key,payload.variables.get(keyofpayload) as string);
shouldUpdate = true; console.log(this.userInputData);
this.EditData.params.shouldUpdate = true;
this.EditData.params.Args.variables = this.userInputData;
this.pathwithVar = this.pathProcessor.FillPathWithVar(
// this.config.data.userInputData,
this.userInputData,
this.config.data.url
);
this.getData(this.pathwithVar);
} }
}); });
}); });this.EditData.params.userInputData = this.strMapObjChange.strMapToObj(this.userInputData);
if(shouldUpdate)
{
(this.$refs.WidgetParams as WidgetParams).setVariableInput(this.userInputData);
//this.updateUI();
(this.$refs.WidgetParams as WidgetParams).setVariableList(
this.pathProcessor.extractVarFromPath(this.config.data.url)
);
}
} }
//app //app
......
...@@ -49,35 +49,18 @@ ...@@ -49,35 +49,18 @@
<div class="hflex" > <div class="hflex" >
<div class="container"> <div class="container">
<div class="columns" style="margin-top:0px"> <button class="button column" @click="viewLoad(EditData.params.Args)" style="background-color: #216dec;padding-top: 6px; ">broadcast</button>
<div class="column is-4">
<span v-show = "!isShowPath" class="largeFont" v-if = "config.data.displayname != ''">{{ config.data.displayname }}</span>
<span v-show = "!isShowPath" class="largeFont" v-if = "config.data.displayname == ''">{{ config.data.url }}</span>
<!--<input class="input colmumn is-8" type="text" v-show="isShowPath" v-model="config.data.displayname">-->
</div>
<div class="column is-1 is-offset-7" >
<a class="delete is-medium" @click="del"></a>
</div>
</div>
<div class="columns"> <div class="columns">
<WidgetParams <WidgetParams
ref="WidgetParams" ref="WidgetParams"
v-show="isShowParams" v-show="isShowParams"
action="broadcast" action="broadcast"
@updataVariables="viewLoad" @updataVariables="viewload"
></WidgetParams> ></WidgetParams>
</div> </div>
<p class="column buttons is-1" style="margin-left: 3%;padding: 0px;margin-right: 10%;margin-top: 5%">
<button @click="openWindows" class="button" style="background-color: #64a6e1">
<span class="icon is-small has-text" style="margin-right: 1px;">
<i class="fa fa-cog" aria-hidden="true"></i>
</span>
EDIT</button>
</p>
<!--<hsc-window-style-metal > <!--<hsc-window-style-metal >
...@@ -163,6 +146,7 @@ import Navigation from "@/components/Common/Navigation.vue"; ...@@ -163,6 +146,7 @@ import Navigation from "@/components/Common/Navigation.vue";
}) })
export default class VarBroadcast extends Widget { export default class VarBroadcast extends Widget {
@Prop() index!:number; @Prop() index!:number;
@Prop() refIndex!:number;
@Prop() widgetList:WidgetRef[] = []; @Prop() widgetList:WidgetRef[] = [];
pathProcessor = new PathProcessor(); pathProcessor = new PathProcessor();
strMapObjChange = new StrMapObjChange(); strMapObjChange = new StrMapObjChange();
...@@ -174,7 +158,7 @@ export default class VarBroadcast extends Widget { ...@@ -174,7 +158,7 @@ export default class VarBroadcast extends Widget {
timer?: number; timer?: number;
isShowPath: boolean = false; isShowPath: boolean = false;
isShowParams: boolean = false; isShowParams: boolean = false;
isOpen: boolean = true; EditPathPoke : string = "";
config: WidgetConfig = { config: WidgetConfig = {
WidgetComponentName: "VarBroadcast", WidgetComponentName: "VarBroadcast",
...@@ -185,13 +169,25 @@ export default class VarBroadcast extends Widget { ...@@ -185,13 +169,25 @@ export default class VarBroadcast extends Widget {
} }
}; };
schemas : any[]= [{ EditData = {
label:'varbroadcast', edit:{
key:'varbroadcast-config', type:'VarBroadcast',
type:'varbroadcast', url:this.config.data.url,
index:this.index, index:this.refIndex,
isShowStateVlaue:false,
},
props:{
fontSize:22,
title:'',
titleSize:'',
}, },
]; params:{
PokedPath:this.EditPathPoke,
action:'get',
Args : {},
tempUserInputData:{},
},
};
created() { created() {
this.config.data.userInputData = this.strMapObjChange.strMapToObj( this.config.data.userInputData = this.strMapObjChange.strMapToObj(
...@@ -199,28 +195,62 @@ export default class VarBroadcast extends Widget { ...@@ -199,28 +195,62 @@ export default class VarBroadcast extends Widget {
); );
} }
del() mounted(){
{ let containerlist = document.getElementsByClassName('container');
this.$emit('del', this.index); //CreateContainerId
console.log("del"+this.index);
var self = this;
let RightClickField = containerlist[this.index];
RightClickField.oncontextmenu = function (e) {
e.preventDefault();
let menu = document.querySelector('.menu');//获取盒子menu。
if(menu) menu.remove();//判断清除初始盒子
menu = document.createElement('div');//创建盒子。
menu.classList.add('menu');//添加类
let menu1 = document.createElement('BUTTON');//创建盒子menu1。
menu1.innerHTML = 'del';//盒子menu1添加文本XXXX
menu1.onclick = self.del;
menu.appendChild(menu1);//menu末尾添加新的节点menu1
let menu2 = document.createElement('BUTTON');//创建盒子menu1。
menu2.innerHTML = 'edit';//盒子menu1添加文本XXXX
menu2.onclick = self.openWindows;
menu.appendChild(menu2);//menu末尾添加新的节点menu1
RightClickField.appendChild(menu);//body末尾添加新的节点menu
menu.style.left = e.offsetX +"px";
menu.style.top = e.offsetY +"px";
menu.style.position = 'absolute';
};
RightClickField.onclick = e => {
let menu = document.querySelector('.menu')
if (menu && !menu.contains(e.target))
menu.remove()
}
} }
openWindows(){ openWindows(){
this.isOpen = ! this.isOpen; //windows.open -> another single page application
var fragment = window.location.origin;
this.$parent.$parent.$root.$children[0].OpenWindows(this.isOpen); var JsonData = JSON.stringify(this.EditData);
this.$emit('schemas', this.schemas); var httpData = encodeURIComponent(JsonData);
var url =fragment+"/WindowsAppIndex.html/?";
window.open(url+httpData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
} }
updateUI(isShowPath:boolean,isShowParams:boolean,url:string) { del()
{
this.isShowPath = isShowPath; this.$emit('del', this.index);
this.isShowParams = isShowParams; console.log("del"+this.index);
this.config.data.url = url; }
console.log("111");
console.log(this.config.data.url);
updateUI() {
this.isShowPath = false;
this.EditData.params.PokedPath = this.config.data.url;
this.EditData.edit.url = this.config.data.url;
this.openWindows();
} }
...@@ -228,28 +258,34 @@ export default class VarBroadcast extends Widget { ...@@ -228,28 +258,34 @@ export default class VarBroadcast extends Widget {
this.isShowPath = !this.isShowPath; this.isShowPath = !this.isShowPath;
} }
getConfig(): WidgetConfig { getConfig(): [WidgetConfig,object] {
// this.config.data.userInputData =(this.$refs.WidgetParams as WidgetParams).getVariableValues();
this.config.data.userInputData = this.strMapObjChange.strMapToObj( return [this.config,this.EditData];
(this.$refs.WidgetParams as WidgetParams).getVariableValues()
);
return this.config;
} }
setConfig(widgetConfig: WidgetConfig): void { //app
this.config = widgetConfig; setConfig(setConfigData: [WidgetConfig,object],fragment:string): void {
//this.updateUI(); this.config = setConfigData[0];
(this.$refs.WidgetParams as WidgetParams).setVariableList( this.EditData = setConfigData[1];
this.pathProcessor.extractVarFromPath(this.config.data.url)
); if(this.EditData.edit.url.search("startpath") != -1 ){this.replaceStartPath(fragment)}
//map不能序列化,必须要单独处理,这里的处理方法仅限map<string,string>类型
var temp = this.config.data.userInputData;
var temp = this.EditData.params.tempUserInputData;
temp = JSON.parse(JSON.stringify(temp)); temp = JSON.parse(JSON.stringify(temp));
temp = this.strMapObjChange.objToStrMap(temp); temp = this.strMapObjChange.objToStrMap(temp);
this.userInputData = temp; //this.EditData.params.tempUserInputData = temp;
(this.$refs.WidgetParams as WidgetParams).setVariableInput(
this.userInputData
); var Args: UpdatePayload = {
action: this.EditData.params.action,
variables: temp,
target: ["self"]
};
this.viewLoad(Args);
} }
samplePoke(sample: any) { samplePoke(sample: any) {
...@@ -279,45 +315,47 @@ export default class VarBroadcast extends Widget { ...@@ -279,45 +315,47 @@ export default class VarBroadcast extends Widget {
this.$parent.$root.$children[0].$children[0].$children[0].config.data.url = pokedPath; this.$parent.$root.$children[0].$children[0].$children[0].config.data.url = pokedPath;
} }
pathPoke() {
this.config.data.url = this.EditData.edit.url;
this.EditPathPoke = this.EditData.edit.url;
var pokepath = this.config.data.url;
window.$axios.get(pokepath).then(response => {
this.samplePoke(response.data);
this.updateUI();
}).catch(err => {
this.EditData.params.PokedPath = this.config.data.url;
this.openWindows();
});
}
replaceStartPath(startPath: string): void { replaceStartPath(startPath: string): void {
this.config.data.url.replace("$startPath$", startPath); this.config.data.url = this.config.data.url.replace("$startpath$", startPath);
this.EditData.edit.url = this.EditData.edit.url.replace("$startpath$", startPath);
} }
parentUpdate(payload: UpdatePayload): void {} parentUpdate(payload: UpdatePayload): void {}
refresh() { refresh() {
var Args: UpdatePayload = { this.viewLoad(this.EditData.params.Args);
action: "get",
variables: (this.$refs.WidgetParams as WidgetParams).getVariableValues(),
target: ["self"]
};
this.viewLoad(Args);
} }
async getData(url: string) { async getData(url: string) {
var apiLoad = url; var apiLoad = url;
await axios await window.$axios.get(apiLoad)
.get(apiLoad, {
headers: {
Pragma: "no-cache",
"Cache-Control": "no-cache"
}
})
.then(response => { .then(response => {
this.StatusValue = response.data.CFET2CORE_SAMPLE_VAL; this.StatusValue = response.data.CFET2CORE_SAMPLE_VAL;
if(this.StatusValue == undefined) if(this.StatusValue == undefined)
{ {
this.StatusValue = "undefined"; this.StatusValue = "undefined";
} }
}); })
} }
//called when widgetParams action clicked //called when widgetParams action clicked
viewLoad(Args: UpdatePayload) { async viewLoad(Args: UpdatePayload) {
// this.config.data.userInputData = Args.variables; console.log("view");
console.log("viewLoad");
console.log(Args.variables);
PubSub.publish('VarBroadcast',Args); PubSub.publish('VarBroadcast',Args);
} }
} }
......
...@@ -16,7 +16,7 @@ module.exports = { ...@@ -16,7 +16,7 @@ module.exports = {
devServer: { devServer: {
proxy: { proxy: {
"/": { "/": {
target: "http://192.168.0.3:8002", target: "http://192.168.0.3:8001",
secure: false, secure: false,
changeOrigin: true changeOrigin: true
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment