From 6102282d9f7837092602b863ae01c2ebce45ab78 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Tue, 16 Jul 2024 13:21:17 +0800 Subject: [PATCH 1/6] :arrow_up: Upgrade(custom): upgrade vue --- package.json | 4 +- yarn.lock | 151 ++++++++++++++++++++++++++------------------------- 2 files changed, 80 insertions(+), 75 deletions(-) diff --git a/package.json b/package.json index 0d34c4f..037e173 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "cos-nodejs-sdk-v5": "^2.12.5", "dexie": "^3.2.4", "electron-updater": "^6.1.4", - "element-plus": "2.7.6", + "element-plus": "2.7.7", "epipebomb": "^1.0.0", "fast-xml-parser": "^4.3.2", "form-data": "^4.0.0", @@ -79,7 +79,7 @@ "upyun": "^3.4.6", "uuid": "^9.0.1", "video.js": "^8.6.1", - "vue": "^3.4.30", + "vue": "^3.4.31", "vue-router": "^4.4.0", "vue3-lazyload": "^0.3.8", "vue3-photo-preview": "^0.3.0", diff --git a/yarn.lock b/yarn.lock index 6251644..5843f36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4071,47 +4071,47 @@ semver "^7.3.4" strip-ansi "^6.0.0" -"@vue/compiler-core@3.4.30": - version "3.4.30" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.30.tgz#a554978f68199a0f254ad5159e9665370c8c1250" - integrity sha512-ZL8y4Xxdh8O6PSwfdZ1IpQ24PjTAieOz3jXb/MDTfDtANcKBMxg1KLm6OX2jofsaQGYfIVzd3BAG22i56/cF1w== +"@vue/compiler-core@3.4.31": + version "3.4.31" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.31.tgz#b51a76f1b30e9b5eba0553264dff0f171aedb7c6" + integrity sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg== dependencies: "@babel/parser" "^7.24.7" - "@vue/shared" "3.4.30" + "@vue/shared" "3.4.31" entities "^4.5.0" estree-walker "^2.0.2" source-map-js "^1.2.0" -"@vue/compiler-dom@3.4.30": - version "3.4.30" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.30.tgz#5af9a5f6f0752f7882d4eba0795e4d00525006dc" - integrity sha512-+16Sd8lYr5j/owCbr9dowcNfrHd+pz+w2/b5Lt26Oz/kB90C9yNbxQ3bYOvt7rI2bxk0nqda39hVcwDFw85c2Q== +"@vue/compiler-dom@3.4.31": + version "3.4.31" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.31.tgz#30961ca847f5d6ad18ffa26236c219f61b195f6b" + integrity sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ== dependencies: - "@vue/compiler-core" "3.4.30" - "@vue/shared" "3.4.30" + "@vue/compiler-core" "3.4.31" + "@vue/shared" "3.4.31" -"@vue/compiler-sfc@3.4.30": - version "3.4.30" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.30.tgz#6a3cc86c20349f8c1976c968a8c80dd7cfef2430" - integrity sha512-8vElKklHn/UY8+FgUFlQrYAPbtiSB2zcgeRKW7HkpSRn/JjMRmZvuOtwDx036D1aqKNSTtXkWRfqx53Qb+HmMg== +"@vue/compiler-sfc@3.4.31": + version "3.4.31" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.31.tgz#cc6bfccda17df8268cc5440842277f61623c591f" + integrity sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ== dependencies: "@babel/parser" "^7.24.7" - "@vue/compiler-core" "3.4.30" - "@vue/compiler-dom" "3.4.30" - "@vue/compiler-ssr" "3.4.30" - "@vue/shared" "3.4.30" + "@vue/compiler-core" "3.4.31" + "@vue/compiler-dom" "3.4.31" + "@vue/compiler-ssr" "3.4.31" + "@vue/shared" "3.4.31" estree-walker "^2.0.2" magic-string "^0.30.10" postcss "^8.4.38" source-map-js "^1.2.0" -"@vue/compiler-ssr@3.4.30": - version "3.4.30" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.30.tgz#7938b51f17d62b883d2a61ae42ec4f8398115b1d" - integrity sha512-ZJ56YZGXJDd6jky4mmM0rNaNP6kIbQu9LTKZDhcpddGe/3QIalB1WHHmZ6iZfFNyj5mSypTa4+qDJa5VIuxMSg== +"@vue/compiler-ssr@3.4.31": + version "3.4.31" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.31.tgz#f62ffecdf15bacb883d0099780cf9a1e3654bfc4" + integrity sha512-RtefmITAje3fJ8FSg1gwgDhdKhZVntIVbwupdyZDSifZTRMiWxWehAOTCc8/KZDnBOcYQ4/9VWxsTbd3wT0hAA== dependencies: - "@vue/compiler-dom" "3.4.30" - "@vue/shared" "3.4.30" + "@vue/compiler-dom" "3.4.31" + "@vue/shared" "3.4.31" "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.3.0": version "3.3.0" @@ -4175,6 +4175,13 @@ dependencies: "@vue/shared" "3.4.30" +"@vue/reactivity@3.4.31": + version "3.4.31" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.31.tgz#eda80e90c4f9d7659efe1f5ed99c2dfdc9e93d77" + integrity sha512-VGkTani8SOoVkZNds1PfJ/T1SlAIOf8E58PGAhIOUDYPC4GAmFA2u/E14TDAFcf3vVDKunc4QqCe/SHr8xC65Q== + dependencies: + "@vue/shared" "3.4.31" + "@vue/runtime-core@3.4.30": version "3.4.30" resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.30.tgz#6db949b273af0b988b4f13fecb034f9c9439c41e" @@ -4183,7 +4190,25 @@ "@vue/reactivity" "3.4.30" "@vue/shared" "3.4.30" -"@vue/runtime-dom@3.4.30", "@vue/runtime-dom@^3.4.30": +"@vue/runtime-core@3.4.31": + version "3.4.31" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.31.tgz#ad3a41ad76385c0429e3e4dbefb81918494e10cf" + integrity sha512-LDkztxeUPazxG/p8c5JDDKPfkCDBkkiNLVNf7XZIUnJ+66GVGkP+TIh34+8LtPisZ+HMWl2zqhIw0xN5MwU1cw== + dependencies: + "@vue/reactivity" "3.4.31" + "@vue/shared" "3.4.31" + +"@vue/runtime-dom@3.4.31": + version "3.4.31" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.31.tgz#bae7ad844f944af33699c73581bc36125bab96ce" + integrity sha512-2Auws3mB7+lHhTFCg8E9ZWopA6Q6L455EcU7bzcQ4x6Dn4cCPuqj6S2oBZgN2a8vJRS/LSYYxwFFq2Hlx3Fsaw== + dependencies: + "@vue/reactivity" "3.4.31" + "@vue/runtime-core" "3.4.31" + "@vue/shared" "3.4.31" + csstype "^3.1.3" + +"@vue/runtime-dom@^3.4.30": version "3.4.30" resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.30.tgz#49f399adc300a000419cb57a20b4481c98f523a4" integrity sha512-tV6B4YiZRj5QsaJgw2THCy5C1H+2UeywO9tqgWEc21tn85qHEERndHN/CxlyXvSBFrpmlexCIdnqPuR9RM9thw== @@ -4193,19 +4218,24 @@ "@vue/shared" "3.4.30" csstype "^3.1.3" -"@vue/server-renderer@3.4.30": - version "3.4.30" - resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.30.tgz#41f117cec12b5fbb9d7c741f59e7a0b515e9b607" - integrity sha512-TBD3eqR1DeDc0cMrXS/vEs/PWzq1uXxnvjoqQuDGFIEHFIwuDTX/KWAQKIBjyMWLFHEeTDGYVsYci85z2UbTDg== +"@vue/server-renderer@3.4.31": + version "3.4.31" + resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.31.tgz#bbe990f793c36d62d05bdbbaf142511d53e159fd" + integrity sha512-D5BLbdvrlR9PE3by9GaUp1gQXlCNadIZytMIb8H2h3FMWJd4oUfkUTEH2wAr3qxoRz25uxbTcbqd3WKlm9EHQA== dependencies: - "@vue/compiler-ssr" "3.4.30" - "@vue/shared" "3.4.30" + "@vue/compiler-ssr" "3.4.31" + "@vue/shared" "3.4.31" "@vue/shared@3.4.30": version "3.4.30" resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.30.tgz#72acfe8df65139dcf298e965fb2ab1cff419e400" integrity sha512-CLg+f8RQCHQnKvuHY9adMsMaQOcqclh6Z5V9TaoMgy0ut0tz848joZ7/CYFFyF/yZ5i2yaw7Fn498C+CNZVHIg== +"@vue/shared@3.4.31": + version "3.4.31" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.31.tgz#af9981f57def2c3f080c14bf219314fc0dc808a0" + integrity sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA== + "@vue/vue-loader-v15@npm:vue-loader@^15.9.7": version "15.10.1" resolved "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz#c451c4cd05a911aae7b5dbbbc09fb913fb3cca18" @@ -7097,10 +7127,10 @@ electron@^22.3.27: "@types/node" "^16.11.26" extract-zip "^2.0.1" -element-plus@2.7.6: - version "2.7.6" - resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.7.6.tgz#09b2c9c1de46dcc6778d37a29d9c0948ce40d635" - integrity sha512-36sw1K23hYjgeooR10U6CiCaCp2wvOqwoFurADZVlekeQ9v5U1FhJCFGEXO6i/kZBBMwsE1c9fxjLs9LENw2Rg== +element-plus@2.7.7: + version "2.7.7" + resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.7.7.tgz#317a4b826d577f4572ca040f2568eb751edd891d" + integrity sha512-7ucUiDAxevyBE8JbXBTe9ofHhS047VmWMLoksE45zZ08XSnhnyG7WUuk3gmDbAklfVMHedb9sEV3OovPUWt+Sw== dependencies: "@ctrl/tinycolor" "^3.4.1" "@element-plus/icons-vue" "^2.3.1" @@ -13921,16 +13951,7 @@ strict-uri-encode@^1.0.0: resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ== -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -13996,7 +14017,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -14024,13 +14045,6 @@ strip-ansi@^5.1.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -15206,16 +15220,16 @@ vue3-photo-preview@^0.3.0: dependencies: lodash-es "^4.17.21" -vue@^3.4.30: - version "3.4.30" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.30.tgz#02c75c63a21e305c38a937866d8ee2269b62bbb4" - integrity sha512-NcxtKCwkdf1zPsr7Y8+QlDBCGqxvjLXF2EX+yi76rV5rrz90Y6gK1cq0olIhdWGgrlhs9ElHuhi9t3+W5sG5Xw== +vue@^3.4.31: + version "3.4.31" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.31.tgz#83a3c4dab8302b0e974b0d4b92a2f6a6378ae797" + integrity sha512-njqRrOy7W3YLAlVqSKpBebtZpDVg21FPoaq1I7f/+qqBThK9ChAIjkRWgeP6Eat+8C+iia4P3OYqpATP21BCoQ== dependencies: - "@vue/compiler-dom" "3.4.30" - "@vue/compiler-sfc" "3.4.30" - "@vue/runtime-dom" "3.4.30" - "@vue/server-renderer" "3.4.30" - "@vue/shared" "3.4.30" + "@vue/compiler-dom" "3.4.31" + "@vue/compiler-sfc" "3.4.31" + "@vue/runtime-dom" "3.4.31" + "@vue/server-renderer" "3.4.31" + "@vue/shared" "3.4.31" watchpack@^2.4.0: version "2.4.0" @@ -15511,7 +15525,7 @@ wordwrap@^1.0.0: resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -15528,15 +15542,6 @@ wrap-ansi@^3.0.1: string-width "^2.1.1" strip-ansi "^4.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 3cfa9f57c2550d054114d2800cc424907962f65f Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Tue, 23 Jul 2024 13:09:32 +0800 Subject: [PATCH 2/6] :sparkles: Feature(custom): optimize gallery page performance ISSUES CLOSED: #225 --- public/loading.jpg | Bin 0 -> 9458 bytes src/main.ts | 6 +++--- src/renderer/pages/Gallery.vue | 16 +++++++++++++--- src/renderer/pages/Upload.vue | 2 ++ src/renderer/utils/drag.ts | 23 +++++++++++++++++++++++ src/renderer/utils/mixin.ts | 30 ------------------------------ 6 files changed, 41 insertions(+), 36 deletions(-) create mode 100644 public/loading.jpg create mode 100644 src/renderer/utils/drag.ts delete mode 100644 src/renderer/utils/mixin.ts diff --git a/public/loading.jpg b/public/loading.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4e8a8f71e66981453c4987f22b5d0eab6a86cb3f GIT binary patch literal 9458 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 H>CgWK(PBjG literal 0 HcmV?d00001 diff --git a/src/main.ts b/src/main.ts index a7865d7..2fd15df 100644 --- a/src/main.ts +++ b/src/main.ts @@ -25,7 +25,6 @@ import db from '@/utils/db' import { T } from '@/i18n/index' import { store } from '@/store' import { initTalkingData } from '@/utils/analytic' -import { dragMixin } from '@/utils/mixin' webFrame.setVisualZoomLevelLimits(1, 1) @@ -37,11 +36,12 @@ app.config.globalProperties.triggerRPC = triggerRPC app.config.globalProperties.sendRPC = sendRPC app.config.globalProperties.sendToMain = sendToMain -app.mixin(dragMixin) const pinia = createPinia() pinia.use(piniaPluginPersistedstate) app.use(VueLazyLoad, { - error: `file://${__static.replace(/\\/g, '/')}/unknown-file-type.svg` + loading: `file://${__static.replace(/\\/g, '/')}/loading.jpg`, + error: `file://${__static.replace(/\\/g, '/')}/unknown-file-type.svg`, + delay: 500 }) app.use(ElementUI) app.use(router) diff --git a/src/renderer/pages/Gallery.vue b/src/renderer/pages/Gallery.vue index d431292..60f92da 100644 --- a/src/renderer/pages/Gallery.vue +++ b/src/renderer/pages/Gallery.vue @@ -184,7 +184,12 @@ class="gallery-list__img" >
- +
{{ formatFileName(item.fileName || '') }} @@ -385,6 +390,7 @@ const isShowBatchRenameDialog = ref(false) const batchRenameMatch = ref('') const batchRenameReplace = ref('') const dateRange = ref('') + const mathcedCount = computed(() => { return filterList.value.filter((item: any) => { return customStrMatch(item.imgUrl, batchRenameMatch.value) @@ -411,7 +417,6 @@ onBeforeMount(async () => { }) }) updateGallery() - document.addEventListener('keydown', handleDetectShiftKey) document.addEventListener('keyup', handleDetectShiftKey) }) @@ -423,7 +428,10 @@ function handleDetectShiftKey(event: KeyboardEvent) { } const filterList = computed(() => { - return getGallery() + const start = new Date().getTime() + const res = getGallery() + console.log(`filterList: ${new Date().getTime() - start}ms`) + return res }) const isAllSelected = computed(() => { @@ -479,7 +487,9 @@ function getGallery(): IGalleryItem[] { } async function updateGallery() { + const start = new Date().getTime() images.value = (await $$db.get({ orderBy: 'desc' }))!.data + console.log(`updateGallery: ${new Date().getTime() - start}ms`) } watch( diff --git a/src/renderer/pages/Upload.vue b/src/renderer/pages/Upload.vue index cb11413..a34e074 100644 --- a/src/renderer/pages/Upload.vue +++ b/src/renderer/pages/Upload.vue @@ -127,7 +127,9 @@ import { SHOW_INPUT_BOX, SHOW_INPUT_BOX_RESPONSE } from '#/events/constants' import { IPasteStyle, IRPCActionType } from '#/types/enum' import { isUrl } from '#/utils/common' import { configPaths } from '#/utils/configPaths' +import { useDragEventListeners } from '@/utils/drag' +useDragEventListeners() const $router = useRouter() const imageProcessDialogVisible = ref(false) diff --git a/src/renderer/utils/drag.ts b/src/renderer/utils/drag.ts new file mode 100644 index 0000000..9e2085d --- /dev/null +++ b/src/renderer/utils/drag.ts @@ -0,0 +1,23 @@ +import { onBeforeUnmount, onMounted } from 'vue' + +function disableDrag(e: DragEvent) { + const dropzone = document.getElementById('upload-area') + if (dropzone === null || !dropzone.contains(e.target)) { + e.preventDefault() + e.dataTransfer!.effectAllowed = 'none' + e.dataTransfer!.dropEffect = 'none' + } +} + +export function useDragEventListeners() { + onMounted(() => { + window.addEventListener('dragenter', disableDrag, false) + window.addEventListener('dragover', disableDrag) + window.addEventListener('drop', disableDrag) + }) + onBeforeUnmount(() => { + window.removeEventListener('dragenter', disableDrag, false) + window.removeEventListener('dragover', disableDrag) + window.removeEventListener('drop', disableDrag) + }) +} diff --git a/src/renderer/utils/mixin.ts b/src/renderer/utils/mixin.ts deleted file mode 100644 index b2d8211..0000000 --- a/src/renderer/utils/mixin.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { ComponentOptions } from 'vue' - -export const dragMixin: ComponentOptions = { - mounted() { - this.disableDragEvent() - }, - - methods: { - disableDragEvent() { - window.addEventListener('dragenter', this.disableDrag, false) - window.addEventListener('dragover', this.disableDrag) - window.addEventListener('drop', this.disableDrag) - }, - - disableDrag(e: DragEvent) { - const dropzone = document.getElementById('upload-area') - if (dropzone === null || !dropzone.contains(e.target)) { - e.preventDefault() - e.dataTransfer!.effectAllowed = 'none' - e.dataTransfer!.dropEffect = 'none' - } - } - }, - - beforeUnmount() { - window.removeEventListener('dragenter', this.disableDrag, false) - window.removeEventListener('dragover', this.disableDrag) - window.removeEventListener('drop', this.disableDrag) - } -} From 60d2a01d5b19bcdff72a60e46a04bfcb1edc8f82 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Thu, 25 Jul 2024 15:54:57 +0800 Subject: [PATCH 3/6] :sparkles: Feature(custom): add advanced picbed --- package.json | 2 +- src/universal/types/shims-module.d.ts | 15 ++++------- src/universal/types/shims-tsx.d.ts | 38 +++++++++++++-------------- yarn.lock | 8 +++--- 4 files changed, 29 insertions(+), 34 deletions(-) diff --git a/package.json b/package.json index 037e173..8f254ec 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "multer": "^1.4.5-lts.1", "node-ssh-no-cpu-features": "^2.0.0", "nodejs-file-downloader": "^4.12.1", - "piclist": "^1.9.0", + "piclist": "^1.9.1", "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.1", "proxy-agent": "^5.0.0", diff --git a/src/universal/types/shims-module.d.ts b/src/universal/types/shims-module.d.ts index 6f68334..919c762 100644 --- a/src/universal/types/shims-module.d.ts +++ b/src/universal/types/shims-module.d.ts @@ -1,10 +1,5 @@ -declare module '*.vue' { - import { DefineComponent } from 'vue' - const component: DefineComponent<{}, {}, any> - export default component -} -// // third-party -// declare module 'fix-path' { -// function fixPath(): void -// export default fixPath -// } +declare module '*.vue' { + import { DefineComponent } from 'vue' + const component: DefineComponent<{}, {}, any> + export default component +} \ No newline at end of file diff --git a/src/universal/types/shims-tsx.d.ts b/src/universal/types/shims-tsx.d.ts index fa560a5..4c1e98d 100644 --- a/src/universal/types/shims-tsx.d.ts +++ b/src/universal/types/shims-tsx.d.ts @@ -1,19 +1,19 @@ -import Vue, { VNode } from 'vue' - -declare global { - namespace JSX { - // tslint:disable no-empty-interface - interface Element extends VNode {} - // tslint:disable no-empty-interface - interface ElementClass extends Vue {} - interface IntrinsicElements { - [elem: string]: any - } - } - - interface Window { - TDAPP: { - onEvent: (EventId: string, Label?: string, MapKv?: IStringKeyMap) => void - } - } -} +import Vue, { VNode } from 'vue' + +declare global { + namespace JSX { + // tslint:disable no-empty-interface + interface Element extends VNode {} + // tslint:disable no-empty-interface + interface ElementClass extends Vue {} + interface IntrinsicElements { + [elem: string]: any + } + } + + interface Window { + TDAPP: { + onEvent: (EventId: string, Label?: string, MapKv?: IStringKeyMap) => void + } + } +} diff --git a/yarn.lock b/yarn.lock index 5843f36..8856f7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11949,10 +11949,10 @@ performance-now@^2.1.0: resolved "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== -piclist@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.9.0.tgz#26f1598f74e2c9553659e9abebb9ca8637a80527" - integrity sha512-kmVL2d0jR8LB2o/hNgWTe/GDR7aMTSn4iV1QtcyNrCXe+9TTuGC52QgWrtlEwcJbkeUxmIquyPnhdwZQ9DWf+Q== +piclist@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.9.1.tgz#19be64573c06d824b43d8c4dab7e4819dbaca7f4" + integrity sha512-esSNT3tkIv3bi+78vmTsRdjmtIL71mP7vsEjadjQR9cuIulu0eN1+aovarAmNqf+RjdRLHB7XffxtPQEMuv4lQ== dependencies: "@aws-sdk/client-s3" "3.421.0" "@aws-sdk/lib-storage" "3.421.0" From 48d24f62da4acb74fe8f230ed3be26fb8f7ee064 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Tue, 30 Jul 2024 10:45:31 +0800 Subject: [PATCH 4/6] :pencil: Docs(custom): update readme --- README.md | 16 +++------------- README_cn.md | 12 ++---------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 600cbeb..13a7d22 100644 --- a/README.md +++ b/README.md @@ -58,30 +58,20 @@ Please install my matching plugin [VS-PicList](https://marketplace.visualstudio. #### **Version 1.6.0-dev and above** -**Typora 1.6.0-dev and above versions now support PicList natively** +**Typora 1.6.0-dev and above versions now support PicList natively if you set language of Typora to Chinese.** -Now you need to set the upload service PicList and PicGo (app) to the installation path of PicList at the same time, it has been fixed in latest dev version. +If your Typora version is lower than 1.8.0, you need to set the upload service PicList and PicGo (app) to the installation path of PicList at the same time. [download link](https://typora.io/releases/all) #### **Version < 1.6.0-dev** -Windows: - -Enter the Typora settings page, select the image, set the upload service to `PicGo(app)`, and then fill in the installation path of PicList in `PicGo path`, as shown below: +For windows, Enter the Typora settings page, select the image, set the upload service to `PicGo(app)`, and then fill in the installation path of PicList in `PicGo path`, as shown below: ![image](https://user-images.githubusercontent.com/96409857/226522101-b3531b7b-534c-4149-b527-8738d4ebb041.png) Or, you can also use the `npm install piclist` command to install PicList-core, and then set the upload service to `PicGo-Core(command line)`. -MacOS: - -Enter the Typora settings page, select the image, set the upload service to `Custom Command`, and then fill in `/Applications/PicList.app/Contents/MacOS/PicList upload` in `Command`, as shown below: - -![image](https://user-images.githubusercontent.com/96409857/226645570-4c6e06a5-5bd9-40c3-a21d-8446c66325e3.png) - -The verification of the upload option may have problems, you can ignore it, and use it directly. - ### How to use in Obsidian In the community plugins, search for and install the Image auto upload Plugin. Next, go to the plugin settings page and change the default uploader to PicGo(app). Set the PicGo server to `http://127.0.0.1:36677/upload` as shown in the image below. Additionally, this plugin also supports cloud-based deletion through PicList. To use this feature, enter `http://127.0.0.1:36677/delete` in the deletion interface. diff --git a/README_cn.md b/README_cn.md index 98fe63a..40c9d65 100644 --- a/README_cn.md +++ b/README_cn.md @@ -58,9 +58,9 @@ PicList的内核使用的是原版PicGo-Core基础上修改的[PicList-core](htt #### **1.6.0版本及以上** -**Typora 1.6.0-dev以及以上版本现在已经原生支持PicList了** +**Typora 1.6.0-dev以及以上版本现在已经原生支持PicList了, 但你需要将Typora的语言设置为中文** -目前Typora中需要同时设置上传服务PicList和PicGo（app）的路径为PicList的安装路径，已经在最新的Dev版本中修复。 +1.8.0以下版本的Typora中需要同时设置上传服务PicList和PicGo（app）的路径为PicList的安装路径。 [下载地址](https://typora.io/releases/all) @@ -74,14 +74,6 @@ Windows: 或者，您也可以使用 `npm install piclist`命令安装PicList-core，然后上传服务设置为 `PicGo-Core(command line)`。 -MacOS: - -进入Typora设置界面，选择图像，将上传服务设置为 `Custom Command`，然后在 `Command`中填写 `/Applications/PicList.app/Contents/MacOS/PicList upload`，如下图所示： - -![image](https://user-images.githubusercontent.com/96409857/226645570-4c6e06a5-5bd9-40c3-a21d-8446c66325e3.png) - -验证上传选项可能会出现问题，可以忽略，直接使用是正常的。 - ### 如何在Obsidian中使用 在社区插件中搜索安装 `Image auto upload Plugin`，然后进入插件设置页面，修改默认上传器为 `PicGo(app)`，设置 `PicGo server`为 `http://127.0.0.1:36677/upload`即可，如下图所示, 此外该插件还额外支持通过PicList进行云端删除，请在删除接口内填入 `http://127.0.0.1:36677/delete`： From 5ebe10c26f41892795c16f24efdb588bb05c05d0 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Tue, 30 Jul 2024 10:49:15 +0800 Subject: [PATCH 5/6] :pencil: Docs(custom): prepare for 2.9.2 --- README.md | 1 + README_cn.md | 1 + currentVersion.md | 15 +++------------ currentVersion_en.md | 15 +++------------ 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 13a7d22..6299f3d 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,7 @@ docker-compose up -d | PicList(Lasso-Doll) | ✔️ | ✔️ | | Telegra.ph | ✔️ | × | | Lsky Pro | ✔️ | ✔️ | +| Custom API platform | × | × | | Plugin | Album cloud deletion | | :----------------------------------------------------------------------------------------: | :------------------: | diff --git a/README_cn.md b/README_cn.md index 40c9d65..b8a7497 100644 --- a/README_cn.md +++ b/README_cn.md @@ -143,6 +143,7 @@ docker-compose up -d | PicList(套娃) | ✔️ | ✔️ | | Telegra.ph | ✔️ | x | | 兰空图床 | ✔️ | ✔️ | +| 自定义图床 | x | x | | 插件 | 相册云删除 | | :----------------------------------------------------------------------------------------: | :--------: | diff --git a/currentVersion.md b/currentVersion.md index 9ece146..4125299 100644 --- a/currentVersion.md +++ b/currentVersion.md @@ -1,14 +1,5 @@ ### ✨ Features -- 新增内置AList上传支持 -- 优化了设置了图片处理操作时的上传进度通知 -- 优化了部分图床的i18n设置 -- 修改内置兰空图床显示名，由`lsky`修改为`兰空图床` -- core版本现在使用piclist桌面版配置文件时支持设置`configName`参数 - -### 🐛 Bug Fixes - -- 修复了s3图床文件名含有特殊字符时无法删除的问题 -- 修复了特定情况下开启手动重命名后会导致软件闪退的问题 -- 修复了图床设置页面按钮的样式问题 -- 优化了多个图床存在的重复记录错误日志的问题 \ No newline at end of file +- 新增高级自定义图床 +- 相册页面现在加载图片时会显示loading图 +- 优化了相册页面的加载速度 \ No newline at end of file diff --git a/currentVersion_en.md b/currentVersion_en.md index 4e4b68b..54f08f3 100644 --- a/currentVersion_en.md +++ b/currentVersion_en.md @@ -1,14 +1,5 @@ ### ✨ Features -- Add built-in AList upload support -- Optimize the upload progress notification when image processing operations are set -- Optimize the i18n settings of some image beds -- Modify the display name of the built-in Lan Kong image bed from `lsky` to `Lan Kong image bed` -- The core version now supports setting the `configName` parameter when using the piclist desktop version configuration file - -### 🐛 Bug Fixes - -- Fix the problem that the s3 image bed cannot be deleted when the file name contains special characters -- Fix the problem that the software crashes under specific conditions after enabling manual renaming -- Fix the style problem of the button on the image bed setting page -- Optimize the problem of repeated recording error logs for multiple image beds +- Add advanced custom image bed +- The album page now displays a loading image when loading pictures +- Optimized the loading speed of the album page From c4aadfbd66bb9db7a3f1d32b7e4300ca20f8a8ec Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Tue, 30 Jul 2024 10:53:02 +0800 Subject: [PATCH 6/6] :tada: Release: v2.9.2 --- CHANGELOG.md | 16 ++++++++++++++++ package.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36461f1..f48d857 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## :tada: 2.9.2 (2024-07-30) + + +### :sparkles: Features + +* **custom:** add advanced picbed ([60d2a01](https://github.com/Kuingsmile/piclist/commit/60d2a01)) +* **custom:** optimize gallery page performance ([3cfa9f5](https://github.com/Kuingsmile/piclist/commit/3cfa9f5)), closes [#225](https://github.com/Kuingsmile/piclist/issues/225) + + +### :pencil: Documentation + +* **custom:** prepare for 2.9.2 ([5ebe10c](https://github.com/Kuingsmile/piclist/commit/5ebe10c)) +* **custom:** update readme ([48d24f6](https://github.com/Kuingsmile/piclist/commit/48d24f6)) + + + ## :tada: 2.9.1 (2024-07-07) diff --git a/package.json b/package.json index 8f254ec..b47f24e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "piclist", - "version": "2.9.1", + "version": "2.9.2", "author": { "name": "Kuingsmile", "email": "pkukuing@gmail.com"