From f42408a363d2a30c3491965963d32f72e919bce9 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 6 Feb 2024 21:23:16 +0800
Subject: [PATCH] no message

---
 electron/electron.js                 | 28 ++++++++++++++++++++++++++++
 resources/assets/js/App.vue          |  2 +-
 resources/assets/js/functions/web.js | 19 ++++++++++---------
 resources/assets/js/store/actions.js |  4 ++--
 resources/mobile                     |  2 +-
 5 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/electron/electron.js b/electron/electron.js
index 5a3e8d096..bd6c67b1a 100644
--- a/electron/electron.js
+++ b/electron/electron.js
@@ -24,6 +24,7 @@ let enablePlugins = false;
 let mainWindow = null,
     mainTray = null,
     subWindow = [],
+    storageBrowser = null,
     isReady = false,
     willQuitApp = false,
     devloadUrl = "",
@@ -491,6 +492,33 @@ ipcMain.on('windowMax', (event) => {
     event.returnValue = "ok"
 })
 
+/**
+ * 创建子窗口存储浏览器
+ * @param args {url}
+ */
+ipcMain.on('storageBrowser', (event, args) => {
+    if (utils.isJson(args) && allowedUrls.test(args.url)) {
+        if (storageBrowser === null) {
+            storageBrowser = new BrowserWindow({
+                show: false,
+                frame: false,
+                transparent: true,
+                webPreferences: {
+                    preload: path.join(__dirname, 'electron-preload.js'),
+                    webSecurity: true,
+                    nodeIntegration: true,
+                    contextIsolation: true,
+                    nativeWindowOpen: true
+                },
+            })
+        }
+        storageBrowser.loadURL(args.url).then(_ => {
+
+        })
+    }
+    event.returnValue = "ok"
+})
+
 /**
  * 给主窗口发送信息
  * @param args {channel, data}
diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index 0cfd4d3c2..126eecb1c 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -135,7 +135,7 @@ export default {
                 //
                 window.localStorage.setItem("__system:userId__", this.userId)
                 window.localStorage.setItem("__system:userToken__", this.userToken)
-                $A.storageBySubWeb({
+                $A.storageByBrowser({
                     userId: this.userId,
                     userToken: this.userToken,
                 })
diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js
index 6a463746e..a3a653658 100755
--- a/resources/assets/js/functions/web.js
+++ b/resources/assets/js/functions/web.js
@@ -920,31 +920,32 @@ import {MarkdownPreview} from "../store/markdown";
          * 通过结果存储同步本地数据
          * @param json
          */
-        storageBySubWeb(json) {
+        storageByBrowser(json) {
             if ($A.isSoftware) {
-                json = Object.assign({}, this.__storageBySubWeb, json)
+                json = Object.assign({}, this.__storageByBrowser, json)
                 const obj = {}
                 Object.keys(json).sort().map(item => {
                     obj[item] = json[item]
                 })
-                if (JSON.stringify(obj) == JSON.stringify(this.__storageBySubWeb)) {
+                if (JSON.stringify(obj) == JSON.stringify(this.__storageByBrowser)) {
                     return
                 }
-                this.__storageBySubWeb = obj
-                const value = encodeURIComponent(JSON.stringify(this.__storageBySubWeb))
+                this.__storageByBrowser = obj
+                const value = encodeURIComponent(JSON.stringify(this.__storageByBrowser))
                 const url = $A.apiUrl(`../storage/synch?value=${value}`)
-                console.log(url);
                 if ($A.isEEUiApp) {
                     $A.eeuiAppSendMessage({
-                        action: 'subWeb',
+                        action: 'storageBrowser',
                         url,
                     });
                 } else {
-                    $A.loadIframe(url, 15000).catch(_ => {})
+                    $A.Electron.sendMessage('storageBrowser', {
+                        url
+                    });
                 }
             }
         },
-        __storageBySubWeb: {}
+        __storageByBrowser: {}
     });
 
     /**
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 1cc05a379..4a32448f6 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -85,7 +85,7 @@ export default {
                 `language/web/key.js`,
                 `language/web/${languageName}.js`,
             ])
-            $A.storageBySubWeb({languageName})
+            $A.storageByBrowser({languageName})
 
             resolve(action)
         })
@@ -522,7 +522,7 @@ export default {
                 themeName: state.themeName,
             });
         }
-        $A.storageBySubWeb({themeConf: state.themeConf})
+        $A.storageByBrowser({themeConf: state.themeConf})
     },
 
     /**
diff --git a/resources/mobile b/resources/mobile
index 771933b49..bf09ca124 160000
--- a/resources/mobile
+++ b/resources/mobile
@@ -1 +1 @@
-Subproject commit 771933b49d280bc4ada4c16fd9d36a4aef115634
+Subproject commit bf09ca1248d05de4af09c96d8d27ee77e553028d