From a8883cd74d04838e2994543a8ddbc9f776160c9c Mon Sep 17 00:00:00 2001 From: sunyuqiang <1129921824@qq.com> Date: Fri, 11 Aug 2023 16:13:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/src/languages/i18n.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/feature/src/languages/i18n.ts b/feature/src/languages/i18n.ts index 3e44e8cf..fbb1e289 100644 --- a/feature/src/languages/i18n.ts +++ b/feature/src/languages/i18n.ts @@ -3,9 +3,6 @@ import messages from './langs'; const { remote } = window.require('electron'); const { perf } = remote.getGlobal('OP_CONFIG').get(); -console.log(messages); -console.log(perf); - // 2. Create i18n instance with options const i18n = createI18n({ legacy: false, From 9fed8c4c7b8570a4f130168d69772b4cbc70335e Mon Sep 17 00:00:00 2001 From: sunyuqiang <1129921824@qq.com> Date: Tue, 19 Sep 2023 19:50:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=A6=81=E7=94=A8electron=E7=9A=84?= =?UTF-8?q?=E6=8B=BC=E5=86=99=E6=A3=80=E6=9F=A5=20&=20=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=AA=97=E4=BD=93=E6=9C=80=E5=B0=8F=E9=AB=98=E5=BA=A6=E4=B8=BA?= =?UTF-8?q?60?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/browsers/detach.ts | 2 ++ src/main/browsers/guide.ts | 2 ++ src/main/browsers/main.ts | 2 ++ src/main/browsers/runner.ts | 1 + 4 files changed, 7 insertions(+) diff --git a/src/main/browsers/detach.ts b/src/main/browsers/detach.ts index 3a9ac557..773e818c 100644 --- a/src/main/browsers/detach.ts +++ b/src/main/browsers/detach.ts @@ -17,6 +17,7 @@ export default () => { const createWindow = async (pluginInfo, viewInfo, view) => { win = new BrowserWindow({ height: viewInfo.height, + minHeight: 60, width: viewInfo.width, autoHideMenuBar: true, titleBarStyle: 'hidden', @@ -36,6 +37,7 @@ export default () => { webviewTag: true, devTools: true, nodeIntegration: true, + spellcheck: false, }, }); if (process.env.WEBPACK_DEV_SERVER_URL) { diff --git a/src/main/browsers/guide.ts b/src/main/browsers/guide.ts index 1d37f85f..679680d2 100644 --- a/src/main/browsers/guide.ts +++ b/src/main/browsers/guide.ts @@ -41,6 +41,7 @@ export default () => { y, width: 800, height: 600, + minHeight: 60, webPreferences: { webSecurity: false, backgroundThrottling: false, @@ -48,6 +49,7 @@ export default () => { webviewTag: true, devTools: true, nodeIntegration: true, + spellcheck: false, }, }); if (process.env.WEBPACK_DEV_SERVER_URL) { diff --git a/src/main/browsers/main.ts b/src/main/browsers/main.ts index 1b5f5f5f..b1ccf0cf 100644 --- a/src/main/browsers/main.ts +++ b/src/main/browsers/main.ts @@ -18,6 +18,7 @@ export default () => { const createWindow = async () => { win = new BrowserWindow({ height: 60, + minHeight: 60, useContentSize: true, resizable: true, width: 800, @@ -33,6 +34,7 @@ export default () => { webviewTag: true, nodeIntegration: true, preload: path.join(__static, 'preload.js'), + spellcheck: false, }, }); if (process.env.WEBPACK_DEV_SERVER_URL) { diff --git a/src/main/browsers/runner.ts b/src/main/browsers/runner.ts index c6fee6a3..c2cb8bf2 100644 --- a/src/main/browsers/runner.ts +++ b/src/main/browsers/runner.ts @@ -128,6 +128,7 @@ export default () => { standard: 'system-ui', serif: 'system-ui', }, + spellcheck: false, }, }); window.setBrowserView(view); From dcd18fe8a17052058326d155d60aa60b8c5042e3 Mon Sep 17 00:00:00 2001 From: sunyuqiang <1129921824@qq.com> Date: Wed, 20 Sep 2023 15:37:06 +0800 Subject: [PATCH 3/5] =?UTF-8?q?:bug:=20windows=E6=90=9C=E7=B4=A2=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/plugins-manager/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/plugins-manager/index.ts b/src/renderer/plugins-manager/index.ts index 3748af21..6277c9b3 100644 --- a/src/renderer/plugins-manager/index.ts +++ b/src/renderer/plugins-manager/index.ts @@ -40,7 +40,7 @@ const createPluginManager = (): any => { }, }); if (result && result.value) { - appList.value = [...appList.value, ...result.value]; + appList.value.push(...result.value); } }; From 9412d3bc59e6ba4c211fb3bfa916d63c49b44ef7 Mon Sep 17 00:00:00 2001 From: sunyuqiang <1129921824@qq.com> Date: Wed, 20 Sep 2023 15:53:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?:bug:=20windows=E6=90=9C=E7=B4=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/app-search/win.ts | 3 +-- src/renderer/components/search.vue | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/app-search/win.ts b/src/core/app-search/win.ts index 5cbcf3f4..7e73c034 100644 --- a/src/core/app-search/win.ts +++ b/src/core/app-search/win.ts @@ -69,8 +69,7 @@ function fileDisplay(filePath) { } if ( !appDetail.target || - appDetail.target.toLowerCase().indexOf('unin') >= 0 || - appDetail.args + appDetail.target.toLowerCase().indexOf('unin') >= 0 ) return; diff --git a/src/renderer/components/search.vue b/src/renderer/components/search.vue index 62aa4200..fc2c194f 100644 --- a/src/renderer/components/search.vue +++ b/src/renderer/components/search.vue @@ -93,6 +93,7 @@ const emit = defineEmits([ 'focus', 'clearSearchValue', 'readClipboardContent', + 'clearClipbord', ]); const keydownEvent = (e, key: string) => { From 3a2f44a448496996fda35e9c7c43423273a82d4e Mon Sep 17 00:00:00 2001 From: sunyuqiang <1129921824@qq.com> Date: Fri, 13 Oct 2023 09:58:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=AA=97=E4=BD=93=E5=AE=BD=E9=AB=98?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8F=98=E9=87=8F=EF=BC=8C=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=9C=80=E5=B0=8F=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constans/common.ts | 2 ++ src/main/browsers/detach.ts | 3 ++- src/main/browsers/guide.ts | 7 ++++--- src/main/browsers/main.ts | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/common/constans/common.ts b/src/common/constans/common.ts index 3cc4b405..01bf468c 100644 --- a/src/common/constans/common.ts +++ b/src/common/constans/common.ts @@ -1,2 +1,4 @@ export const WINDOW_WIDTH = 688; export const WINDOW_HEIGHT = 60; + +export const WINDOW_MIN_HEIGHT = 60; diff --git a/src/main/browsers/detach.ts b/src/main/browsers/detach.ts index 773e818c..4b01e925 100644 --- a/src/main/browsers/detach.ts +++ b/src/main/browsers/detach.ts @@ -1,6 +1,7 @@ import { BrowserWindow, ipcMain, nativeTheme } from 'electron'; import localConfig from '../common/initLocalConfig'; import path from 'path'; +import { WINDOW_MIN_HEIGHT } from '@/common/constans/common'; export default () => { let win: any; @@ -17,7 +18,7 @@ export default () => { const createWindow = async (pluginInfo, viewInfo, view) => { win = new BrowserWindow({ height: viewInfo.height, - minHeight: 60, + minHeight: WINDOW_MIN_HEIGHT, width: viewInfo.width, autoHideMenuBar: true, titleBarStyle: 'hidden', diff --git a/src/main/browsers/guide.ts b/src/main/browsers/guide.ts index 679680d2..580a32e2 100644 --- a/src/main/browsers/guide.ts +++ b/src/main/browsers/guide.ts @@ -1,5 +1,6 @@ import { BrowserWindow, ipcMain, nativeTheme, screen } from 'electron'; import path from 'path'; +import { WINDOW_HEIGHT, WINDOW_MIN_HEIGHT, WINDOW_WIDTH } from '@/common/constans/common'; const getWindowPos = (width, height) => { const screenPoint = screen.getCursorScreenPoint(); @@ -39,9 +40,9 @@ export default () => { enableLargerThanScreen: true, x, y, - width: 800, - height: 600, - minHeight: 60, + width: WINDOW_WIDTH, + height: WINDOW_HEIGHT, + minHeight: WINDOW_MIN_HEIGHT, webPreferences: { webSecurity: false, backgroundThrottling: false, diff --git a/src/main/browsers/main.ts b/src/main/browsers/main.ts index 40843bad..8912515d 100644 --- a/src/main/browsers/main.ts +++ b/src/main/browsers/main.ts @@ -3,7 +3,7 @@ import path from 'path'; import { createProtocol } from 'vue-cli-plugin-electron-builder/lib'; // import versonHandler from '../common/versionHandler'; import localConfig from '@/main/common/initLocalConfig'; -import { WINDOW_HEIGHT, WINDOW_WIDTH } from '@/common/constans/common'; +import { WINDOW_HEIGHT, WINDOW_MIN_HEIGHT, WINDOW_WIDTH } from '@/common/constans/common'; // eslint-disable-next-line @typescript-eslint/no-var-requires require('@electron/remote/main').initialize(); @@ -19,7 +19,7 @@ export default () => { const createWindow = async () => { win = new BrowserWindow({ height: WINDOW_HEIGHT, - minHeight: 60, + minHeight: WINDOW_MIN_HEIGHT, useContentSize: true, resizable: true, width: WINDOW_WIDTH,