Merge branch 'dev_v3' into test_v3

# Conflicts: # public/dist/assets/AppSider-37d75fdb.js # public/dist/assets/AppSider-a7301cdd.js # public/dist/assets/AppSider-d48c3965.js # public/dist/assets/HttpServer-0912c8b7.js # public/dist/assets/HttpServer-546d6543.js # public/dist/assets/HttpServer-ed0cf5b9.js # public/dist/assets/Index-034efc6a.js # public/dist/assets/Index-08a68a56.js # public/dist/assets/Index-0a2dd15e.js # public/dist/assets/Index-0b2ed0b9.js # public/dist/assets/Index-0c7eea33.js # public/dist/assets/Index-0c9716bb.js # public/dist/assets/Index-10bba485.js # public/dist/assets/Index-10ccb891.js # public/dist/assets/Index-19397142.js # public/dist/assets/Index-1c9a1a3c.js # public/dist/assets/Index-275356b3.js # public/dist/assets/Index-3787ff4d.js # public/dist/assets/Index-3fb421ed.js # public/dist/assets/Index-42e24823.js # public/dist/assets/Index-46b18835.js # public/dist/assets/Index-49dffb1d.js # public/dist/assets/Index-4c8f0528.js # public/dist/assets/Index-4ead8109.js # public/dist/assets/Index-53ee5687.js # public/dist/assets/Index-586aac40.js # public/dist/assets/Index-5fee302f.js # public/dist/assets/Index-60c27949.js # public/dist/assets/Index-6658484b.js # public/dist/assets/Index-6bf27758.js # public/dist/assets/Index-739b1e83.js # public/dist/assets/Index-7412a1d7.js # public/dist/assets/Index-74f192e6.js # public/dist/assets/Index-7f0573a3.js # public/dist/assets/Index-7f0cd861.js # public/dist/assets/Index-818d29dc.js # public/dist/assets/Index-8b9c9ecd.js # public/dist/assets/Index-8d8a0d0e.js # public/dist/assets/Index-90db42e6.js # public/dist/assets/Index-922a1229.js # public/dist/assets/Index-96df2d3c.js # public/dist/assets/Index-98f2b7d4.js # public/dist/assets/Index-9990c62b.js # public/dist/assets/Index-a717c6f6.js # public/dist/assets/Index-ae1fb139.js # public/dist/assets/Index-afdf2d82.js # public/dist/assets/Index-b2727714.js # public/dist/assets/Index-bbf9da88.js # public/dist/assets/Index-c35a8796.js # public/dist/assets/Index-c62981d9.js # public/dist/assets/Index-cb8b9bf1.js # public/dist/assets/Index-d66e2d7b.js # public/dist/assets/Index-d9ba0d3e.js # public/dist/assets/Index-da530e68.js # public/dist/assets/Index-db1203f0.js # public/dist/assets/Index-e75e109f.js # public/dist/assets/Index-f4e201af.js # public/dist/assets/Index-f713a226.js # public/dist/assets/Index-f7288458.js # public/dist/assets/Ipc-1f3029ea.js # public/dist/assets/Ipc-45ee52db.js # public/dist/assets/Ipc-4d92174b.js # public/dist/assets/Ipc-7b5efd90.js # public/dist/assets/Ipc-c93bc100.js # public/dist/assets/Ipc-d9cee164.js # public/dist/assets/Menu-27224c6e.js # public/dist/assets/Menu-c7c3a351.js # public/dist/assets/Menu-cb098491.js # public/dist/assets/Pic-303a031c.js # public/dist/assets/Pic-90e6fdc0.js # public/dist/assets/Pic-bbb96498.js # public/dist/assets/SocketServer-bff9de3d.js # public/dist/assets/Window-55d42d7d.js # public/dist/assets/Window-c2cf4f95.js # public/dist/assets/Window-e0fe9230.js # public/dist/assets/index-40d1cd1c.js # public/dist/assets/index-587e4740.js # public/dist/assets/index-71914d0e.js # public/dist/assets/index-869350c9.js # public/dist/assets/index-869350c9.js.gz # public/dist/assets/store2-5d974a5c.js # public/dist/assets/store2-c7ac8a8d.js # public/dist/assets/store2-d04fc23f.js # public/dist/index.html # public/dist/index.html.gz
2026-06-13 11:14:37 +08:00 · 2024-01-09 11:00:09 +08:00
parent 226cee8162 7e13c8a56e
commit 43ef81b2bb
98 changed files with 452 additions and 32 deletions
--- a/electron/config/bin.js
+++ b/electron/config/bin.js
@@ -23,11 +23,6 @@ module.exports = {
      args: ['.', '--env=local'],
      loadingPage: '/public/html/loading.html',
    },
-    go: {
-      directory: './go',
-      cmd: 'go',
-      args: ['run', './main.go', '--env=dev','--basedir=../', '--port=7073'],
-    },
  },

  /**
--- a/electron/config/builder.json
+++ b/electron/config/builder.json
@@ -11,6 +11,7 @@
    "!frontend/",
    "!run/",
    "!logs/",
+    "!go/",
    "!data/"
  ],
  "extraResources": {
--- a/electron/config/config.default.js
+++ b/electron/config/config.default.js
@@ -123,10 +123,10 @@ module.exports = (appInfo) => {
   */
  config.cross = {
    go: {
-      enable: true,
+      enable: false,
      name: 'goapp',
      args: ['--port=7073'],
-      appExit: true,
+      appExit: false,
    }
  };   

--- a/electron/config/config.local.js
+++ b/electron/config/config.local.js
@@ -25,6 +25,23 @@ module.exports = (appInfo) => {
    messageLog: true
  };   

+  /**
+   * Cross-language service
+   * 跨语言服务
+   * 如果有cmd参数，则执行该命令且需要指定 directory
+   */
+  config.cross = {
+    go: {
+      // 应用运行时启动
+      enable: true,
+      name: 'goapp',
+      cmd: 'go',
+      directory: './go',
+      args: ['run', './main.go', '--env=dev','--basedir=../', '--port=7073'],
+      appExit: true,
+    }
+  };   
+
  return {
    ...config
  };
--- a/electron/controller/cross.js
+++ b/electron/controller/cross.js
@@ -2,6 +2,7 @@

 const { Controller } = require('ee-core');
 const Cross = require('ee-core/cross');
+const Log = require('ee-core/log');
 const HttpClient = require('ee-core/httpclient');

 /**
@@ -15,21 +16,79 @@ class CrossController extends Controller {
  }

  /**
-   * 所有方法接收两个参数
-   * @param args 前端传的参数
-   * @param event - ipc通信时才有值。详情见：控制器文档
+   * View process service information
   */
+  info() {
+    const pids = Cross.getPids();
+    Log.info('cross pids:', pids);
+
+    let num = 1;
+    pids.forEach(pid => {
+      let entity = Cross.getProc(pid);
+      Log.info(`server-${num} name:${entity.name}`);
+      Log.info(`server-${num} config:`, entity.config);
+      num++;
+    })
+
+    return 'hello electron-egg';
+  }

  /**
-   * Access the api for the go service
+   * Get service url
+   */  
+  async getUrl(args) {
+    const { name } = args;
+    const goUrl = Cross.getUrl(name);
+
+    const entity = Cross.getProcByName(name);
+    entity.child.on('close', (code, signal) => {
+      Log.info(`server close event code:${code}, signal: ${signal}`);
+
+    })
+
+    return goUrl;
+  }
+
+  /**
+   * kill service
+   * By default (modifiable), killing the process will exit the electron application.
+   */  
+  async killServer(args) {
+    const { type, name } = args;
+    if (type == 'all') {
+      Cross.killAll();
+    } else {
+      Cross.killByName(name);
+    }
+
+    return;
+  }
+
+  /**
+   * create service
+   * In the default configuration, services can be started with applications. 
+   * Developers can turn off the configuration and create it manually.
+   */   
+  async createServer(args) {
+    const { service } = args;
+    const entity = await Cross.run(service);
+    Log.info('server name:', entity.name);
+    Log.info('server config:', entity.config);
+    Log.info('server url:', Cross.getUrl(entity.name));
+
+    return;
+  }
+
+  /**
+   * Access the api for the cross service
   */
-  async requestGoApi() {
-
+  async requestApi(args) {
+    const { name } = args;
    const hc = new HttpClient();
-    const goUrl = Cross.getUrl('go');
-    console.log('goUrl:', goUrl);
+    const serverUrl = Cross.getUrl(name);
+    console.log('Server Url:', serverUrl);

-    const apiHello = goUrl + '/api/hello'
+    const apiHello = serverUrl + '/api/hello'
    const options = {
      method: 'GET',
      data: {},
--- a/electron/controller/example.js
+++ b/electron/controller/example.js
@@ -27,10 +27,10 @@ class ExampleController extends Controller {
   */
  async test () {

-    const result1 = await Services.get('example').test('electron');
-    Log.info('service result1:', result1);
+    // const result1 = await Services.get('example').test('electron');
+    // Log.info('service result1:', result1);

-    Services.get('framework').test('electron');
+    // Services.get('framework').test('electron');

    return 'hello electron-egg';
  }
--- a/frontend/src/api/main.js
+++ b/frontend/src/api/main.js
@@ -55,7 +55,11 @@ const ipcApiRoute = {
  restoreWindow: 'controller.effect.restoreWindow',

  // cross
-  requestGoApi: 'controller.cross.requestGoApi',
+  crossInfo: 'controller.cross.info',
+  getCrossUrl: 'controller.cross.getUrl',
+  killCrossServer: 'controller.cross.killServer',
+  createCrossServer: 'controller.cross.createServer',
+  requestApi: 'controller.cross.requestApi',
 }

 /**
--- a/frontend/src/views/cross/go/Index.vue
+++ b/frontend/src/views/cross/go/Index.vue
@@ -2,12 +2,37 @@
    <div id="app-cross-go">
      <div class="one-block-1">
        <span>
-          1. 向go服务发送http请求
+          1. 基础控制
        </span>
      </div>  
      <div class="one-block-2">
        <a-space>
-          <a-button @click="exec(1)"> 点击 </a-button>
+          <a-button @click="getUrl()"> 获取地址 </a-button>
+          <a-button @click="kill()"> kill </a-button>
+          <a-button @click="create()"> 启动 </a-button>
+          <a-button @click="info()"> 查看 </a-button>
+        </a-space>
+      </div>
+      <div class="one-block-1">
+        <span>
+          2. 发送http请求
+        </span>
+      </div>  
+      <div class="one-block-2">
+        <a-space>
+          <a-button @click="request(1)"> 前端发送 </a-button>
+          <a-button @click="request(2)"> 主进程发送 </a-button>
+        </a-space>
+      </div>
+      <div class="one-block-1">
+        <span>
+          3. 多个服务
+        </span>
+      </div>  
+      <div class="one-block-2">
+        <a-space>
+          <a-button @click="create()"> 再启动一个 </a-button>
+          <a-button @click="killAll()"> kill所有 </a-button>
        </a-space>
      </div>
    </div>
@@ -15,23 +40,62 @@
  <script>
  import { ipcApiRoute } from '@/api/main';
  import { ipc } from '@/utils/ipcRenderer';
+  import axios from 'axios';
  
  export default {
    data() {
      return {
        type: 1,
+        serverUrl: ''
      };
    },
    methods: {
-      exec(id) {
-        const params = {
-          id: id
-        }
-        ipc.invoke(ipcApiRoute.requestGoApi, params).then(res => {
+      info() {
+        ipc.invoke(ipcApiRoute.crossInfo, {}).then(res => {
          console.log('res:', res);
-          const data = res.data || null;
-          this.$message.info(`go服务返回: ${data}`, );
        }) 
+      },
+      getUrl() {
+        ipc.invoke(ipcApiRoute.getCrossUrl, {name: 'goapp'}).then(url => {
+          this.serverUrl = url;
+          this.$message.info(`服务地址: ${url}`);
+        }) 
+      },
+      kill() {
+        // name参数是 进程对象上的name，这里仅作为参照
+        ipc.invoke(ipcApiRoute.killCrossServer, {type: 'one', name: 'goapp'})
+      },
+      killAll() {
+        ipc.invoke(ipcApiRoute.killCrossServer, {type: 'all', name: 'goapp'})
+      },
+      create() {
+        ipc.invoke(ipcApiRoute.createCrossServer, {service: 'go'})
+      },
+      request(type) {
+        if (type == 1 && this.serverUrl == "") {
+          this.$message.info("请先获取服务地址");
+          return
+        }
+        if (type == 1) {
+          const testApi = this.serverUrl + '/api/hello';
+          const cfg = {
+            method: 'get',
+            url: testApi,
+            params: { id: '1111111'},
+            timeout: 1000,
+          }
+          axios(cfg).then(res => {
+            console.log('res:', res);
+            const data = res.data.data || null;
+            this.$message.info(`服务返回: ${data}`);
+          })
+        } else {
+          ipc.invoke(ipcApiRoute.requestApi, {name: 'goapp'}).then(res => {
+            console.log('res:', res);
+            const data = res.data || null;
+            this.$message.info(`服务返回: ${data}`);
+          }) 
+        }
      }    
    }
  };
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ee",
-  "version": "3.9.0",
+  "version": "3.10.0",
  "description": "A fast, desktop software development framework",
  "main": "main.js",
  "scripts": {
--- a/public/dist/assets/AppSider-37d75fdb.js
+++ b/public/dist/assets/AppSider-37d75fdb.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/AppSider-37d75fdb.js
 import{_ as e,r as a,o as n,c as t,w as o,a as s,b as l,d as i,F as u,e as c,t as r,p as m,f as d,g as p}from"./index-04ffc5d9.js";const g=""+new URL("logo-abcaf0c2.png",import.meta.url).href,f={name:"AppSider",data:()=>({collapsed:!0,current:"menu_1",menu:{menu_1:{icon:"icon-fengche",title:"框架",pageName:"Framework",params:{}},menu_2:{icon:"icon-niudan",title:"系统",pageName:"Os",params:{}},menu_3:{icon:"icon-xiangji",title:"硬件",pageName:"Hardware",params:{}},menu_4:{icon:"icon-liuxing",title:"特效",pageName:"Effect",params:{}},menu_5:{icon:"icon-gouwu",title:"cross",pageName:"Cross",params:{}}}}),created(){},mounted(){this.menuHandle()},methods:{menuHandle(e){console.log("sider menu e:",e),this.current=e?e.key:this.current,console.log("sider menu current:",this.current);const a=this.menu[this.current];console.log("[home] load linkInfo:",a),this.$router.push({name:a.pageName,params:a.params})},changeMenu(e){console.log("sider menu e:",e)}}},h=(e=>(m("data-v-a1fe120d"),e=e(),d(),e))((()=>p("div",{class:"logo"},[p("img",{class:"pic-logo",src:g})],-1)));const _=e(f,[["render",function(e,m,d,p,g,f){const _=a("icon-font"),y=a("a-menu-item"),w=a("a-menu"),k=a("a-layout-sider"),N=a("router-view"),v=a("a-layout-content"),x=a("a-layout");return n(),t(x,{id:"app-layout-sider"},{default:o((()=>[s(k,{modelValue:g.collapsed,"onUpdate:modelValue":m[0]||(m[0]=e=>g.collapsed=e),theme:"light",class:"layout-sider",width:"100"},{default:o((()=>[h,s(w,{class:"menu-item",theme:"light",mode:"inline",selectedKeys:[g.current],onClick:f.menuHandle},{default:o((()=>[(n(!0),l(u,null,i(g.menu,((e,a)=>(n(),t(y,{key:a},{default:o((()=>[s(_,{type:e.icon},null,8,["type"]),c(" "+r(e.title),1)])),_:2},1024)))),128))])),_:1},8,["selectedKeys","onClick"])])),_:1},8,["modelValue"]),s(x,null,{default:o((()=>[s(v,{class:"layout-content"},{default:o((()=>[s(N)])),_:1})])),_:1})])),_:1})}],["__scopeId","data-v-a1fe120d"]]);export{_ as default};
+========
+import{_ as e,r as a,o as n,c as t,w as o,a as s,b as l,d as i,F as u,e as c,t as r,p as m,f as d,g as p}from"./index-869350c9.js";const g=""+new URL("logo-abcaf0c2.png",import.meta.url).href,f={name:"AppSider",data:()=>({collapsed:!0,current:"menu_1",menu:{menu_1:{icon:"icon-fengche",title:"框架",pageName:"Framework",params:{}},menu_2:{icon:"icon-niudan",title:"系统",pageName:"Os",params:{}},menu_3:{icon:"icon-xiangji",title:"硬件",pageName:"Hardware",params:{}},menu_4:{icon:"icon-liuxing",title:"特效",pageName:"Effect",params:{}},menu_5:{icon:"icon-gouwu",title:"cross",pageName:"Cross",params:{}}}}),created(){},mounted(){this.menuHandle()},methods:{menuHandle(e){console.log("sider menu e:",e),this.current=e?e.key:this.current,console.log("sider menu current:",this.current);const a=this.menu[this.current];console.log("[home] load linkInfo:",a),this.$router.push({name:a.pageName,params:a.params})},changeMenu(e){console.log("sider menu e:",e)}}},h=(e=>(m("data-v-a1fe120d"),e=e(),d(),e))((()=>p("div",{class:"logo"},[p("img",{class:"pic-logo",src:g})],-1)));const _=e(f,[["render",function(e,m,d,p,g,f){const _=a("icon-font"),y=a("a-menu-item"),w=a("a-menu"),k=a("a-layout-sider"),N=a("router-view"),v=a("a-layout-content"),x=a("a-layout");return n(),t(x,{id:"app-layout-sider"},{default:o((()=>[s(k,{modelValue:g.collapsed,"onUpdate:modelValue":m[0]||(m[0]=e=>g.collapsed=e),theme:"light",class:"layout-sider",width:"100"},{default:o((()=>[h,s(w,{class:"menu-item",theme:"light",mode:"inline",selectedKeys:[g.current],onClick:f.menuHandle},{default:o((()=>[(n(!0),l(u,null,i(g.menu,((e,a)=>(n(),t(y,{key:a},{default:o((()=>[s(_,{type:e.icon},null,8,["type"]),c(" "+r(e.title),1)])),_:2},1024)))),128))])),_:1},8,["selectedKeys","onClick"])])),_:1},8,["modelValue"]),s(x,null,{default:o((()=>[s(v,{class:"layout-content"},{default:o((()=>[s(N)])),_:1})])),_:1})])),_:1})}],["__scopeId","data-v-a1fe120d"]]);export{_ as default};
+>>>>>>>> dev_v3:public/dist/assets/AppSider-a7301cdd.js
--- a/public/dist/assets/AppSider-a7301cdd.js
+++ b/public/dist/assets/AppSider-a7301cdd.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/AppSider-37d75fdb.js
+import{_ as e,r as a,o as n,c as t,w as o,a as s,b as l,d as i,F as u,e as c,t as r,p as m,f as d,g as p}from"./index-04ffc5d9.js";const g=""+new URL("logo-abcaf0c2.png",import.meta.url).href,f={name:"AppSider",data:()=>({collapsed:!0,current:"menu_1",menu:{menu_1:{icon:"icon-fengche",title:"框架",pageName:"Framework",params:{}},menu_2:{icon:"icon-niudan",title:"系统",pageName:"Os",params:{}},menu_3:{icon:"icon-xiangji",title:"硬件",pageName:"Hardware",params:{}},menu_4:{icon:"icon-liuxing",title:"特效",pageName:"Effect",params:{}},menu_5:{icon:"icon-gouwu",title:"cross",pageName:"Cross",params:{}}}}),created(){},mounted(){this.menuHandle()},methods:{menuHandle(e){console.log("sider menu e:",e),this.current=e?e.key:this.current,console.log("sider menu current:",this.current);const a=this.menu[this.current];console.log("[home] load linkInfo:",a),this.$router.push({name:a.pageName,params:a.params})},changeMenu(e){console.log("sider menu e:",e)}}},h=(e=>(m("data-v-a1fe120d"),e=e(),d(),e))((()=>p("div",{class:"logo"},[p("img",{class:"pic-logo",src:g})],-1)));const _=e(f,[["render",function(e,m,d,p,g,f){const _=a("icon-font"),y=a("a-menu-item"),w=a("a-menu"),k=a("a-layout-sider"),N=a("router-view"),v=a("a-layout-content"),x=a("a-layout");return n(),t(x,{id:"app-layout-sider"},{default:o((()=>[s(k,{modelValue:g.collapsed,"onUpdate:modelValue":m[0]||(m[0]=e=>g.collapsed=e),theme:"light",class:"layout-sider",width:"100"},{default:o((()=>[h,s(w,{class:"menu-item",theme:"light",mode:"inline",selectedKeys:[g.current],onClick:f.menuHandle},{default:o((()=>[(n(!0),l(u,null,i(g.menu,((e,a)=>(n(),t(y,{key:a},{default:o((()=>[s(_,{type:e.icon},null,8,["type"]),c(" "+r(e.title),1)])),_:2},1024)))),128))])),_:1},8,["selectedKeys","onClick"])])),_:1},8,["modelValue"]),s(x,null,{default:o((()=>[s(v,{class:"layout-content"},{default:o((()=>[s(N)])),_:1})])),_:1})])),_:1})}],["__scopeId","data-v-a1fe120d"]]);export{_ as default};
+========
+import{_ as e,r as a,o as n,c as t,w as o,a as s,b as l,d as i,F as u,e as c,t as r,p as m,f as d,g as p}from"./index-869350c9.js";const g=""+new URL("logo-abcaf0c2.png",import.meta.url).href,f={name:"AppSider",data:()=>({collapsed:!0,current:"menu_1",menu:{menu_1:{icon:"icon-fengche",title:"框架",pageName:"Framework",params:{}},menu_2:{icon:"icon-niudan",title:"系统",pageName:"Os",params:{}},menu_3:{icon:"icon-xiangji",title:"硬件",pageName:"Hardware",params:{}},menu_4:{icon:"icon-liuxing",title:"特效",pageName:"Effect",params:{}},menu_5:{icon:"icon-gouwu",title:"cross",pageName:"Cross",params:{}}}}),created(){},mounted(){this.menuHandle()},methods:{menuHandle(e){console.log("sider menu e:",e),this.current=e?e.key:this.current,console.log("sider menu current:",this.current);const a=this.menu[this.current];console.log("[home] load linkInfo:",a),this.$router.push({name:a.pageName,params:a.params})},changeMenu(e){console.log("sider menu e:",e)}}},h=(e=>(m("data-v-a1fe120d"),e=e(),d(),e))((()=>p("div",{class:"logo"},[p("img",{class:"pic-logo",src:g})],-1)));const _=e(f,[["render",function(e,m,d,p,g,f){const _=a("icon-font"),y=a("a-menu-item"),w=a("a-menu"),k=a("a-layout-sider"),N=a("router-view"),v=a("a-layout-content"),x=a("a-layout");return n(),t(x,{id:"app-layout-sider"},{default:o((()=>[s(k,{modelValue:g.collapsed,"onUpdate:modelValue":m[0]||(m[0]=e=>g.collapsed=e),theme:"light",class:"layout-sider",width:"100"},{default:o((()=>[h,s(w,{class:"menu-item",theme:"light",mode:"inline",selectedKeys:[g.current],onClick:f.menuHandle},{default:o((()=>[(n(!0),l(u,null,i(g.menu,((e,a)=>(n(),t(y,{key:a},{default:o((()=>[s(_,{type:e.icon},null,8,["type"]),c(" "+r(e.title),1)])),_:2},1024)))),128))])),_:1},8,["selectedKeys","onClick"])])),_:1},8,["modelValue"]),s(x,null,{default:o((()=>[s(v,{class:"layout-content"},{default:o((()=>[s(N)])),_:1})])),_:1})])),_:1})}],["__scopeId","data-v-a1fe120d"]]);export{_ as default};
+>>>>>>>> dev_v3:public/dist/assets/AppSider-a7301cdd.js
--- a/public/dist/assets/AppSider-a7301cdd.js.gz
+++ b/public/dist/assets/AppSider-a7301cdd.js.gz
--- a/public/dist/assets/HttpServer-0912c8b7.js
+++ b/public/dist/assets/HttpServer-0912c8b7.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/HttpServer-546d6543.js
+import{i as t}from"./main-d72f38de.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{a as s}from"./index-587e4740.js";import{s as o}from"./store2-c7ac8a8d.js";import{_ as r,r as n,o as a,b as i,g as l,t as c,e as u,a as d,w as p,p as h,f as m}from"./index-04ffc5d9.js";const v={data:()=>({currentStatus:"关闭",servicAddress:"无"}),mounted(){this.init()},methods:{init(){e.invoke(t.checkHttpServer,{}).then((t=>{t.enable&&(this.currentStatus="开启",this.servicAddress=t.server,o.set("httpServiceConfig",t))}))},sendRequest(e){"关闭"!=this.currentStatus?this.requestHttp(t.doHttpRequest,{id:e}).then((t=>{})):this.$message.error("http服务未开启")},requestHttp(t,e){const r=o.get("httpServiceConfig").server||"http://localhost:7071";let n=t.split(".").join("/");return n=r+"/"+n,console.log("url:",n),s({url:n,method:"post",data:e,timeout:6e4})},backendRequest(){console.log("GO_URL:","http://www.test.com");s({baseURL:"http://www.test.com",method:"get",url:"/hello",timeout:6e4}).then((t=>{console.log("res:",t);const e=t.data||null;this.$message.info(`go服务返回: ${e}`)}))}}},f=t=>(h("data-v-3508e997"),t=t(),m(),t),b={id:"app-base-httpserver"},g=f((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 使用http与主进程通信 ")],-1))),k={class:"one-block-2"},w=f((()=>l("div",{class:"one-block-1"},[l("span",null," 2. 使用http与服务端通信 ")],-1))),R={class:"one-block-2"};const q=r(v,[["render",function(t,e,s,o,r,h){const m=n("a-button");return a(),i("div",b,[g,l("div",k,[l("p",null,"* 状态："+c(r.currentStatus),1),l("p",null,"* 地址："+c(r.servicAddress),1),l("p",null,[u("* 发送请求： "),d(m,{onClick:e[0]||(e[0]=t=>h.sendRequest("pictures"))},{default:p((()=>[u(" 打开【我的图片】 ")])),_:1})])]),w,l("div",R,[l("p",null,[d(m,{onClick:e[1]||(e[1]=t=>h.backendRequest())},{default:p((()=>[u(" 发送请求 ")])),_:1}),u(" （请自行创建服务） ")])])])}],["__scopeId","data-v-3508e997"]]);export{q as default};
+========
+import{i as t}from"./main-ce25b28f.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{a as s}from"./index-71914d0e.js";import{s as o}from"./store2-5d974a5c.js";import{_ as r,r as n,o as a,b as i,g as l,t as c,e as u,a as d,w as p,p as h,f as m}from"./index-869350c9.js";const v={data:()=>({currentStatus:"关闭",servicAddress:"无"}),mounted(){this.init()},methods:{init(){e.invoke(t.checkHttpServer,{}).then((t=>{t.enable&&(this.currentStatus="开启",this.servicAddress=t.server,o.set("httpServiceConfig",t))}))},sendRequest(e){"关闭"!=this.currentStatus?this.requestHttp(t.doHttpRequest,{id:e}).then((t=>{})):this.$message.error("http服务未开启")},requestHttp(t,e){const r=o.get("httpServiceConfig").server||"http://localhost:7071";let n=t.split(".").join("/");return n=r+"/"+n,console.log("url:",n),s({url:n,method:"post",data:e,timeout:6e4})},backendRequest(){console.log("GO_URL:","http://www.test.com");s({baseURL:"http://www.test.com",method:"get",url:"/hello",timeout:6e4}).then((t=>{console.log("res:",t);const e=t.data||null;this.$message.info(`go服务返回: ${e}`)}))}}},f=t=>(h("data-v-3508e997"),t=t(),m(),t),b={id:"app-base-httpserver"},g=f((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 使用http与主进程通信 ")],-1))),k={class:"one-block-2"},w=f((()=>l("div",{class:"one-block-1"},[l("span",null," 2. 使用http与服务端通信 ")],-1))),R={class:"one-block-2"};const q=r(v,[["render",function(t,e,s,o,r,h){const m=n("a-button");return a(),i("div",b,[g,l("div",k,[l("p",null,"* 状态："+c(r.currentStatus),1),l("p",null,"* 地址："+c(r.servicAddress),1),l("p",null,[u("* 发送请求： "),d(m,{onClick:e[0]||(e[0]=t=>h.sendRequest("pictures"))},{default:p((()=>[u(" 打开【我的图片】 ")])),_:1})])]),w,l("div",R,[l("p",null,[d(m,{onClick:e[1]||(e[1]=t=>h.backendRequest())},{default:p((()=>[u(" 发送请求 ")])),_:1}),u(" （请自行创建服务） ")])])])}],["__scopeId","data-v-3508e997"]]);export{q as default};
+>>>>>>>> dev_v3:public/dist/assets/HttpServer-0912c8b7.js
--- a/public/dist/assets/HttpServer-0912c8b7.js.gz
+++ b/public/dist/assets/HttpServer-0912c8b7.js.gz
--- a/public/dist/assets/HttpServer-546d6543.js
+++ b/public/dist/assets/HttpServer-546d6543.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/HttpServer-546d6543.js
 import{i as t}from"./main-d72f38de.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{a as s}from"./index-587e4740.js";import{s as o}from"./store2-c7ac8a8d.js";import{_ as r,r as n,o as a,b as i,g as l,t as c,e as u,a as d,w as p,p as h,f as m}from"./index-04ffc5d9.js";const v={data:()=>({currentStatus:"关闭",servicAddress:"无"}),mounted(){this.init()},methods:{init(){e.invoke(t.checkHttpServer,{}).then((t=>{t.enable&&(this.currentStatus="开启",this.servicAddress=t.server,o.set("httpServiceConfig",t))}))},sendRequest(e){"关闭"!=this.currentStatus?this.requestHttp(t.doHttpRequest,{id:e}).then((t=>{})):this.$message.error("http服务未开启")},requestHttp(t,e){const r=o.get("httpServiceConfig").server||"http://localhost:7071";let n=t.split(".").join("/");return n=r+"/"+n,console.log("url:",n),s({url:n,method:"post",data:e,timeout:6e4})},backendRequest(){console.log("GO_URL:","http://www.test.com");s({baseURL:"http://www.test.com",method:"get",url:"/hello",timeout:6e4}).then((t=>{console.log("res:",t);const e=t.data||null;this.$message.info(`go服务返回: ${e}`)}))}}},f=t=>(h("data-v-3508e997"),t=t(),m(),t),b={id:"app-base-httpserver"},g=f((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 使用http与主进程通信 ")],-1))),k={class:"one-block-2"},w=f((()=>l("div",{class:"one-block-1"},[l("span",null," 2. 使用http与服务端通信 ")],-1))),R={class:"one-block-2"};const q=r(v,[["render",function(t,e,s,o,r,h){const m=n("a-button");return a(),i("div",b,[g,l("div",k,[l("p",null,"* 状态："+c(r.currentStatus),1),l("p",null,"* 地址："+c(r.servicAddress),1),l("p",null,[u("* 发送请求： "),d(m,{onClick:e[0]||(e[0]=t=>h.sendRequest("pictures"))},{default:p((()=>[u(" 打开【我的图片】 ")])),_:1})])]),w,l("div",R,[l("p",null,[d(m,{onClick:e[1]||(e[1]=t=>h.backendRequest())},{default:p((()=>[u(" 发送请求 ")])),_:1}),u(" （请自行创建服务） ")])])])}],["__scopeId","data-v-3508e997"]]);export{q as default};
+========
+import{i as t}from"./main-ce25b28f.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{a as s}from"./index-71914d0e.js";import{s as o}from"./store2-5d974a5c.js";import{_ as r,r as n,o as a,b as i,g as l,t as c,e as u,a as d,w as p,p as h,f as m}from"./index-869350c9.js";const v={data:()=>({currentStatus:"关闭",servicAddress:"无"}),mounted(){this.init()},methods:{init(){e.invoke(t.checkHttpServer,{}).then((t=>{t.enable&&(this.currentStatus="开启",this.servicAddress=t.server,o.set("httpServiceConfig",t))}))},sendRequest(e){"关闭"!=this.currentStatus?this.requestHttp(t.doHttpRequest,{id:e}).then((t=>{})):this.$message.error("http服务未开启")},requestHttp(t,e){const r=o.get("httpServiceConfig").server||"http://localhost:7071";let n=t.split(".").join("/");return n=r+"/"+n,console.log("url:",n),s({url:n,method:"post",data:e,timeout:6e4})},backendRequest(){console.log("GO_URL:","http://www.test.com");s({baseURL:"http://www.test.com",method:"get",url:"/hello",timeout:6e4}).then((t=>{console.log("res:",t);const e=t.data||null;this.$message.info(`go服务返回: ${e}`)}))}}},f=t=>(h("data-v-3508e997"),t=t(),m(),t),b={id:"app-base-httpserver"},g=f((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 使用http与主进程通信 ")],-1))),k={class:"one-block-2"},w=f((()=>l("div",{class:"one-block-1"},[l("span",null," 2. 使用http与服务端通信 ")],-1))),R={class:"one-block-2"};const q=r(v,[["render",function(t,e,s,o,r,h){const m=n("a-button");return a(),i("div",b,[g,l("div",k,[l("p",null,"* 状态："+c(r.currentStatus),1),l("p",null,"* 地址："+c(r.servicAddress),1),l("p",null,[u("* 发送请求： "),d(m,{onClick:e[0]||(e[0]=t=>h.sendRequest("pictures"))},{default:p((()=>[u(" 打开【我的图片】 ")])),_:1})])]),w,l("div",R,[l("p",null,[d(m,{onClick:e[1]||(e[1]=t=>h.backendRequest())},{default:p((()=>[u(" 发送请求 ")])),_:1}),u(" （请自行创建服务） ")])])])}],["__scopeId","data-v-3508e997"]]);export{q as default};
+>>>>>>>> dev_v3:public/dist/assets/HttpServer-0912c8b7.js
--- a/public/dist/assets/Index-034efc6a.js
+++ b/public/dist/assets/Index-034efc6a.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-275356b3.js
+import{i as e}from"./main-d72f38de.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{s as a}from"./store2-c7ac8a8d.js";import{_ as o,r as t,o as l,b as i,g as n,a as d,w as c,e as r,p as u,f as p}from"./index-04ffc5d9.js";const f=[{content:"【下载】目录",id:"downloads"},{content:"【图片】目录",id:"pictures"},{content:"【文档】目录",id:"documents"},{content:"【音乐】目录",id:"music"}],h={data:()=>({file_list:f,action_url:"",image_info:[],num:0,servicAddress:"",dir_path:"D:\\www\\ee"}),mounted(){this.getHost()},methods:{getHost(){s.invoke(e.checkHttpServer,{}).then((s=>{if(s.enable){this.servicAddress=s.server,a.set("httpServiceConfig",s);const o=s.server||"http://localhost:7071";let t=e.uploadFile.split(".").join("/");this.action_url=o+"/"+t}}))},openDirectry(a){s.invoke(e.openDirectory,{id:a}).then((e=>{}))},selectDir(){s.invoke(e.selectFolder,"").then((e=>{this.dir_path=e,this.$message.info(e)}))},messageShow(){s.invoke(e.messageShow,"").then((e=>{this.$message.info(e)}))},messageShowConfirm(){s.invoke(e.messageShowConfirm,"").then((e=>{this.$message.info(e)}))},handleFileChange(e){if(console.log("handleFileChange-----"),""==this.action_url)return void this.$message.error("http服务未开启");const s=e.file.status;if("uploading"!==s&&console.log(e.file),"done"===s){const s=e.file.response;if(console.log("uploadRes:",s),"success"!==s.code)return this.$message.error(`file upload failed ${s.code} .`),!1;this.num++;const a=s.data;a.id=this.num,a.imageUrlText="image url",this.image_info.push(a),this.$message.success(`${e.file.name} file uploaded successfully.`)}else"error"===s&&this.$message.error(`${e.file.name} file upload failed.`)}}},m=e=>(u("data-v-d30dccef"),e=e(),p(),e),g={id:"app-base-file"},_=m((()=>n("div",{class:"one-block-1"},[n("span",null," 1. 系统原生对话框 ")],-1))),v={class:"one-block-2"},k=m((()=>n("div",{class:"one-block-1"},[n("span",null," 2. 选择保存目录 ")],-1))),C={class:"one-block-2"},b=m((()=>n("div",{class:"one-block-1"},[n("span",null," 3. 打开文件夹 ")],-1))),w={class:"one-block-2"},$=m((()=>n("div",{class:"one-block-1"},[n("span",null," 4. 上传文件到图床 ")],-1))),S={class:"one-block-2"},D=m((()=>n("p",{class:"ant-upload-drag-icon"},null,-1))),j=m((()=>n("p",{class:"ant-upload-text"}," 点击 或 拖拽文件到这里 ",-1))),y=m((()=>n("p",{class:"ant-upload-hint"}," 注意：请使用您自己的图床token ",-1))),F=m((()=>n("div",{class:"footer"},null,-1)));const x=o(h,[["render",function(e,s,a,o,u,p){const f=t("a-button"),h=t("a-space"),m=t("a-input"),x=t("a-col"),H=t("a-row"),V=t("a-card"),A=t("a-list-item"),I=t("a-list"),R=t("a-upload-dragger");return l(),i("div",g,[_,n("div",v,[d(h,null,{default:c((()=>[d(f,{onClick:s[0]||(s[0]=e=>p.messageShow())},{default:c((()=>[r("消息提示(ipc)")])),_:1}),d(f,{onClick:s[1]||(s[1]=e=>p.messageShowConfirm())},{default:c((()=>[r("消息提示与确认(ipc)")])),_:1})])),_:1})]),k,n("div",C,[d(H,null,{default:c((()=>[d(x,{span:12},{default:c((()=>[d(m,{modelValue:u.dir_path,"onUpdate:modelValue":s[2]||(s[2]=e=>u.dir_path=e),value:u.dir_path,"addon-before":"保存目录"},null,8,["modelValue","value"])])),_:1}),d(x,{span:12},{default:c((()=>[d(f,{onClick:p.selectDir},{default:c((()=>[r(" 修改目录 ")])),_:1},8,["onClick"])])),_:1})])),_:1})]),b,n("div",w,[d(I,{grid:{gutter:16,column:4},"data-source":u.file_list},{renderItem:c((({item:e})=>[d(A,{onClick:s=>p.openDirectry(e.id)},{default:c((()=>[d(V,{title:e.content},{default:c((()=>[d(f,{type:"link"},{default:c((()=>[r(" 打开 ")])),_:1})])),_:2},1032,["title"])])),_:2},1032,["onClick"])])),_:1},8,["data-source"])]),$,n("div",S,[d(R,{name:"file",multiple:!0,action:u.action_url,onChange:p.handleFileChange},{default:c((()=>[D,j,y])),_:1},8,["action","onChange"])]),F])}],["__scopeId","data-v-d30dccef"]]);export{x as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{s as a}from"./store2-5d974a5c.js";import{_ as o,r as t,o as l,b as i,g as n,a as d,w as c,e as r,p as u,f as p}from"./index-869350c9.js";const f=[{content:"【下载】目录",id:"downloads"},{content:"【图片】目录",id:"pictures"},{content:"【文档】目录",id:"documents"},{content:"【音乐】目录",id:"music"}],h={data:()=>({file_list:f,action_url:"",image_info:[],num:0,servicAddress:"",dir_path:"D:\\www\\ee"}),mounted(){this.getHost()},methods:{getHost(){s.invoke(e.checkHttpServer,{}).then((s=>{if(s.enable){this.servicAddress=s.server,a.set("httpServiceConfig",s);const o=s.server||"http://localhost:7071";let t=e.uploadFile.split(".").join("/");this.action_url=o+"/"+t}}))},openDirectry(a){s.invoke(e.openDirectory,{id:a}).then((e=>{}))},selectDir(){s.invoke(e.selectFolder,"").then((e=>{this.dir_path=e,this.$message.info(e)}))},messageShow(){s.invoke(e.messageShow,"").then((e=>{this.$message.info(e)}))},messageShowConfirm(){s.invoke(e.messageShowConfirm,"").then((e=>{this.$message.info(e)}))},handleFileChange(e){if(console.log("handleFileChange-----"),""==this.action_url)return void this.$message.error("http服务未开启");const s=e.file.status;if("uploading"!==s&&console.log(e.file),"done"===s){const s=e.file.response;if(console.log("uploadRes:",s),"success"!==s.code)return this.$message.error(`file upload failed ${s.code} .`),!1;this.num++;const a=s.data;a.id=this.num,a.imageUrlText="image url",this.image_info.push(a),this.$message.success(`${e.file.name} file uploaded successfully.`)}else"error"===s&&this.$message.error(`${e.file.name} file upload failed.`)}}},m=e=>(u("data-v-d30dccef"),e=e(),p(),e),g={id:"app-base-file"},_=m((()=>n("div",{class:"one-block-1"},[n("span",null," 1. 系统原生对话框 ")],-1))),v={class:"one-block-2"},k=m((()=>n("div",{class:"one-block-1"},[n("span",null," 2. 选择保存目录 ")],-1))),C={class:"one-block-2"},b=m((()=>n("div",{class:"one-block-1"},[n("span",null," 3. 打开文件夹 ")],-1))),w={class:"one-block-2"},$=m((()=>n("div",{class:"one-block-1"},[n("span",null," 4. 上传文件到图床 ")],-1))),S={class:"one-block-2"},D=m((()=>n("p",{class:"ant-upload-drag-icon"},null,-1))),j=m((()=>n("p",{class:"ant-upload-text"}," 点击 或 拖拽文件到这里 ",-1))),y=m((()=>n("p",{class:"ant-upload-hint"}," 注意：请使用您自己的图床token ",-1))),F=m((()=>n("div",{class:"footer"},null,-1)));const x=o(h,[["render",function(e,s,a,o,u,p){const f=t("a-button"),h=t("a-space"),m=t("a-input"),x=t("a-col"),H=t("a-row"),V=t("a-card"),A=t("a-list-item"),I=t("a-list"),R=t("a-upload-dragger");return l(),i("div",g,[_,n("div",v,[d(h,null,{default:c((()=>[d(f,{onClick:s[0]||(s[0]=e=>p.messageShow())},{default:c((()=>[r("消息提示(ipc)")])),_:1}),d(f,{onClick:s[1]||(s[1]=e=>p.messageShowConfirm())},{default:c((()=>[r("消息提示与确认(ipc)")])),_:1})])),_:1})]),k,n("div",C,[d(H,null,{default:c((()=>[d(x,{span:12},{default:c((()=>[d(m,{modelValue:u.dir_path,"onUpdate:modelValue":s[2]||(s[2]=e=>u.dir_path=e),value:u.dir_path,"addon-before":"保存目录"},null,8,["modelValue","value"])])),_:1}),d(x,{span:12},{default:c((()=>[d(f,{onClick:p.selectDir},{default:c((()=>[r(" 修改目录 ")])),_:1},8,["onClick"])])),_:1})])),_:1})]),b,n("div",w,[d(I,{grid:{gutter:16,column:4},"data-source":u.file_list},{renderItem:c((({item:e})=>[d(A,{onClick:s=>p.openDirectry(e.id)},{default:c((()=>[d(V,{title:e.content},{default:c((()=>[d(f,{type:"link"},{default:c((()=>[r(" 打开 ")])),_:1})])),_:2},1032,["title"])])),_:2},1032,["onClick"])])),_:1},8,["data-source"])]),$,n("div",S,[d(R,{name:"file",multiple:!0,action:u.action_url,onChange:p.handleFileChange},{default:c((()=>[D,j,y])),_:1},8,["action","onChange"])]),F])}],["__scopeId","data-v-d30dccef"]]);export{x as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-034efc6a.js
--- a/public/dist/assets/Index-034efc6a.js.gz
+++ b/public/dist/assets/Index-034efc6a.js.gz
--- a/public/dist/assets/Index-0a122f66.css
+++ b/public/dist/assets/Index-0a122f66.css
@@ -0,0 +1 @@
+#app-cross-go[data-v-28ca45de]{padding:0 10px;text-align:left;width:100%}#app-cross-go .one-block-1[data-v-28ca45de]{font-size:16px;padding-top:10px}#app-cross-go .one-block-2[data-v-28ca45de]{padding-top:10px}
--- a/public/dist/assets/Index-0a2dd15e.js
+++ b/public/dist/assets/Index-0a2dd15e.js
--- a/public/dist/assets/Index-0a2dd15e.js.gz
+++ b/public/dist/assets/Index-0a2dd15e.js.gz
--- a/public/dist/assets/Index-10ccb891.js
+++ b/public/dist/assets/Index-10ccb891.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-f713a226.js
+import{i as e}from"./main-d72f38de.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as o,h as n,r as a,o as l,b as s,g as i,a as d,w as c,e as w,p as m,f as r}from"./index-04ffc5d9.js";const v={data:()=>({views:[{type:"web",content:"https://www.baidu.com/"},{type:"html",content:"/public/html/view_example.html"}]}),methods:{loadViewContent(o){t.invoke(e.loadViewContent,n(this.views[o])).then((e=>{console.log(e)}))},removeViewContent(o){t.invoke(e.removeViewContent,n(this.views[o])).then((e=>{console.log(e)}))}}},p=e=>(m("data-v-792e445a"),e=e(),r(),e),u={id:"app-base-window-view"},h=p((()=>i("div",{class:"one-block-1"},[i("span",null," 1. 嵌入web内容 ")],-1))),f={class:"one-block-2"},C=p((()=>i("div",{class:"one-block-1"},[i("span",null," 2. 嵌入html内容 ")],-1))),b={class:"one-block-2"};const k=o(v,[["render",function(e,t,o,n,m,r){const v=a("a-button"),p=a("a-space");return l(),s("div",u,[h,i("div",f,[d(p,null,{default:c((()=>[d(v,{onClick:t[0]||(t[0]=e=>r.loadViewContent(0))},{default:c((()=>[w("加载百度页面")])),_:1}),d(v,{onClick:t[1]||(t[1]=e=>r.removeViewContent(0))},{default:c((()=>[w("移除百度页面")])),_:1})])),_:1})]),C,i("div",b,[d(p,null,{default:c((()=>[d(v,{onClick:t[2]||(t[2]=e=>r.loadViewContent(1))},{default:c((()=>[w("加载html页面")])),_:1}),d(v,{onClick:t[3]||(t[3]=e=>r.removeViewContent(1))},{default:c((()=>[w("移除html页面")])),_:1})])),_:1})])])}],["__scopeId","data-v-792e445a"]]);export{k as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as o,h as n,r as a,o as l,b as s,g as i,a as d,w as c,e as w,p as m,f as r}from"./index-869350c9.js";const v={data:()=>({views:[{type:"web",content:"https://www.baidu.com/"},{type:"html",content:"/public/html/view_example.html"}]}),methods:{loadViewContent(o){t.invoke(e.loadViewContent,n(this.views[o])).then((e=>{console.log(e)}))},removeViewContent(o){t.invoke(e.removeViewContent,n(this.views[o])).then((e=>{console.log(e)}))}}},p=e=>(m("data-v-792e445a"),e=e(),r(),e),u={id:"app-base-window-view"},h=p((()=>i("div",{class:"one-block-1"},[i("span",null," 1. 嵌入web内容 ")],-1))),f={class:"one-block-2"},C=p((()=>i("div",{class:"one-block-1"},[i("span",null," 2. 嵌入html内容 ")],-1))),b={class:"one-block-2"};const k=o(v,[["render",function(e,t,o,n,m,r){const v=a("a-button"),p=a("a-space");return l(),s("div",u,[h,i("div",f,[d(p,null,{default:c((()=>[d(v,{onClick:t[0]||(t[0]=e=>r.loadViewContent(0))},{default:c((()=>[w("加载百度页面")])),_:1}),d(v,{onClick:t[1]||(t[1]=e=>r.removeViewContent(0))},{default:c((()=>[w("移除百度页面")])),_:1})])),_:1})]),C,i("div",b,[d(p,null,{default:c((()=>[d(v,{onClick:t[2]||(t[2]=e=>r.loadViewContent(1))},{default:c((()=>[w("加载html页面")])),_:1}),d(v,{onClick:t[3]||(t[3]=e=>r.removeViewContent(1))},{default:c((()=>[w("移除html页面")])),_:1})])),_:1})])])}],["__scopeId","data-v-792e445a"]]);export{k as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-10ccb891.js
--- a/public/dist/assets/Index-10ccb891.js.gz
+++ b/public/dist/assets/Index-10ccb891.js.gz
--- a/public/dist/assets/Index-1c9a1a3c.js
+++ b/public/dist/assets/Index-1c9a1a3c.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-1c9a1a3c.js
 import{i as e}from"./main-d72f38de.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{a}from"./index-587e4740.js";import{s as r}from"./store2-c7ac8a8d.js";import{_ as t,r as o,o as i,b as n,g as d,a as v,w as c,e as m,p as l,f}from"./index-04ffc5d9.js";const u={data:()=>({server:""}),methods:{startServer(){s.invoke(e.startJavaServer,{}).then((e=>{0!=e.code?this.$message.error(e.msg):(this.$message.info("异步启动"),r.set("javaService",e.server))}))},closeServer(){s.invoke(e.closeJavaServer,{}).then((e=>{0!=e.code&&this.$message.error(e.msg),this.$message.info("异步关闭"),r.remove("javaService")}))},sendRequest(){const e=r.get("javaService")||"";if(""==e)return void this.$message.error("服务未开启 或 正在启动中");a({method:"get",url:e+"/test1/get",params:{id:"1111111"},timeout:6e4}).then((e=>{const s=e.data||null;this.$message.info(`java服务返回: ${s}`)}))}}},p={id:"app-other"},g=(e=>(l("data-v-da7e5fd3"),e=e(),f(),e))((()=>d("div",{class:"one-block-1"},[d("span",null," 请求java服务接口 ")],-1))),h={class:"one-block-2"};const j=t(u,[["render",function(e,s,a,r,t,l){const f=o("a-button"),u=o("a-space");return i(),n("div",p,[g,d("div",h,[v(u,null,{default:c((()=>[v(f,{onClick:s[0]||(s[0]=e=>l.startServer())},{default:c((()=>[m(" 启动java项目 ")])),_:1}),v(f,{onClick:s[1]||(s[1]=e=>l.sendRequest())},{default:c((()=>[m(" 测试接口 ")])),_:1}),v(f,{onClick:s[2]||(s[2]=e=>l.closeServer())},{default:c((()=>[m(" 关闭java项目 ")])),_:1})])),_:1})])])}],["__scopeId","data-v-da7e5fd3"]]);export{j as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{a}from"./index-71914d0e.js";import{s as r}from"./store2-5d974a5c.js";import{_ as t,r as o,o as i,b as n,g as d,a as v,w as c,e as m,p as l,f}from"./index-869350c9.js";const u={data:()=>({server:""}),methods:{startServer(){s.invoke(e.startJavaServer,{}).then((e=>{0!=e.code?this.$message.error(e.msg):(this.$message.info("异步启动"),r.set("javaService",e.server))}))},closeServer(){s.invoke(e.closeJavaServer,{}).then((e=>{0!=e.code&&this.$message.error(e.msg),this.$message.info("异步关闭"),r.remove("javaService")}))},sendRequest(){const e=r.get("javaService")||"";if(""==e)return void this.$message.error("服务未开启 或 正在启动中");a({method:"get",url:e+"/test1/get",params:{id:"1111111"},timeout:6e4}).then((e=>{const s=e.data||null;this.$message.info(`java服务返回: ${s}`)}))}}},p={id:"app-other"},g=(e=>(l("data-v-da7e5fd3"),e=e(),f(),e))((()=>d("div",{class:"one-block-1"},[d("span",null," 请求java服务接口 ")],-1))),h={class:"one-block-2"};const j=t(u,[["render",function(e,s,a,r,t,l){const f=o("a-button"),u=o("a-space");return i(),n("div",p,[g,d("div",h,[v(u,null,{default:c((()=>[v(f,{onClick:s[0]||(s[0]=e=>l.startServer())},{default:c((()=>[m(" 启动java项目 ")])),_:1}),v(f,{onClick:s[1]||(s[1]=e=>l.sendRequest())},{default:c((()=>[m(" 测试接口 ")])),_:1}),v(f,{onClick:s[2]||(s[2]=e=>l.closeServer())},{default:c((()=>[m(" 关闭java项目 ")])),_:1})])),_:1})])])}],["__scopeId","data-v-da7e5fd3"]]);export{j as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-d66e2d7b.js
--- a/public/dist/assets/Index-275356b3.js
+++ b/public/dist/assets/Index-275356b3.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-275356b3.js
 import{i as e}from"./main-d72f38de.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{s as a}from"./store2-c7ac8a8d.js";import{_ as o,r as t,o as l,b as i,g as n,a as d,w as c,e as r,p as u,f as p}from"./index-04ffc5d9.js";const f=[{content:"【下载】目录",id:"downloads"},{content:"【图片】目录",id:"pictures"},{content:"【文档】目录",id:"documents"},{content:"【音乐】目录",id:"music"}],h={data:()=>({file_list:f,action_url:"",image_info:[],num:0,servicAddress:"",dir_path:"D:\\www\\ee"}),mounted(){this.getHost()},methods:{getHost(){s.invoke(e.checkHttpServer,{}).then((s=>{if(s.enable){this.servicAddress=s.server,a.set("httpServiceConfig",s);const o=s.server||"http://localhost:7071";let t=e.uploadFile.split(".").join("/");this.action_url=o+"/"+t}}))},openDirectry(a){s.invoke(e.openDirectory,{id:a}).then((e=>{}))},selectDir(){s.invoke(e.selectFolder,"").then((e=>{this.dir_path=e,this.$message.info(e)}))},messageShow(){s.invoke(e.messageShow,"").then((e=>{this.$message.info(e)}))},messageShowConfirm(){s.invoke(e.messageShowConfirm,"").then((e=>{this.$message.info(e)}))},handleFileChange(e){if(console.log("handleFileChange-----"),""==this.action_url)return void this.$message.error("http服务未开启");const s=e.file.status;if("uploading"!==s&&console.log(e.file),"done"===s){const s=e.file.response;if(console.log("uploadRes:",s),"success"!==s.code)return this.$message.error(`file upload failed ${s.code} .`),!1;this.num++;const a=s.data;a.id=this.num,a.imageUrlText="image url",this.image_info.push(a),this.$message.success(`${e.file.name} file uploaded successfully.`)}else"error"===s&&this.$message.error(`${e.file.name} file upload failed.`)}}},m=e=>(u("data-v-d30dccef"),e=e(),p(),e),g={id:"app-base-file"},_=m((()=>n("div",{class:"one-block-1"},[n("span",null," 1. 系统原生对话框 ")],-1))),v={class:"one-block-2"},k=m((()=>n("div",{class:"one-block-1"},[n("span",null," 2. 选择保存目录 ")],-1))),C={class:"one-block-2"},b=m((()=>n("div",{class:"one-block-1"},[n("span",null," 3. 打开文件夹 ")],-1))),w={class:"one-block-2"},$=m((()=>n("div",{class:"one-block-1"},[n("span",null," 4. 上传文件到图床 ")],-1))),S={class:"one-block-2"},D=m((()=>n("p",{class:"ant-upload-drag-icon"},null,-1))),j=m((()=>n("p",{class:"ant-upload-text"}," 点击 或 拖拽文件到这里 ",-1))),y=m((()=>n("p",{class:"ant-upload-hint"}," 注意：请使用您自己的图床token ",-1))),F=m((()=>n("div",{class:"footer"},null,-1)));const x=o(h,[["render",function(e,s,a,o,u,p){const f=t("a-button"),h=t("a-space"),m=t("a-input"),x=t("a-col"),H=t("a-row"),V=t("a-card"),A=t("a-list-item"),I=t("a-list"),R=t("a-upload-dragger");return l(),i("div",g,[_,n("div",v,[d(h,null,{default:c((()=>[d(f,{onClick:s[0]||(s[0]=e=>p.messageShow())},{default:c((()=>[r("消息提示(ipc)")])),_:1}),d(f,{onClick:s[1]||(s[1]=e=>p.messageShowConfirm())},{default:c((()=>[r("消息提示与确认(ipc)")])),_:1})])),_:1})]),k,n("div",C,[d(H,null,{default:c((()=>[d(x,{span:12},{default:c((()=>[d(m,{modelValue:u.dir_path,"onUpdate:modelValue":s[2]||(s[2]=e=>u.dir_path=e),value:u.dir_path,"addon-before":"保存目录"},null,8,["modelValue","value"])])),_:1}),d(x,{span:12},{default:c((()=>[d(f,{onClick:p.selectDir},{default:c((()=>[r(" 修改目录 ")])),_:1},8,["onClick"])])),_:1})])),_:1})]),b,n("div",w,[d(I,{grid:{gutter:16,column:4},"data-source":u.file_list},{renderItem:c((({item:e})=>[d(A,{onClick:s=>p.openDirectry(e.id)},{default:c((()=>[d(V,{title:e.content},{default:c((()=>[d(f,{type:"link"},{default:c((()=>[r(" 打开 ")])),_:1})])),_:2},1032,["title"])])),_:2},1032,["onClick"])])),_:1},8,["data-source"])]),$,n("div",S,[d(R,{name:"file",multiple:!0,action:u.action_url,onChange:p.handleFileChange},{default:c((()=>[D,j,y])),_:1},8,["action","onChange"])]),F])}],["__scopeId","data-v-d30dccef"]]);export{x as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{s as a}from"./store2-5d974a5c.js";import{_ as o,r as t,o as l,b as i,g as n,a as d,w as c,e as r,p as u,f as p}from"./index-869350c9.js";const f=[{content:"【下载】目录",id:"downloads"},{content:"【图片】目录",id:"pictures"},{content:"【文档】目录",id:"documents"},{content:"【音乐】目录",id:"music"}],h={data:()=>({file_list:f,action_url:"",image_info:[],num:0,servicAddress:"",dir_path:"D:\\www\\ee"}),mounted(){this.getHost()},methods:{getHost(){s.invoke(e.checkHttpServer,{}).then((s=>{if(s.enable){this.servicAddress=s.server,a.set("httpServiceConfig",s);const o=s.server||"http://localhost:7071";let t=e.uploadFile.split(".").join("/");this.action_url=o+"/"+t}}))},openDirectry(a){s.invoke(e.openDirectory,{id:a}).then((e=>{}))},selectDir(){s.invoke(e.selectFolder,"").then((e=>{this.dir_path=e,this.$message.info(e)}))},messageShow(){s.invoke(e.messageShow,"").then((e=>{this.$message.info(e)}))},messageShowConfirm(){s.invoke(e.messageShowConfirm,"").then((e=>{this.$message.info(e)}))},handleFileChange(e){if(console.log("handleFileChange-----"),""==this.action_url)return void this.$message.error("http服务未开启");const s=e.file.status;if("uploading"!==s&&console.log(e.file),"done"===s){const s=e.file.response;if(console.log("uploadRes:",s),"success"!==s.code)return this.$message.error(`file upload failed ${s.code} .`),!1;this.num++;const a=s.data;a.id=this.num,a.imageUrlText="image url",this.image_info.push(a),this.$message.success(`${e.file.name} file uploaded successfully.`)}else"error"===s&&this.$message.error(`${e.file.name} file upload failed.`)}}},m=e=>(u("data-v-d30dccef"),e=e(),p(),e),g={id:"app-base-file"},_=m((()=>n("div",{class:"one-block-1"},[n("span",null," 1. 系统原生对话框 ")],-1))),v={class:"one-block-2"},k=m((()=>n("div",{class:"one-block-1"},[n("span",null," 2. 选择保存目录 ")],-1))),C={class:"one-block-2"},b=m((()=>n("div",{class:"one-block-1"},[n("span",null," 3. 打开文件夹 ")],-1))),w={class:"one-block-2"},$=m((()=>n("div",{class:"one-block-1"},[n("span",null," 4. 上传文件到图床 ")],-1))),S={class:"one-block-2"},D=m((()=>n("p",{class:"ant-upload-drag-icon"},null,-1))),j=m((()=>n("p",{class:"ant-upload-text"}," 点击 或 拖拽文件到这里 ",-1))),y=m((()=>n("p",{class:"ant-upload-hint"}," 注意：请使用您自己的图床token ",-1))),F=m((()=>n("div",{class:"footer"},null,-1)));const x=o(h,[["render",function(e,s,a,o,u,p){const f=t("a-button"),h=t("a-space"),m=t("a-input"),x=t("a-col"),H=t("a-row"),V=t("a-card"),A=t("a-list-item"),I=t("a-list"),R=t("a-upload-dragger");return l(),i("div",g,[_,n("div",v,[d(h,null,{default:c((()=>[d(f,{onClick:s[0]||(s[0]=e=>p.messageShow())},{default:c((()=>[r("消息提示(ipc)")])),_:1}),d(f,{onClick:s[1]||(s[1]=e=>p.messageShowConfirm())},{default:c((()=>[r("消息提示与确认(ipc)")])),_:1})])),_:1})]),k,n("div",C,[d(H,null,{default:c((()=>[d(x,{span:12},{default:c((()=>[d(m,{modelValue:u.dir_path,"onUpdate:modelValue":s[2]||(s[2]=e=>u.dir_path=e),value:u.dir_path,"addon-before":"保存目录"},null,8,["modelValue","value"])])),_:1}),d(x,{span:12},{default:c((()=>[d(f,{onClick:p.selectDir},{default:c((()=>[r(" 修改目录 ")])),_:1},8,["onClick"])])),_:1})])),_:1})]),b,n("div",w,[d(I,{grid:{gutter:16,column:4},"data-source":u.file_list},{renderItem:c((({item:e})=>[d(A,{onClick:s=>p.openDirectry(e.id)},{default:c((()=>[d(V,{title:e.content},{default:c((()=>[d(f,{type:"link"},{default:c((()=>[r(" 打开 ")])),_:1})])),_:2},1032,["title"])])),_:2},1032,["onClick"])])),_:1},8,["data-source"])]),$,n("div",S,[d(R,{name:"file",multiple:!0,action:u.action_url,onChange:p.handleFileChange},{default:c((()=>[D,j,y])),_:1},8,["action","onChange"])]),F])}],["__scopeId","data-v-d30dccef"]]);export{x as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-034efc6a.js
--- a/public/dist/assets/Index-3787ff4d.js
+++ b/public/dist/assets/Index-3787ff4d.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-5fee302f.js
+import{i as a}from"./main-d72f38de.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as s,r as t,o as n,b as c,g as l,a as o,w as d,e as i,F as r,d as u,p as f,f as p,c as b,t as k}from"./index-04ffc5d9.js";const m={data:()=>({data:[]}),methods:{getScreen(s){e.invoke(a.getScreen,s).then((a=>{this.data=a}))}}},_=a=>(f("data-v-5c2facb0"),a=a(),p(),a),v={id:"app-base-screen"},g=_((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 屏幕信息 ")],-1))),S={class:"one-block-2"},h=_((()=>l("div",{class:"one-block-1"},[l("span",null," 结果： ")],-1))),j={class:"one-block-2"};const C=s(m,[["render",function(a,e,s,f,p,m){const _=t("a-button"),C=t("a-space"),x=t("a-descriptions-item"),w=t("a-descriptions");return n(),c("div",v,[g,l("div",S,[o(C,null,{default:d((()=>[o(_,{onClick:e[0]||(e[0]=a=>m.getScreen(0))},{default:d((()=>[i("获取当前鼠标位置")])),_:1}),o(_,{onClick:e[1]||(e[1]=a=>m.getScreen(1))},{default:d((()=>[i("获取主屏幕")])),_:1}),o(_,{onClick:e[2]||(e[2]=a=>m.getScreen(2))},{default:d((()=>[i("获取所有屏幕")])),_:1})])),_:1})]),h,l("div",j,[o(w,{title:""},{default:d((()=>[(n(!0),c(r,null,u(p.data,((a,e)=>(n(),b(x,{key:e,label:a.title},{default:d((()=>[i(k(a.desc),1)])),_:2},1032,["label"])))),128))])),_:1})])])}],["__scopeId","data-v-5c2facb0"]]);export{C as default};
+========
+import{i as a}from"./main-ce25b28f.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as s,r as t,o as n,b as c,g as l,a as o,w as d,e as i,F as r,d as u,p as f,f as p,c as b,t as k}from"./index-869350c9.js";const m={data:()=>({data:[]}),methods:{getScreen(s){e.invoke(a.getScreen,s).then((a=>{this.data=a}))}}},_=a=>(f("data-v-5c2facb0"),a=a(),p(),a),v={id:"app-base-screen"},g=_((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 屏幕信息 ")],-1))),S={class:"one-block-2"},h=_((()=>l("div",{class:"one-block-1"},[l("span",null," 结果： ")],-1))),j={class:"one-block-2"};const C=s(m,[["render",function(a,e,s,f,p,m){const _=t("a-button"),C=t("a-space"),x=t("a-descriptions-item"),w=t("a-descriptions");return n(),c("div",v,[g,l("div",S,[o(C,null,{default:d((()=>[o(_,{onClick:e[0]||(e[0]=a=>m.getScreen(0))},{default:d((()=>[i("获取当前鼠标位置")])),_:1}),o(_,{onClick:e[1]||(e[1]=a=>m.getScreen(1))},{default:d((()=>[i("获取主屏幕")])),_:1}),o(_,{onClick:e[2]||(e[2]=a=>m.getScreen(2))},{default:d((()=>[i("获取所有屏幕")])),_:1})])),_:1})]),h,l("div",j,[o(w,{title:""},{default:d((()=>[(n(!0),c(r,null,u(p.data,((a,e)=>(n(),b(x,{key:e,label:a.title},{default:d((()=>[i(k(a.desc),1)])),_:2},1032,["label"])))),128))])),_:1})])])}],["__scopeId","data-v-5c2facb0"]]);export{C as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-3787ff4d.js
--- a/public/dist/assets/Index-3787ff4d.js.gz
+++ b/public/dist/assets/Index-3787ff4d.js.gz
--- a/public/dist/assets/Index-3fb421ed.js
+++ b/public/dist/assets/Index-3fb421ed.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-3fb421ed.js
 import{i as e}from"./main-d72f38de.js";import{i}from"./ipcRenderer-5e19eaee.js";import{_ as n,h as o,r as a,o as l,b as t,g as s,a as d,w,e as c,p as u,f as m}from"./index-04ffc5d9.js";const p={data:()=>({views:[{type:"web",content:"https://www.bilibili.com/",windowName:"window-web",windowTitle:"bilibili"},{type:"html",content:"/public/html/view_example.html",windowName:"window-html",windowTitle:"html window"},{type:"vue",content:"#/special/subwindow",windowName:"window-vue",windowTitle:"vue window"}]}),methods:{createWindow(n){i.invoke(e.createWindow,o(this.views[n])).then((e=>{console.log(e)}))}}},r=e=>(u("data-v-f82edd5f"),e=e(),m(),e),b={id:"app-base-window"},v=r((()=>s("div",{class:"one-block-1"},[s("span",null," 1. 新窗口中加载web内容 ")],-1))),f={class:"one-block-2"},h=r((()=>s("div",{class:"one-block-1"},[s("span",null," 2. 新窗口中加载html内容 ")],-1))),k={class:"one-block-2"},_=r((()=>s("div",{class:"one-block-1"},[s("span",null," 3. 新窗口中加载当前项目页面 ")],-1))),W={class:"one-block-2"};const j=n(p,[["render",function(e,i,n,o,u,m){const p=a("a-button"),r=a("a-space");return l(),t("div",b,[v,s("div",f,[d(r,null,{default:w((()=>[d(p,{onClick:i[0]||(i[0]=e=>m.createWindow(0))},{default:w((()=>[c("打开哔哩哔哩")])),_:1})])),_:1})]),h,s("div",k,[d(r,null,{default:w((()=>[d(p,{onClick:i[1]||(i[1]=e=>m.createWindow(1))},{default:w((()=>[c("打开html页面")])),_:1})])),_:1})]),_,s("div",W,[d(r,null,{default:w((()=>[d(p,{onClick:i[2]||(i[2]=e=>m.createWindow(2))},{default:w((()=>[c("打开vue页面")])),_:1})])),_:1})])])}],["__scopeId","data-v-f82edd5f"]]);export{j as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i}from"./ipcRenderer-5e19eaee.js";import{_ as n,h as o,r as a,o as l,b as t,g as s,a as d,w,e as c,p as u,f as m}from"./index-869350c9.js";const p={data:()=>({views:[{type:"web",content:"https://www.bilibili.com/",windowName:"window-web",windowTitle:"bilibili"},{type:"html",content:"/public/html/view_example.html",windowName:"window-html",windowTitle:"html window"},{type:"vue",content:"#/special/subwindow",windowName:"window-vue",windowTitle:"vue window"}]}),methods:{createWindow(n){i.invoke(e.createWindow,o(this.views[n])).then((e=>{console.log(e)}))}}},r=e=>(u("data-v-f82edd5f"),e=e(),m(),e),b={id:"app-base-window"},v=r((()=>s("div",{class:"one-block-1"},[s("span",null," 1. 新窗口中加载web内容 ")],-1))),f={class:"one-block-2"},h=r((()=>s("div",{class:"one-block-1"},[s("span",null," 2. 新窗口中加载html内容 ")],-1))),k={class:"one-block-2"},_=r((()=>s("div",{class:"one-block-1"},[s("span",null," 3. 新窗口中加载当前项目页面 ")],-1))),W={class:"one-block-2"};const j=n(p,[["render",function(e,i,n,o,u,m){const p=a("a-button"),r=a("a-space");return l(),t("div",b,[v,s("div",f,[d(r,null,{default:w((()=>[d(p,{onClick:i[0]||(i[0]=e=>m.createWindow(0))},{default:w((()=>[c("打开哔哩哔哩")])),_:1})])),_:1})]),h,s("div",k,[d(r,null,{default:w((()=>[d(p,{onClick:i[1]||(i[1]=e=>m.createWindow(1))},{default:w((()=>[c("打开html页面")])),_:1})])),_:1})]),_,s("div",W,[d(r,null,{default:w((()=>[d(p,{onClick:i[2]||(i[2]=e=>m.createWindow(2))},{default:w((()=>[c("打开vue页面")])),_:1})])),_:1})])])}],["__scopeId","data-v-f82edd5f"]]);export{j as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-53ee5687.js
--- a/public/dist/assets/Index-42e24823.js
+++ b/public/dist/assets/Index-42e24823.js
--- a/public/dist/assets/Index-46b18835.js
+++ b/public/dist/assets/Index-46b18835.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-c35a8796.js
+import{i as n}from"./main-d72f38de.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as a,r as o,o as i,b as t,g as c,a as p,w as s,e as m,p as y,f as l}from"./index-04ffc5d9.js";const d=[{name:"对话框",type:"icon-duihuakuang"},{name:"闹钟",type:"icon-naozhong"},{name:"笑脸",type:"icon-xiaolian"},{name:"ok",type:"icon-ok"},{name:"风车",type:"icon-fengche"},{name:"汗颜",type:"icon-hanyan"},{name:"相机",type:"icon-xiangji"},{name:"礼物",type:"icon-liwu"},{name:"礼花",type:"icon-lihua"},{name:"扭蛋",type:"icon-niudan"},{name:"流星",type:"icon-liuxing"},{name:"风筝",type:"icon-fengzheng"},{name:"蛋糕",type:"icon-dangao"},{name:"泡泡",type:"icon-paopao"},{name:"购物",type:"icon-gouwu"},{name:"饮料",type:"icon-yinliao"},{name:"云彩",type:"icon-yuncai"},{name:"彩铅",type:"icon-caiqian"},{name:"纸飞机",type:"icon-zhifeiji"},{name:"点赞",type:"icon-dianzan"},{name:"煎蛋",type:"icon-jiandan"},{name:"小熊",type:"icon-xiaoxiong"},{name:"花",type:"icon-hua"},{name:"眼睛",type:"icon-yanjing"}],u={data:()=>({type:1,iconData:d}),methods:{exec(a){console.log("process:",process);const o={id:a};e.invoke(n.test,o).then((n=>{console.log("res:",n)}))},exec2(n){}}},r={id:"app-base-test-api"},g=(n=>(y("data-v-e3ea38b6"),n=n(),l(),n))((()=>c("div",{class:"one-block-1"},[c("span",null," 1. 测试一些操作系统api ")],-1))),f={class:"one-block-2"};const x=a(u,[["render",function(n,e,a,y,l,d){const u=o("a-button"),x=o("a-space");return i(),t("div",r,[g,c("div",f,[p(x,null,{default:s((()=>[p(u,{onClick:e[0]||(e[0]=n=>d.exec(1))},{default:s((()=>[m(" 点击 ")])),_:1}),p(u,{onClick:e[1]||(e[1]=n=>d.exec2(1))},{default:s((()=>[m(" 点击2 ")])),_:1})])),_:1})])])}],["__scopeId","data-v-e3ea38b6"]]);export{x as default};
+========
+import{i as n}from"./main-ce25b28f.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as a,r as o,o as i,b as t,g as c,a as p,w as s,e as m,p as y,f as l}from"./index-869350c9.js";const d=[{name:"对话框",type:"icon-duihuakuang"},{name:"闹钟",type:"icon-naozhong"},{name:"笑脸",type:"icon-xiaolian"},{name:"ok",type:"icon-ok"},{name:"风车",type:"icon-fengche"},{name:"汗颜",type:"icon-hanyan"},{name:"相机",type:"icon-xiangji"},{name:"礼物",type:"icon-liwu"},{name:"礼花",type:"icon-lihua"},{name:"扭蛋",type:"icon-niudan"},{name:"流星",type:"icon-liuxing"},{name:"风筝",type:"icon-fengzheng"},{name:"蛋糕",type:"icon-dangao"},{name:"泡泡",type:"icon-paopao"},{name:"购物",type:"icon-gouwu"},{name:"饮料",type:"icon-yinliao"},{name:"云彩",type:"icon-yuncai"},{name:"彩铅",type:"icon-caiqian"},{name:"纸飞机",type:"icon-zhifeiji"},{name:"点赞",type:"icon-dianzan"},{name:"煎蛋",type:"icon-jiandan"},{name:"小熊",type:"icon-xiaoxiong"},{name:"花",type:"icon-hua"},{name:"眼睛",type:"icon-yanjing"}],u={data:()=>({type:1,iconData:d}),methods:{exec(a){console.log("process:",process);const o={id:a};e.invoke(n.test,o).then((n=>{console.log("res:",n)}))},exec2(n){}}},r={id:"app-base-test-api"},g=(n=>(y("data-v-e3ea38b6"),n=n(),l(),n))((()=>c("div",{class:"one-block-1"},[c("span",null," 1. 测试一些操作系统api ")],-1))),f={class:"one-block-2"};const x=a(u,[["render",function(n,e,a,y,l,d){const u=o("a-button"),x=o("a-space");return i(),t("div",r,[g,c("div",f,[p(x,null,{default:s((()=>[p(u,{onClick:e[0]||(e[0]=n=>d.exec(1))},{default:s((()=>[m(" 点击 ")])),_:1}),p(u,{onClick:e[1]||(e[1]=n=>d.exec2(1))},{default:s((()=>[m(" 点击2 ")])),_:1})])),_:1})])])}],["__scopeId","data-v-e3ea38b6"]]);export{x as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-46b18835.js
--- a/public/dist/assets/Index-46b18835.js.gz
+++ b/public/dist/assets/Index-46b18835.js.gz
--- a/public/dist/assets/Index-49dffb1d.js
+++ b/public/dist/assets/Index-49dffb1d.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-49dffb1d.js
 import{i as a}from"./main-d72f38de.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as t,r as n,o,b as s,g as u,a as c,w as i,p as l,f as h}from"./index-04ffc5d9.js";const d={data:()=>({autoLaunchChecked:!1}),mounted(){this.init()},methods:{init(){e.invoke(a.autoLaunch,"check").then((a=>{console.log("[ipcRenderer] [autoLaunch] result:",a),this.autoLaunchChecked=a.status}))},autoLaunchChange(a){console.log("[ipcRenderer] [autoLaunch] self.autoLaunchChecked:",this.autoLaunchChecked)}}},r=a=>(l("data-v-1b008e01"),a=a(),h(),a),m={id:"app-base-system-launch"},p={class:"one-block-2"},C=r((()=>u("a",null,"启动",-1))),L=r((()=>u("span",null," 开机自动启动 ",-1)));const k=t(d,[["render",function(a,e,t,l,h,d){const r=n("a-list-item-meta"),k=n("a-switch"),f=n("a-list-item"),g=n("a-list");return o(),s("div",m,[u("div",p,[c(g,{class:"set-auto",itemLayout:"horizontal"},{default:i((()=>[c(f,{style:{"text-align":"left"}},{actions:i((()=>[c(k,{modelValue:h.autoLaunchChecked,"onUpdate:modelValue":e[0]||(e[0]=a=>h.autoLaunchChecked=a),checkedChildren:"开",unCheckedChildren:"关",onChange:e[1]||(e[1]=a=>d.autoLaunchChange())},null,8,["modelValue"])])),default:i((()=>[c(r,null,{title:i((()=>[C])),description:i((()=>[L])),_:1})])),_:1})])),_:1})])])}],["__scopeId","data-v-1b008e01"]]);export{k as default};
+========
+import{i as a}from"./main-ce25b28f.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as t,r as n,o,b as s,g as u,a as c,w as i,p as l,f as h}from"./index-869350c9.js";const d={data:()=>({autoLaunchChecked:!1}),mounted(){this.init()},methods:{init(){e.invoke(a.autoLaunch,"check").then((a=>{console.log("[ipcRenderer] [autoLaunch] result:",a),this.autoLaunchChecked=a.status}))},autoLaunchChange(a){console.log("[ipcRenderer] [autoLaunch] self.autoLaunchChecked:",this.autoLaunchChecked)}}},r=a=>(l("data-v-1b008e01"),a=a(),h(),a),m={id:"app-base-system-launch"},p={class:"one-block-2"},C=r((()=>u("a",null,"启动",-1))),L=r((()=>u("span",null," 开机自动启动 ",-1)));const k=t(d,[["render",function(a,e,t,l,h,d){const r=n("a-list-item-meta"),k=n("a-switch"),f=n("a-list-item"),g=n("a-list");return o(),s("div",m,[u("div",p,[c(g,{class:"set-auto",itemLayout:"horizontal"},{default:i((()=>[c(f,{style:{"text-align":"left"}},{actions:i((()=>[c(k,{modelValue:h.autoLaunchChecked,"onUpdate:modelValue":e[0]||(e[0]=a=>h.autoLaunchChecked=a),checkedChildren:"开",unCheckedChildren:"关",onChange:e[1]||(e[1]=a=>d.autoLaunchChange())},null,8,["modelValue"])])),default:i((()=>[c(r,null,{title:i((()=>[C])),description:i((()=>[L])),_:1})])),_:1})])),_:1})])])}],["__scopeId","data-v-1b008e01"]]);export{k as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-afdf2d82.js
--- a/public/dist/assets/Index-53ee5687.js
+++ b/public/dist/assets/Index-53ee5687.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-3fb421ed.js
+import{i as e}from"./main-d72f38de.js";import{i}from"./ipcRenderer-5e19eaee.js";import{_ as n,h as o,r as a,o as l,b as t,g as s,a as d,w,e as c,p as u,f as m}from"./index-04ffc5d9.js";const p={data:()=>({views:[{type:"web",content:"https://www.bilibili.com/",windowName:"window-web",windowTitle:"bilibili"},{type:"html",content:"/public/html/view_example.html",windowName:"window-html",windowTitle:"html window"},{type:"vue",content:"#/special/subwindow",windowName:"window-vue",windowTitle:"vue window"}]}),methods:{createWindow(n){i.invoke(e.createWindow,o(this.views[n])).then((e=>{console.log(e)}))}}},r=e=>(u("data-v-f82edd5f"),e=e(),m(),e),b={id:"app-base-window"},v=r((()=>s("div",{class:"one-block-1"},[s("span",null," 1. 新窗口中加载web内容 ")],-1))),f={class:"one-block-2"},h=r((()=>s("div",{class:"one-block-1"},[s("span",null," 2. 新窗口中加载html内容 ")],-1))),k={class:"one-block-2"},_=r((()=>s("div",{class:"one-block-1"},[s("span",null," 3. 新窗口中加载当前项目页面 ")],-1))),W={class:"one-block-2"};const j=n(p,[["render",function(e,i,n,o,u,m){const p=a("a-button"),r=a("a-space");return l(),t("div",b,[v,s("div",f,[d(r,null,{default:w((()=>[d(p,{onClick:i[0]||(i[0]=e=>m.createWindow(0))},{default:w((()=>[c("打开哔哩哔哩")])),_:1})])),_:1})]),h,s("div",k,[d(r,null,{default:w((()=>[d(p,{onClick:i[1]||(i[1]=e=>m.createWindow(1))},{default:w((()=>[c("打开html页面")])),_:1})])),_:1})]),_,s("div",W,[d(r,null,{default:w((()=>[d(p,{onClick:i[2]||(i[2]=e=>m.createWindow(2))},{default:w((()=>[c("打开vue页面")])),_:1})])),_:1})])])}],["__scopeId","data-v-f82edd5f"]]);export{j as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i}from"./ipcRenderer-5e19eaee.js";import{_ as n,h as o,r as a,o as l,b as t,g as s,a as d,w,e as c,p as u,f as m}from"./index-869350c9.js";const p={data:()=>({views:[{type:"web",content:"https://www.bilibili.com/",windowName:"window-web",windowTitle:"bilibili"},{type:"html",content:"/public/html/view_example.html",windowName:"window-html",windowTitle:"html window"},{type:"vue",content:"#/special/subwindow",windowName:"window-vue",windowTitle:"vue window"}]}),methods:{createWindow(n){i.invoke(e.createWindow,o(this.views[n])).then((e=>{console.log(e)}))}}},r=e=>(u("data-v-f82edd5f"),e=e(),m(),e),b={id:"app-base-window"},v=r((()=>s("div",{class:"one-block-1"},[s("span",null," 1. 新窗口中加载web内容 ")],-1))),f={class:"one-block-2"},h=r((()=>s("div",{class:"one-block-1"},[s("span",null," 2. 新窗口中加载html内容 ")],-1))),k={class:"one-block-2"},_=r((()=>s("div",{class:"one-block-1"},[s("span",null," 3. 新窗口中加载当前项目页面 ")],-1))),W={class:"one-block-2"};const j=n(p,[["render",function(e,i,n,o,u,m){const p=a("a-button"),r=a("a-space");return l(),t("div",b,[v,s("div",f,[d(r,null,{default:w((()=>[d(p,{onClick:i[0]||(i[0]=e=>m.createWindow(0))},{default:w((()=>[c("打开哔哩哔哩")])),_:1})])),_:1})]),h,s("div",k,[d(r,null,{default:w((()=>[d(p,{onClick:i[1]||(i[1]=e=>m.createWindow(1))},{default:w((()=>[c("打开html页面")])),_:1})])),_:1})]),_,s("div",W,[d(r,null,{default:w((()=>[d(p,{onClick:i[2]||(i[2]=e=>m.createWindow(2))},{default:w((()=>[c("打开vue页面")])),_:1})])),_:1})])])}],["__scopeId","data-v-f82edd5f"]]);export{j as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-53ee5687.js
--- a/public/dist/assets/Index-53ee5687.js.gz
+++ b/public/dist/assets/Index-53ee5687.js.gz
--- a/public/dist/assets/Index-5fee302f.js
+++ b/public/dist/assets/Index-5fee302f.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-5fee302f.js
 import{i as a}from"./main-d72f38de.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as s,r as t,o as n,b as c,g as l,a as o,w as d,e as i,F as r,d as u,p as f,f as p,c as b,t as k}from"./index-04ffc5d9.js";const m={data:()=>({data:[]}),methods:{getScreen(s){e.invoke(a.getScreen,s).then((a=>{this.data=a}))}}},_=a=>(f("data-v-5c2facb0"),a=a(),p(),a),v={id:"app-base-screen"},g=_((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 屏幕信息 ")],-1))),S={class:"one-block-2"},h=_((()=>l("div",{class:"one-block-1"},[l("span",null," 结果： ")],-1))),j={class:"one-block-2"};const C=s(m,[["render",function(a,e,s,f,p,m){const _=t("a-button"),C=t("a-space"),x=t("a-descriptions-item"),w=t("a-descriptions");return n(),c("div",v,[g,l("div",S,[o(C,null,{default:d((()=>[o(_,{onClick:e[0]||(e[0]=a=>m.getScreen(0))},{default:d((()=>[i("获取当前鼠标位置")])),_:1}),o(_,{onClick:e[1]||(e[1]=a=>m.getScreen(1))},{default:d((()=>[i("获取主屏幕")])),_:1}),o(_,{onClick:e[2]||(e[2]=a=>m.getScreen(2))},{default:d((()=>[i("获取所有屏幕")])),_:1})])),_:1})]),h,l("div",j,[o(w,{title:""},{default:d((()=>[(n(!0),c(r,null,u(p.data,((a,e)=>(n(),b(x,{key:e,label:a.title},{default:d((()=>[i(k(a.desc),1)])),_:2},1032,["label"])))),128))])),_:1})])])}],["__scopeId","data-v-5c2facb0"]]);export{C as default};
+========
+import{i as a}from"./main-ce25b28f.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as s,r as t,o as n,b as c,g as l,a as o,w as d,e as i,F as r,d as u,p as f,f as p,c as b,t as k}from"./index-869350c9.js";const m={data:()=>({data:[]}),methods:{getScreen(s){e.invoke(a.getScreen,s).then((a=>{this.data=a}))}}},_=a=>(f("data-v-5c2facb0"),a=a(),p(),a),v={id:"app-base-screen"},g=_((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 屏幕信息 ")],-1))),S={class:"one-block-2"},h=_((()=>l("div",{class:"one-block-1"},[l("span",null," 结果： ")],-1))),j={class:"one-block-2"};const C=s(m,[["render",function(a,e,s,f,p,m){const _=t("a-button"),C=t("a-space"),x=t("a-descriptions-item"),w=t("a-descriptions");return n(),c("div",v,[g,l("div",S,[o(C,null,{default:d((()=>[o(_,{onClick:e[0]||(e[0]=a=>m.getScreen(0))},{default:d((()=>[i("获取当前鼠标位置")])),_:1}),o(_,{onClick:e[1]||(e[1]=a=>m.getScreen(1))},{default:d((()=>[i("获取主屏幕")])),_:1}),o(_,{onClick:e[2]||(e[2]=a=>m.getScreen(2))},{default:d((()=>[i("获取所有屏幕")])),_:1})])),_:1})]),h,l("div",j,[o(w,{title:""},{default:d((()=>[(n(!0),c(r,null,u(p.data,((a,e)=>(n(),b(x,{key:e,label:a.title},{default:d((()=>[i(k(a.desc),1)])),_:2},1032,["label"])))),128))])),_:1})])])}],["__scopeId","data-v-5c2facb0"]]);export{C as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-3787ff4d.js
--- a/public/dist/assets/Index-6658484b.js
+++ b/public/dist/assets/Index-6658484b.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-6658484b.js
 import{i as e}from"./main-d72f38de.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as i,h as s,r as a,o as n,b as l,g as o,a as r,w as d,e as c,t as u,p as m,f as v}from"./index-04ffc5d9.js";const p={data:()=>({defaultDeviceName:"",printerList:[],views:[{type:"html",content:"/public/html/view_example.html"}]}),mounted(){this.init()},methods:{init(){t.removeAllListeners(e.printStatus),t.on(e.printStatus,((e,t)=>{console.log("result",t),this.$message.info("打印中...")}))},getPrinter(){t.invoke(e.getPrinterList,{}).then((e=>{this.printerList=e}))},doPrint(i){console.log("defaultDeviceName:",this.defaultDeviceName);const a={view:s(this.views[i]),deviceName:this.defaultDeviceName};t.send(e.print,a)},defaultDevice(e){let t="";return e.isDefault&&(t="- 默认",this.defaultDeviceName=e.name),t}}},f=e=>(m("data-v-b732860b"),e=e(),v(),e),h={id:"app-hw-bluetooth"},b=f((()=>o("div",{class:"one-block-1"},[o("span",null," 1. 打印机设备 ")],-1))),k={class:"one-block-2"},D={class:"one-block-2"},_=f((()=>o("div",null,"设备列表",-1))),g=f((()=>o("div",{class:"one-block-1"},[o("span",null," 2. 打印内容 ")],-1))),N={class:"one-block-2"};const w=i(p,[["render",function(e,t,i,s,m,v){const p=a("a-button"),f=a("a-list-item"),w=a("a-list");return n(),l("div",h,[b,o("div",k,[r(p,{onClick:t[0]||(t[0]=e=>v.getPrinter())},{default:d((()=>[c(" 获取打印机列表 ")])),_:1})]),o("div",D,[r(w,{size:"small",bordered:"","data-source":m.printerList},{renderItem:d((({item:e})=>[r(f,null,{default:d((()=>[c(u(e.displayName)+" "+u(v.defaultDevice(e)),1)])),_:2},1024)])),header:d((()=>[_])),_:1},8,["data-source"])]),g,o("div",N,[r(p,{onClick:t[1]||(t[1]=e=>v.doPrint(0))},{default:d((()=>[c(" 打印一个页面 ")])),_:1})])])}],["__scopeId","data-v-b732860b"]]);export{w as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as i,h as s,r as a,o as n,b as l,g as o,a as r,w as d,e as c,t as u,p as m,f as v}from"./index-869350c9.js";const p={data:()=>({defaultDeviceName:"",printerList:[],views:[{type:"html",content:"/public/html/view_example.html"}]}),mounted(){this.init()},methods:{init(){t.removeAllListeners(e.printStatus),t.on(e.printStatus,((e,t)=>{console.log("result",t),this.$message.info("打印中...")}))},getPrinter(){t.invoke(e.getPrinterList,{}).then((e=>{this.printerList=e}))},doPrint(i){console.log("defaultDeviceName:",this.defaultDeviceName);const a={view:s(this.views[i]),deviceName:this.defaultDeviceName};t.send(e.print,a)},defaultDevice(e){let t="";return e.isDefault&&(t="- 默认",this.defaultDeviceName=e.name),t}}},f=e=>(m("data-v-b732860b"),e=e(),v(),e),h={id:"app-hw-bluetooth"},b=f((()=>o("div",{class:"one-block-1"},[o("span",null," 1. 打印机设备 ")],-1))),k={class:"one-block-2"},D={class:"one-block-2"},_=f((()=>o("div",null,"设备列表",-1))),g=f((()=>o("div",{class:"one-block-1"},[o("span",null," 2. 打印内容 ")],-1))),N={class:"one-block-2"};const w=i(p,[["render",function(e,t,i,s,m,v){const p=a("a-button"),f=a("a-list-item"),w=a("a-list");return n(),l("div",h,[b,o("div",k,[r(p,{onClick:t[0]||(t[0]=e=>v.getPrinter())},{default:d((()=>[c(" 获取打印机列表 ")])),_:1})]),o("div",D,[r(w,{size:"small",bordered:"","data-source":m.printerList},{renderItem:d((({item:e})=>[r(f,null,{default:d((()=>[c(u(e.displayName)+" "+u(v.defaultDevice(e)),1)])),_:2},1024)])),header:d((()=>[_])),_:1},8,["data-source"])]),g,o("div",N,[r(p,{onClick:t[1]||(t[1]=e=>v.doPrint(0))},{default:d((()=>[c(" 打印一个页面 ")])),_:1})])])}],["__scopeId","data-v-b732860b"]]);export{w as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-7f0cd861.js
--- a/public/dist/assets/Index-6bf27758.js
+++ b/public/dist/assets/Index-6bf27758.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-6bf27758.js
 import{s,i as e}from"./main-d72f38de.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as t,r as o,o as n,b as r,g as c,a as d,w as i,e as l,t as p,p as u,f as m}from"./index-04ffc5d9.js";const f={data:()=>({status:0,progress:"",percentNumber:0}),mounted(){this.init()},methods:{init(){a.removeAllListeners(s.appUpdater),a.on(s.appUpdater,((s,e)=>{e=JSON.parse(e),this.status=e.status,3==e.status?(this.progress=e.desc,this.percentNumber=e.percentNumber):this.$message.info(e.desc)}))},checkForUpdater(){a.invoke(e.checkForUpdater).then((s=>{console.log(s)}))},download(){1===this.status?a.invoke(e.downloadApp).then((s=>{console.log(s)})):this.$message.info("没有可用版本")}}},h=s=>(u("data-v-88c3fe69"),s=s(),m(),s),k={id:"app-demo-window"},v=h((()=>c("div",{class:"one-block-1"},[c("span",null," 1. 自动更新 ")],-1))),b={class:"one-block-2"},g=h((()=>c("div",{class:"one-block-1"},[c("span",null," 2. 下载进度 ")],-1))),_={class:"one-block-2"};const w=t(f,[["render",function(s,e,a,t,u,m){const f=o("a-button"),h=o("a-space"),w=o("a-progress");return n(),r("div",k,[v,c("div",b,[d(h,null,{default:i((()=>[d(f,{onClick:e[0]||(e[0]=s=>m.checkForUpdater())},{default:i((()=>[l("检查更新")])),_:1}),d(f,{onClick:e[1]||(e[1]=s=>m.download())},{default:i((()=>[l("下载并安装")])),_:1})])),_:1})]),g,c("div",_,[d(w,{percent:u.percentNumber,status:"active"},null,8,["percent"]),d(h,null,{default:i((()=>[l(p(u.progress),1)])),_:1})])])}],["__scopeId","data-v-88c3fe69"]]);export{w as default};
+========
+import{s,i as e}from"./main-ce25b28f.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as t,r as o,o as n,b as r,g as c,a as d,w as i,e as l,t as p,p as u,f as m}from"./index-869350c9.js";const f={data:()=>({status:0,progress:"",percentNumber:0}),mounted(){this.init()},methods:{init(){a.removeAllListeners(s.appUpdater),a.on(s.appUpdater,((s,e)=>{e=JSON.parse(e),this.status=e.status,3==e.status?(this.progress=e.desc,this.percentNumber=e.percentNumber):this.$message.info(e.desc)}))},checkForUpdater(){a.invoke(e.checkForUpdater).then((s=>{console.log(s)}))},download(){1===this.status?a.invoke(e.downloadApp).then((s=>{console.log(s)})):this.$message.info("没有可用版本")}}},h=s=>(u("data-v-88c3fe69"),s=s(),m(),s),k={id:"app-demo-window"},v=h((()=>c("div",{class:"one-block-1"},[c("span",null," 1. 自动更新 ")],-1))),b={class:"one-block-2"},g=h((()=>c("div",{class:"one-block-1"},[c("span",null," 2. 下载进度 ")],-1))),_={class:"one-block-2"};const w=t(f,[["render",function(s,e,a,t,u,m){const f=o("a-button"),h=o("a-space"),w=o("a-progress");return n(),r("div",k,[v,c("div",b,[d(h,null,{default:i((()=>[d(f,{onClick:e[0]||(e[0]=s=>m.checkForUpdater())},{default:i((()=>[l("检查更新")])),_:1}),d(f,{onClick:e[1]||(e[1]=s=>m.download())},{default:i((()=>[l("下载并安装")])),_:1})])),_:1})]),g,c("div",_,[d(w,{percent:u.percentNumber,status:"active"},null,8,["percent"]),d(h,null,{default:i((()=>[l(p(u.progress),1)])),_:1})])])}],["__scopeId","data-v-88c3fe69"]]);export{w as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-c62981d9.js
--- a/public/dist/assets/Index-739b1e83.js
+++ b/public/dist/assets/Index-739b1e83.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-739b1e83.js
 import{i as s}from"./main-d72f38de.js";import{i as r}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as o,o as i,b as p,g as l,a as t,w as d,e as a,t as n,p as u,f as c}from"./index-04ffc5d9.js";const g={data:()=>({processPids:"",progress1:0,progress2:0,progress3:0,progress4:0,progress5:0,progress6:0,progress1_pid:0,progress2_pid:0,progress3_pid:0,progress4_pid:0,progress5_pid:0,progress6_pid:0}),mounted(){this.init()},methods:{init(){r.removeAllListeners(s.timerJobProgress),r.removeAllListeners(s.createPoolNotice),r.on(s.timerJobProgress,((s,r)=>{switch(r.jobId){case 1:this.progress1=r.number,this.progress1_pid=0==r.pid?r.pid:this.progress1_pid;break;case 2:this.progress2=r.number,this.progress2_pid=0==r.pid?r.pid:this.progress2_pid;break;case 3:this.progress3=r.number,this.progress3_pid=0==r.pid?r.pid:this.progress3_pid;break;case 4:this.progress4=r.number,this.progress4_pid=0==r.pid?r.pid:this.progress4_pid;break;case 5:this.progress5=r.number,this.progress5_pid=0==r.pid?r.pid:this.progress5_pid;break;case 6:this.progress6=r.number,this.progress6_pid=0==r.pid?r.pid:this.progress6_pid}})),r.on(s.createPoolNotice,((s,r)=>{let e=JSON.stringify(r);this.processPids=e}))},runJob(e,o){let i={id:e,type:"timer",action:o};r.invoke(s.someJob,i).then((s=>{if("close"!=o)switch(s.jobId){case 1:this.progress1_pid=s.result.pid;break;case 2:this.progress2_pid=s.result.pid}}))},createPool(){r.send(s.createPool,{number:3})},runJobByPool(e,o){let i={id:e,type:"timer",action:o};r.invoke(s.someJobByPool,i).then((s=>{switch(s.jobId){case 3:this.progress3_pid=s.result.pid;break;case 4:this.progress4_pid=s.result.pid;break;case 5:this.progress5_pid=s.result.pid;break;case 6:this.progress6_pid=s.result.pid}}))}}},_=s=>(u("data-v-71705fa7"),s=s(),c(),s),b={id:"app-base-jobs"},h=_((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 任务 / 并发任务 ")],-1))),f={class:"one-block-2"},k=_((()=>l("p",null,null,-1))),m=_((()=>l("div",{class:"one-block-1"},[l("span",null," 2. 任务池 / 并发任务 ")],-1))),P={class:"one-block-2"},J=_((()=>l("p",null,null,-1))),v=_((()=>l("p",null,null,-1))),y=_((()=>l("p",null,null,-1))),C=_((()=>l("p",null,null,-1)));const j=e(g,[["render",function(s,r,e,u,c,g){const _=o("a-button"),j=o("a-space");return i(),p("div",b,[h,l("div",f,[t(j,null,{default:d((()=>[t(_,{onClick:r[0]||(r[0]=s=>g.runJob(1,"create"))},{default:d((()=>[a("执行任务1")])),_:1}),a(" 进度："+n(c.progress1)+" ， 进程pid："+n(c.progress1_pid)+" ",1),t(_,{onClick:r[1]||(r[1]=s=>g.runJob(1,"close"))},{default:d((()=>[a("关闭")])),_:1})])),_:1}),k,t(j,null,{default:d((()=>[t(_,{onClick:r[2]||(r[2]=s=>g.runJob(2,"create"))},{default:d((()=>[a("执行任务2")])),_:1}),a(" 进度："+n(c.progress2)+" ， 进程pid："+n(c.progress2_pid)+" ",1),t(_,{onClick:r[3]||(r[3]=s=>g.runJob(2,"close"))},{default:d((()=>[a("关闭")])),_:1})])),_:1})]),m,l("div",P,[t(j,null,{default:d((()=>[t(_,{onClick:r[4]||(r[4]=s=>g.createPool())},{default:d((()=>[a("创建进程池")])),_:1}),a(" 进程pids："+n(c.processPids),1)])),_:1}),J,t(j,null,{default:d((()=>[t(_,{onClick:r[5]||(r[5]=s=>g.runJobByPool(3,"run"))},{default:d((()=>[a("执行任务3")])),_:1}),a(" 进度："+n(c.progress3)+" ，进程pid："+n(c.progress3_pid),1)])),_:1}),v,t(j,null,{default:d((()=>[t(_,{onClick:r[6]||(r[6]=s=>g.runJobByPool(4,"run"))},{default:d((()=>[a("执行任务4")])),_:1}),a(" 进度："+n(c.progress4)+" ，进程pid："+n(c.progress4_pid),1)])),_:1}),y,t(j,null,{default:d((()=>[t(_,{onClick:r[7]||(r[7]=s=>g.runJobByPool(5,"run"))},{default:d((()=>[a("执行任务5")])),_:1}),a(" 进度："+n(c.progress5)+" ，进程pid："+n(c.progress5_pid),1)])),_:1}),C,t(j,null,{default:d((()=>[t(_,{onClick:r[8]||(r[8]=s=>g.runJobByPool(6,"run"))},{default:d((()=>[a("执行任务6")])),_:1}),a(" 进度："+n(c.progress6)+" ，进程pid："+n(c.progress6_pid),1)])),_:1})])])}],["__scopeId","data-v-71705fa7"]]);export{j as default};
+========
+import{i as s}from"./main-ce25b28f.js";import{i as r}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as o,o as i,b as p,g as l,a as t,w as d,e as a,t as n,p as u,f as c}from"./index-869350c9.js";const g={data:()=>({processPids:"",progress1:0,progress2:0,progress3:0,progress4:0,progress5:0,progress6:0,progress1_pid:0,progress2_pid:0,progress3_pid:0,progress4_pid:0,progress5_pid:0,progress6_pid:0}),mounted(){this.init()},methods:{init(){r.removeAllListeners(s.timerJobProgress),r.removeAllListeners(s.createPoolNotice),r.on(s.timerJobProgress,((s,r)=>{switch(r.jobId){case 1:this.progress1=r.number,this.progress1_pid=0==r.pid?r.pid:this.progress1_pid;break;case 2:this.progress2=r.number,this.progress2_pid=0==r.pid?r.pid:this.progress2_pid;break;case 3:this.progress3=r.number,this.progress3_pid=0==r.pid?r.pid:this.progress3_pid;break;case 4:this.progress4=r.number,this.progress4_pid=0==r.pid?r.pid:this.progress4_pid;break;case 5:this.progress5=r.number,this.progress5_pid=0==r.pid?r.pid:this.progress5_pid;break;case 6:this.progress6=r.number,this.progress6_pid=0==r.pid?r.pid:this.progress6_pid}})),r.on(s.createPoolNotice,((s,r)=>{let e=JSON.stringify(r);this.processPids=e}))},runJob(e,o){let i={id:e,type:"timer",action:o};r.invoke(s.someJob,i).then((s=>{if("close"!=o)switch(s.jobId){case 1:this.progress1_pid=s.result.pid;break;case 2:this.progress2_pid=s.result.pid}}))},createPool(){r.send(s.createPool,{number:3})},runJobByPool(e,o){let i={id:e,type:"timer",action:o};r.invoke(s.someJobByPool,i).then((s=>{switch(s.jobId){case 3:this.progress3_pid=s.result.pid;break;case 4:this.progress4_pid=s.result.pid;break;case 5:this.progress5_pid=s.result.pid;break;case 6:this.progress6_pid=s.result.pid}}))}}},_=s=>(u("data-v-71705fa7"),s=s(),c(),s),b={id:"app-base-jobs"},h=_((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 任务 / 并发任务 ")],-1))),f={class:"one-block-2"},k=_((()=>l("p",null,null,-1))),m=_((()=>l("div",{class:"one-block-1"},[l("span",null," 2. 任务池 / 并发任务 ")],-1))),P={class:"one-block-2"},J=_((()=>l("p",null,null,-1))),v=_((()=>l("p",null,null,-1))),y=_((()=>l("p",null,null,-1))),C=_((()=>l("p",null,null,-1)));const j=e(g,[["render",function(s,r,e,u,c,g){const _=o("a-button"),j=o("a-space");return i(),p("div",b,[h,l("div",f,[t(j,null,{default:d((()=>[t(_,{onClick:r[0]||(r[0]=s=>g.runJob(1,"create"))},{default:d((()=>[a("执行任务1")])),_:1}),a(" 进度："+n(c.progress1)+" ， 进程pid："+n(c.progress1_pid)+" ",1),t(_,{onClick:r[1]||(r[1]=s=>g.runJob(1,"close"))},{default:d((()=>[a("关闭")])),_:1})])),_:1}),k,t(j,null,{default:d((()=>[t(_,{onClick:r[2]||(r[2]=s=>g.runJob(2,"create"))},{default:d((()=>[a("执行任务2")])),_:1}),a(" 进度："+n(c.progress2)+" ， 进程pid："+n(c.progress2_pid)+" ",1),t(_,{onClick:r[3]||(r[3]=s=>g.runJob(2,"close"))},{default:d((()=>[a("关闭")])),_:1})])),_:1})]),m,l("div",P,[t(j,null,{default:d((()=>[t(_,{onClick:r[4]||(r[4]=s=>g.createPool())},{default:d((()=>[a("创建进程池")])),_:1}),a(" 进程pids："+n(c.processPids),1)])),_:1}),J,t(j,null,{default:d((()=>[t(_,{onClick:r[5]||(r[5]=s=>g.runJobByPool(3,"run"))},{default:d((()=>[a("执行任务3")])),_:1}),a(" 进度："+n(c.progress3)+" ，进程pid："+n(c.progress3_pid),1)])),_:1}),v,t(j,null,{default:d((()=>[t(_,{onClick:r[6]||(r[6]=s=>g.runJobByPool(4,"run"))},{default:d((()=>[a("执行任务4")])),_:1}),a(" 进度："+n(c.progress4)+" ，进程pid："+n(c.progress4_pid),1)])),_:1}),y,t(j,null,{default:d((()=>[t(_,{onClick:r[7]||(r[7]=s=>g.runJobByPool(5,"run"))},{default:d((()=>[a("执行任务5")])),_:1}),a(" 进度："+n(c.progress5)+" ，进程pid："+n(c.progress5_pid),1)])),_:1}),C,t(j,null,{default:d((()=>[t(_,{onClick:r[8]||(r[8]=s=>g.runJobByPool(6,"run"))},{default:d((()=>[a("执行任务6")])),_:1}),a(" 进度："+n(c.progress6)+" ，进程pid："+n(c.progress6_pid),1)])),_:1})])])}],["__scopeId","data-v-71705fa7"]]);export{j as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-a717c6f6.js
--- a/public/dist/assets/Index-7412a1d7.js
+++ b/public/dist/assets/Index-7412a1d7.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-818d29dc.js
+import{i as a}from"./main-d72f38de.js";import{i as o}from"./ipcRenderer-5e19eaee.js";import{_ as n,r as s,o as i,b as e,g as t,a as d,w as l,e as r,p as c,f as p}from"./index-04ffc5d9.js";const u={data:()=>({}),methods:{loginWindow(){this.$router.push({name:"SpecialLoginWindow",params:{}}),o.invoke(a.loginWindow,{width:400,height:300}).then((a=>{}))}}},f={id:"effect-login-index"},m=(a=>(c("data-v-3b73b158"),a=a(),p(),a))((()=>t("div",{class:"one-block-1"},[t("span",null," 1. 登录 ")],-1))),b={class:"one-block-2"};const g=n(u,[["render",function(a,o,n,c,p,u){const g=s("a-button"),h=s("a-space");return i(),e("div",f,[m,t("div",b,[d(h,null,{default:l((()=>[d(g,{onClick:o[0]||(o[0]=a=>u.loginWindow())},{default:l((()=>[r("切换为登录窗口")])),_:1})])),_:1})])])}],["__scopeId","data-v-3b73b158"]]);export{g as default};
+========
+import{i as a}from"./main-ce25b28f.js";import{i as o}from"./ipcRenderer-5e19eaee.js";import{_ as n,r as s,o as i,b as e,g as t,a as d,w as l,e as r,p as c,f as p}from"./index-869350c9.js";const u={data:()=>({}),methods:{loginWindow(){this.$router.push({name:"SpecialLoginWindow",params:{}}),o.invoke(a.loginWindow,{width:400,height:300}).then((a=>{}))}}},f={id:"effect-login-index"},m=(a=>(c("data-v-3b73b158"),a=a(),p(),a))((()=>t("div",{class:"one-block-1"},[t("span",null," 1. 登录 ")],-1))),b={class:"one-block-2"};const g=n(u,[["render",function(a,o,n,c,p,u){const g=s("a-button"),h=s("a-space");return i(),e("div",f,[m,t("div",b,[d(h,null,{default:l((()=>[d(g,{onClick:o[0]||(o[0]=a=>u.loginWindow())},{default:l((()=>[r("切换为登录窗口")])),_:1})])),_:1})])])}],["__scopeId","data-v-3b73b158"]]);export{g as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-7412a1d7.js
--- a/public/dist/assets/Index-74f192e6.js
+++ b/public/dist/assets/Index-74f192e6.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-74f192e6.js
 import{i as t}from"./main-d72f38de.js";import{i}from"./ipcRenderer-5e19eaee.js";import{_ as e,h as s,r as n,o,b as a,g as l,a as d,w as c,e as f,p as r,f as p}from"./index-04ffc5d9.js";const u={data:()=>({views:[{type:"main",title:"通知标题",subtitle:"副标题",body:"这是通知内容-默认",silent:!0},{type:"main",title:"提示音",subtitle:"副标题-提示音",body:"这是通知内容-提示音",silent:!1},{type:"main",title:"点击通知事件",subtitle:"副标题-点击通知事件",body:"这是通知内容-点击通知事件",clickEvent:!0},{type:"main",title:"关闭通知事件",subtitle:"副标题-关闭通知事件",body:"这是通知内容-点击通知事件",closeEvent:!0}]}),mounted(){this.init()},methods:{init(){i.removeAllListeners(t.sendNotification),i.on(t.sendNotification,((t,i)=>{"[object Object]"==Object.prototype.toString.call(i)&&this.$message.info(i.msg)}))},sendNotification(e){i.send(t.sendNotification,s(this.views[e]))}}},b={id:"app-base-notification"},m=(t=>(r("data-v-6555f14e"),t=t(),p(),t))((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 弹出桌面通知 ")],-1))),v={class:"one-block-2"};const y=e(u,[["render",function(t,i,e,s,r,p){const u=n("a-button"),y=n("a-space");return o(),a("div",b,[m,l("div",v,[d(y,null,{default:c((()=>[d(u,{onClick:i[0]||(i[0]=t=>p.sendNotification(0))},{default:c((()=>[f("默认")])),_:1}),d(u,{onClick:i[1]||(i[1]=t=>p.sendNotification(1))},{default:c((()=>[f("发出提示音")])),_:1}),d(u,{onClick:i[2]||(i[2]=t=>p.sendNotification(2))},{default:c((()=>[f("点击通知触发事件")])),_:1}),d(u,{onClick:i[3]||(i[3]=t=>p.sendNotification(3))},{default:c((()=>[f("关闭通知触发事件")])),_:1})])),_:1})])])}],["__scopeId","data-v-6555f14e"]]);export{y as default};
+========
+import{i as t}from"./main-ce25b28f.js";import{i}from"./ipcRenderer-5e19eaee.js";import{_ as e,h as s,r as n,o,b as a,g as l,a as d,w as c,e as f,p as r,f as p}from"./index-869350c9.js";const u={data:()=>({views:[{type:"main",title:"通知标题",subtitle:"副标题",body:"这是通知内容-默认",silent:!0},{type:"main",title:"提示音",subtitle:"副标题-提示音",body:"这是通知内容-提示音",silent:!1},{type:"main",title:"点击通知事件",subtitle:"副标题-点击通知事件",body:"这是通知内容-点击通知事件",clickEvent:!0},{type:"main",title:"关闭通知事件",subtitle:"副标题-关闭通知事件",body:"这是通知内容-点击通知事件",closeEvent:!0}]}),mounted(){this.init()},methods:{init(){i.removeAllListeners(t.sendNotification),i.on(t.sendNotification,((t,i)=>{"[object Object]"==Object.prototype.toString.call(i)&&this.$message.info(i.msg)}))},sendNotification(e){i.send(t.sendNotification,s(this.views[e]))}}},b={id:"app-base-notification"},m=(t=>(r("data-v-6555f14e"),t=t(),p(),t))((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 弹出桌面通知 ")],-1))),v={class:"one-block-2"};const y=e(u,[["render",function(t,i,e,s,r,p){const u=n("a-button"),y=n("a-space");return o(),a("div",b,[m,l("div",v,[d(y,null,{default:c((()=>[d(u,{onClick:i[0]||(i[0]=t=>p.sendNotification(0))},{default:c((()=>[f("默认")])),_:1}),d(u,{onClick:i[1]||(i[1]=t=>p.sendNotification(1))},{default:c((()=>[f("发出提示音")])),_:1}),d(u,{onClick:i[2]||(i[2]=t=>p.sendNotification(2))},{default:c((()=>[f("点击通知触发事件")])),_:1}),d(u,{onClick:i[3]||(i[3]=t=>p.sendNotification(3))},{default:c((()=>[f("关闭通知触发事件")])),_:1})])),_:1})])])}],["__scopeId","data-v-6555f14e"]]);export{y as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-b2727714.js
--- a/public/dist/assets/Index-7f0cd861.js
+++ b/public/dist/assets/Index-7f0cd861.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-6658484b.js
+import{i as e}from"./main-d72f38de.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as i,h as s,r as a,o as n,b as l,g as o,a as r,w as d,e as c,t as u,p as m,f as v}from"./index-04ffc5d9.js";const p={data:()=>({defaultDeviceName:"",printerList:[],views:[{type:"html",content:"/public/html/view_example.html"}]}),mounted(){this.init()},methods:{init(){t.removeAllListeners(e.printStatus),t.on(e.printStatus,((e,t)=>{console.log("result",t),this.$message.info("打印中...")}))},getPrinter(){t.invoke(e.getPrinterList,{}).then((e=>{this.printerList=e}))},doPrint(i){console.log("defaultDeviceName:",this.defaultDeviceName);const a={view:s(this.views[i]),deviceName:this.defaultDeviceName};t.send(e.print,a)},defaultDevice(e){let t="";return e.isDefault&&(t="- 默认",this.defaultDeviceName=e.name),t}}},f=e=>(m("data-v-b732860b"),e=e(),v(),e),h={id:"app-hw-bluetooth"},b=f((()=>o("div",{class:"one-block-1"},[o("span",null," 1. 打印机设备 ")],-1))),k={class:"one-block-2"},D={class:"one-block-2"},_=f((()=>o("div",null,"设备列表",-1))),g=f((()=>o("div",{class:"one-block-1"},[o("span",null," 2. 打印内容 ")],-1))),N={class:"one-block-2"};const w=i(p,[["render",function(e,t,i,s,m,v){const p=a("a-button"),f=a("a-list-item"),w=a("a-list");return n(),l("div",h,[b,o("div",k,[r(p,{onClick:t[0]||(t[0]=e=>v.getPrinter())},{default:d((()=>[c(" 获取打印机列表 ")])),_:1})]),o("div",D,[r(w,{size:"small",bordered:"","data-source":m.printerList},{renderItem:d((({item:e})=>[r(f,null,{default:d((()=>[c(u(e.displayName)+" "+u(v.defaultDevice(e)),1)])),_:2},1024)])),header:d((()=>[_])),_:1},8,["data-source"])]),g,o("div",N,[r(p,{onClick:t[1]||(t[1]=e=>v.doPrint(0))},{default:d((()=>[c(" 打印一个页面 ")])),_:1})])])}],["__scopeId","data-v-b732860b"]]);export{w as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as i,h as s,r as a,o as n,b as l,g as o,a as r,w as d,e as c,t as u,p as m,f as v}from"./index-869350c9.js";const p={data:()=>({defaultDeviceName:"",printerList:[],views:[{type:"html",content:"/public/html/view_example.html"}]}),mounted(){this.init()},methods:{init(){t.removeAllListeners(e.printStatus),t.on(e.printStatus,((e,t)=>{console.log("result",t),this.$message.info("打印中...")}))},getPrinter(){t.invoke(e.getPrinterList,{}).then((e=>{this.printerList=e}))},doPrint(i){console.log("defaultDeviceName:",this.defaultDeviceName);const a={view:s(this.views[i]),deviceName:this.defaultDeviceName};t.send(e.print,a)},defaultDevice(e){let t="";return e.isDefault&&(t="- 默认",this.defaultDeviceName=e.name),t}}},f=e=>(m("data-v-b732860b"),e=e(),v(),e),h={id:"app-hw-bluetooth"},b=f((()=>o("div",{class:"one-block-1"},[o("span",null," 1. 打印机设备 ")],-1))),k={class:"one-block-2"},D={class:"one-block-2"},_=f((()=>o("div",null,"设备列表",-1))),g=f((()=>o("div",{class:"one-block-1"},[o("span",null," 2. 打印内容 ")],-1))),N={class:"one-block-2"};const w=i(p,[["render",function(e,t,i,s,m,v){const p=a("a-button"),f=a("a-list-item"),w=a("a-list");return n(),l("div",h,[b,o("div",k,[r(p,{onClick:t[0]||(t[0]=e=>v.getPrinter())},{default:d((()=>[c(" 获取打印机列表 ")])),_:1})]),o("div",D,[r(w,{size:"small",bordered:"","data-source":m.printerList},{renderItem:d((({item:e})=>[r(f,null,{default:d((()=>[c(u(e.displayName)+" "+u(v.defaultDevice(e)),1)])),_:2},1024)])),header:d((()=>[_])),_:1},8,["data-source"])]),g,o("div",N,[r(p,{onClick:t[1]||(t[1]=e=>v.doPrint(0))},{default:d((()=>[c(" 打印一个页面 ")])),_:1})])])}],["__scopeId","data-v-b732860b"]]);export{w as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-7f0cd861.js
--- a/public/dist/assets/Index-7f0cd861.js.gz
+++ b/public/dist/assets/Index-7f0cd861.js.gz
--- a/public/dist/assets/Index-818d29dc.js
+++ b/public/dist/assets/Index-818d29dc.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-818d29dc.js
 import{i as a}from"./main-d72f38de.js";import{i as o}from"./ipcRenderer-5e19eaee.js";import{_ as n,r as s,o as i,b as e,g as t,a as d,w as l,e as r,p as c,f as p}from"./index-04ffc5d9.js";const u={data:()=>({}),methods:{loginWindow(){this.$router.push({name:"SpecialLoginWindow",params:{}}),o.invoke(a.loginWindow,{width:400,height:300}).then((a=>{}))}}},f={id:"effect-login-index"},m=(a=>(c("data-v-3b73b158"),a=a(),p(),a))((()=>t("div",{class:"one-block-1"},[t("span",null," 1. 登录 ")],-1))),b={class:"one-block-2"};const g=n(u,[["render",function(a,o,n,c,p,u){const g=s("a-button"),h=s("a-space");return i(),e("div",f,[m,t("div",b,[d(h,null,{default:l((()=>[d(g,{onClick:o[0]||(o[0]=a=>u.loginWindow())},{default:l((()=>[r("切换为登录窗口")])),_:1})])),_:1})])])}],["__scopeId","data-v-3b73b158"]]);export{g as default};
+========
+import{i as a}from"./main-ce25b28f.js";import{i as o}from"./ipcRenderer-5e19eaee.js";import{_ as n,r as s,o as i,b as e,g as t,a as d,w as l,e as r,p as c,f as p}from"./index-869350c9.js";const u={data:()=>({}),methods:{loginWindow(){this.$router.push({name:"SpecialLoginWindow",params:{}}),o.invoke(a.loginWindow,{width:400,height:300}).then((a=>{}))}}},f={id:"effect-login-index"},m=(a=>(c("data-v-3b73b158"),a=a(),p(),a))((()=>t("div",{class:"one-block-1"},[t("span",null," 1. 登录 ")],-1))),b={class:"one-block-2"};const g=n(u,[["render",function(a,o,n,c,p,u){const g=s("a-button"),h=s("a-space");return i(),e("div",f,[m,t("div",b,[d(h,null,{default:l((()=>[d(g,{onClick:o[0]||(o[0]=a=>u.loginWindow())},{default:l((()=>[r("切换为登录窗口")])),_:1})])),_:1})])])}],["__scopeId","data-v-3b73b158"]]);export{g as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-7412a1d7.js
--- a/public/dist/assets/Index-8b9c9ecd.js
+++ b/public/dist/assets/Index-8b9c9ecd.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-8b9c9ecd.js
 import{i as t}from"./main-d72f38de.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as n,r as o,o as e,b as a,g as i,a as r,w as l,t as c,p,f as u}from"./index-04ffc5d9.js";const d={data:()=>({currentStatus:"无"}),mounted(){this.init()},methods:{init(){s.removeAllListeners(t.initPowerMonitor),s.on(t.initPowerMonitor,((t,s)=>{"[object Object]"==Object.prototype.toString.call(s)&&(this.currentStatus=s.msg,this.$message.info(s.msg))})),s.send(t.initPowerMonitor,"")}}},m=t=>(p("data-v-564cbe99"),t=t(),u(),t),b={id:"app-base-powermonitor"},f=m((()=>i("div",{class:"one-block-1"},[i("span",null," 1. 监控电源状态 ")],-1))),j={class:"one-block-2"},v=m((()=>i("p",null,"* 拔掉电源，使用电池供电",-1))),g=m((()=>i("p",null,"* 接入电源",-1))),w=m((()=>i("p",null,"* 锁屏",-1))),h=m((()=>i("p",null,"* 解锁",-1)));const S=n(d,[["render",function(t,s,n,p,u,d){const m=o("a-space");return e(),a("div",b,[f,i("div",j,[r(m,null,{default:l((()=>[i("p",null,"* 当前状态："+c(u.currentStatus),1)])),_:1}),v,g,w,h])])}],["__scopeId","data-v-564cbe99"]]);export{S as default};
+========
+import{i as t}from"./main-ce25b28f.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as n,r as o,o as e,b as a,g as i,a as r,w as l,t as c,p,f as u}from"./index-869350c9.js";const d={data:()=>({currentStatus:"无"}),mounted(){this.init()},methods:{init(){s.removeAllListeners(t.initPowerMonitor),s.on(t.initPowerMonitor,((t,s)=>{"[object Object]"==Object.prototype.toString.call(s)&&(this.currentStatus=s.msg,this.$message.info(s.msg))})),s.send(t.initPowerMonitor,"")}}},m=t=>(p("data-v-564cbe99"),t=t(),u(),t),b={id:"app-base-powermonitor"},f=m((()=>i("div",{class:"one-block-1"},[i("span",null," 1. 监控电源状态 ")],-1))),j={class:"one-block-2"},v=m((()=>i("p",null,"* 拔掉电源，使用电池供电",-1))),g=m((()=>i("p",null,"* 接入电源",-1))),w=m((()=>i("p",null,"* 锁屏",-1))),h=m((()=>i("p",null,"* 解锁",-1)));const S=n(d,[["render",function(t,s,n,p,u,d){const m=o("a-space");return e(),a("div",b,[f,i("div",j,[r(m,null,{default:l((()=>[i("p",null,"* 当前状态："+c(u.currentStatus),1)])),_:1}),v,g,w,h])])}],["__scopeId","data-v-564cbe99"]]);export{S as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-bbf9da88.js
--- a/public/dist/assets/Index-90db42e6.js
+++ b/public/dist/assets/Index-90db42e6.js
--- a/public/dist/assets/Index-922a1229.js
+++ b/public/dist/assets/Index-922a1229.js
--- a/public/dist/assets/Index-922a1229.js.gz
+++ b/public/dist/assets/Index-922a1229.js.gz
--- a/public/dist/assets/Index-9990c62b.js
+++ b/public/dist/assets/Index-9990c62b.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-f4e201af.js
+import{i as e}from"./main-d72f38de.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as s,r as t,o,b as n,g as r,a as d,w as i,e as l,t as c,p,f as u}from"./index-04ffc5d9.js";const f={data:()=>({data:[{content:"powershell.exe",id:"powershell.exe"}]}),methods:{openSoft(s){a.invoke(e.openSoftware,s).then((e=>{e||this.$message.error("程序不存在")}))}}},m={id:"app-base-software-open"},b=(e=>(p("data-v-90e4d11c"),e=e(),u(),e))((()=>r("div",{class:"one-block-1"},[r("span",null," 1. 调用其它软件（exe、bash等可执行程序） "),r("p"),r("span",{class:"sub-content"}," 注：请先将【powershell.exe】复制到【electron-egg/build/extraResources】目录中 ")],-1))),h={class:"one-block-2"};const x=s(f,[["render",function(e,a,s,p,u,f){const x=t("a-button"),k=t("a-list-item"),v=t("a-list");return o(),n("div",m,[b,r("div",h,[d(v,{bordered:"","data-source":u.data},{renderItem:i((({item:e})=>[d(k,{onClick:a=>f.openSoft(e.id)},{default:i((()=>[l(c(e.content)+" ",1),d(x,{type:"link"},{default:i((()=>[l(" 执行 ")])),_:1})])),_:2},1032,["onClick"])])),_:1},8,["data-source"])])])}],["__scopeId","data-v-90e4d11c"]]);export{x as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as s,r as t,o,b as n,g as r,a as d,w as i,e as l,t as c,p,f as u}from"./index-869350c9.js";const f={data:()=>({data:[{content:"powershell.exe",id:"powershell.exe"}]}),methods:{openSoft(s){a.invoke(e.openSoftware,s).then((e=>{e||this.$message.error("程序不存在")}))}}},m={id:"app-base-software-open"},b=(e=>(p("data-v-90e4d11c"),e=e(),u(),e))((()=>r("div",{class:"one-block-1"},[r("span",null," 1. 调用其它软件（exe、bash等可执行程序） "),r("p"),r("span",{class:"sub-content"}," 注：请先将【powershell.exe】复制到【electron-egg/build/extraResources】目录中 ")],-1))),h={class:"one-block-2"};const x=s(f,[["render",function(e,a,s,p,u,f){const x=t("a-button"),k=t("a-list-item"),v=t("a-list");return o(),n("div",m,[b,r("div",h,[d(v,{bordered:"","data-source":u.data},{renderItem:i((({item:e})=>[d(k,{onClick:a=>f.openSoft(e.id)},{default:i((()=>[l(c(e.content)+" ",1),d(x,{type:"link"},{default:i((()=>[l(" 执行 ")])),_:1})])),_:2},1032,["onClick"])])),_:1},8,["data-source"])])])}],["__scopeId","data-v-90e4d11c"]]);export{x as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-9990c62b.js
--- a/public/dist/assets/Index-9990c62b.js.gz
+++ b/public/dist/assets/Index-9990c62b.js.gz
--- a/public/dist/assets/Index-a717c6f6.js
+++ b/public/dist/assets/Index-a717c6f6.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-739b1e83.js
+import{i as s}from"./main-d72f38de.js";import{i as r}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as o,o as i,b as p,g as l,a as t,w as d,e as a,t as n,p as u,f as c}from"./index-04ffc5d9.js";const g={data:()=>({processPids:"",progress1:0,progress2:0,progress3:0,progress4:0,progress5:0,progress6:0,progress1_pid:0,progress2_pid:0,progress3_pid:0,progress4_pid:0,progress5_pid:0,progress6_pid:0}),mounted(){this.init()},methods:{init(){r.removeAllListeners(s.timerJobProgress),r.removeAllListeners(s.createPoolNotice),r.on(s.timerJobProgress,((s,r)=>{switch(r.jobId){case 1:this.progress1=r.number,this.progress1_pid=0==r.pid?r.pid:this.progress1_pid;break;case 2:this.progress2=r.number,this.progress2_pid=0==r.pid?r.pid:this.progress2_pid;break;case 3:this.progress3=r.number,this.progress3_pid=0==r.pid?r.pid:this.progress3_pid;break;case 4:this.progress4=r.number,this.progress4_pid=0==r.pid?r.pid:this.progress4_pid;break;case 5:this.progress5=r.number,this.progress5_pid=0==r.pid?r.pid:this.progress5_pid;break;case 6:this.progress6=r.number,this.progress6_pid=0==r.pid?r.pid:this.progress6_pid}})),r.on(s.createPoolNotice,((s,r)=>{let e=JSON.stringify(r);this.processPids=e}))},runJob(e,o){let i={id:e,type:"timer",action:o};r.invoke(s.someJob,i).then((s=>{if("close"!=o)switch(s.jobId){case 1:this.progress1_pid=s.result.pid;break;case 2:this.progress2_pid=s.result.pid}}))},createPool(){r.send(s.createPool,{number:3})},runJobByPool(e,o){let i={id:e,type:"timer",action:o};r.invoke(s.someJobByPool,i).then((s=>{switch(s.jobId){case 3:this.progress3_pid=s.result.pid;break;case 4:this.progress4_pid=s.result.pid;break;case 5:this.progress5_pid=s.result.pid;break;case 6:this.progress6_pid=s.result.pid}}))}}},_=s=>(u("data-v-71705fa7"),s=s(),c(),s),b={id:"app-base-jobs"},h=_((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 任务 / 并发任务 ")],-1))),f={class:"one-block-2"},k=_((()=>l("p",null,null,-1))),m=_((()=>l("div",{class:"one-block-1"},[l("span",null," 2. 任务池 / 并发任务 ")],-1))),P={class:"one-block-2"},J=_((()=>l("p",null,null,-1))),v=_((()=>l("p",null,null,-1))),y=_((()=>l("p",null,null,-1))),C=_((()=>l("p",null,null,-1)));const j=e(g,[["render",function(s,r,e,u,c,g){const _=o("a-button"),j=o("a-space");return i(),p("div",b,[h,l("div",f,[t(j,null,{default:d((()=>[t(_,{onClick:r[0]||(r[0]=s=>g.runJob(1,"create"))},{default:d((()=>[a("执行任务1")])),_:1}),a(" 进度："+n(c.progress1)+" ， 进程pid："+n(c.progress1_pid)+" ",1),t(_,{onClick:r[1]||(r[1]=s=>g.runJob(1,"close"))},{default:d((()=>[a("关闭")])),_:1})])),_:1}),k,t(j,null,{default:d((()=>[t(_,{onClick:r[2]||(r[2]=s=>g.runJob(2,"create"))},{default:d((()=>[a("执行任务2")])),_:1}),a(" 进度："+n(c.progress2)+" ， 进程pid："+n(c.progress2_pid)+" ",1),t(_,{onClick:r[3]||(r[3]=s=>g.runJob(2,"close"))},{default:d((()=>[a("关闭")])),_:1})])),_:1})]),m,l("div",P,[t(j,null,{default:d((()=>[t(_,{onClick:r[4]||(r[4]=s=>g.createPool())},{default:d((()=>[a("创建进程池")])),_:1}),a(" 进程pids："+n(c.processPids),1)])),_:1}),J,t(j,null,{default:d((()=>[t(_,{onClick:r[5]||(r[5]=s=>g.runJobByPool(3,"run"))},{default:d((()=>[a("执行任务3")])),_:1}),a(" 进度："+n(c.progress3)+" ，进程pid："+n(c.progress3_pid),1)])),_:1}),v,t(j,null,{default:d((()=>[t(_,{onClick:r[6]||(r[6]=s=>g.runJobByPool(4,"run"))},{default:d((()=>[a("执行任务4")])),_:1}),a(" 进度："+n(c.progress4)+" ，进程pid："+n(c.progress4_pid),1)])),_:1}),y,t(j,null,{default:d((()=>[t(_,{onClick:r[7]||(r[7]=s=>g.runJobByPool(5,"run"))},{default:d((()=>[a("执行任务5")])),_:1}),a(" 进度："+n(c.progress5)+" ，进程pid："+n(c.progress5_pid),1)])),_:1}),C,t(j,null,{default:d((()=>[t(_,{onClick:r[8]||(r[8]=s=>g.runJobByPool(6,"run"))},{default:d((()=>[a("执行任务6")])),_:1}),a(" 进度："+n(c.progress6)+" ，进程pid："+n(c.progress6_pid),1)])),_:1})])])}],["__scopeId","data-v-71705fa7"]]);export{j as default};
+========
+import{i as s}from"./main-ce25b28f.js";import{i as r}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as o,o as i,b as p,g as l,a as t,w as d,e as a,t as n,p as u,f as c}from"./index-869350c9.js";const g={data:()=>({processPids:"",progress1:0,progress2:0,progress3:0,progress4:0,progress5:0,progress6:0,progress1_pid:0,progress2_pid:0,progress3_pid:0,progress4_pid:0,progress5_pid:0,progress6_pid:0}),mounted(){this.init()},methods:{init(){r.removeAllListeners(s.timerJobProgress),r.removeAllListeners(s.createPoolNotice),r.on(s.timerJobProgress,((s,r)=>{switch(r.jobId){case 1:this.progress1=r.number,this.progress1_pid=0==r.pid?r.pid:this.progress1_pid;break;case 2:this.progress2=r.number,this.progress2_pid=0==r.pid?r.pid:this.progress2_pid;break;case 3:this.progress3=r.number,this.progress3_pid=0==r.pid?r.pid:this.progress3_pid;break;case 4:this.progress4=r.number,this.progress4_pid=0==r.pid?r.pid:this.progress4_pid;break;case 5:this.progress5=r.number,this.progress5_pid=0==r.pid?r.pid:this.progress5_pid;break;case 6:this.progress6=r.number,this.progress6_pid=0==r.pid?r.pid:this.progress6_pid}})),r.on(s.createPoolNotice,((s,r)=>{let e=JSON.stringify(r);this.processPids=e}))},runJob(e,o){let i={id:e,type:"timer",action:o};r.invoke(s.someJob,i).then((s=>{if("close"!=o)switch(s.jobId){case 1:this.progress1_pid=s.result.pid;break;case 2:this.progress2_pid=s.result.pid}}))},createPool(){r.send(s.createPool,{number:3})},runJobByPool(e,o){let i={id:e,type:"timer",action:o};r.invoke(s.someJobByPool,i).then((s=>{switch(s.jobId){case 3:this.progress3_pid=s.result.pid;break;case 4:this.progress4_pid=s.result.pid;break;case 5:this.progress5_pid=s.result.pid;break;case 6:this.progress6_pid=s.result.pid}}))}}},_=s=>(u("data-v-71705fa7"),s=s(),c(),s),b={id:"app-base-jobs"},h=_((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 任务 / 并发任务 ")],-1))),f={class:"one-block-2"},k=_((()=>l("p",null,null,-1))),m=_((()=>l("div",{class:"one-block-1"},[l("span",null," 2. 任务池 / 并发任务 ")],-1))),P={class:"one-block-2"},J=_((()=>l("p",null,null,-1))),v=_((()=>l("p",null,null,-1))),y=_((()=>l("p",null,null,-1))),C=_((()=>l("p",null,null,-1)));const j=e(g,[["render",function(s,r,e,u,c,g){const _=o("a-button"),j=o("a-space");return i(),p("div",b,[h,l("div",f,[t(j,null,{default:d((()=>[t(_,{onClick:r[0]||(r[0]=s=>g.runJob(1,"create"))},{default:d((()=>[a("执行任务1")])),_:1}),a(" 进度："+n(c.progress1)+" ， 进程pid："+n(c.progress1_pid)+" ",1),t(_,{onClick:r[1]||(r[1]=s=>g.runJob(1,"close"))},{default:d((()=>[a("关闭")])),_:1})])),_:1}),k,t(j,null,{default:d((()=>[t(_,{onClick:r[2]||(r[2]=s=>g.runJob(2,"create"))},{default:d((()=>[a("执行任务2")])),_:1}),a(" 进度："+n(c.progress2)+" ， 进程pid："+n(c.progress2_pid)+" ",1),t(_,{onClick:r[3]||(r[3]=s=>g.runJob(2,"close"))},{default:d((()=>[a("关闭")])),_:1})])),_:1})]),m,l("div",P,[t(j,null,{default:d((()=>[t(_,{onClick:r[4]||(r[4]=s=>g.createPool())},{default:d((()=>[a("创建进程池")])),_:1}),a(" 进程pids："+n(c.processPids),1)])),_:1}),J,t(j,null,{default:d((()=>[t(_,{onClick:r[5]||(r[5]=s=>g.runJobByPool(3,"run"))},{default:d((()=>[a("执行任务3")])),_:1}),a(" 进度："+n(c.progress3)+" ，进程pid："+n(c.progress3_pid),1)])),_:1}),v,t(j,null,{default:d((()=>[t(_,{onClick:r[6]||(r[6]=s=>g.runJobByPool(4,"run"))},{default:d((()=>[a("执行任务4")])),_:1}),a(" 进度："+n(c.progress4)+" ，进程pid："+n(c.progress4_pid),1)])),_:1}),y,t(j,null,{default:d((()=>[t(_,{onClick:r[7]||(r[7]=s=>g.runJobByPool(5,"run"))},{default:d((()=>[a("执行任务5")])),_:1}),a(" 进度："+n(c.progress5)+" ，进程pid："+n(c.progress5_pid),1)])),_:1}),C,t(j,null,{default:d((()=>[t(_,{onClick:r[8]||(r[8]=s=>g.runJobByPool(6,"run"))},{default:d((()=>[a("执行任务6")])),_:1}),a(" 进度："+n(c.progress6)+" ，进程pid："+n(c.progress6_pid),1)])),_:1})])])}],["__scopeId","data-v-71705fa7"]]);export{j as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-a717c6f6.js
--- a/public/dist/assets/Index-a717c6f6.js.gz
+++ b/public/dist/assets/Index-a717c6f6.js.gz
--- a/public/dist/assets/Index-afdf2d82.js
+++ b/public/dist/assets/Index-afdf2d82.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-49dffb1d.js
+import{i as a}from"./main-d72f38de.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as t,r as n,o,b as s,g as u,a as c,w as i,p as l,f as h}from"./index-04ffc5d9.js";const d={data:()=>({autoLaunchChecked:!1}),mounted(){this.init()},methods:{init(){e.invoke(a.autoLaunch,"check").then((a=>{console.log("[ipcRenderer] [autoLaunch] result:",a),this.autoLaunchChecked=a.status}))},autoLaunchChange(a){console.log("[ipcRenderer] [autoLaunch] self.autoLaunchChecked:",this.autoLaunchChecked)}}},r=a=>(l("data-v-1b008e01"),a=a(),h(),a),m={id:"app-base-system-launch"},p={class:"one-block-2"},C=r((()=>u("a",null,"启动",-1))),L=r((()=>u("span",null," 开机自动启动 ",-1)));const k=t(d,[["render",function(a,e,t,l,h,d){const r=n("a-list-item-meta"),k=n("a-switch"),f=n("a-list-item"),g=n("a-list");return o(),s("div",m,[u("div",p,[c(g,{class:"set-auto",itemLayout:"horizontal"},{default:i((()=>[c(f,{style:{"text-align":"left"}},{actions:i((()=>[c(k,{modelValue:h.autoLaunchChecked,"onUpdate:modelValue":e[0]||(e[0]=a=>h.autoLaunchChecked=a),checkedChildren:"开",unCheckedChildren:"关",onChange:e[1]||(e[1]=a=>d.autoLaunchChange())},null,8,["modelValue"])])),default:i((()=>[c(r,null,{title:i((()=>[C])),description:i((()=>[L])),_:1})])),_:1})])),_:1})])])}],["__scopeId","data-v-1b008e01"]]);export{k as default};
+========
+import{i as a}from"./main-ce25b28f.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as t,r as n,o,b as s,g as u,a as c,w as i,p as l,f as h}from"./index-869350c9.js";const d={data:()=>({autoLaunchChecked:!1}),mounted(){this.init()},methods:{init(){e.invoke(a.autoLaunch,"check").then((a=>{console.log("[ipcRenderer] [autoLaunch] result:",a),this.autoLaunchChecked=a.status}))},autoLaunchChange(a){console.log("[ipcRenderer] [autoLaunch] self.autoLaunchChecked:",this.autoLaunchChecked)}}},r=a=>(l("data-v-1b008e01"),a=a(),h(),a),m={id:"app-base-system-launch"},p={class:"one-block-2"},C=r((()=>u("a",null,"启动",-1))),L=r((()=>u("span",null," 开机自动启动 ",-1)));const k=t(d,[["render",function(a,e,t,l,h,d){const r=n("a-list-item-meta"),k=n("a-switch"),f=n("a-list-item"),g=n("a-list");return o(),s("div",m,[u("div",p,[c(g,{class:"set-auto",itemLayout:"horizontal"},{default:i((()=>[c(f,{style:{"text-align":"left"}},{actions:i((()=>[c(k,{modelValue:h.autoLaunchChecked,"onUpdate:modelValue":e[0]||(e[0]=a=>h.autoLaunchChecked=a),checkedChildren:"开",unCheckedChildren:"关",onChange:e[1]||(e[1]=a=>d.autoLaunchChange())},null,8,["modelValue"])])),default:i((()=>[c(r,null,{title:i((()=>[C])),description:i((()=>[L])),_:1})])),_:1})])),_:1})])])}],["__scopeId","data-v-1b008e01"]]);export{k as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-afdf2d82.js
--- a/public/dist/assets/Index-afdf2d82.js.gz
+++ b/public/dist/assets/Index-afdf2d82.js.gz
--- a/public/dist/assets/Index-b2727714.js
+++ b/public/dist/assets/Index-b2727714.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-74f192e6.js
+import{i as t}from"./main-d72f38de.js";import{i}from"./ipcRenderer-5e19eaee.js";import{_ as e,h as s,r as n,o,b as a,g as l,a as d,w as c,e as f,p as r,f as p}from"./index-04ffc5d9.js";const u={data:()=>({views:[{type:"main",title:"通知标题",subtitle:"副标题",body:"这是通知内容-默认",silent:!0},{type:"main",title:"提示音",subtitle:"副标题-提示音",body:"这是通知内容-提示音",silent:!1},{type:"main",title:"点击通知事件",subtitle:"副标题-点击通知事件",body:"这是通知内容-点击通知事件",clickEvent:!0},{type:"main",title:"关闭通知事件",subtitle:"副标题-关闭通知事件",body:"这是通知内容-点击通知事件",closeEvent:!0}]}),mounted(){this.init()},methods:{init(){i.removeAllListeners(t.sendNotification),i.on(t.sendNotification,((t,i)=>{"[object Object]"==Object.prototype.toString.call(i)&&this.$message.info(i.msg)}))},sendNotification(e){i.send(t.sendNotification,s(this.views[e]))}}},b={id:"app-base-notification"},m=(t=>(r("data-v-6555f14e"),t=t(),p(),t))((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 弹出桌面通知 ")],-1))),v={class:"one-block-2"};const y=e(u,[["render",function(t,i,e,s,r,p){const u=n("a-button"),y=n("a-space");return o(),a("div",b,[m,l("div",v,[d(y,null,{default:c((()=>[d(u,{onClick:i[0]||(i[0]=t=>p.sendNotification(0))},{default:c((()=>[f("默认")])),_:1}),d(u,{onClick:i[1]||(i[1]=t=>p.sendNotification(1))},{default:c((()=>[f("发出提示音")])),_:1}),d(u,{onClick:i[2]||(i[2]=t=>p.sendNotification(2))},{default:c((()=>[f("点击通知触发事件")])),_:1}),d(u,{onClick:i[3]||(i[3]=t=>p.sendNotification(3))},{default:c((()=>[f("关闭通知触发事件")])),_:1})])),_:1})])])}],["__scopeId","data-v-6555f14e"]]);export{y as default};
+========
+import{i as t}from"./main-ce25b28f.js";import{i}from"./ipcRenderer-5e19eaee.js";import{_ as e,h as s,r as n,o,b as a,g as l,a as d,w as c,e as f,p as r,f as p}from"./index-869350c9.js";const u={data:()=>({views:[{type:"main",title:"通知标题",subtitle:"副标题",body:"这是通知内容-默认",silent:!0},{type:"main",title:"提示音",subtitle:"副标题-提示音",body:"这是通知内容-提示音",silent:!1},{type:"main",title:"点击通知事件",subtitle:"副标题-点击通知事件",body:"这是通知内容-点击通知事件",clickEvent:!0},{type:"main",title:"关闭通知事件",subtitle:"副标题-关闭通知事件",body:"这是通知内容-点击通知事件",closeEvent:!0}]}),mounted(){this.init()},methods:{init(){i.removeAllListeners(t.sendNotification),i.on(t.sendNotification,((t,i)=>{"[object Object]"==Object.prototype.toString.call(i)&&this.$message.info(i.msg)}))},sendNotification(e){i.send(t.sendNotification,s(this.views[e]))}}},b={id:"app-base-notification"},m=(t=>(r("data-v-6555f14e"),t=t(),p(),t))((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 弹出桌面通知 ")],-1))),v={class:"one-block-2"};const y=e(u,[["render",function(t,i,e,s,r,p){const u=n("a-button"),y=n("a-space");return o(),a("div",b,[m,l("div",v,[d(y,null,{default:c((()=>[d(u,{onClick:i[0]||(i[0]=t=>p.sendNotification(0))},{default:c((()=>[f("默认")])),_:1}),d(u,{onClick:i[1]||(i[1]=t=>p.sendNotification(1))},{default:c((()=>[f("发出提示音")])),_:1}),d(u,{onClick:i[2]||(i[2]=t=>p.sendNotification(2))},{default:c((()=>[f("点击通知触发事件")])),_:1}),d(u,{onClick:i[3]||(i[3]=t=>p.sendNotification(3))},{default:c((()=>[f("关闭通知触发事件")])),_:1})])),_:1})])])}],["__scopeId","data-v-6555f14e"]]);export{y as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-b2727714.js
--- a/public/dist/assets/Index-b2727714.js.gz
+++ b/public/dist/assets/Index-b2727714.js.gz
--- a/public/dist/assets/Index-bbf9da88.js
+++ b/public/dist/assets/Index-bbf9da88.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-8b9c9ecd.js
+import{i as t}from"./main-d72f38de.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as n,r as o,o as e,b as a,g as i,a as r,w as l,t as c,p,f as u}from"./index-04ffc5d9.js";const d={data:()=>({currentStatus:"无"}),mounted(){this.init()},methods:{init(){s.removeAllListeners(t.initPowerMonitor),s.on(t.initPowerMonitor,((t,s)=>{"[object Object]"==Object.prototype.toString.call(s)&&(this.currentStatus=s.msg,this.$message.info(s.msg))})),s.send(t.initPowerMonitor,"")}}},m=t=>(p("data-v-564cbe99"),t=t(),u(),t),b={id:"app-base-powermonitor"},f=m((()=>i("div",{class:"one-block-1"},[i("span",null," 1. 监控电源状态 ")],-1))),j={class:"one-block-2"},v=m((()=>i("p",null,"* 拔掉电源，使用电池供电",-1))),g=m((()=>i("p",null,"* 接入电源",-1))),w=m((()=>i("p",null,"* 锁屏",-1))),h=m((()=>i("p",null,"* 解锁",-1)));const S=n(d,[["render",function(t,s,n,p,u,d){const m=o("a-space");return e(),a("div",b,[f,i("div",j,[r(m,null,{default:l((()=>[i("p",null,"* 当前状态："+c(u.currentStatus),1)])),_:1}),v,g,w,h])])}],["__scopeId","data-v-564cbe99"]]);export{S as default};
+========
+import{i as t}from"./main-ce25b28f.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as n,r as o,o as e,b as a,g as i,a as r,w as l,t as c,p,f as u}from"./index-869350c9.js";const d={data:()=>({currentStatus:"无"}),mounted(){this.init()},methods:{init(){s.removeAllListeners(t.initPowerMonitor),s.on(t.initPowerMonitor,((t,s)=>{"[object Object]"==Object.prototype.toString.call(s)&&(this.currentStatus=s.msg,this.$message.info(s.msg))})),s.send(t.initPowerMonitor,"")}}},m=t=>(p("data-v-564cbe99"),t=t(),u(),t),b={id:"app-base-powermonitor"},f=m((()=>i("div",{class:"one-block-1"},[i("span",null," 1. 监控电源状态 ")],-1))),j={class:"one-block-2"},v=m((()=>i("p",null,"* 拔掉电源，使用电池供电",-1))),g=m((()=>i("p",null,"* 接入电源",-1))),w=m((()=>i("p",null,"* 锁屏",-1))),h=m((()=>i("p",null,"* 解锁",-1)));const S=n(d,[["render",function(t,s,n,p,u,d){const m=o("a-space");return e(),a("div",b,[f,i("div",j,[r(m,null,{default:l((()=>[i("p",null,"* 当前状态："+c(u.currentStatus),1)])),_:1}),v,g,w,h])])}],["__scopeId","data-v-564cbe99"]]);export{S as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-bbf9da88.js
--- a/public/dist/assets/Index-bbf9da88.js.gz
+++ b/public/dist/assets/Index-bbf9da88.js.gz
--- a/public/dist/assets/Index-c18b5384.js
+++ b/public/dist/assets/Index-c18b5384.js
@@ -0,0 +1 @@
+import{i as e}from"./main-ce25b28f.js";import{i as l}from"./ipcRenderer-5e19eaee.js";import{a as s}from"./index-71914d0e.js";import{_ as o,r as a,o as t,b as n,g as i,a as r,w as c,e as d,p as u,f as p}from"./index-869350c9.js";const k={data:()=>({type:1,serverUrl:""}),methods:{info(){l.invoke(e.crossInfo,{}).then((e=>{console.log("res:",e)}))},getUrl(){l.invoke(e.getCrossUrl,{name:"goapp"}).then((e=>{this.serverUrl=e,this.$message.info(`服务地址: ${e}`)}))},kill(){l.invoke(e.killCrossServer,{type:"one",name:"goapp"})},killAll(){l.invoke(e.killCrossServer,{type:"all",name:"goapp"})},create(){l.invoke(e.createCrossServer,{service:"go"})},request(o){if(1!=o||""!=this.serverUrl)if(1==o){const e=this.serverUrl+"/api/hello";s({method:"get",url:e,params:{id:"1111111"},timeout:1e3}).then((e=>{console.log("res:",e);const l=e.data.data||null;this.$message.info(`服务返回: ${l}`)}))}else l.invoke(e.requestApi,{name:"goapp"}).then((e=>{console.log("res:",e);const l=e.data||null;this.$message.info(`服务返回: ${l}`)}));else this.$message.info("请先获取服务地址")}}},f=e=>(u("data-v-28ca45de"),e=e(),p(),e),v={id:"app-cross-go"},m=f((()=>i("div",{class:"one-block-1"},[i("span",null," 1. 基础控制 ")],-1))),g={class:"one-block-2"},h=f((()=>i("div",{class:"one-block-1"},[i("span",null," 2. 发送http请求 ")],-1))),_={class:"one-block-2"},C=f((()=>i("div",{class:"one-block-1"},[i("span",null," 3. 多个服务 ")],-1))),b={class:"one-block-2"};const U=o(k,[["render",function(e,l,s,o,u,p){const k=a("a-button"),f=a("a-space");return t(),n("div",v,[m,i("div",g,[r(f,null,{default:c((()=>[r(k,{onClick:l[0]||(l[0]=e=>p.getUrl())},{default:c((()=>[d(" 获取地址 ")])),_:1}),r(k,{onClick:l[1]||(l[1]=e=>p.kill())},{default:c((()=>[d(" kill ")])),_:1}),r(k,{onClick:l[2]||(l[2]=e=>p.create())},{default:c((()=>[d(" 启动 ")])),_:1}),r(k,{onClick:l[3]||(l[3]=e=>p.info())},{default:c((()=>[d(" 查看 ")])),_:1})])),_:1})]),h,i("div",_,[r(f,null,{default:c((()=>[r(k,{onClick:l[4]||(l[4]=e=>p.request(1))},{default:c((()=>[d(" 前端发送 ")])),_:1}),r(k,{onClick:l[5]||(l[5]=e=>p.request(2))},{default:c((()=>[d(" 主进程发送 ")])),_:1})])),_:1})]),C,i("div",b,[r(f,null,{default:c((()=>[r(k,{onClick:l[6]||(l[6]=e=>p.create())},{default:c((()=>[d(" 再启动一个 ")])),_:1}),r(k,{onClick:l[7]||(l[7]=e=>p.killAll())},{default:c((()=>[d(" kill所有 ")])),_:1})])),_:1})])])}],["__scopeId","data-v-28ca45de"]]);export{U as default};
--- a/public/dist/assets/Index-c18b5384.js.gz
+++ b/public/dist/assets/Index-c18b5384.js.gz
--- a/public/dist/assets/Index-c35a8796.js
+++ b/public/dist/assets/Index-c35a8796.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-c35a8796.js
 import{i as n}from"./main-d72f38de.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as a,r as o,o as i,b as t,g as c,a as p,w as s,e as m,p as y,f as l}from"./index-04ffc5d9.js";const d=[{name:"对话框",type:"icon-duihuakuang"},{name:"闹钟",type:"icon-naozhong"},{name:"笑脸",type:"icon-xiaolian"},{name:"ok",type:"icon-ok"},{name:"风车",type:"icon-fengche"},{name:"汗颜",type:"icon-hanyan"},{name:"相机",type:"icon-xiangji"},{name:"礼物",type:"icon-liwu"},{name:"礼花",type:"icon-lihua"},{name:"扭蛋",type:"icon-niudan"},{name:"流星",type:"icon-liuxing"},{name:"风筝",type:"icon-fengzheng"},{name:"蛋糕",type:"icon-dangao"},{name:"泡泡",type:"icon-paopao"},{name:"购物",type:"icon-gouwu"},{name:"饮料",type:"icon-yinliao"},{name:"云彩",type:"icon-yuncai"},{name:"彩铅",type:"icon-caiqian"},{name:"纸飞机",type:"icon-zhifeiji"},{name:"点赞",type:"icon-dianzan"},{name:"煎蛋",type:"icon-jiandan"},{name:"小熊",type:"icon-xiaoxiong"},{name:"花",type:"icon-hua"},{name:"眼睛",type:"icon-yanjing"}],u={data:()=>({type:1,iconData:d}),methods:{exec(a){console.log("process:",process);const o={id:a};e.invoke(n.test,o).then((n=>{console.log("res:",n)}))},exec2(n){}}},r={id:"app-base-test-api"},g=(n=>(y("data-v-e3ea38b6"),n=n(),l(),n))((()=>c("div",{class:"one-block-1"},[c("span",null," 1. 测试一些操作系统api ")],-1))),f={class:"one-block-2"};const x=a(u,[["render",function(n,e,a,y,l,d){const u=o("a-button"),x=o("a-space");return i(),t("div",r,[g,c("div",f,[p(x,null,{default:s((()=>[p(u,{onClick:e[0]||(e[0]=n=>d.exec(1))},{default:s((()=>[m(" 点击 ")])),_:1}),p(u,{onClick:e[1]||(e[1]=n=>d.exec2(1))},{default:s((()=>[m(" 点击2 ")])),_:1})])),_:1})])])}],["__scopeId","data-v-e3ea38b6"]]);export{x as default};
+========
+import{i as n}from"./main-ce25b28f.js";import{i as e}from"./ipcRenderer-5e19eaee.js";import{_ as a,r as o,o as i,b as t,g as c,a as p,w as s,e as m,p as y,f as l}from"./index-869350c9.js";const d=[{name:"对话框",type:"icon-duihuakuang"},{name:"闹钟",type:"icon-naozhong"},{name:"笑脸",type:"icon-xiaolian"},{name:"ok",type:"icon-ok"},{name:"风车",type:"icon-fengche"},{name:"汗颜",type:"icon-hanyan"},{name:"相机",type:"icon-xiangji"},{name:"礼物",type:"icon-liwu"},{name:"礼花",type:"icon-lihua"},{name:"扭蛋",type:"icon-niudan"},{name:"流星",type:"icon-liuxing"},{name:"风筝",type:"icon-fengzheng"},{name:"蛋糕",type:"icon-dangao"},{name:"泡泡",type:"icon-paopao"},{name:"购物",type:"icon-gouwu"},{name:"饮料",type:"icon-yinliao"},{name:"云彩",type:"icon-yuncai"},{name:"彩铅",type:"icon-caiqian"},{name:"纸飞机",type:"icon-zhifeiji"},{name:"点赞",type:"icon-dianzan"},{name:"煎蛋",type:"icon-jiandan"},{name:"小熊",type:"icon-xiaoxiong"},{name:"花",type:"icon-hua"},{name:"眼睛",type:"icon-yanjing"}],u={data:()=>({type:1,iconData:d}),methods:{exec(a){console.log("process:",process);const o={id:a};e.invoke(n.test,o).then((n=>{console.log("res:",n)}))},exec2(n){}}},r={id:"app-base-test-api"},g=(n=>(y("data-v-e3ea38b6"),n=n(),l(),n))((()=>c("div",{class:"one-block-1"},[c("span",null," 1. 测试一些操作系统api ")],-1))),f={class:"one-block-2"};const x=a(u,[["render",function(n,e,a,y,l,d){const u=o("a-button"),x=o("a-space");return i(),t("div",r,[g,c("div",f,[p(x,null,{default:s((()=>[p(u,{onClick:e[0]||(e[0]=n=>d.exec(1))},{default:s((()=>[m(" 点击 ")])),_:1}),p(u,{onClick:e[1]||(e[1]=n=>d.exec2(1))},{default:s((()=>[m(" 点击2 ")])),_:1})])),_:1})])])}],["__scopeId","data-v-e3ea38b6"]]);export{x as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-46b18835.js
--- a/public/dist/assets/Index-c62981d9.js
+++ b/public/dist/assets/Index-c62981d9.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-6bf27758.js
+import{s,i as e}from"./main-d72f38de.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as t,r as o,o as n,b as r,g as c,a as d,w as i,e as l,t as p,p as u,f as m}from"./index-04ffc5d9.js";const f={data:()=>({status:0,progress:"",percentNumber:0}),mounted(){this.init()},methods:{init(){a.removeAllListeners(s.appUpdater),a.on(s.appUpdater,((s,e)=>{e=JSON.parse(e),this.status=e.status,3==e.status?(this.progress=e.desc,this.percentNumber=e.percentNumber):this.$message.info(e.desc)}))},checkForUpdater(){a.invoke(e.checkForUpdater).then((s=>{console.log(s)}))},download(){1===this.status?a.invoke(e.downloadApp).then((s=>{console.log(s)})):this.$message.info("没有可用版本")}}},h=s=>(u("data-v-88c3fe69"),s=s(),m(),s),k={id:"app-demo-window"},v=h((()=>c("div",{class:"one-block-1"},[c("span",null," 1. 自动更新 ")],-1))),b={class:"one-block-2"},g=h((()=>c("div",{class:"one-block-1"},[c("span",null," 2. 下载进度 ")],-1))),_={class:"one-block-2"};const w=t(f,[["render",function(s,e,a,t,u,m){const f=o("a-button"),h=o("a-space"),w=o("a-progress");return n(),r("div",k,[v,c("div",b,[d(h,null,{default:i((()=>[d(f,{onClick:e[0]||(e[0]=s=>m.checkForUpdater())},{default:i((()=>[l("检查更新")])),_:1}),d(f,{onClick:e[1]||(e[1]=s=>m.download())},{default:i((()=>[l("下载并安装")])),_:1})])),_:1})]),g,c("div",_,[d(w,{percent:u.percentNumber,status:"active"},null,8,["percent"]),d(h,null,{default:i((()=>[l(p(u.progress),1)])),_:1})])])}],["__scopeId","data-v-88c3fe69"]]);export{w as default};
+========
+import{s,i as e}from"./main-ce25b28f.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as t,r as o,o as n,b as r,g as c,a as d,w as i,e as l,t as p,p as u,f as m}from"./index-869350c9.js";const f={data:()=>({status:0,progress:"",percentNumber:0}),mounted(){this.init()},methods:{init(){a.removeAllListeners(s.appUpdater),a.on(s.appUpdater,((s,e)=>{e=JSON.parse(e),this.status=e.status,3==e.status?(this.progress=e.desc,this.percentNumber=e.percentNumber):this.$message.info(e.desc)}))},checkForUpdater(){a.invoke(e.checkForUpdater).then((s=>{console.log(s)}))},download(){1===this.status?a.invoke(e.downloadApp).then((s=>{console.log(s)})):this.$message.info("没有可用版本")}}},h=s=>(u("data-v-88c3fe69"),s=s(),m(),s),k={id:"app-demo-window"},v=h((()=>c("div",{class:"one-block-1"},[c("span",null," 1. 自动更新 ")],-1))),b={class:"one-block-2"},g=h((()=>c("div",{class:"one-block-1"},[c("span",null," 2. 下载进度 ")],-1))),_={class:"one-block-2"};const w=t(f,[["render",function(s,e,a,t,u,m){const f=o("a-button"),h=o("a-space"),w=o("a-progress");return n(),r("div",k,[v,c("div",b,[d(h,null,{default:i((()=>[d(f,{onClick:e[0]||(e[0]=s=>m.checkForUpdater())},{default:i((()=>[l("检查更新")])),_:1}),d(f,{onClick:e[1]||(e[1]=s=>m.download())},{default:i((()=>[l("下载并安装")])),_:1})])),_:1})]),g,c("div",_,[d(w,{percent:u.percentNumber,status:"active"},null,8,["percent"]),d(h,null,{default:i((()=>[l(p(u.progress),1)])),_:1})])])}],["__scopeId","data-v-88c3fe69"]]);export{w as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-c62981d9.js
--- a/public/dist/assets/Index-c62981d9.js.gz
+++ b/public/dist/assets/Index-c62981d9.js.gz
--- a/public/dist/assets/Index-cb8b9bf1.js
+++ b/public/dist/assets/Index-cb8b9bf1.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-cb8b9bf1.js
 import{i as e}from"./main-d72f38de.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as a,r as s,o,b as n,g as l,a as r,w as d,t as u,e as m,p as h,f as i}from"./index-04ffc5d9.js";const c={data:()=>({currentThemeMode:"",themeList:["system","light","dark"]}),mounted(){},methods:{setTheme(a){this.currentThemeMode=a.target.value,console.log("setTheme currentThemeMode:",this.currentThemeMode),t.invoke(e.setTheme,this.currentThemeMode).then((e=>{console.log("result:",e),this.currentThemeMode=e}))},getTheme(){t.invoke(e.getTheme).then((e=>{console.log("result:",e),this.currentThemeMode=e}))}}},T=e=>(h("data-v-5a0f8a17"),e=e(),i(),e),v={id:"app-base-screen"},f=T((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 系统主题模式 ")],-1))),p={class:"one-block-2"},g=T((()=>l("div",{class:"one-block-1"}," 2. 设置主题模式（请自行实现前端UI效果） ",-1))),M={class:"one-block-2"};const _=a(c,[["render",function(e,t,a,h,i,c){const T=s("a-button"),_=s("a-space"),k=s("a-radio"),b=s("a-radio-group");return o(),n("div",v,[f,l("div",p,[r(_,null,{default:d((()=>[r(T,{onClick:t[0]||(t[0]=e=>c.getTheme())},{default:d((()=>[m("获取模式")])),_:1})])),_:1}),l("span",null," 结果："+u(i.currentThemeMode),1)]),g,l("div",M,[r(b,{modelValue:i.currentThemeMode,"onUpdate:modelValue":t[1]||(t[1]=e=>i.currentThemeMode=e),onChange:c.setTheme},{default:d((()=>[r(k,{value:i.themeList[0]},{default:d((()=>[m(u(i.themeList[0]),1)])),_:1},8,["value"]),r(k,{value:i.themeList[1]},{default:d((()=>[m(u(i.themeList[1]),1)])),_:1},8,["value"]),r(k,{value:i.themeList[2]},{default:d((()=>[m(u(i.themeList[2]),1)])),_:1},8,["value"])])),_:1},8,["modelValue","onChange"])])])}],["__scopeId","data-v-5a0f8a17"]]);export{_ as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as a,r as s,o,b as n,g as l,a as r,w as d,t as u,e as m,p as h,f as i}from"./index-869350c9.js";const c={data:()=>({currentThemeMode:"",themeList:["system","light","dark"]}),mounted(){},methods:{setTheme(a){this.currentThemeMode=a.target.value,console.log("setTheme currentThemeMode:",this.currentThemeMode),t.invoke(e.setTheme,this.currentThemeMode).then((e=>{console.log("result:",e),this.currentThemeMode=e}))},getTheme(){t.invoke(e.getTheme).then((e=>{console.log("result:",e),this.currentThemeMode=e}))}}},T=e=>(h("data-v-5a0f8a17"),e=e(),i(),e),v={id:"app-base-screen"},f=T((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 系统主题模式 ")],-1))),p={class:"one-block-2"},g=T((()=>l("div",{class:"one-block-1"}," 2. 设置主题模式（请自行实现前端UI效果） ",-1))),M={class:"one-block-2"};const _=a(c,[["render",function(e,t,a,h,i,c){const T=s("a-button"),_=s("a-space"),k=s("a-radio"),b=s("a-radio-group");return o(),n("div",v,[f,l("div",p,[r(_,null,{default:d((()=>[r(T,{onClick:t[0]||(t[0]=e=>c.getTheme())},{default:d((()=>[m("获取模式")])),_:1})])),_:1}),l("span",null," 结果："+u(i.currentThemeMode),1)]),g,l("div",M,[r(b,{modelValue:i.currentThemeMode,"onUpdate:modelValue":t[1]||(t[1]=e=>i.currentThemeMode=e),onChange:c.setTheme},{default:d((()=>[r(k,{value:i.themeList[0]},{default:d((()=>[m(u(i.themeList[0]),1)])),_:1},8,["value"]),r(k,{value:i.themeList[1]},{default:d((()=>[m(u(i.themeList[1]),1)])),_:1},8,["value"]),r(k,{value:i.themeList[2]},{default:d((()=>[m(u(i.themeList[2]),1)])),_:1},8,["value"])])),_:1},8,["modelValue","onChange"])])])}],["__scopeId","data-v-5a0f8a17"]]);export{_ as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-e75e109f.js
--- a/public/dist/assets/Index-d012f7e3.css
+++ b/public/dist/assets/Index-d012f7e3.css
@@ -1 +0,0 @@
-#app-cross-go[data-v-0c19a913]{padding:0 10px;text-align:left;width:100%}#app-cross-go .one-block-1[data-v-0c19a913]{font-size:16px;padding-top:10px}#app-cross-go .one-block-2[data-v-0c19a913]{padding-top:10px}
--- a/public/dist/assets/Index-d66e2d7b.js
+++ b/public/dist/assets/Index-d66e2d7b.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-1c9a1a3c.js
+import{i as e}from"./main-d72f38de.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{a}from"./index-587e4740.js";import{s as r}from"./store2-c7ac8a8d.js";import{_ as t,r as o,o as i,b as n,g as d,a as v,w as c,e as m,p as l,f}from"./index-04ffc5d9.js";const u={data:()=>({server:""}),methods:{startServer(){s.invoke(e.startJavaServer,{}).then((e=>{0!=e.code?this.$message.error(e.msg):(this.$message.info("异步启动"),r.set("javaService",e.server))}))},closeServer(){s.invoke(e.closeJavaServer,{}).then((e=>{0!=e.code&&this.$message.error(e.msg),this.$message.info("异步关闭"),r.remove("javaService")}))},sendRequest(){const e=r.get("javaService")||"";if(""==e)return void this.$message.error("服务未开启 或 正在启动中");a({method:"get",url:e+"/test1/get",params:{id:"1111111"},timeout:6e4}).then((e=>{const s=e.data||null;this.$message.info(`java服务返回: ${s}`)}))}}},p={id:"app-other"},g=(e=>(l("data-v-da7e5fd3"),e=e(),f(),e))((()=>d("div",{class:"one-block-1"},[d("span",null," 请求java服务接口 ")],-1))),h={class:"one-block-2"};const j=t(u,[["render",function(e,s,a,r,t,l){const f=o("a-button"),u=o("a-space");return i(),n("div",p,[g,d("div",h,[v(u,null,{default:c((()=>[v(f,{onClick:s[0]||(s[0]=e=>l.startServer())},{default:c((()=>[m(" 启动java项目 ")])),_:1}),v(f,{onClick:s[1]||(s[1]=e=>l.sendRequest())},{default:c((()=>[m(" 测试接口 ")])),_:1}),v(f,{onClick:s[2]||(s[2]=e=>l.closeServer())},{default:c((()=>[m(" 关闭java项目 ")])),_:1})])),_:1})])])}],["__scopeId","data-v-da7e5fd3"]]);export{j as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{a}from"./index-71914d0e.js";import{s as r}from"./store2-5d974a5c.js";import{_ as t,r as o,o as i,b as n,g as d,a as v,w as c,e as m,p as l,f}from"./index-869350c9.js";const u={data:()=>({server:""}),methods:{startServer(){s.invoke(e.startJavaServer,{}).then((e=>{0!=e.code?this.$message.error(e.msg):(this.$message.info("异步启动"),r.set("javaService",e.server))}))},closeServer(){s.invoke(e.closeJavaServer,{}).then((e=>{0!=e.code&&this.$message.error(e.msg),this.$message.info("异步关闭"),r.remove("javaService")}))},sendRequest(){const e=r.get("javaService")||"";if(""==e)return void this.$message.error("服务未开启 或 正在启动中");a({method:"get",url:e+"/test1/get",params:{id:"1111111"},timeout:6e4}).then((e=>{const s=e.data||null;this.$message.info(`java服务返回: ${s}`)}))}}},p={id:"app-other"},g=(e=>(l("data-v-da7e5fd3"),e=e(),f(),e))((()=>d("div",{class:"one-block-1"},[d("span",null," 请求java服务接口 ")],-1))),h={class:"one-block-2"};const j=t(u,[["render",function(e,s,a,r,t,l){const f=o("a-button"),u=o("a-space");return i(),n("div",p,[g,d("div",h,[v(u,null,{default:c((()=>[v(f,{onClick:s[0]||(s[0]=e=>l.startServer())},{default:c((()=>[m(" 启动java项目 ")])),_:1}),v(f,{onClick:s[1]||(s[1]=e=>l.sendRequest())},{default:c((()=>[m(" 测试接口 ")])),_:1}),v(f,{onClick:s[2]||(s[2]=e=>l.closeServer())},{default:c((()=>[m(" 关闭java项目 ")])),_:1})])),_:1})])])}],["__scopeId","data-v-da7e5fd3"]]);export{j as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-d66e2d7b.js
--- a/public/dist/assets/Index-d66e2d7b.js.gz
+++ b/public/dist/assets/Index-d66e2d7b.js.gz
--- a/public/dist/assets/Index-e75e109f.js
+++ b/public/dist/assets/Index-e75e109f.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-cb8b9bf1.js
+import{i as e}from"./main-d72f38de.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as a,r as s,o,b as n,g as l,a as r,w as d,t as u,e as m,p as h,f as i}from"./index-04ffc5d9.js";const c={data:()=>({currentThemeMode:"",themeList:["system","light","dark"]}),mounted(){},methods:{setTheme(a){this.currentThemeMode=a.target.value,console.log("setTheme currentThemeMode:",this.currentThemeMode),t.invoke(e.setTheme,this.currentThemeMode).then((e=>{console.log("result:",e),this.currentThemeMode=e}))},getTheme(){t.invoke(e.getTheme).then((e=>{console.log("result:",e),this.currentThemeMode=e}))}}},T=e=>(h("data-v-5a0f8a17"),e=e(),i(),e),v={id:"app-base-screen"},f=T((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 系统主题模式 ")],-1))),p={class:"one-block-2"},g=T((()=>l("div",{class:"one-block-1"}," 2. 设置主题模式（请自行实现前端UI效果） ",-1))),M={class:"one-block-2"};const _=a(c,[["render",function(e,t,a,h,i,c){const T=s("a-button"),_=s("a-space"),k=s("a-radio"),b=s("a-radio-group");return o(),n("div",v,[f,l("div",p,[r(_,null,{default:d((()=>[r(T,{onClick:t[0]||(t[0]=e=>c.getTheme())},{default:d((()=>[m("获取模式")])),_:1})])),_:1}),l("span",null," 结果："+u(i.currentThemeMode),1)]),g,l("div",M,[r(b,{modelValue:i.currentThemeMode,"onUpdate:modelValue":t[1]||(t[1]=e=>i.currentThemeMode=e),onChange:c.setTheme},{default:d((()=>[r(k,{value:i.themeList[0]},{default:d((()=>[m(u(i.themeList[0]),1)])),_:1},8,["value"]),r(k,{value:i.themeList[1]},{default:d((()=>[m(u(i.themeList[1]),1)])),_:1},8,["value"]),r(k,{value:i.themeList[2]},{default:d((()=>[m(u(i.themeList[2]),1)])),_:1},8,["value"])])),_:1},8,["modelValue","onChange"])])])}],["__scopeId","data-v-5a0f8a17"]]);export{_ as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as a,r as s,o,b as n,g as l,a as r,w as d,t as u,e as m,p as h,f as i}from"./index-869350c9.js";const c={data:()=>({currentThemeMode:"",themeList:["system","light","dark"]}),mounted(){},methods:{setTheme(a){this.currentThemeMode=a.target.value,console.log("setTheme currentThemeMode:",this.currentThemeMode),t.invoke(e.setTheme,this.currentThemeMode).then((e=>{console.log("result:",e),this.currentThemeMode=e}))},getTheme(){t.invoke(e.getTheme).then((e=>{console.log("result:",e),this.currentThemeMode=e}))}}},T=e=>(h("data-v-5a0f8a17"),e=e(),i(),e),v={id:"app-base-screen"},f=T((()=>l("div",{class:"one-block-1"},[l("span",null," 1. 系统主题模式 ")],-1))),p={class:"one-block-2"},g=T((()=>l("div",{class:"one-block-1"}," 2. 设置主题模式（请自行实现前端UI效果） ",-1))),M={class:"one-block-2"};const _=a(c,[["render",function(e,t,a,h,i,c){const T=s("a-button"),_=s("a-space"),k=s("a-radio"),b=s("a-radio-group");return o(),n("div",v,[f,l("div",p,[r(_,null,{default:d((()=>[r(T,{onClick:t[0]||(t[0]=e=>c.getTheme())},{default:d((()=>[m("获取模式")])),_:1})])),_:1}),l("span",null," 结果："+u(i.currentThemeMode),1)]),g,l("div",M,[r(b,{modelValue:i.currentThemeMode,"onUpdate:modelValue":t[1]||(t[1]=e=>i.currentThemeMode=e),onChange:c.setTheme},{default:d((()=>[r(k,{value:i.themeList[0]},{default:d((()=>[m(u(i.themeList[0]),1)])),_:1},8,["value"]),r(k,{value:i.themeList[1]},{default:d((()=>[m(u(i.themeList[1]),1)])),_:1},8,["value"]),r(k,{value:i.themeList[2]},{default:d((()=>[m(u(i.themeList[2]),1)])),_:1},8,["value"])])),_:1},8,["modelValue","onChange"])])])}],["__scopeId","data-v-5a0f8a17"]]);export{_ as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-e75e109f.js
--- a/public/dist/assets/Index-e75e109f.js.gz
+++ b/public/dist/assets/Index-e75e109f.js.gz
--- a/public/dist/assets/Index-f4e201af.js
+++ b/public/dist/assets/Index-f4e201af.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-f4e201af.js
 import{i as e}from"./main-d72f38de.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as s,r as t,o,b as n,g as r,a as d,w as i,e as l,t as c,p,f as u}from"./index-04ffc5d9.js";const f={data:()=>({data:[{content:"powershell.exe",id:"powershell.exe"}]}),methods:{openSoft(s){a.invoke(e.openSoftware,s).then((e=>{e||this.$message.error("程序不存在")}))}}},m={id:"app-base-software-open"},b=(e=>(p("data-v-90e4d11c"),e=e(),u(),e))((()=>r("div",{class:"one-block-1"},[r("span",null," 1. 调用其它软件（exe、bash等可执行程序） "),r("p"),r("span",{class:"sub-content"}," 注：请先将【powershell.exe】复制到【electron-egg/build/extraResources】目录中 ")],-1))),h={class:"one-block-2"};const x=s(f,[["render",function(e,a,s,p,u,f){const x=t("a-button"),k=t("a-list-item"),v=t("a-list");return o(),n("div",m,[b,r("div",h,[d(v,{bordered:"","data-source":u.data},{renderItem:i((({item:e})=>[d(k,{onClick:a=>f.openSoft(e.id)},{default:i((()=>[l(c(e.content)+" ",1),d(x,{type:"link"},{default:i((()=>[l(" 执行 ")])),_:1})])),_:2},1032,["onClick"])])),_:1},8,["data-source"])])])}],["__scopeId","data-v-90e4d11c"]]);export{x as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as s,r as t,o,b as n,g as r,a as d,w as i,e as l,t as c,p,f as u}from"./index-869350c9.js";const f={data:()=>({data:[{content:"powershell.exe",id:"powershell.exe"}]}),methods:{openSoft(s){a.invoke(e.openSoftware,s).then((e=>{e||this.$message.error("程序不存在")}))}}},m={id:"app-base-software-open"},b=(e=>(p("data-v-90e4d11c"),e=e(),u(),e))((()=>r("div",{class:"one-block-1"},[r("span",null," 1. 调用其它软件（exe、bash等可执行程序） "),r("p"),r("span",{class:"sub-content"}," 注：请先将【powershell.exe】复制到【electron-egg/build/extraResources】目录中 ")],-1))),h={class:"one-block-2"};const x=s(f,[["render",function(e,a,s,p,u,f){const x=t("a-button"),k=t("a-list-item"),v=t("a-list");return o(),n("div",m,[b,r("div",h,[d(v,{bordered:"","data-source":u.data},{renderItem:i((({item:e})=>[d(k,{onClick:a=>f.openSoft(e.id)},{default:i((()=>[l(c(e.content)+" ",1),d(x,{type:"link"},{default:i((()=>[l(" 执行 ")])),_:1})])),_:2},1032,["onClick"])])),_:1},8,["data-source"])])])}],["__scopeId","data-v-90e4d11c"]]);export{x as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-9990c62b.js
--- a/public/dist/assets/Index-f713a226.js
+++ b/public/dist/assets/Index-f713a226.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Index-f713a226.js
 import{i as e}from"./main-d72f38de.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as o,h as n,r as a,o as l,b as s,g as i,a as d,w as c,e as w,p as m,f as r}from"./index-04ffc5d9.js";const v={data:()=>({views:[{type:"web",content:"https://www.baidu.com/"},{type:"html",content:"/public/html/view_example.html"}]}),methods:{loadViewContent(o){t.invoke(e.loadViewContent,n(this.views[o])).then((e=>{console.log(e)}))},removeViewContent(o){t.invoke(e.removeViewContent,n(this.views[o])).then((e=>{console.log(e)}))}}},p=e=>(m("data-v-792e445a"),e=e(),r(),e),u={id:"app-base-window-view"},h=p((()=>i("div",{class:"one-block-1"},[i("span",null," 1. 嵌入web内容 ")],-1))),f={class:"one-block-2"},C=p((()=>i("div",{class:"one-block-1"},[i("span",null," 2. 嵌入html内容 ")],-1))),b={class:"one-block-2"};const k=o(v,[["render",function(e,t,o,n,m,r){const v=a("a-button"),p=a("a-space");return l(),s("div",u,[h,i("div",f,[d(p,null,{default:c((()=>[d(v,{onClick:t[0]||(t[0]=e=>r.loadViewContent(0))},{default:c((()=>[w("加载百度页面")])),_:1}),d(v,{onClick:t[1]||(t[1]=e=>r.removeViewContent(0))},{default:c((()=>[w("移除百度页面")])),_:1})])),_:1})]),C,i("div",b,[d(p,null,{default:c((()=>[d(v,{onClick:t[2]||(t[2]=e=>r.loadViewContent(1))},{default:c((()=>[w("加载html页面")])),_:1}),d(v,{onClick:t[3]||(t[3]=e=>r.removeViewContent(1))},{default:c((()=>[w("移除html页面")])),_:1})])),_:1})])])}],["__scopeId","data-v-792e445a"]]);export{k as default};
+========
+import{i as e}from"./main-ce25b28f.js";import{i as t}from"./ipcRenderer-5e19eaee.js";import{_ as o,h as n,r as a,o as l,b as s,g as i,a as d,w as c,e as w,p as m,f as r}from"./index-869350c9.js";const v={data:()=>({views:[{type:"web",content:"https://www.baidu.com/"},{type:"html",content:"/public/html/view_example.html"}]}),methods:{loadViewContent(o){t.invoke(e.loadViewContent,n(this.views[o])).then((e=>{console.log(e)}))},removeViewContent(o){t.invoke(e.removeViewContent,n(this.views[o])).then((e=>{console.log(e)}))}}},p=e=>(m("data-v-792e445a"),e=e(),r(),e),u={id:"app-base-window-view"},h=p((()=>i("div",{class:"one-block-1"},[i("span",null," 1. 嵌入web内容 ")],-1))),f={class:"one-block-2"},C=p((()=>i("div",{class:"one-block-1"},[i("span",null," 2. 嵌入html内容 ")],-1))),b={class:"one-block-2"};const k=o(v,[["render",function(e,t,o,n,m,r){const v=a("a-button"),p=a("a-space");return l(),s("div",u,[h,i("div",f,[d(p,null,{default:c((()=>[d(v,{onClick:t[0]||(t[0]=e=>r.loadViewContent(0))},{default:c((()=>[w("加载百度页面")])),_:1}),d(v,{onClick:t[1]||(t[1]=e=>r.removeViewContent(0))},{default:c((()=>[w("移除百度页面")])),_:1})])),_:1})]),C,i("div",b,[d(p,null,{default:c((()=>[d(v,{onClick:t[2]||(t[2]=e=>r.loadViewContent(1))},{default:c((()=>[w("加载html页面")])),_:1}),d(v,{onClick:t[3]||(t[3]=e=>r.removeViewContent(1))},{default:c((()=>[w("移除html页面")])),_:1})])),_:1})])])}],["__scopeId","data-v-792e445a"]]);export{k as default};
+>>>>>>>> dev_v3:public/dist/assets/Index-10ccb891.js
--- a/public/dist/assets/Index-f7288458.js
+++ b/public/dist/assets/Index-f7288458.js
--- a/public/dist/assets/Index-f7288458.js.gz
+++ b/public/dist/assets/Index-f7288458.js.gz
--- a/public/dist/assets/Ipc-1f3029ea.js
+++ b/public/dist/assets/Ipc-1f3029ea.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Ipc-1f3029ea.js
 import{i as e,s as n}from"./main-d72f38de.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as o,r as a,o as l,b as i,g as d,a as t,w as c,e as g,t as u,p as r,f as k}from"./index-04ffc5d9.js";const m={data:()=>({messageString:"",message1:"",message2:"",message3:"",mainWCid:0}),mounted(){this.init()},methods:{init(){s.removeAllListeners(e.ipcSendMsg),s.on(e.ipcSendMsg,((n,s)=>{console.log("[ipcRenderer] [socketMsgStart] result:",s),this.messageString=s,n.sender.send(e.hello,"electron-egg")})),s.removeAllListeners(n.window1ToWindow2),s.on(n.window1ToWindow2,((e,n)=>{this.$message.info(n)}))},sendMsgStart(){s.send(e.ipcSendMsg,{type:"start",content:"开始"})},sendMsgStop(){s.send(e.ipcSendMsg,{type:"end",content:""})},handleInvoke(){s.invoke(e.ipcInvokeMsg,"异步-回调").then((e=>{console.log("r:",e),this.message1=e}))},async handleInvoke2(){const n=await s.invoke(e.ipcInvokeMsg,"异步");console.log("msg:",n),this.message2=n},handleSendSync(){const n=s.sendSync(e.ipcSendSyncMsg,"同步");this.message3=n},sendTosubWindow(){s.invoke(e.getWCid,"main").then((e=>{this.mainWCid=e,s.sendTo(this.mainWCid,n.window2ToWindow1,"窗口2 通过 sendTo 给主窗口发送消息")}))}}},p=e=>(r("data-v-54ef5770"),e=e(),k(),e),v={id:"app-base-subwindow-ipc"},f=p((()=>d("div",{class:"one-block-1"},[d("span",null," 1. 发送异步消息 ")],-1))),S={class:"one-block-2"},h=p((()=>d("p",null,null,-1))),w=p((()=>d("div",{class:"one-block-1"},[d("span",null," 2. 同步消息（不推荐，阻塞执行） ")],-1))),C={class:"one-block-2"},b=p((()=>d("div",{class:"one-block-1"},[d("span",null," 3. 长消息： 服务端持续向前端页面发消息 ")],-1))),_={class:"one-block-2"},M=p((()=>d("div",{class:"one-block-1"},[d("span",null," 4. 多窗口通信：窗口之间互相通信 ")],-1))),W={class:"one-block-2"};const y=o(m,[["render",function(e,n,s,o,r,k){const m=a("a-button"),p=a("a-space");return l(),i("div",v,[f,d("div",S,[t(p,null,{default:c((()=>[t(m,{onClick:k.handleInvoke},{default:c((()=>[g("发送 - 回调")])),_:1},8,["onClick"]),g(" 结果："+u(r.message1),1)])),_:1}),h,t(p,null,{default:c((()=>[t(m,{onClick:k.handleInvoke2},{default:c((()=>[g("发送 - async/await")])),_:1},8,["onClick"]),g(" 结果："+u(r.message2),1)])),_:1})]),w,d("div",C,[t(p,null,{default:c((()=>[t(m,{onClick:k.handleSendSync},{default:c((()=>[g("同步消息")])),_:1},8,["onClick"]),g(" 结果："+u(r.message3),1)])),_:1})]),b,d("div",_,[t(p,null,{default:c((()=>[t(m,{onClick:k.sendMsgStart},{default:c((()=>[g("开始")])),_:1},8,["onClick"]),t(m,{onClick:k.sendMsgStop},{default:c((()=>[g("结束")])),_:1},8,["onClick"]),g(" 结果："+u(r.messageString),1)])),_:1})]),M,d("div",W,[t(p,null,{default:c((()=>[t(m,{onClick:n[0]||(n[0]=e=>k.sendTosubWindow())},{default:c((()=>[g("向主窗口发消息")])),_:1})])),_:1})])])}],["__scopeId","data-v-54ef5770"]]);export{y as default};
+========
+import{i as e,s as n}from"./main-ce25b28f.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as o,r as a,o as l,b as i,g as d,a as t,w as c,e as g,t as u,p as r,f as k}from"./index-869350c9.js";const m={data:()=>({messageString:"",message1:"",message2:"",message3:"",mainWCid:0}),mounted(){this.init()},methods:{init(){s.removeAllListeners(e.ipcSendMsg),s.on(e.ipcSendMsg,((n,s)=>{console.log("[ipcRenderer] [socketMsgStart] result:",s),this.messageString=s,n.sender.send(e.hello,"electron-egg")})),s.removeAllListeners(n.window1ToWindow2),s.on(n.window1ToWindow2,((e,n)=>{this.$message.info(n)}))},sendMsgStart(){s.send(e.ipcSendMsg,{type:"start",content:"开始"})},sendMsgStop(){s.send(e.ipcSendMsg,{type:"end",content:""})},handleInvoke(){s.invoke(e.ipcInvokeMsg,"异步-回调").then((e=>{console.log("r:",e),this.message1=e}))},async handleInvoke2(){const n=await s.invoke(e.ipcInvokeMsg,"异步");console.log("msg:",n),this.message2=n},handleSendSync(){const n=s.sendSync(e.ipcSendSyncMsg,"同步");this.message3=n},sendTosubWindow(){s.invoke(e.getWCid,"main").then((e=>{this.mainWCid=e,s.sendTo(this.mainWCid,n.window2ToWindow1,"窗口2 通过 sendTo 给主窗口发送消息")}))}}},p=e=>(r("data-v-54ef5770"),e=e(),k(),e),v={id:"app-base-subwindow-ipc"},f=p((()=>d("div",{class:"one-block-1"},[d("span",null," 1. 发送异步消息 ")],-1))),S={class:"one-block-2"},h=p((()=>d("p",null,null,-1))),w=p((()=>d("div",{class:"one-block-1"},[d("span",null," 2. 同步消息（不推荐，阻塞执行） ")],-1))),C={class:"one-block-2"},b=p((()=>d("div",{class:"one-block-1"},[d("span",null," 3. 长消息： 服务端持续向前端页面发消息 ")],-1))),_={class:"one-block-2"},M=p((()=>d("div",{class:"one-block-1"},[d("span",null," 4. 多窗口通信：窗口之间互相通信 ")],-1))),W={class:"one-block-2"};const y=o(m,[["render",function(e,n,s,o,r,k){const m=a("a-button"),p=a("a-space");return l(),i("div",v,[f,d("div",S,[t(p,null,{default:c((()=>[t(m,{onClick:k.handleInvoke},{default:c((()=>[g("发送 - 回调")])),_:1},8,["onClick"]),g(" 结果："+u(r.message1),1)])),_:1}),h,t(p,null,{default:c((()=>[t(m,{onClick:k.handleInvoke2},{default:c((()=>[g("发送 - async/await")])),_:1},8,["onClick"]),g(" 结果："+u(r.message2),1)])),_:1})]),w,d("div",C,[t(p,null,{default:c((()=>[t(m,{onClick:k.handleSendSync},{default:c((()=>[g("同步消息")])),_:1},8,["onClick"]),g(" 结果："+u(r.message3),1)])),_:1})]),b,d("div",_,[t(p,null,{default:c((()=>[t(m,{onClick:k.sendMsgStart},{default:c((()=>[g("开始")])),_:1},8,["onClick"]),t(m,{onClick:k.sendMsgStop},{default:c((()=>[g("结束")])),_:1},8,["onClick"]),g(" 结果："+u(r.messageString),1)])),_:1})]),M,d("div",W,[t(p,null,{default:c((()=>[t(m,{onClick:n[0]||(n[0]=e=>k.sendTosubWindow())},{default:c((()=>[g("向主窗口发消息")])),_:1})])),_:1})])])}],["__scopeId","data-v-54ef5770"]]);export{y as default};
+>>>>>>>> dev_v3:public/dist/assets/Ipc-4d92174b.js
--- a/public/dist/assets/Ipc-45ee52db.js
+++ b/public/dist/assets/Ipc-45ee52db.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Ipc-7b5efd90.js
+import{i as e,s as n}from"./main-d72f38de.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as o,h as i,r as a,o as d,b as l,g as t,a as c,w,e as g,t as r,p as u,f as p}from"./index-04ffc5d9.js";const k={data:()=>({messageString:"",message1:"",message2:"",message3:"",windowName:"window-ipc",newWcId:0,views:[{type:"vue",content:"#/special/subwindow",windowName:"window-ipc",windowTitle:"ipc window"}]}),mounted(){this.init()},methods:{init(){s.removeAllListeners(e.ipcSendMsg),s.on(e.ipcSendMsg,((n,s)=>{console.log("[ipcRenderer] [socketMsgStart] result:",s),this.messageString=s,n.sender.send(e.hello,"electron-egg")})),s.removeAllListeners(n.window2ToWindow1),s.on(n.window2ToWindow1,((e,n)=>{this.$message.info(n)}))},sendMsgStart(){s.send(e.ipcSendMsg,{type:"start",content:"开始"})},sendMsgStop(){s.send(e.ipcSendMsg,{type:"end",content:""})},handleInvoke(){s.invoke(e.ipcInvokeMsg,"异步-回调").then((e=>{console.log("r:",e),this.message1=e}))},async handleInvoke2(){const n=await s.invoke(e.ipcInvokeMsg,"异步");console.log("msg:",n),this.message2=n},handleSendSync(){const n=s.sendSync(e.ipcSendSyncMsg,"同步");this.message3=n},createWindow(n){s.invoke(e.createWindow,i(this.views[n])).then((e=>{console.log("[createWindow] id:",e)}))},async sendTosubWindow(){this.newWcId=await s.invoke(e.getWCid,this.windowName),s.sendTo(this.newWcId,n.window1ToWindow2,"窗口1通过 sendTo 给窗口2发送消息")}}},m=e=>(u("data-v-227d95f1"),e=e(),p(),e),v={id:"app-base-socket-ipc"},f=m((()=>t("div",{class:"one-block-1"},[t("span",null," 1. 发送异步消息 ")],-1))),h={class:"one-block-2"},S=m((()=>t("p",null,null,-1))),_=m((()=>t("div",{class:"one-block-1"},[t("span",null," 2. 同步消息（不推荐，阻塞执行） ")],-1))),b={class:"one-block-2"},C=m((()=>t("div",{class:"one-block-1"},[t("span",null," 3. 长消息： 服务端持续向前端页面发消息 ")],-1))),W={class:"one-block-2"},M=m((()=>t("div",{class:"one-block-1"},[t("span",null," 4. 多窗口通信：子窗口与主进程通信，子窗口互相通信 ")],-1))),y={class:"one-block-2"};const I=o(k,[["render",function(e,n,s,o,i,u){const p=a("a-button"),k=a("a-space");return d(),l("div",v,[f,t("div",h,[c(k,null,{default:w((()=>[c(p,{onClick:u.handleInvoke},{default:w((()=>[g("发送 - 回调")])),_:1},8,["onClick"]),g(" 结果："+r(i.message1),1)])),_:1}),S,c(k,null,{default:w((()=>[c(p,{onClick:u.handleInvoke2},{default:w((()=>[g("发送 - async/await")])),_:1},8,["onClick"]),g(" 结果："+r(i.message2),1)])),_:1})]),_,t("div",b,[c(k,null,{default:w((()=>[c(p,{onClick:u.handleSendSync},{default:w((()=>[g("同步消息")])),_:1},8,["onClick"]),g(" 结果："+r(i.message3),1)])),_:1})]),C,t("div",W,[c(k,null,{default:w((()=>[c(p,{onClick:u.sendMsgStart},{default:w((()=>[g("开始")])),_:1},8,["onClick"]),c(p,{onClick:u.sendMsgStop},{default:w((()=>[g("结束")])),_:1},8,["onClick"]),g(" 结果："+r(i.messageString),1)])),_:1})]),M,t("div",y,[c(k,null,{default:w((()=>[c(p,{onClick:n[0]||(n[0]=e=>u.createWindow(0))},{default:w((()=>[g("打开新窗口2")])),_:1}),c(p,{onClick:n[1]||(n[1]=e=>u.sendTosubWindow())},{default:w((()=>[g("向新窗口2发消息")])),_:1})])),_:1})])])}],["__scopeId","data-v-227d95f1"]]);export{I as default};
+========
+import{i as e,s as n}from"./main-ce25b28f.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as o,h as i,r as a,o as d,b as l,g as t,a as c,w,e as g,t as r,p as u,f as p}from"./index-869350c9.js";const k={data:()=>({messageString:"",message1:"",message2:"",message3:"",windowName:"window-ipc",newWcId:0,views:[{type:"vue",content:"#/special/subwindow",windowName:"window-ipc",windowTitle:"ipc window"}]}),mounted(){this.init()},methods:{init(){s.removeAllListeners(e.ipcSendMsg),s.on(e.ipcSendMsg,((n,s)=>{console.log("[ipcRenderer] [socketMsgStart] result:",s),this.messageString=s,n.sender.send(e.hello,"electron-egg")})),s.removeAllListeners(n.window2ToWindow1),s.on(n.window2ToWindow1,((e,n)=>{this.$message.info(n)}))},sendMsgStart(){s.send(e.ipcSendMsg,{type:"start",content:"开始"})},sendMsgStop(){s.send(e.ipcSendMsg,{type:"end",content:""})},handleInvoke(){s.invoke(e.ipcInvokeMsg,"异步-回调").then((e=>{console.log("r:",e),this.message1=e}))},async handleInvoke2(){const n=await s.invoke(e.ipcInvokeMsg,"异步");console.log("msg:",n),this.message2=n},handleSendSync(){const n=s.sendSync(e.ipcSendSyncMsg,"同步");this.message3=n},createWindow(n){s.invoke(e.createWindow,i(this.views[n])).then((e=>{console.log("[createWindow] id:",e)}))},async sendTosubWindow(){this.newWcId=await s.invoke(e.getWCid,this.windowName),s.sendTo(this.newWcId,n.window1ToWindow2,"窗口1通过 sendTo 给窗口2发送消息")}}},m=e=>(u("data-v-227d95f1"),e=e(),p(),e),v={id:"app-base-socket-ipc"},f=m((()=>t("div",{class:"one-block-1"},[t("span",null," 1. 发送异步消息 ")],-1))),h={class:"one-block-2"},S=m((()=>t("p",null,null,-1))),_=m((()=>t("div",{class:"one-block-1"},[t("span",null," 2. 同步消息（不推荐，阻塞执行） ")],-1))),b={class:"one-block-2"},C=m((()=>t("div",{class:"one-block-1"},[t("span",null," 3. 长消息： 服务端持续向前端页面发消息 ")],-1))),W={class:"one-block-2"},M=m((()=>t("div",{class:"one-block-1"},[t("span",null," 4. 多窗口通信：子窗口与主进程通信，子窗口互相通信 ")],-1))),y={class:"one-block-2"};const I=o(k,[["render",function(e,n,s,o,i,u){const p=a("a-button"),k=a("a-space");return d(),l("div",v,[f,t("div",h,[c(k,null,{default:w((()=>[c(p,{onClick:u.handleInvoke},{default:w((()=>[g("发送 - 回调")])),_:1},8,["onClick"]),g(" 结果："+r(i.message1),1)])),_:1}),S,c(k,null,{default:w((()=>[c(p,{onClick:u.handleInvoke2},{default:w((()=>[g("发送 - async/await")])),_:1},8,["onClick"]),g(" 结果："+r(i.message2),1)])),_:1})]),_,t("div",b,[c(k,null,{default:w((()=>[c(p,{onClick:u.handleSendSync},{default:w((()=>[g("同步消息")])),_:1},8,["onClick"]),g(" 结果："+r(i.message3),1)])),_:1})]),C,t("div",W,[c(k,null,{default:w((()=>[c(p,{onClick:u.sendMsgStart},{default:w((()=>[g("开始")])),_:1},8,["onClick"]),c(p,{onClick:u.sendMsgStop},{default:w((()=>[g("结束")])),_:1},8,["onClick"]),g(" 结果："+r(i.messageString),1)])),_:1})]),M,t("div",y,[c(k,null,{default:w((()=>[c(p,{onClick:n[0]||(n[0]=e=>u.createWindow(0))},{default:w((()=>[g("打开新窗口2")])),_:1}),c(p,{onClick:n[1]||(n[1]=e=>u.sendTosubWindow())},{default:w((()=>[g("向新窗口2发消息")])),_:1})])),_:1})])])}],["__scopeId","data-v-227d95f1"]]);export{I as default};
+>>>>>>>> dev_v3:public/dist/assets/Ipc-45ee52db.js
--- a/public/dist/assets/Ipc-45ee52db.js.gz
+++ b/public/dist/assets/Ipc-45ee52db.js.gz
--- a/public/dist/assets/Ipc-4d92174b.js
+++ b/public/dist/assets/Ipc-4d92174b.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Ipc-1f3029ea.js
+import{i as e,s as n}from"./main-d72f38de.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as o,r as a,o as l,b as i,g as d,a as t,w as c,e as g,t as u,p as r,f as k}from"./index-04ffc5d9.js";const m={data:()=>({messageString:"",message1:"",message2:"",message3:"",mainWCid:0}),mounted(){this.init()},methods:{init(){s.removeAllListeners(e.ipcSendMsg),s.on(e.ipcSendMsg,((n,s)=>{console.log("[ipcRenderer] [socketMsgStart] result:",s),this.messageString=s,n.sender.send(e.hello,"electron-egg")})),s.removeAllListeners(n.window1ToWindow2),s.on(n.window1ToWindow2,((e,n)=>{this.$message.info(n)}))},sendMsgStart(){s.send(e.ipcSendMsg,{type:"start",content:"开始"})},sendMsgStop(){s.send(e.ipcSendMsg,{type:"end",content:""})},handleInvoke(){s.invoke(e.ipcInvokeMsg,"异步-回调").then((e=>{console.log("r:",e),this.message1=e}))},async handleInvoke2(){const n=await s.invoke(e.ipcInvokeMsg,"异步");console.log("msg:",n),this.message2=n},handleSendSync(){const n=s.sendSync(e.ipcSendSyncMsg,"同步");this.message3=n},sendTosubWindow(){s.invoke(e.getWCid,"main").then((e=>{this.mainWCid=e,s.sendTo(this.mainWCid,n.window2ToWindow1,"窗口2 通过 sendTo 给主窗口发送消息")}))}}},p=e=>(r("data-v-54ef5770"),e=e(),k(),e),v={id:"app-base-subwindow-ipc"},f=p((()=>d("div",{class:"one-block-1"},[d("span",null," 1. 发送异步消息 ")],-1))),S={class:"one-block-2"},h=p((()=>d("p",null,null,-1))),w=p((()=>d("div",{class:"one-block-1"},[d("span",null," 2. 同步消息（不推荐，阻塞执行） ")],-1))),C={class:"one-block-2"},b=p((()=>d("div",{class:"one-block-1"},[d("span",null," 3. 长消息： 服务端持续向前端页面发消息 ")],-1))),_={class:"one-block-2"},M=p((()=>d("div",{class:"one-block-1"},[d("span",null," 4. 多窗口通信：窗口之间互相通信 ")],-1))),W={class:"one-block-2"};const y=o(m,[["render",function(e,n,s,o,r,k){const m=a("a-button"),p=a("a-space");return l(),i("div",v,[f,d("div",S,[t(p,null,{default:c((()=>[t(m,{onClick:k.handleInvoke},{default:c((()=>[g("发送 - 回调")])),_:1},8,["onClick"]),g(" 结果："+u(r.message1),1)])),_:1}),h,t(p,null,{default:c((()=>[t(m,{onClick:k.handleInvoke2},{default:c((()=>[g("发送 - async/await")])),_:1},8,["onClick"]),g(" 结果："+u(r.message2),1)])),_:1})]),w,d("div",C,[t(p,null,{default:c((()=>[t(m,{onClick:k.handleSendSync},{default:c((()=>[g("同步消息")])),_:1},8,["onClick"]),g(" 结果："+u(r.message3),1)])),_:1})]),b,d("div",_,[t(p,null,{default:c((()=>[t(m,{onClick:k.sendMsgStart},{default:c((()=>[g("开始")])),_:1},8,["onClick"]),t(m,{onClick:k.sendMsgStop},{default:c((()=>[g("结束")])),_:1},8,["onClick"]),g(" 结果："+u(r.messageString),1)])),_:1})]),M,d("div",W,[t(p,null,{default:c((()=>[t(m,{onClick:n[0]||(n[0]=e=>k.sendTosubWindow())},{default:c((()=>[g("向主窗口发消息")])),_:1})])),_:1})])])}],["__scopeId","data-v-54ef5770"]]);export{y as default};
+========
+import{i as e,s as n}from"./main-ce25b28f.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as o,r as a,o as l,b as i,g as d,a as t,w as c,e as g,t as u,p as r,f as k}from"./index-869350c9.js";const m={data:()=>({messageString:"",message1:"",message2:"",message3:"",mainWCid:0}),mounted(){this.init()},methods:{init(){s.removeAllListeners(e.ipcSendMsg),s.on(e.ipcSendMsg,((n,s)=>{console.log("[ipcRenderer] [socketMsgStart] result:",s),this.messageString=s,n.sender.send(e.hello,"electron-egg")})),s.removeAllListeners(n.window1ToWindow2),s.on(n.window1ToWindow2,((e,n)=>{this.$message.info(n)}))},sendMsgStart(){s.send(e.ipcSendMsg,{type:"start",content:"开始"})},sendMsgStop(){s.send(e.ipcSendMsg,{type:"end",content:""})},handleInvoke(){s.invoke(e.ipcInvokeMsg,"异步-回调").then((e=>{console.log("r:",e),this.message1=e}))},async handleInvoke2(){const n=await s.invoke(e.ipcInvokeMsg,"异步");console.log("msg:",n),this.message2=n},handleSendSync(){const n=s.sendSync(e.ipcSendSyncMsg,"同步");this.message3=n},sendTosubWindow(){s.invoke(e.getWCid,"main").then((e=>{this.mainWCid=e,s.sendTo(this.mainWCid,n.window2ToWindow1,"窗口2 通过 sendTo 给主窗口发送消息")}))}}},p=e=>(r("data-v-54ef5770"),e=e(),k(),e),v={id:"app-base-subwindow-ipc"},f=p((()=>d("div",{class:"one-block-1"},[d("span",null," 1. 发送异步消息 ")],-1))),S={class:"one-block-2"},h=p((()=>d("p",null,null,-1))),w=p((()=>d("div",{class:"one-block-1"},[d("span",null," 2. 同步消息（不推荐，阻塞执行） ")],-1))),C={class:"one-block-2"},b=p((()=>d("div",{class:"one-block-1"},[d("span",null," 3. 长消息： 服务端持续向前端页面发消息 ")],-1))),_={class:"one-block-2"},M=p((()=>d("div",{class:"one-block-1"},[d("span",null," 4. 多窗口通信：窗口之间互相通信 ")],-1))),W={class:"one-block-2"};const y=o(m,[["render",function(e,n,s,o,r,k){const m=a("a-button"),p=a("a-space");return l(),i("div",v,[f,d("div",S,[t(p,null,{default:c((()=>[t(m,{onClick:k.handleInvoke},{default:c((()=>[g("发送 - 回调")])),_:1},8,["onClick"]),g(" 结果："+u(r.message1),1)])),_:1}),h,t(p,null,{default:c((()=>[t(m,{onClick:k.handleInvoke2},{default:c((()=>[g("发送 - async/await")])),_:1},8,["onClick"]),g(" 结果："+u(r.message2),1)])),_:1})]),w,d("div",C,[t(p,null,{default:c((()=>[t(m,{onClick:k.handleSendSync},{default:c((()=>[g("同步消息")])),_:1},8,["onClick"]),g(" 结果："+u(r.message3),1)])),_:1})]),b,d("div",_,[t(p,null,{default:c((()=>[t(m,{onClick:k.sendMsgStart},{default:c((()=>[g("开始")])),_:1},8,["onClick"]),t(m,{onClick:k.sendMsgStop},{default:c((()=>[g("结束")])),_:1},8,["onClick"]),g(" 结果："+u(r.messageString),1)])),_:1})]),M,d("div",W,[t(p,null,{default:c((()=>[t(m,{onClick:n[0]||(n[0]=e=>k.sendTosubWindow())},{default:c((()=>[g("向主窗口发消息")])),_:1})])),_:1})])])}],["__scopeId","data-v-54ef5770"]]);export{y as default};
+>>>>>>>> dev_v3:public/dist/assets/Ipc-4d92174b.js
--- a/public/dist/assets/Ipc-4d92174b.js.gz
+++ b/public/dist/assets/Ipc-4d92174b.js.gz
--- a/public/dist/assets/Ipc-7b5efd90.js
+++ b/public/dist/assets/Ipc-7b5efd90.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Ipc-7b5efd90.js
 import{i as e,s as n}from"./main-d72f38de.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as o,h as i,r as a,o as d,b as l,g as t,a as c,w,e as g,t as r,p as u,f as p}from"./index-04ffc5d9.js";const k={data:()=>({messageString:"",message1:"",message2:"",message3:"",windowName:"window-ipc",newWcId:0,views:[{type:"vue",content:"#/special/subwindow",windowName:"window-ipc",windowTitle:"ipc window"}]}),mounted(){this.init()},methods:{init(){s.removeAllListeners(e.ipcSendMsg),s.on(e.ipcSendMsg,((n,s)=>{console.log("[ipcRenderer] [socketMsgStart] result:",s),this.messageString=s,n.sender.send(e.hello,"electron-egg")})),s.removeAllListeners(n.window2ToWindow1),s.on(n.window2ToWindow1,((e,n)=>{this.$message.info(n)}))},sendMsgStart(){s.send(e.ipcSendMsg,{type:"start",content:"开始"})},sendMsgStop(){s.send(e.ipcSendMsg,{type:"end",content:""})},handleInvoke(){s.invoke(e.ipcInvokeMsg,"异步-回调").then((e=>{console.log("r:",e),this.message1=e}))},async handleInvoke2(){const n=await s.invoke(e.ipcInvokeMsg,"异步");console.log("msg:",n),this.message2=n},handleSendSync(){const n=s.sendSync(e.ipcSendSyncMsg,"同步");this.message3=n},createWindow(n){s.invoke(e.createWindow,i(this.views[n])).then((e=>{console.log("[createWindow] id:",e)}))},async sendTosubWindow(){this.newWcId=await s.invoke(e.getWCid,this.windowName),s.sendTo(this.newWcId,n.window1ToWindow2,"窗口1通过 sendTo 给窗口2发送消息")}}},m=e=>(u("data-v-227d95f1"),e=e(),p(),e),v={id:"app-base-socket-ipc"},f=m((()=>t("div",{class:"one-block-1"},[t("span",null," 1. 发送异步消息 ")],-1))),h={class:"one-block-2"},S=m((()=>t("p",null,null,-1))),_=m((()=>t("div",{class:"one-block-1"},[t("span",null," 2. 同步消息（不推荐，阻塞执行） ")],-1))),b={class:"one-block-2"},C=m((()=>t("div",{class:"one-block-1"},[t("span",null," 3. 长消息： 服务端持续向前端页面发消息 ")],-1))),W={class:"one-block-2"},M=m((()=>t("div",{class:"one-block-1"},[t("span",null," 4. 多窗口通信：子窗口与主进程通信，子窗口互相通信 ")],-1))),y={class:"one-block-2"};const I=o(k,[["render",function(e,n,s,o,i,u){const p=a("a-button"),k=a("a-space");return d(),l("div",v,[f,t("div",h,[c(k,null,{default:w((()=>[c(p,{onClick:u.handleInvoke},{default:w((()=>[g("发送 - 回调")])),_:1},8,["onClick"]),g(" 结果："+r(i.message1),1)])),_:1}),S,c(k,null,{default:w((()=>[c(p,{onClick:u.handleInvoke2},{default:w((()=>[g("发送 - async/await")])),_:1},8,["onClick"]),g(" 结果："+r(i.message2),1)])),_:1})]),_,t("div",b,[c(k,null,{default:w((()=>[c(p,{onClick:u.handleSendSync},{default:w((()=>[g("同步消息")])),_:1},8,["onClick"]),g(" 结果："+r(i.message3),1)])),_:1})]),C,t("div",W,[c(k,null,{default:w((()=>[c(p,{onClick:u.sendMsgStart},{default:w((()=>[g("开始")])),_:1},8,["onClick"]),c(p,{onClick:u.sendMsgStop},{default:w((()=>[g("结束")])),_:1},8,["onClick"]),g(" 结果："+r(i.messageString),1)])),_:1})]),M,t("div",y,[c(k,null,{default:w((()=>[c(p,{onClick:n[0]||(n[0]=e=>u.createWindow(0))},{default:w((()=>[g("打开新窗口2")])),_:1}),c(p,{onClick:n[1]||(n[1]=e=>u.sendTosubWindow())},{default:w((()=>[g("向新窗口2发消息")])),_:1})])),_:1})])])}],["__scopeId","data-v-227d95f1"]]);export{I as default};
+========
+import{i as e,s as n}from"./main-ce25b28f.js";import{i as s}from"./ipcRenderer-5e19eaee.js";import{_ as o,h as i,r as a,o as d,b as l,g as t,a as c,w,e as g,t as r,p as u,f as p}from"./index-869350c9.js";const k={data:()=>({messageString:"",message1:"",message2:"",message3:"",windowName:"window-ipc",newWcId:0,views:[{type:"vue",content:"#/special/subwindow",windowName:"window-ipc",windowTitle:"ipc window"}]}),mounted(){this.init()},methods:{init(){s.removeAllListeners(e.ipcSendMsg),s.on(e.ipcSendMsg,((n,s)=>{console.log("[ipcRenderer] [socketMsgStart] result:",s),this.messageString=s,n.sender.send(e.hello,"electron-egg")})),s.removeAllListeners(n.window2ToWindow1),s.on(n.window2ToWindow1,((e,n)=>{this.$message.info(n)}))},sendMsgStart(){s.send(e.ipcSendMsg,{type:"start",content:"开始"})},sendMsgStop(){s.send(e.ipcSendMsg,{type:"end",content:""})},handleInvoke(){s.invoke(e.ipcInvokeMsg,"异步-回调").then((e=>{console.log("r:",e),this.message1=e}))},async handleInvoke2(){const n=await s.invoke(e.ipcInvokeMsg,"异步");console.log("msg:",n),this.message2=n},handleSendSync(){const n=s.sendSync(e.ipcSendSyncMsg,"同步");this.message3=n},createWindow(n){s.invoke(e.createWindow,i(this.views[n])).then((e=>{console.log("[createWindow] id:",e)}))},async sendTosubWindow(){this.newWcId=await s.invoke(e.getWCid,this.windowName),s.sendTo(this.newWcId,n.window1ToWindow2,"窗口1通过 sendTo 给窗口2发送消息")}}},m=e=>(u("data-v-227d95f1"),e=e(),p(),e),v={id:"app-base-socket-ipc"},f=m((()=>t("div",{class:"one-block-1"},[t("span",null," 1. 发送异步消息 ")],-1))),h={class:"one-block-2"},S=m((()=>t("p",null,null,-1))),_=m((()=>t("div",{class:"one-block-1"},[t("span",null," 2. 同步消息（不推荐，阻塞执行） ")],-1))),b={class:"one-block-2"},C=m((()=>t("div",{class:"one-block-1"},[t("span",null," 3. 长消息： 服务端持续向前端页面发消息 ")],-1))),W={class:"one-block-2"},M=m((()=>t("div",{class:"one-block-1"},[t("span",null," 4. 多窗口通信：子窗口与主进程通信，子窗口互相通信 ")],-1))),y={class:"one-block-2"};const I=o(k,[["render",function(e,n,s,o,i,u){const p=a("a-button"),k=a("a-space");return d(),l("div",v,[f,t("div",h,[c(k,null,{default:w((()=>[c(p,{onClick:u.handleInvoke},{default:w((()=>[g("发送 - 回调")])),_:1},8,["onClick"]),g(" 结果："+r(i.message1),1)])),_:1}),S,c(k,null,{default:w((()=>[c(p,{onClick:u.handleInvoke2},{default:w((()=>[g("发送 - async/await")])),_:1},8,["onClick"]),g(" 结果："+r(i.message2),1)])),_:1})]),_,t("div",b,[c(k,null,{default:w((()=>[c(p,{onClick:u.handleSendSync},{default:w((()=>[g("同步消息")])),_:1},8,["onClick"]),g(" 结果："+r(i.message3),1)])),_:1})]),C,t("div",W,[c(k,null,{default:w((()=>[c(p,{onClick:u.sendMsgStart},{default:w((()=>[g("开始")])),_:1},8,["onClick"]),c(p,{onClick:u.sendMsgStop},{default:w((()=>[g("结束")])),_:1},8,["onClick"]),g(" 结果："+r(i.messageString),1)])),_:1})]),M,t("div",y,[c(k,null,{default:w((()=>[c(p,{onClick:n[0]||(n[0]=e=>u.createWindow(0))},{default:w((()=>[g("打开新窗口2")])),_:1}),c(p,{onClick:n[1]||(n[1]=e=>u.sendTosubWindow())},{default:w((()=>[g("向新窗口2发消息")])),_:1})])),_:1})])])}],["__scopeId","data-v-227d95f1"]]);export{I as default};
+>>>>>>>> dev_v3:public/dist/assets/Ipc-45ee52db.js
--- a/public/dist/assets/Menu-27224c6e.js
+++ b/public/dist/assets/Menu-27224c6e.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Menu-27224c6e.js
 import{_ as e,r as a,o as t,c as n,w as i,a as r,b as o,d as m,F as s,g as l,t as p}from"./index-04ffc5d9.js";const u={framework:{menu_100:{icon:"profile",title:"通信",pageName:"FrameworkSocketIpc",params:{}},menu_101:{icon:"profile",title:"http服务",pageName:"FrameworkSocketHttpServer",params:{}},menu_102:{icon:"profile",title:"socket服务",pageName:"FrameworkSocketSocketServer",params:{}},menu_103:{icon:"profile",title:"json数据库",pageName:"FrameworkJsonDBIndex",params:{}},menu_104:{icon:"profile",title:"sqlite数据库",pageName:"FrameworkSqliteDBIndex",params:{}},menu_105:{icon:"profile",title:"任务",pageName:"FrameworkJobsIndex",params:{}},menu_106:{icon:"profile",title:"自动更新",pageName:"FrameworkUpdaterIndex",params:{}},menu_107:{icon:"profile",title:"软件调用",pageName:"FrameworkSoftwareIndex",params:{}},menu_108:{icon:"profile",title:"java",pageName:"FrameworkJavaIndex",params:{}},menu_109:{icon:"profile",title:"测试",pageName:"FrameworkTestApiIndex",params:{}}},os:{menu_100:{icon:"profile",title:"文件",pageName:"OsFileIndex",params:{}},menu_101:{icon:"profile",title:"视图",pageName:"OsWindowViewIndex",params:{}},menu_102:{icon:"profile",title:"窗口",pageName:"OsWindowIndex",params:{}},menu_103:{icon:"profile",title:"桌面通知",pageName:"OsNotificationIndex",params:{}},menu_104:{icon:"profile",title:"电源监控",pageName:"OsPowerMonitorIndex",params:{}},menu_105:{icon:"profile",title:"屏幕信息",pageName:"OsScreenIndex",params:{}},menu_106:{icon:"profile",title:"系统主题",pageName:"OsThemeIndex",params:{}},menu_110:{icon:"profile",title:"图片",pageName:"OsFilePic",params:{}}},hardware:{menu_100:{icon:"profile",title:"打印机",pageName:"HardwarePrinterIndex",params:{}}},effect:{menu_100:{icon:"profile",title:"视频播放器",pageName:"EffectVideoIndex",params:{}},menu_110:{icon:"profile",title:"登录",pageName:"EffectLoginIndex",params:{}}},cross:{menu_100:{icon:"profile",title:"go服务",pageName:"CrossGoIndex",params:{}}}};const c=e({props:{id:{type:String,default:""}},data:()=>({menu:{},current:"menu_100",keys:[]}),watch:{id:function(){console.log("watch id ----- ",this.id),this.current="menu_100",this.menuHandle()}},created(){},mounted(){this.menuHandle()},methods:{menuHandle(){console.log("menu ------ id:",this.id),this.menu=u[this.id];const e=this.menu[this.current];this.$router.push({name:e.pageName,params:e.params})},changeMenu(e){console.log("changeMenu e:",e),this.current=e.key}}},[["render",function(e,u,c,d,f,g){const _=a("router-link"),h=a("a-menu-item"),N=a("a-menu"),k=a("a-layout-sider"),w=a("router-view"),x=a("a-layout-content"),I=a("a-layout");return t(),n(I,{id:"app-menu"},{default:i((()=>[r(k,{theme:"light",class:"layout-sider"},{default:i((()=>[r(N,{theme:"light",mode:"inline",selectedKeys:[f.current],onClick:g.changeMenu},{default:i((()=>[(t(!0),o(s,null,m(f.menu,((e,a)=>(t(),n(h,{key:a},{default:i((()=>[r(_,{to:{name:e.pageName,params:e.params}},{default:i((()=>[l("span",null,p(e.title),1)])),_:2},1032,["to"])])),_:2},1024)))),128))])),_:1},8,["selectedKeys","onClick"])])),_:1}),r(I,null,{default:i((()=>[r(x,null,{default:i((()=>[r(w)])),_:1})])),_:1})])),_:1})}],["__scopeId","data-v-cb2fcd1f"]]);export{c as default};
+========
+import{_ as e,r as a,o as t,c as n,w as i,a as r,b as o,d as m,F as s,g as l,t as p}from"./index-869350c9.js";const u={framework:{menu_100:{icon:"profile",title:"通信",pageName:"FrameworkSocketIpc",params:{}},menu_101:{icon:"profile",title:"http服务",pageName:"FrameworkSocketHttpServer",params:{}},menu_102:{icon:"profile",title:"socket服务",pageName:"FrameworkSocketSocketServer",params:{}},menu_103:{icon:"profile",title:"json数据库",pageName:"FrameworkJsonDBIndex",params:{}},menu_104:{icon:"profile",title:"sqlite数据库",pageName:"FrameworkSqliteDBIndex",params:{}},menu_105:{icon:"profile",title:"任务",pageName:"FrameworkJobsIndex",params:{}},menu_106:{icon:"profile",title:"自动更新",pageName:"FrameworkUpdaterIndex",params:{}},menu_107:{icon:"profile",title:"软件调用",pageName:"FrameworkSoftwareIndex",params:{}},menu_108:{icon:"profile",title:"java",pageName:"FrameworkJavaIndex",params:{}},menu_109:{icon:"profile",title:"测试",pageName:"FrameworkTestApiIndex",params:{}}},os:{menu_100:{icon:"profile",title:"文件",pageName:"OsFileIndex",params:{}},menu_101:{icon:"profile",title:"视图",pageName:"OsWindowViewIndex",params:{}},menu_102:{icon:"profile",title:"窗口",pageName:"OsWindowIndex",params:{}},menu_103:{icon:"profile",title:"桌面通知",pageName:"OsNotificationIndex",params:{}},menu_104:{icon:"profile",title:"电源监控",pageName:"OsPowerMonitorIndex",params:{}},menu_105:{icon:"profile",title:"屏幕信息",pageName:"OsScreenIndex",params:{}},menu_106:{icon:"profile",title:"系统主题",pageName:"OsThemeIndex",params:{}},menu_110:{icon:"profile",title:"图片",pageName:"OsFilePic",params:{}}},hardware:{menu_100:{icon:"profile",title:"打印机",pageName:"HardwarePrinterIndex",params:{}}},effect:{menu_100:{icon:"profile",title:"视频播放器",pageName:"EffectVideoIndex",params:{}},menu_110:{icon:"profile",title:"登录",pageName:"EffectLoginIndex",params:{}}},cross:{menu_100:{icon:"profile",title:"go服务",pageName:"CrossGoIndex",params:{}}}};const c=e({props:{id:{type:String,default:""}},data:()=>({menu:{},current:"menu_100",keys:[]}),watch:{id:function(){console.log("watch id ----- ",this.id),this.current="menu_100",this.menuHandle()}},created(){},mounted(){this.menuHandle()},methods:{menuHandle(){console.log("menu ------ id:",this.id),this.menu=u[this.id];const e=this.menu[this.current];this.$router.push({name:e.pageName,params:e.params})},changeMenu(e){console.log("changeMenu e:",e),this.current=e.key}}},[["render",function(e,u,c,d,f,g){const _=a("router-link"),h=a("a-menu-item"),N=a("a-menu"),k=a("a-layout-sider"),w=a("router-view"),x=a("a-layout-content"),I=a("a-layout");return t(),n(I,{id:"app-menu"},{default:i((()=>[r(k,{theme:"light",class:"layout-sider"},{default:i((()=>[r(N,{theme:"light",mode:"inline",selectedKeys:[f.current],onClick:g.changeMenu},{default:i((()=>[(t(!0),o(s,null,m(f.menu,((e,a)=>(t(),n(h,{key:a},{default:i((()=>[r(_,{to:{name:e.pageName,params:e.params}},{default:i((()=>[l("span",null,p(e.title),1)])),_:2},1032,["to"])])),_:2},1024)))),128))])),_:1},8,["selectedKeys","onClick"])])),_:1}),r(I,null,{default:i((()=>[r(x,null,{default:i((()=>[r(w)])),_:1})])),_:1})])),_:1})}],["__scopeId","data-v-cb2fcd1f"]]);export{c as default};
+>>>>>>>> dev_v3:public/dist/assets/Menu-c7c3a351.js
--- a/public/dist/assets/Menu-c7c3a351.js
+++ b/public/dist/assets/Menu-c7c3a351.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Menu-27224c6e.js
+import{_ as e,r as a,o as t,c as n,w as i,a as r,b as o,d as m,F as s,g as l,t as p}from"./index-04ffc5d9.js";const u={framework:{menu_100:{icon:"profile",title:"通信",pageName:"FrameworkSocketIpc",params:{}},menu_101:{icon:"profile",title:"http服务",pageName:"FrameworkSocketHttpServer",params:{}},menu_102:{icon:"profile",title:"socket服务",pageName:"FrameworkSocketSocketServer",params:{}},menu_103:{icon:"profile",title:"json数据库",pageName:"FrameworkJsonDBIndex",params:{}},menu_104:{icon:"profile",title:"sqlite数据库",pageName:"FrameworkSqliteDBIndex",params:{}},menu_105:{icon:"profile",title:"任务",pageName:"FrameworkJobsIndex",params:{}},menu_106:{icon:"profile",title:"自动更新",pageName:"FrameworkUpdaterIndex",params:{}},menu_107:{icon:"profile",title:"软件调用",pageName:"FrameworkSoftwareIndex",params:{}},menu_108:{icon:"profile",title:"java",pageName:"FrameworkJavaIndex",params:{}},menu_109:{icon:"profile",title:"测试",pageName:"FrameworkTestApiIndex",params:{}}},os:{menu_100:{icon:"profile",title:"文件",pageName:"OsFileIndex",params:{}},menu_101:{icon:"profile",title:"视图",pageName:"OsWindowViewIndex",params:{}},menu_102:{icon:"profile",title:"窗口",pageName:"OsWindowIndex",params:{}},menu_103:{icon:"profile",title:"桌面通知",pageName:"OsNotificationIndex",params:{}},menu_104:{icon:"profile",title:"电源监控",pageName:"OsPowerMonitorIndex",params:{}},menu_105:{icon:"profile",title:"屏幕信息",pageName:"OsScreenIndex",params:{}},menu_106:{icon:"profile",title:"系统主题",pageName:"OsThemeIndex",params:{}},menu_110:{icon:"profile",title:"图片",pageName:"OsFilePic",params:{}}},hardware:{menu_100:{icon:"profile",title:"打印机",pageName:"HardwarePrinterIndex",params:{}}},effect:{menu_100:{icon:"profile",title:"视频播放器",pageName:"EffectVideoIndex",params:{}},menu_110:{icon:"profile",title:"登录",pageName:"EffectLoginIndex",params:{}}},cross:{menu_100:{icon:"profile",title:"go服务",pageName:"CrossGoIndex",params:{}}}};const c=e({props:{id:{type:String,default:""}},data:()=>({menu:{},current:"menu_100",keys:[]}),watch:{id:function(){console.log("watch id ----- ",this.id),this.current="menu_100",this.menuHandle()}},created(){},mounted(){this.menuHandle()},methods:{menuHandle(){console.log("menu ------ id:",this.id),this.menu=u[this.id];const e=this.menu[this.current];this.$router.push({name:e.pageName,params:e.params})},changeMenu(e){console.log("changeMenu e:",e),this.current=e.key}}},[["render",function(e,u,c,d,f,g){const _=a("router-link"),h=a("a-menu-item"),N=a("a-menu"),k=a("a-layout-sider"),w=a("router-view"),x=a("a-layout-content"),I=a("a-layout");return t(),n(I,{id:"app-menu"},{default:i((()=>[r(k,{theme:"light",class:"layout-sider"},{default:i((()=>[r(N,{theme:"light",mode:"inline",selectedKeys:[f.current],onClick:g.changeMenu},{default:i((()=>[(t(!0),o(s,null,m(f.menu,((e,a)=>(t(),n(h,{key:a},{default:i((()=>[r(_,{to:{name:e.pageName,params:e.params}},{default:i((()=>[l("span",null,p(e.title),1)])),_:2},1032,["to"])])),_:2},1024)))),128))])),_:1},8,["selectedKeys","onClick"])])),_:1}),r(I,null,{default:i((()=>[r(x,null,{default:i((()=>[r(w)])),_:1})])),_:1})])),_:1})}],["__scopeId","data-v-cb2fcd1f"]]);export{c as default};
+========
+import{_ as e,r as a,o as t,c as n,w as i,a as r,b as o,d as m,F as s,g as l,t as p}from"./index-869350c9.js";const u={framework:{menu_100:{icon:"profile",title:"通信",pageName:"FrameworkSocketIpc",params:{}},menu_101:{icon:"profile",title:"http服务",pageName:"FrameworkSocketHttpServer",params:{}},menu_102:{icon:"profile",title:"socket服务",pageName:"FrameworkSocketSocketServer",params:{}},menu_103:{icon:"profile",title:"json数据库",pageName:"FrameworkJsonDBIndex",params:{}},menu_104:{icon:"profile",title:"sqlite数据库",pageName:"FrameworkSqliteDBIndex",params:{}},menu_105:{icon:"profile",title:"任务",pageName:"FrameworkJobsIndex",params:{}},menu_106:{icon:"profile",title:"自动更新",pageName:"FrameworkUpdaterIndex",params:{}},menu_107:{icon:"profile",title:"软件调用",pageName:"FrameworkSoftwareIndex",params:{}},menu_108:{icon:"profile",title:"java",pageName:"FrameworkJavaIndex",params:{}},menu_109:{icon:"profile",title:"测试",pageName:"FrameworkTestApiIndex",params:{}}},os:{menu_100:{icon:"profile",title:"文件",pageName:"OsFileIndex",params:{}},menu_101:{icon:"profile",title:"视图",pageName:"OsWindowViewIndex",params:{}},menu_102:{icon:"profile",title:"窗口",pageName:"OsWindowIndex",params:{}},menu_103:{icon:"profile",title:"桌面通知",pageName:"OsNotificationIndex",params:{}},menu_104:{icon:"profile",title:"电源监控",pageName:"OsPowerMonitorIndex",params:{}},menu_105:{icon:"profile",title:"屏幕信息",pageName:"OsScreenIndex",params:{}},menu_106:{icon:"profile",title:"系统主题",pageName:"OsThemeIndex",params:{}},menu_110:{icon:"profile",title:"图片",pageName:"OsFilePic",params:{}}},hardware:{menu_100:{icon:"profile",title:"打印机",pageName:"HardwarePrinterIndex",params:{}}},effect:{menu_100:{icon:"profile",title:"视频播放器",pageName:"EffectVideoIndex",params:{}},menu_110:{icon:"profile",title:"登录",pageName:"EffectLoginIndex",params:{}}},cross:{menu_100:{icon:"profile",title:"go服务",pageName:"CrossGoIndex",params:{}}}};const c=e({props:{id:{type:String,default:""}},data:()=>({menu:{},current:"menu_100",keys:[]}),watch:{id:function(){console.log("watch id ----- ",this.id),this.current="menu_100",this.menuHandle()}},created(){},mounted(){this.menuHandle()},methods:{menuHandle(){console.log("menu ------ id:",this.id),this.menu=u[this.id];const e=this.menu[this.current];this.$router.push({name:e.pageName,params:e.params})},changeMenu(e){console.log("changeMenu e:",e),this.current=e.key}}},[["render",function(e,u,c,d,f,g){const _=a("router-link"),h=a("a-menu-item"),N=a("a-menu"),k=a("a-layout-sider"),w=a("router-view"),x=a("a-layout-content"),I=a("a-layout");return t(),n(I,{id:"app-menu"},{default:i((()=>[r(k,{theme:"light",class:"layout-sider"},{default:i((()=>[r(N,{theme:"light",mode:"inline",selectedKeys:[f.current],onClick:g.changeMenu},{default:i((()=>[(t(!0),o(s,null,m(f.menu,((e,a)=>(t(),n(h,{key:a},{default:i((()=>[r(_,{to:{name:e.pageName,params:e.params}},{default:i((()=>[l("span",null,p(e.title),1)])),_:2},1032,["to"])])),_:2},1024)))),128))])),_:1},8,["selectedKeys","onClick"])])),_:1}),r(I,null,{default:i((()=>[r(x,null,{default:i((()=>[r(w)])),_:1})])),_:1})])),_:1})}],["__scopeId","data-v-cb2fcd1f"]]);export{c as default};
+>>>>>>>> dev_v3:public/dist/assets/Menu-c7c3a351.js
--- a/public/dist/assets/Menu-c7c3a351.js.gz
+++ b/public/dist/assets/Menu-c7c3a351.js.gz
--- a/public/dist/assets/Pic-90e6fdc0.js
+++ b/public/dist/assets/Pic-90e6fdc0.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Pic-90e6fdc0.js
 import{i as s}from"./main-d72f38de.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as t,o as i,b as c,g as o,a as l,w as n,e as p,p as d,f as r}from"./index-04ffc5d9.js";const u={data:()=>({picPath:"https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"}),methods:{selectPic(){a.invoke(s.selectPic,{}).then((s=>{this.picPath=s}))}}},f=s=>(d("data-v-d083fee8"),s=s(),r(),s),m={id:"os-file-pic"},h=f((()=>o("div",{class:"one-block-1"},[o("span",null," 1. 加载本机图片 ")],-1))),P={class:"one-block-2"},j=f((()=>o("p",null,null,-1)));const v=e(u,[["render",function(s,a,e,d,r,u){const f=t("a-button"),v=t("a-space"),k=t("a-image");return i(),c("div",m,[h,o("div",P,[l(v,null,{default:n((()=>[l(f,{onClick:a[0]||(a[0]=s=>u.selectPic(0))},{default:n((()=>[p("选择图片")])),_:1})])),_:1}),j,l(k,{width:500,src:r.picPath},null,8,["src"])])])}],["__scopeId","data-v-d083fee8"]]);export{v as default};
+========
+import{i as s}from"./main-ce25b28f.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as t,o as i,b as c,g as o,a as l,w as n,e as p,p as d,f as r}from"./index-869350c9.js";const u={data:()=>({picPath:"https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"}),methods:{selectPic(){a.invoke(s.selectPic,{}).then((s=>{this.picPath=s}))}}},f=s=>(d("data-v-d083fee8"),s=s(),r(),s),m={id:"os-file-pic"},h=f((()=>o("div",{class:"one-block-1"},[o("span",null," 1. 加载本机图片 ")],-1))),P={class:"one-block-2"},j=f((()=>o("p",null,null,-1)));const v=e(u,[["render",function(s,a,e,d,r,u){const f=t("a-button"),v=t("a-space"),k=t("a-image");return i(),c("div",m,[h,o("div",P,[l(v,null,{default:n((()=>[l(f,{onClick:a[0]||(a[0]=s=>u.selectPic(0))},{default:n((()=>[p("选择图片")])),_:1})])),_:1}),j,l(k,{width:500,src:r.picPath},null,8,["src"])])])}],["__scopeId","data-v-d083fee8"]]);export{v as default};
+>>>>>>>> dev_v3:public/dist/assets/Pic-bbb96498.js
--- a/public/dist/assets/Pic-bbb96498.js
+++ b/public/dist/assets/Pic-bbb96498.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Pic-90e6fdc0.js
+import{i as s}from"./main-d72f38de.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as t,o as i,b as c,g as o,a as l,w as n,e as p,p as d,f as r}from"./index-04ffc5d9.js";const u={data:()=>({picPath:"https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"}),methods:{selectPic(){a.invoke(s.selectPic,{}).then((s=>{this.picPath=s}))}}},f=s=>(d("data-v-d083fee8"),s=s(),r(),s),m={id:"os-file-pic"},h=f((()=>o("div",{class:"one-block-1"},[o("span",null," 1. 加载本机图片 ")],-1))),P={class:"one-block-2"},j=f((()=>o("p",null,null,-1)));const v=e(u,[["render",function(s,a,e,d,r,u){const f=t("a-button"),v=t("a-space"),k=t("a-image");return i(),c("div",m,[h,o("div",P,[l(v,null,{default:n((()=>[l(f,{onClick:a[0]||(a[0]=s=>u.selectPic(0))},{default:n((()=>[p("选择图片")])),_:1})])),_:1}),j,l(k,{width:500,src:r.picPath},null,8,["src"])])])}],["__scopeId","data-v-d083fee8"]]);export{v as default};
+========
+import{i as s}from"./main-ce25b28f.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as t,o as i,b as c,g as o,a as l,w as n,e as p,p as d,f as r}from"./index-869350c9.js";const u={data:()=>({picPath:"https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"}),methods:{selectPic(){a.invoke(s.selectPic,{}).then((s=>{this.picPath=s}))}}},f=s=>(d("data-v-d083fee8"),s=s(),r(),s),m={id:"os-file-pic"},h=f((()=>o("div",{class:"one-block-1"},[o("span",null," 1. 加载本机图片 ")],-1))),P={class:"one-block-2"},j=f((()=>o("p",null,null,-1)));const v=e(u,[["render",function(s,a,e,d,r,u){const f=t("a-button"),v=t("a-space"),k=t("a-image");return i(),c("div",m,[h,o("div",P,[l(v,null,{default:n((()=>[l(f,{onClick:a[0]||(a[0]=s=>u.selectPic(0))},{default:n((()=>[p("选择图片")])),_:1})])),_:1}),j,l(k,{width:500,src:r.picPath},null,8,["src"])])])}],["__scopeId","data-v-d083fee8"]]);export{v as default};
+>>>>>>>> dev_v3:public/dist/assets/Pic-bbb96498.js
--- a/public/dist/assets/SocketServer-bff9de3d.js
+++ b/public/dist/assets/SocketServer-bff9de3d.js
--- a/public/dist/assets/SocketServer-bff9de3d.js.gz
+++ b/public/dist/assets/SocketServer-bff9de3d.js.gz
--- a/public/dist/assets/Window-55d42d7d.js
+++ b/public/dist/assets/Window-55d42d7d.js
@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Window-c2cf4f95.js
+import{i as o}from"./main-d72f38de.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as i,o as t,b as s,g as n,a as r,w as d,t as l,e as m}from"./index-04ffc5d9.js";const g={id:"effect-login-window"},p={class:"block-1"},c={key:1};const u=e({data:()=>({loading:!1,loginText:"正在登陆......"}),methods:{login(){this.loading=!0,setTimeout((()=>{this.$router.push({name:"Framework",params:{}}),a.invoke(o.restoreWindow,{width:980,height:650}).then((o=>{}))}),2e3)}}},[["render",function(o,a,e,u,f,h){const k=i("a-button");return t(),s("div",g,[n("div",p,[f.loading?(t(),s("span",c,l(f.loginText),1)):(t(),s("a",{key:0,onClick:a[0]||(a[0]=(...o)=>h.login&&h.login(...o))},[r(k,{type:"primary"},{default:d((()=>[m(" 登录 ")])),_:1})]))])])}],["__scopeId","data-v-be47062b"]]);export{u as default};
+========
+import{i as o}from"./main-ce25b28f.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as i,o as t,b as s,g as n,a as r,w as d,t as l,e as m}from"./index-869350c9.js";const g={id:"effect-login-window"},p={class:"block-1"},c={key:1};const u=e({data:()=>({loading:!1,loginText:"正在登陆......"}),methods:{login(){this.loading=!0,setTimeout((()=>{this.$router.push({name:"Framework",params:{}}),a.invoke(o.restoreWindow,{width:980,height:650}).then((o=>{}))}),2e3)}}},[["render",function(o,a,e,u,f,h){const k=i("a-button");return t(),s("div",g,[n("div",p,[f.loading?(t(),s("span",c,l(f.loginText),1)):(t(),s("a",{key:0,onClick:a[0]||(a[0]=(...o)=>h.login&&h.login(...o))},[r(k,{type:"primary"},{default:d((()=>[m(" 登录 ")])),_:1})]))])])}],["__scopeId","data-v-be47062b"]]);export{u as default};
+>>>>>>>> dev_v3:public/dist/assets/Window-55d42d7d.js
--- a/public/dist/assets/Window-c2cf4f95.js
+++ b/public/dist/assets/Window-c2cf4f95.js
@@ -1 +1,5 @@
+<<<<<<<< HEAD:public/dist/assets/Window-c2cf4f95.js
 import{i as o}from"./main-d72f38de.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as i,o as t,b as s,g as n,a as r,w as d,t as l,e as m}from"./index-04ffc5d9.js";const g={id:"effect-login-window"},p={class:"block-1"},c={key:1};const u=e({data:()=>({loading:!1,loginText:"正在登陆......"}),methods:{login(){this.loading=!0,setTimeout((()=>{this.$router.push({name:"Framework",params:{}}),a.invoke(o.restoreWindow,{width:980,height:650}).then((o=>{}))}),2e3)}}},[["render",function(o,a,e,u,f,h){const k=i("a-button");return t(),s("div",g,[n("div",p,[f.loading?(t(),s("span",c,l(f.loginText),1)):(t(),s("a",{key:0,onClick:a[0]||(a[0]=(...o)=>h.login&&h.login(...o))},[r(k,{type:"primary"},{default:d((()=>[m(" 登录 ")])),_:1})]))])])}],["__scopeId","data-v-be47062b"]]);export{u as default};
+========
+import{i as o}from"./main-ce25b28f.js";import{i as a}from"./ipcRenderer-5e19eaee.js";import{_ as e,r as i,o as t,b as s,g as n,a as r,w as d,t as l,e as m}from"./index-869350c9.js";const g={id:"effect-login-window"},p={class:"block-1"},c={key:1};const u=e({data:()=>({loading:!1,loginText:"正在登陆......"}),methods:{login(){this.loading=!0,setTimeout((()=>{this.$router.push({name:"Framework",params:{}}),a.invoke(o.restoreWindow,{width:980,height:650}).then((o=>{}))}),2e3)}}},[["render",function(o,a,e,u,f,h){const k=i("a-button");return t(),s("div",g,[n("div",p,[f.loading?(t(),s("span",c,l(f.loginText),1)):(t(),s("a",{key:0,onClick:a[0]||(a[0]=(...o)=>h.login&&h.login(...o))},[r(k,{type:"primary"},{default:d((()=>[m(" 登录 ")])),_:1})]))])])}],["__scopeId","data-v-be47062b"]]);export{u as default};
+>>>>>>>> dev_v3:public/dist/assets/Window-55d42d7d.js
--- a/public/dist/assets/index-587e4740.js
+++ b/public/dist/assets/index-587e4740.js
--- a/public/dist/assets/index-71914d0e.js
+++ b/public/dist/assets/index-71914d0e.js
--- a/public/dist/assets/index-71914d0e.js.gz
+++ b/public/dist/assets/index-71914d0e.js.gz
--- a/public/dist/assets/index-869350c9.js
+++ b/public/dist/assets/index-869350c9.js
--- a/public/dist/assets/index-869350c9.js.gz
+++ b/public/dist/assets/index-869350c9.js.gz
--- a/public/dist/assets/main-ce25b28f.js
+++ b/public/dist/assets/main-ce25b28f.js
@@ -1 +1 @@
-const o={test:"controller.example.test",checkForUpdater:"controller.framework.checkForUpdater",downloadApp:"controller.framework.downloadApp",jsondbOperation:"controller.framework.jsondbOperation",sqlitedbOperation:"controller.framework.sqlitedbOperation",uploadFile:"controller.framework.uploadFile",checkHttpServer:"controller.framework.checkHttpServer",doHttpRequest:"controller.framework.doHttpRequest",doSocketRequest:"controller.framework.doSocketRequest",ipcInvokeMsg:"controller.framework.ipcInvokeMsg",ipcSendSyncMsg:"controller.framework.ipcSendSyncMsg",ipcSendMsg:"controller.framework.ipcSendMsg",startJavaServer:"controller.framework.startJavaServer",closeJavaServer:"controller.framework.closeJavaServer",someJob:"controller.framework.someJob",timerJobProgress:"controller.framework.timerJobProgress",createPool:"controller.framework.createPool",createPoolNotice:"controller.framework.createPoolNotice",someJobByPool:"controller.framework.someJobByPool",hello:"controller.framework.hello",openSoftware:"controller.framework.openSoftware",messageShow:"controller.os.messageShow",messageShowConfirm:"controller.os.messageShowConfirm",selectFolder:"controller.os.selectFolder",selectPic:"controller.os.selectPic",openDirectory:"controller.os.openDirectory",loadViewContent:"controller.os.loadViewContent",removeViewContent:"controller.os.removeViewContent",createWindow:"controller.os.createWindow",getWCid:"controller.os.getWCid",sendNotification:"controller.os.sendNotification",initPowerMonitor:"controller.os.initPowerMonitor",getScreen:"controller.os.getScreen",autoLaunch:"controller.os.autoLaunch",setTheme:"controller.os.setTheme",getTheme:"controller.os.getTheme",getPrinterList:"controller.hardware.getPrinterList",print:"controller.hardware.print",printStatus:"controller.hardware.printStatus",selectFile:"controller.effect.selectFile",loginWindow:"controller.effect.loginWindow",restoreWindow:"controller.effect.restoreWindow",requestGoApi:"controller.cross.requestGoApi"},e={appUpdater:"app.updater",window1ToWindow2:"window1-to-window2",window2ToWindow1:"window2-to-window1"};export{o as i,e as s};
+const o={test:"controller.example.test",checkForUpdater:"controller.framework.checkForUpdater",downloadApp:"controller.framework.downloadApp",jsondbOperation:"controller.framework.jsondbOperation",sqlitedbOperation:"controller.framework.sqlitedbOperation",uploadFile:"controller.framework.uploadFile",checkHttpServer:"controller.framework.checkHttpServer",doHttpRequest:"controller.framework.doHttpRequest",doSocketRequest:"controller.framework.doSocketRequest",ipcInvokeMsg:"controller.framework.ipcInvokeMsg",ipcSendSyncMsg:"controller.framework.ipcSendSyncMsg",ipcSendMsg:"controller.framework.ipcSendMsg",startJavaServer:"controller.framework.startJavaServer",closeJavaServer:"controller.framework.closeJavaServer",someJob:"controller.framework.someJob",timerJobProgress:"controller.framework.timerJobProgress",createPool:"controller.framework.createPool",createPoolNotice:"controller.framework.createPoolNotice",someJobByPool:"controller.framework.someJobByPool",hello:"controller.framework.hello",openSoftware:"controller.framework.openSoftware",messageShow:"controller.os.messageShow",messageShowConfirm:"controller.os.messageShowConfirm",selectFolder:"controller.os.selectFolder",selectPic:"controller.os.selectPic",openDirectory:"controller.os.openDirectory",loadViewContent:"controller.os.loadViewContent",removeViewContent:"controller.os.removeViewContent",createWindow:"controller.os.createWindow",getWCid:"controller.os.getWCid",sendNotification:"controller.os.sendNotification",initPowerMonitor:"controller.os.initPowerMonitor",getScreen:"controller.os.getScreen",autoLaunch:"controller.os.autoLaunch",setTheme:"controller.os.setTheme",getTheme:"controller.os.getTheme",getPrinterList:"controller.hardware.getPrinterList",print:"controller.hardware.print",printStatus:"controller.hardware.printStatus",selectFile:"controller.effect.selectFile",loginWindow:"controller.effect.loginWindow",restoreWindow:"controller.effect.restoreWindow",crossInfo:"controller.cross.info",getCrossUrl:"controller.cross.getUrl",killCrossServer:"controller.cross.killServer",createCrossServer:"controller.cross.createServer",requestApi:"controller.cross.requestApi"},e={appUpdater:"app.updater",window1ToWindow2:"window1-to-window2",window2ToWindow1:"window2-to-window1"};export{o as i,e as s};
--- a/public/dist/assets/main-ce25b28f.js.gz
+++ b/public/dist/assets/main-ce25b28f.js.gz
--- a/public/dist/assets/main-d72f38de.js.gz
+++ b/public/dist/assets/main-d72f38de.js.gz
--- a/public/dist/assets/store2-5d974a5c.js
+++ b/public/dist/assets/store2-5d974a5c.js
@@ -0,0 +1,7 @@
+<<<<<<<< HEAD:public/dist/assets/store2-c7ac8a8d.js
+import{j as t,i as e}from"./index-04ffc5d9.js";var r,n,i,s,a,o={exports:{}};
+========
+import{i as t,j as e}from"./index-869350c9.js";var r,n,i,s,a,o={exports:{}};
+>>>>>>>> dev_v3:public/dist/assets/store2-5d974a5c.js
+/*! store2 - v2.14.2 - 2022-07-18
+* Copyright (c) 2022 Nathan Bubna; Licensed (MIT OR GPL-3.0) */r=o,n=t,i=t&&t.define,(a=(s={version:"2.14.2",areas:{},apis:{},nsdelim:".",inherit:function(t,e){for(var r in t)e.hasOwnProperty(r)||Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(t,r));return e},stringify:function(t,e){return void 0===t||"function"==typeof t?t+"":JSON.stringify(t,e||s.replace)},parse:function(t,e){try{return JSON.parse(t,e||s.revive)}catch(r){return t}},fn:function(t,e){for(var r in s.storeAPI[t]=e,s.apis)s.apis[r][t]=e},get:function(t,e){return t.getItem(e)},set:function(t,e,r){t.setItem(e,r)},remove:function(t,e){t.removeItem(e)},key:function(t,e){return t.key(e)},length:function(t){return t.length},clear:function(t){t.clear()},Store:function(t,e,r){var n=s.inherit(s.storeAPI,(function(t,e,r){return 0===arguments.length?n.getAll():"function"==typeof e?n.transact(t,e,r):void 0!==e?n.set(t,e,r):"string"==typeof t||"number"==typeof t?n.get(t):"function"==typeof t?n.each(t):t?n.setAll(t,e):n.clear()}));n._id=t;try{var i="__store2_test";e.setItem(i,"ok"),n._area=e,e.removeItem(i)}catch(a){n._area=s.storage("fake")}return n._ns=r||"",s.areas[t]||(s.areas[t]=n._area),s.apis[n._ns+n._id]||(s.apis[n._ns+n._id]=n),n},storeAPI:{area:function(t,e){var r=this[t];return r&&r.area||(r=s.Store(t,e,this._ns),this[t]||(this[t]=r)),r},namespace:function(t,e,r){if(r=r||this._delim||s.nsdelim,!t)return this._ns?this._ns.substring(0,this._ns.length-r.length):"";var n=t,i=this[n];if(!(i&&i.namespace||((i=s.Store(this._id,this._area,this._ns+n+r))._delim=r,this[n]||(this[n]=i),e)))for(var a in s.areas)i.area(a,s.areas[a]);return i},isFake:function(t){return t?(this._real=this._area,this._area=s.storage("fake")):!1===t&&(this._area=this._real||this._area),"fake"===this._area.name},toString:function(){return"store"+(this._ns?"."+this.namespace():"")+"["+this._id+"]"},has:function(t){return this._area.has?this._area.has(this._in(t)):!!(this._in(t)in this._area)},size:function(){return this.keys().length},each:function(t,e){for(var r=0,n=s.length(this._area);r<n;r++){var i=this._out(s.key(this._area,r));if(void 0!==i&&!1===t.call(this,i,this.get(i),e))break;n>s.length(this._area)&&(n--,r--)}return e||this},keys:function(t){return this.each((function(t,e,r){r.push(t)}),t||[])},get:function(t,e){var r,n=s.get(this._area,this._in(t));return"function"==typeof e&&(r=e,e=null),null!==n?s.parse(n,r):null!=e?e:n},getAll:function(t){return this.each((function(t,e,r){r[t]=e}),t||{})},transact:function(t,e,r){var n=this.get(t,r),i=e(n);return this.set(t,void 0===i?n:i),this},set:function(t,e,r){var n,i=this.get(t);return null!=i&&!1===r?e:("function"==typeof r&&(n=r,r=void 0),s.set(this._area,this._in(t),s.stringify(e,n),r)||i)},setAll:function(t,e){var r,n;for(var i in t)n=t[i],this.set(i,n,e)!==n&&(r=!0);return r},add:function(t,e,r){var n=this.get(t);if(n instanceof Array)e=n.concat(e);else if(null!==n){var i=typeof n;if(i===typeof e&&"object"===i){for(var a in e)n[a]=e[a];e=n}else e=n+e}return s.set(this._area,this._in(t),s.stringify(e,r)),e},remove:function(t,e){var r=this.get(t,e);return s.remove(this._area,this._in(t)),r},clear:function(){return this._ns?this.each((function(t){s.remove(this._area,this._in(t))}),1):s.clear(this._area),this},clearAll:function(){var t=this._area;for(var e in s.areas)s.areas.hasOwnProperty(e)&&(this._area=s.areas[e],this.clear());return this._area=t,this},_in:function(t){return"string"!=typeof t&&(t=s.stringify(t)),this._ns?this._ns+t:t},_out:function(t){return this._ns?t&&0===t.indexOf(this._ns)?t.substring(this._ns.length):void 0:t}},storage:function(t){return s.inherit(s.storageAPI,{items:{},name:t})},storageAPI:{length:0,has:function(t){return this.items.hasOwnProperty(t)},key:function(t){var e=0;for(var r in this.items)if(this.has(r)&&t===e++)return r},setItem:function(t,e){this.has(t)||this.length++,this.items[t]=e},removeItem:function(t){this.has(t)&&(delete this.items[t],this.length--)},getItem:function(t){return this.has(t)?this.items[t]:null},clear:function(){for(var t in this.items)this.removeItem(t)}}}).Store("local",function(){try{return localStorage}catch(t){}}())).local=a,a._=s,a.area("session",function(){try{return sessionStorage}catch(t){}}()),a.area("page",s.storage("page")),"function"==typeof i&&void 0!==i.amd?i("store2",[],(function(){return a})):r.exports?r.exports=a:(n.store&&(s.conflict=n.store),n.store=a);const h=e(o.exports);export{h as s};
--- a/public/dist/assets/store2-5d974a5c.js.gz
+++ b/public/dist/assets/store2-5d974a5c.js.gz
--- a/public/dist/assets/store2-c7ac8a8d.js
+++ b/public/dist/assets/store2-c7ac8a8d.js
@@ -1,3 +1,7 @@
+<<<<<<<< HEAD:public/dist/assets/store2-c7ac8a8d.js
 import{j as t,i as e}from"./index-04ffc5d9.js";var r,n,i,s,a,o={exports:{}};
+========
+import{i as t,j as e}from"./index-869350c9.js";var r,n,i,s,a,o={exports:{}};
+>>>>>>>> dev_v3:public/dist/assets/store2-5d974a5c.js
 /*! store2 - v2.14.2 - 2022-07-18
 * Copyright (c) 2022 Nathan Bubna; Licensed (MIT OR GPL-3.0) */r=o,n=t,i=t&&t.define,(a=(s={version:"2.14.2",areas:{},apis:{},nsdelim:".",inherit:function(t,e){for(var r in t)e.hasOwnProperty(r)||Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(t,r));return e},stringify:function(t,e){return void 0===t||"function"==typeof t?t+"":JSON.stringify(t,e||s.replace)},parse:function(t,e){try{return JSON.parse(t,e||s.revive)}catch(r){return t}},fn:function(t,e){for(var r in s.storeAPI[t]=e,s.apis)s.apis[r][t]=e},get:function(t,e){return t.getItem(e)},set:function(t,e,r){t.setItem(e,r)},remove:function(t,e){t.removeItem(e)},key:function(t,e){return t.key(e)},length:function(t){return t.length},clear:function(t){t.clear()},Store:function(t,e,r){var n=s.inherit(s.storeAPI,(function(t,e,r){return 0===arguments.length?n.getAll():"function"==typeof e?n.transact(t,e,r):void 0!==e?n.set(t,e,r):"string"==typeof t||"number"==typeof t?n.get(t):"function"==typeof t?n.each(t):t?n.setAll(t,e):n.clear()}));n._id=t;try{var i="__store2_test";e.setItem(i,"ok"),n._area=e,e.removeItem(i)}catch(a){n._area=s.storage("fake")}return n._ns=r||"",s.areas[t]||(s.areas[t]=n._area),s.apis[n._ns+n._id]||(s.apis[n._ns+n._id]=n),n},storeAPI:{area:function(t,e){var r=this[t];return r&&r.area||(r=s.Store(t,e,this._ns),this[t]||(this[t]=r)),r},namespace:function(t,e,r){if(r=r||this._delim||s.nsdelim,!t)return this._ns?this._ns.substring(0,this._ns.length-r.length):"";var n=t,i=this[n];if(!(i&&i.namespace||((i=s.Store(this._id,this._area,this._ns+n+r))._delim=r,this[n]||(this[n]=i),e)))for(var a in s.areas)i.area(a,s.areas[a]);return i},isFake:function(t){return t?(this._real=this._area,this._area=s.storage("fake")):!1===t&&(this._area=this._real||this._area),"fake"===this._area.name},toString:function(){return"store"+(this._ns?"."+this.namespace():"")+"["+this._id+"]"},has:function(t){return this._area.has?this._area.has(this._in(t)):!!(this._in(t)in this._area)},size:function(){return this.keys().length},each:function(t,e){for(var r=0,n=s.length(this._area);r<n;r++){var i=this._out(s.key(this._area,r));if(void 0!==i&&!1===t.call(this,i,this.get(i),e))break;n>s.length(this._area)&&(n--,r--)}return e||this},keys:function(t){return this.each((function(t,e,r){r.push(t)}),t||[])},get:function(t,e){var r,n=s.get(this._area,this._in(t));return"function"==typeof e&&(r=e,e=null),null!==n?s.parse(n,r):null!=e?e:n},getAll:function(t){return this.each((function(t,e,r){r[t]=e}),t||{})},transact:function(t,e,r){var n=this.get(t,r),i=e(n);return this.set(t,void 0===i?n:i),this},set:function(t,e,r){var n,i=this.get(t);return null!=i&&!1===r?e:("function"==typeof r&&(n=r,r=void 0),s.set(this._area,this._in(t),s.stringify(e,n),r)||i)},setAll:function(t,e){var r,n;for(var i in t)n=t[i],this.set(i,n,e)!==n&&(r=!0);return r},add:function(t,e,r){var n=this.get(t);if(n instanceof Array)e=n.concat(e);else if(null!==n){var i=typeof n;if(i===typeof e&&"object"===i){for(var a in e)n[a]=e[a];e=n}else e=n+e}return s.set(this._area,this._in(t),s.stringify(e,r)),e},remove:function(t,e){var r=this.get(t,e);return s.remove(this._area,this._in(t)),r},clear:function(){return this._ns?this.each((function(t){s.remove(this._area,this._in(t))}),1):s.clear(this._area),this},clearAll:function(){var t=this._area;for(var e in s.areas)s.areas.hasOwnProperty(e)&&(this._area=s.areas[e],this.clear());return this._area=t,this},_in:function(t){return"string"!=typeof t&&(t=s.stringify(t)),this._ns?this._ns+t:t},_out:function(t){return this._ns?t&&0===t.indexOf(this._ns)?t.substring(this._ns.length):void 0:t}},storage:function(t){return s.inherit(s.storageAPI,{items:{},name:t})},storageAPI:{length:0,has:function(t){return this.items.hasOwnProperty(t)},key:function(t){var e=0;for(var r in this.items)if(this.has(r)&&t===e++)return r},setItem:function(t,e){this.has(t)||this.length++,this.items[t]=e},removeItem:function(t){this.has(t)&&(delete this.items[t],this.length--)},getItem:function(t){return this.has(t)?this.items[t]:null},clear:function(){for(var t in this.items)this.removeItem(t)}}}).Store("local",function(){try{return localStorage}catch(t){}}())).local=a,a._=s,a.area("session",function(){try{return sessionStorage}catch(t){}}()),a.area("page",s.storage("page")),"function"==typeof i&&void 0!==i.amd?i("store2",[],(function(){return a})):r.exports?r.exports=a:(n.store&&(s.conflict=n.store),n.store=a);const h=e(o.exports);export{h as s};
--- a/public/dist/index.html
+++ b/public/dist/index.html
@@ -84,7 +84,11 @@
        }
      }
    </style>
+<<<<<<< HEAD
    <script type="module" crossorigin src="./assets/index-04ffc5d9.js"></script>
+=======
+    <script type="module" crossorigin src="./assets/index-869350c9.js"></script>
+>>>>>>> dev_v3
    <link rel="stylesheet" href="./assets/index-244dcb81.css">
  </head>
  <body>
				`@@ -0,0 +1 @@`
				`#app-cross-go[data-v-28ca45de]{padding:0 10px;text-align:left;width:100%}#app-cross-go .one-block-1[data-v-28ca45de]{font-size:16px;padding-top:10px}#app-cross-go .one-block-2[data-v-28ca45de]{padding-top:10px}`
				`@@ -0,0 +1 @@`
				import{i as e}from"./main-ce25b28f.js";import{i as l}from"./ipcRenderer-5e19eaee.js";import{a as s}from"./index-71914d0e.js";import{_ as o,r as a,o as t,b as n,g as i,a as r,w as c,e as d,p as u,f as p}from"./index-869350c9.js";const k={data:()=>({type:1,serverUrl:""}),methods:{info(){l.invoke(e.crossInfo,{}).then((e=>{console.log("res:",e)}))},getUrl(){l.invoke(e.getCrossUrl,{name:"goapp"}).then((e=>{this.serverUrl=e,this.$message.info(`服务地址: ${e}`)}))},kill(){l.invoke(e.killCrossServer,{type:"one",name:"goapp"})},killAll(){l.invoke(e.killCrossServer,{type:"all",name:"goapp"})},create(){l.invoke(e.createCrossServer,{service:"go"})},request(o){if(1!=o\|\|""!=this.serverUrl)if(1==o){const e=this.serverUrl+"/api/hello";s({method:"get",url:e,params:{id:"1111111"},timeout:1e3}).then((e=>{console.log("res:",e);const l=e.data.data\|\|null;this.$message.info(`服务返回: ${l}`)}))}else l.invoke(e.requestApi,{name:"goapp"}).then((e=>{console.log("res:",e);const l=e.data\|\|null;this.$message.info(`服务返回: ${l}`)}));else this.$message.info("请先获取服务地址")}}},f=e=>(u("data-v-28ca45de"),e=e(),p(),e),v={id:"app-cross-go"},m=f((()=>i("div",{class:"one-block-1"},[i("span",null," 1. 基础控制 ")],-1))),g={class:"one-block-2"},h=f((()=>i("div",{class:"one-block-1"},[i("span",null," 2. 发送http请求 ")],-1))),_={class:"one-block-2"},C=f((()=>i("div",{class:"one-block-1"},[i("span",null," 3. 多个服务 ")],-1))),b={class:"one-block-2"};const U=o(k,[["render",function(e,l,s,o,u,p){const k=a("a-button"),f=a("a-space");return t(),n("div",v,[m,i("div",g,[r(f,null,{default:c((()=>[r(k,{onClick:l[0]\|\|(l[0]=e=>p.getUrl())},{default:c((()=>[d(" 获取地址 ")])),_:1}),r(k,{onClick:l[1]\|\|(l[1]=e=>p.kill())},{default:c((()=>[d(" kill ")])),_:1}),r(k,{onClick:l[2]\|\|(l[2]=e=>p.create())},{default:c((()=>[d(" 启动 ")])),_:1}),r(k,{onClick:l[3]\|\|(l[3]=e=>p.info())},{default:c((()=>[d(" 查看 ")])),_:1})])),_:1})]),h,i("div",_,[r(f,null,{default:c((()=>[r(k,{onClick:l[4]\|\|(l[4]=e=>p.request(1))},{default:c((()=>[d(" 前端发送 ")])),_:1}),r(k,{onClick:l[5]\|\|(l[5]=e=>p.request(2))},{default:c((()=>[d(" 主进程发送 ")])),_:1})])),_:1})]),C,i("div",b,[r(f,null,{default:c((()=>[r(k,{onClick:l[6]\|\|(l[6]=e=>p.create())},{default:c((()=>[d(" 再启动一个 ")])),_:1}),r(k,{onClick:l[7]\|\|(l[7]=e=>p.killAll())},{default:c((()=>[d(" kill所有 ")])),_:1})])),_:1})])])}],["__scopeId","data-v-28ca45de"]]);export{U as default};
				`@@ -1 +0,0 @@`
				`#app-cross-go[data-v-0c19a913]{padding:0 10px;text-align:left;width:100%}#app-cross-go .one-block-1[data-v-0c19a913]{font-size:16px;padding-top:10px}#app-cross-go .one-block-2[data-v-0c19a913]{padding-top:10px}`