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 @@ - +