From f671b83b6a0a3b3d875623c6983096466bbd92a3 Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Fri, 10 Nov 2023 14:35:37 +0800 Subject: [PATCH] :bug: fix #289,#291,#290 --- feature/src/assets/delete.png | Bin 0 -> 845 bytes feature/src/main.ts | 6 + package.json | 4 +- public/icons/delete@2x.png | Bin 0 -> 845 bytes public/icons/pin@2x.png | Bin 0 -> 830 bytes public/icons/unpin@2x.png | Bin 0 -> 747 bytes public/preload.js | 4 + src/common/constans/renderer.ts | 3 +- src/common/utils/dragWindow.ts | 3 +- src/common/utils/getWindowHeight.ts | 4 +- src/main/common/api.ts | 5 +- src/main/common/registerHotKey.ts | 14 +-- src/renderer/App.vue | 70 ++++++++--- src/renderer/components/result.vue | 158 ++++++++++++++++++++---- src/renderer/plugins-manager/index.ts | 81 +++++++++--- src/renderer/plugins-manager/options.ts | 6 +- yarn.lock | 7 +- 17 files changed, 277 insertions(+), 88 deletions(-) create mode 100644 feature/src/assets/delete.png create mode 100644 public/icons/delete@2x.png create mode 100644 public/icons/pin@2x.png create mode 100644 public/icons/unpin@2x.png diff --git a/feature/src/assets/delete.png b/feature/src/assets/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..122b5de4d279217b763baa4ad6ef6ce4fbf2e9d1 GIT binary patch literal 845 zcmV-T1G4;yP)JCU4`9GC`ap64z(}6wTOF&RNCtH$xv0I?8L*B1 z6jT7c1|0+NUPAH>08zLg&jI|>Gk}jBMBjdUuhw(2K~nbS0UR|(Z=4)s-mFc_R$d11 z)=G;NGVi_LtgE}6|3vaHU=oiI$8(AsfQzPiD9`i0GBK?gfSO}|#&j0(i(?qT0=*MX zg1VK$`;HRrxn$k(P$CcHr-Z_?Gp@I5_~^C;5})-cWzt z0PX;=O7fZ3d7hUx6ybf9V&?9#Nb*&q(Wv|b=$oAKNma+6T`KL9C03lC zp3a)hrk>SlmP)fManvA7F8IxjyB%QESD%yoL2}T_GFB#;XXs?L)3?l}pmMs^O*w^Awg5?9cL5)< zu}5BS5`UBKVFO-^!qD9b)z)nAgx8}aC)H;YnT%K%vjb{xh4YnwK2hD2PNY*>NesuW zBdUv0qmoi@K5ymIQqtH^H7b%kWmYZ(z;d(*&_Duw2jH>G", "private": true, "scripts": { @@ -30,7 +30,7 @@ "fix-path": "^3.0.0", "get-mac-apps": "^1.0.2", "got": "^11.8.3", - "lodash.throttle": "^4.1.1", + "lodash.debounce": "^4.0.8", "memorystream": "^0.3.1", "node-key-sender": "^1.0.11", "npm": "6.14.7", diff --git a/public/icons/delete@2x.png b/public/icons/delete@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..122b5de4d279217b763baa4ad6ef6ce4fbf2e9d1 GIT binary patch literal 845 zcmV-T1G4;yP)JCU4`9GC`ap64z(}6wTOF&RNCtH$xv0I?8L*B1 z6jT7c1|0+NUPAH>08zLg&jI|>Gk}jBMBjdUuhw(2K~nbS0UR|(Z=4)s-mFc_R$d11 z)=G;NGVi_LtgE}6|3vaHU=oiI$8(AsfQzPiD9`i0GBK?gfSO}|#&j0(i(?qT0=*MX zg1VK$`;HRrxn$k(P$CcHr-Z_?Gp@I5_~^C;5})-cWzt z0PX;=O7fZ3d7hUx6ybf9V&?9#Nb*&q(Wv|b=$oAKNma+6T`KL9C03lC zp3a)hrk>SlmP)fManvA7F8IxjyB%QESD%yoL2}T_GFB#;XXs?L)3?l}pmMs^O*w^Awg5?9cL5)< zu}5BS5`UBKVFO-^!qD9b)z)nAgx8}aC)H;YnT%K%vjb{xh4YnwK2hD2PNY*>NesuW zBdUv0qmoi@K5ymIQqtH^H7b%kWmYZ(z;d(*&_Duw2jH>GP)Ra}c3!Ec0$QpGBFI5*r(Vv=Hf@R&CP`4~XnK&=n70VrtU9RR)ppxEUH4k|VUUH6jw4ZwQM zrcWR>KGFn1k*rHs7o3|)7< z93wdk;2FuMBpW2h0W1i}`UL=6!-B&a9|7=DfYz<0+a+s;R4$SSNv>$}X8_9q#QJTL zyJAkm78x}#&3muwH)vAr>#PDj&WyVzg%t5!1{6+G$+}rZq0L+amBp-S@`ZY^FT%Sm$YXIJfRU=5fAhy>@j*|Rh--HvQH@i?RX0+I{nEbHZ zWed82Dv%eN-{>i6%$pWEs*isP%pAJS1Cm_MGVasw0LI#i^j`qIXm9o^FR*EqxoD)8 z;$UX7BghJVT&pXfR}7L51olBkOj=vTtXW|KXntyHDz1_5`8yHLzp{Q2?io`*4Z{1j zyvI``7W1wxbDEb!eoB=}rN4T()`r&H#40mbpe$&V?|*^)0TUOl`2PAO4FCWD07*qo IM6N<$f;T64NB{r; literal 0 HcmV?d00001 diff --git a/public/icons/unpin@2x.png b/public/icons/unpin@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b234c8de217070cf7ba5d73c67aeacfe3919ec0d GIT binary patch literal 747 zcmVJNRCt`VR>6uBK@{9ccG0`IH*YR@(GL(j=}B*T6BPUoK?o#O zNx*|32z&9ixQgH>hZ(`$W;Qndv61v% z#R#B0ue~+E&gL9I6`;}A+5of^_#%LB04R3V+CjyprSS^M69CbX@~#Eca|B>Z0Z#+? zYM_75)bdfAtG9c-Ud~UEyiamWazb(>;2EZKjbtW>{Irct%-dQ|usZ-g2P=V0q6@q* zHTM<=*P5{@xrt|E;`>)gzBizez)lQ!)R1?UVd}2U9g@2MK16VmPe|SXu%CfLJ^+P{ zLY2mCS06rR^TYl1T?2A+=8LkTEh52dTIRj0mQ$Rgm&(gP2!M2LB zsqvmndRS-e3|a`+DY31FK@lr`WZwhp)k(Vgm=kq|4%kSx) z-Ve~7nIioMz%1J5036umeyB3%MyeHuZnqn2G>5hp%4rfsfHwk*--Vm87bQu|roRaW zS`CLok5MiCov`oUHp# { let draggable = true; const onMouseDown = (e) => { - // if (commonConst.macOS()) return; + // 右击不移动 + if (e.button === 2) return; draggable = true; mouseX = e.clientX; mouseY = e.clientY; diff --git a/src/common/utils/getWindowHeight.ts b/src/common/utils/getWindowHeight.ts index f455a00..9e1a02b 100644 --- a/src/common/utils/getWindowHeight.ts +++ b/src/common/utils/getWindowHeight.ts @@ -1,6 +1,6 @@ -const WINDOW_MAX_HEIGHT = 600; +const WINDOW_MAX_HEIGHT = 620; const WINDOW_MIN_HEIGHT = 60; -const PRE_ITEM_HEIGHT = 60; +const PRE_ITEM_HEIGHT = 70; const HISTORY_HEIGHT = 70; export default (searchList: Array, historyList): number => { diff --git a/src/main/common/api.ts b/src/main/common/api.ts index ec36a2d..3fe6baa 100644 --- a/src/main/common/api.ts +++ b/src/main/common/api.ts @@ -139,7 +139,6 @@ class API extends DBInstance { public hideMainWindow(arg, window) { window.hide(); } - public showMainWindow(arg, window) { window.show(); } @@ -148,6 +147,10 @@ class API extends DBInstance { return dialog.showOpenDialogSync(window, data); } + public showSaveDialog({ data }, window) { + return dialog.showSaveDialogSync(window, data); + } + public setExpendHeight({ data: height }, window: BrowserWindow, e) { const originWindow = this.getCurrentWindow(window, e); if (!originWindow) return; diff --git a/src/main/common/registerHotKey.ts b/src/main/common/registerHotKey.ts index 984909e..782787f 100644 --- a/src/main/common/registerHotKey.ts +++ b/src/main/common/registerHotKey.ts @@ -15,10 +15,12 @@ const registerHotKey = (mainWindow: BrowserWindow): void => { // 设置开机启动 const setAutoLogin = async () => { const config = await localConfig.getConfig(); - app.setLoginItemSettings({ - openAtLogin: config.perf.common.start, - openAsHidden: true, - }); + if (app.getLoginItemSettings().openAtLogin !== config.perf.common.start) { + app.setLoginItemSettings({ + openAtLogin: config.perf.common.start, + openAsHidden: true, + }); + } }; const setTheme = async () => { @@ -86,10 +88,6 @@ const registerHotKey = (mainWindow: BrowserWindow): void => { }); }); - // globalShortcut.register(config.perf.shortCut.separate, () => { - // - // }); - globalShortcut.register(config.perf.shortCut.quit, () => { // mainWindow.webContents.send('init-rubick'); // mainWindow.show(); diff --git a/src/renderer/App.vue b/src/renderer/App.vue index df10810..5d9f6f7 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -27,18 +27,22 @@ :currentSelect="currentSelect" :options="options" :clipboardFile="clipboardFile || []" + @setPluginHistory="setPluginHistory" + @choosePlugin="choosePlugin" />