From 66d8d714db8a5ee22d7a32ff168e23738cc67926 Mon Sep 17 00:00:00 2001 From: PiEgg Date: Fri, 6 Jan 2023 17:21:27 +0800 Subject: [PATCH] :hammer: Refactor: upgrade vue2 -> vue3 --- .eslintrc.js | 2 +- .gitignore | 3 + docs/APP.vue | 2 +- package.json | 154 +- src/main.ts | 53 +- src/main/apis/app/uploader/apis.ts | 1 + src/main/apis/gui/index.ts | 1 + src/main/events/ipcList.ts | 1 + src/main/events/remotes/menu.ts | 3 +- src/main/lifeCycle/index.ts | 6 +- src/renderer/App.vue | 22 +- src/renderer/components/ChoosePicBed.vue | 37 - src/renderer/components/ConfigForm.vue | 217 +- src/renderer/components/InputBoxDialog.vue | 105 +- src/renderer/hooks/useStore.ts | 6 + src/renderer/i18n/index.ts | 4 +- src/renderer/layouts/Main.vue | 406 +- src/renderer/pages/Gallery.vue | 841 +- src/renderer/pages/MiniPage.vue | 313 +- src/renderer/pages/PicGoSetting.vue | 1305 +-- src/renderer/pages/Plugin.vue | 770 +- src/renderer/pages/RenamePage.vue | 77 +- src/renderer/pages/ShortKey.vue | 214 +- src/renderer/pages/TrayPage.vue | 229 +- src/renderer/pages/Upload.vue | 358 +- src/renderer/pages/UploaderConfigPage.vue | 222 +- src/renderer/pages/picbeds/index.vue | 136 +- src/renderer/router/config.ts | 11 + src/renderer/router/index.ts | 38 +- src/renderer/store/index.js | 11 - src/renderer/store/index.ts | 37 + src/renderer/store/modules/Counter.js | 25 - src/renderer/store/modules/index.js | 14 - src/renderer/utils/ConfirmButtonMixin.ts | 26 - src/renderer/utils/bus.ts | 22 +- src/renderer/utils/common.ts | 35 + src/renderer/utils/dataSender.ts | 55 + src/renderer/utils/db.ts | 4 +- src/renderer/utils/mainMixin.ts | 71 +- src/renderer/utils/mixin.ts | 35 +- src/universal/events/constants.ts | 1 + src/universal/types/extra-vue.d.ts | 14 +- src/universal/types/shims-module.d.ts | 5 +- src/universal/types/types.d.ts | 8 + tsconfig.json | 6 +- yarn.lock | 8512 ++++++++------------ 46 files changed, 6584 insertions(+), 7834 deletions(-) delete mode 100644 src/renderer/components/ChoosePicBed.vue create mode 100644 src/renderer/hooks/useStore.ts create mode 100644 src/renderer/router/config.ts delete mode 100644 src/renderer/store/index.js create mode 100644 src/renderer/store/index.ts delete mode 100644 src/renderer/store/modules/Counter.js delete mode 100644 src/renderer/store/modules/index.js delete mode 100644 src/renderer/utils/ConfirmButtonMixin.ts create mode 100644 src/renderer/utils/dataSender.ts diff --git a/.eslintrc.js b/.eslintrc.js index 7183db5..e0f9900 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -8,7 +8,7 @@ module.exports = { }, parser: 'vue-eslint-parser', extends: [ - 'plugin:vue/essential', + 'plugin:vue/vue3-recommended', '@vue/standard', '@vue/typescript' ], diff --git a/.gitignore b/.gitignore index 1409d29..94a9fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ dist_electron/ test.js .env scripts/*.yml + +#Electron-builder output +/dist_electron \ No newline at end of file diff --git a/docs/APP.vue b/docs/APP.vue index f666ac9..a447d9a 100644 --- a/docs/APP.vue +++ b/docs/APP.vue @@ -30,7 +30,7 @@ + + diff --git a/src/renderer/components/ChoosePicBed.vue b/src/renderer/components/ChoosePicBed.vue deleted file mode 100644 index 3ce28c6..0000000 --- a/src/renderer/components/ChoosePicBed.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - diff --git a/src/renderer/components/ConfigForm.vue b/src/renderer/components/ConfigForm.vue index 234f3bc..c9d738e 100644 --- a/src/renderer/components/ConfigForm.vue +++ b/src/renderer/components/ConfigForm.vue @@ -1,11 +1,14 @@ - diff --git a/src/renderer/components/InputBoxDialog.vue b/src/renderer/components/InputBoxDialog.vue index dc95b94..1381329 100644 --- a/src/renderer/components/InputBoxDialog.vue +++ b/src/renderer/components/InputBoxDialog.vue @@ -1,69 +1,84 @@ - + diff --git a/src/renderer/pages/MiniPage.vue b/src/renderer/pages/MiniPage.vue index a3b530c..68cdd94 100644 --- a/src/renderer/pages/MiniPage.vue +++ b/src/renderer/pages/MiniPage.vue @@ -1,187 +1,198 @@ - + diff --git a/src/renderer/pages/TrayPage.vue b/src/renderer/pages/TrayPage.vue index fde3b85..8a181d6 100644 --- a/src/renderer/pages/TrayPage.vue +++ b/src/renderer/pages/TrayPage.vue @@ -1,24 +1,59 @@ - - disableDragFile () { - window.addEventListener('dragover', (e) => { - e = e || event - e.preventDefault() - }, false) - window.addEventListener('drop', (e) => { - e = e || event - e.preventDefault() - }, false) - } - - uploadClipboardFiles () { - if (this.uploadFlag) { - return - } - this.uploadFlag = true - ipcRenderer.send('uploadClipboardFiles') - } - - mounted () { - this.disableDragFile() - this.getData() - ipcRenderer.on('dragFiles', async (event: Event, files: string[]) => { - for (let i = 0; i < files.length; i++) { - const item = files[i] - await this.$$db.insert(item) - } - this.files = (await this.$$db.get({ orderBy: 'desc', limit: 5 })).data - }) - ipcRenderer.on('clipboardFiles', (event: Event, files: ImgInfo[]) => { - this.clipboardFiles = files - }) - ipcRenderer.on('uploadFiles', async () => { - this.files = (await this.$$db.get({ orderBy: 'desc', limit: 5 })).data - this.uploadFlag = false - }) - ipcRenderer.on('updateFiles', () => { - this.getData() - }) - } - - beforeDestroy () { - ipcRenderer.removeAllListeners('dragFiles') - ipcRenderer.removeAllListeners('clipboardFiles') - ipcRenderer.removeAllListeners('uploadClipboardFiles') - ipcRenderer.removeAllListeners('updateFiles') - } + @@ -179,11 +215,20 @@ body::-webkit-scrollbar background #49B1F5 .upload-img__index color #fff + .upload-img__container + display flex + flex-direction column + justify-content center + align-items center .upload-img - width 100% + max-width 100% object-fit scale-down margin 0 auto &__container + display flex + flex-direction column + justify-content center + align-items center width 100% padding 8px 8px 4px height 100% diff --git a/src/renderer/pages/Upload.vue b/src/renderer/pages/Upload.vue index 1fb2140..2f66fe4 100644 --- a/src/renderer/pages/Upload.vue +++ b/src/renderer/pages/Upload.vue @@ -1,9 +1,18 @@ - +