CC

src/App.vue

@@ -165,6 +165,7 @@ import AutoBroadcast from "./components/AutoBroadcast/AutoBroadcast.vue";
 import SlideShow from "./components/SlideShow/SlideShow.vue";
 import CardReader from "./components/CardReader/CardReader.vue";
 import Windows from "./components/Common/Windows.vue";
+import Grid from "./components/Layout/Grid.vue";
 // import Gauge from "./components/Gauge/Gauge.vue";
 
 //this is the view selecotr class
@@ -190,6 +191,7 @@ import Windows from "./components/Common/Windows.vue";
     CardReader,
     Windows,
     Navigation,
+    Grid
   }
 })
 
@@ -227,7 +229,8 @@ export default class App extends Vue {
     "AutoBroadcast",
     "SlideShow",
     "CardReader",
-    "Navigation"
+    "Navigation",
+    "Grid"
   ];
 
 
@@ -411,13 +414,18 @@ export default class App extends Vue {
 
 
     UpdateWidget(EditData:any) {
-        console.log(EditData);
         this.$refs[EditData.edit.index][0].EditData = EditData;
-        console.log(EditData);
         this.$refs[EditData.edit.index][0].pathPoke();
         this.$refs[EditData.edit.index][0].viewLoad(EditData.params.Args);
     }
 
+    /*UpdateApply(EditData:any) {
+        this.$refs[EditData.edit.index][0].EditData = EditData;
+        console.log(EditData);
+        this.$refs[EditData.edit.index][0].viewLoad(EditData.params.Args);
+        this.$refs[EditData.edit.index][0].viewSetLoad(EditData.params.Args);
+    }*/
+
   exportActiveWidgetList(): AllWidgetConfig {
     for (var widget of this.widgetList) {
         console.log("innn");

src/Windows/WindowsApp.vue

@@ -174,7 +174,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
@@ -187,9 +187,9 @@ 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);
@@ -198,7 +198,7 @@ export default class WindowsApp extends Vue {
             var data = JSON.parse(httpData);
             console.log(data);
             this.EditData = data;
-        }*/
+        }
 
     }
 

src/components/Config/BoolConfig.vue

 <template>
 
-    <div class="container" style="margin-top: 30px;">
+    <div class="container" style="margin-top: 30px; padding-top: 8px;">
 
         <div class="columns content " v-bind:class="EditData.props.titleSize" style="margin-bottom: 0px;padding-left: 7px;">
             <div class="column content-table-cell-heading-color is-narrow" style="margin: 0px;padding: 0px;">
@@ -209,7 +209,7 @@
             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');
+            window.open(url+httpData, "WidgetWindow",'height=400, width=800, top=200, left=400, toolbar=no');
 
         }
 

src/components/Config/Config.vue

 <template>
 
-    <div class="container" style="margin-top: 30px;">
+    <div class="container" style="margin-top: 30px;padding-top: 5.5px;">
 
       <div class="columns content " v-bind:class="EditData.props.titleSize" style="margin-bottom: 0px;padding-left: 7px;">
         <div class="column content-table-cell-heading-color is-narrow" style="margin: 0px;padding: 0px;">
@@ -214,7 +214,7 @@ export default class Config extends Widget {
         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');
+        window.open(url+httpData, "WidgetWindow",'height=400, width=800, top=200, left=400, toolbar=no');
 
     }
 

src/components/Layout/Grid.vue

+<template>
+
+
+    <div  class="container" style="margin-top: 30px;margin-left: 0px;margin-right: 0px;">
+
+        <!--<hr style="height:5px;border:none;border-top:3px double #606366;width: 105%" />-->
+        <div class="columns">
+
+        <div class="column" style=" text-decoration:line-through; width: 100%;height: 2px;background: #02378d;overflow: hidden;"></div>
+            <div class="column" style="width:auto;">www</div>
+            <div class="column" style=" text-decoration:line-through; width: 100%;height: 2px;background: #02378d;overflow: hidden;"></div>
+
+        </div>
+    </div>
+
+
+</template>
+
+
+
+<script lang="ts">
+
+
+    import Component from "vue-class-component";
+    import { Prop, Watch } from "vue-property-decorator";
+    import { WidgetConfig } from "@/models/WidgetConfig";
+    import { UpdatePayload } from "@/models/UpdatePayload";
+    import { Widget } from "@/models/widget";
+    import { ResourceInfo } from "@/models/Customview";
+    import { WidgetRef } from "@/models/WidgetRef";
+    import PathProcessor from "@/models/PathProcessor";
+    import StrMapObjChange from "@/models/StrMapObjChange";
+    import axios from "axios";
+
+
+    @Component({
+        components: {
+
+        }
+    })
+
+
+
+    export default class Grid extends Widget {
+        @Prop() index!:number;
+        @Prop() refIndex!:number;
+        @Prop() widgetList:WidgetRef[] = [];
+
+        pathProcessor = new PathProcessor();
+        strMapObjChange = new StrMapObjChange();
+        WidgetComponentName: string = "Grid";
+        pathId: string = "";
+        userInputData = new Map<string, string>();
+        isShowParams: boolean = false;
+        parentPath!: string;
+        childrenPath!: string[];
+
+
+        config: WidgetConfig = {
+            WidgetComponentName: "Grid",
+            data: {
+                url: "",
+                displayname:"",
+                userInputData: ""
+            }
+        };
+
+        EditData = {
+            edit:{
+                type:'Grid',
+                index:this.refIndex,
+            },
+            props:{
+                color:"",
+                title:"",
+            },
+            params:{
+            },
+        };
+
+
+
+        created() {
+            this.config.data.userInputData = this.strMapObjChange.strMapToObj(
+                this.userInputData
+            );
+        }
+
+
+        mounted() {
+
+            let containerlist = document.getElementsByClassName('container');
+            //CreateContainerId
+
+            var self = this;
+            let RightClickField = containerlist[this.index];
+
+            RightClickField.oncontextmenu = function (e) {
+                e.preventDefault();//demo区域停止原鼠标右击菜单
+                //this.popMenu('itemMenu',100,"100");
+                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;
+                //menu2.setAttribute("onclick", this.openWindows);
+                menu.appendChild(menu2);//menu末尾添加新的节点menu1
+                RightClickField.appendChild(menu);//body末尾添加新的节点menu
+                //盒子跟随鼠标光标。
+                //menu.style.top = $('#RightClick').offset().top;
+                menu.style.left = e.offsetX +"px";
+                menu.style.top = e.offsetY +"px";
+                menu.style.position = 'absolute';
+                //menu.style.top = '${e.clientY}px';
+                //menu.style.left = '${e.clientX}px';
+                console.log(menu.style.top);
+                console.log(menu);
+
+            };
+
+            //全局点击时消失。
+            RightClickField.onclick = e => {
+                let menu = document.querySelector('.menu')
+                if (menu && !menu.contains(e.target))
+                    menu.remove()
+            }
+
+
+        }
+
+
+
+        del(){
+            this.$emit('del', this.index);
+        }
+
+
+        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=400, width=800, top=200, left=400, toolbar=no');
+
+
+        }
+
+
+        getConfig(): [WidgetConfig,object] {
+            return [this.config,this.EditData];
+        }
+
+        setConfig(setConfigData: [WidgetConfig,object],fragment:string): void {
+            this.config = setConfigData[0];
+            this.EditData = setConfigData[1];
+
+        }
+
+
+
+
+    }
+</script>
+
+<style scoped>
+    .waveView {
+        width: 100%;
+        height: auto;
+    }
+
+    .hflex{
+        display: flex;
+        flex-direction: row-reverse;
+        align-items: center;
+
+    }
+
+
+
+
+
+</style>
+

src/components/Method/Method.vue

@@ -154,7 +154,7 @@ export default class Method extends Widget {
         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');
+        window.open(url+httpData, "WidgetWindow",'height=400, width=800, top=200, left=400, toolbar=no');
 
     }
 

src/components/Navigation/Navigation.vue

 <template>
 
 
-    <div  class="container" id="RightClick" style="margin-top: 10px;">
+    <div  class="container" id="RightClick" style="margin-top: 30px;">
 
         <div class="buttons">
                 <button class="button has-text-info is-light is-medium is-fullwidth" style="padding: 4px;margin-bottom: 25px;" @click="isShowParams = !isShowParams">
@@ -173,7 +173,7 @@
             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');
+            window.open(url+httpData, "WidgetWindow",'height=400, width=800, top=200, left=400, toolbar=no');
 
 
         }

src/components/State/BoolState.vue

@@ -70,7 +70,7 @@
         isShowPath: boolean = false;
         isShowParams: boolean = false;
         EditPathPoke : string =  "";
-        fontSize:number = 60;
+        fontSize:number = 50;
         activeColor:string = '#bbb';
         stateKey:string = '';
         StateIndicator = {
@@ -176,7 +176,7 @@
             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');
+            window.open(url+httpData, "WidgetWindow",'height=400, width=800, top=200, left=400, toolbar=no');
 
 
         }

src/components/State/State.vue

@@ -70,7 +70,7 @@ export default class State extends Widget {
   isShowPath: boolean = false;
   isShowParams: boolean = false;
   EditPathPoke : string =  "";
-  fontSize:number = 60;
+  fontSize:number = 50;
   activeColor:string = '#bbb';
   stateKey:string = '';
 
@@ -170,7 +170,7 @@ export default class State extends Widget {
         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');
+        window.open(url+httpData, "WidgetWindow",'height=400, width=800, top=200, left=400, toolbar=no');
 
 
         /*var fragment = window.location.origin;

src/components/Status/LabelStatus.vue

@@ -268,7 +268,7 @@
             //var httpData = escape(JsonData); //build
             var httpData = encodeURIComponent(JsonData);
             var url =fragment+"/WindowsAppIndex.html/?";
-            window.open(url+httpData, "WidgetWindow",'height=100, width=100, top=10, left=10, toolbar=no');
+            window.open(url+httpData, "WidgetWindow",'height=400, width=800, top=200, left=400, toolbar=no');
         }
 
 
@@ -298,8 +298,13 @@
 
 
             var temp = this.EditData.params.tempUserInputData;
+            console.log(this.EditData.params.tempUserInputData);
+            //temp = unescape(temp);
+            //console.log(temp);
             temp = JSON.parse(JSON.stringify(temp));
+            console.log(temp);
             temp = this.strMapObjChange.objToStrMap(temp);
+            console.log(temp);
             //this.EditData.params.tempUserInputData = temp;
 
 
@@ -309,6 +314,8 @@
                 target: ["self"]
             };
 
+            this.EditData.params.Args = Args;
+
 
             this.viewLoad(Args);
         }
@@ -374,6 +381,7 @@
         //app
         parentUpdate(payload: UpdatePayload): void {
            // var shouldUpdate:boolean = false
+            console.log(this.EditData.params.userInputData);
             this.userInputData = this.strMapObjChange.strMapToObj(
                 this.EditData.params.userInputData);
             //this.userInputData = this.EditData.params.userInputData;
@@ -381,6 +389,7 @@
             temp = this.strMapObjChange.objToStrMap(temp);
             this.userInputData = temp;
             console.log(this.userInputData);
+            console.log(payload.variables);
             this.userInputData.forEach((value , key) =>{
                 payload.variables.forEach((valueofpayload,keyofpayload)=>{
                     if(key == keyofpayload && ((this.userInputData.get(key) as string) != (payload.variables.get(keyofpayload) as string)))
@@ -424,6 +433,7 @@
 
         async getData(url: string) {
             var apiLoad = url;
+            console.log(url);
             await window.$axios.get(apiLoad)
                 .then(response => {
                     this.StatusValue = response.data.CFET2CORE_SAMPLE_VAL;

src/components/Status/Status.vue

@@ -286,7 +286,7 @@ export default class Status extends Widget {
       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');
+      window.open(url+httpData, "WidgetWindow",'height=400, width=800, top=200, left=400, toolbar=no');
 
   }
 
@@ -331,6 +331,7 @@ export default class Status extends Widget {
           target: ["self"]
       };
 
+      this.EditData.params.Args = Args;
 
       this.viewLoad(Args);
     //this.updateUI();

src/components/VarBroadcast/VarBroadcast.vue

@@ -47,7 +47,7 @@
     <br />
   </b-container>-->
   <div class="hflex" >
-    <div class="container">
+    <div class="container" style="margin-top: 30px;padding-top: 5px;">
 
         <button class="button column" @click="viewLoad(EditData.params.Args)" style="background-color: #216dec;padding-top: 6px; ">broadcast</button>
 

src/main.ts

@@ -69,3 +69,4 @@ Vue.prototype.$axios=axios;
 //console.log(Appmain.$children[0].UpdateWidget('111'));
 window.UpdateWidget = Appuse.$children[0].UpdateWidget;
 
+

vue.config.js

@@ -16,7 +16,7 @@ module.exports = {
     devServer: {
       proxy: {
         "/": {
-          target: "http://192.168.0.3:8001",
+          target: "http://192.168.0.119:8002",
           secure: false,
           changeOrigin: true
         }