From b3addcc7bfeb50f4dfad4aa6a45b1a4f545acd44 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Mon, 22 Jan 2024 18:58:22 -0800 Subject: [PATCH 1/7] :pencil: Docs(custom): update docs --- currentVersion_en.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/currentVersion_en.md b/currentVersion_en.md index 49671843..1fe2f987 100644 --- a/currentVersion_en.md +++ b/currentVersion_en.md @@ -6,11 +6,6 @@ 🐛 Bug Fixes -- 修复了修改s3图床相册链接后，拷贝图片链接没有对应修改的问题 -- 修复了修改s3图床相册连接后，云端删除失效的问题 -- 修复了设置精细转换格式时的序列化错误 -- 修复了界面翻译错误 - - Fix the problem that the copied image link is not modified after modifying the s3 album link - Fixed the problem that the cloud deletion is invalid after modifying the s3 album connection - Fixed serialization error when setting fine conversion format From 868407f123c990fb343e384204811ffe654532df Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Tue, 23 Jan 2024 18:43:53 -0800 Subject: [PATCH 2/7] :hammer: Refactor(custom): update i18n --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index bf4be547..c8c81a74 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "multer": "^1.4.5-lts.1", "node-ssh-no-cpu-features": "^1.0.1", "nodejs-file-downloader": "^4.12.1", - "piclist": "^1.7.7", + "piclist": "^1.7.8", "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.0", "proxy-agent": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index 4d717340..ca53fbd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12392,10 +12392,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.7.7: - version "1.7.7" - resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.7.7.tgz#fa4bcd08e623859a678dd20160e512b83650bf87" - integrity sha512-GBusAPlEAcGMkp91tCZ4hX3oHVevQMJxagmFPWaIwj1G6FY/twKtnO/BiGoLcz1DwiZpxglWx5zPWw4IM7beLg== +piclist@^1.7.8: + version "1.7.8" + resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.7.8.tgz#7d013354608a9d45a52e1947b0591c3a60b6a37e" + integrity sha512-GXHGpq03J7aZKDJ/fMvuUrOy+aeE5g9mFObhfKRE2p89IPbv/Y1ll9OcQkjf8wcqWPdC1240u5p+GOMyUgr2Dg== dependencies: "@aws-sdk/client-s3" "3.421.0" "@aws-sdk/lib-storage" "3.421.0" From 48cfaab0ebfc90221726b7ef7a56b0f42418c509 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Thu, 25 Jan 2024 05:02:50 -0800 Subject: [PATCH 3/7] :sparkles: Feature(custom): support picbed name click to config page --- src/renderer/pages/picbeds/index.vue | 53 ++++++++++++---------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/src/renderer/pages/picbeds/index.vue b/src/renderer/pages/picbeds/index.vue index 8843c8e3..64703171 100644 --- a/src/renderer/pages/picbeds/index.vue +++ b/src/renderer/pages/picbeds/index.vue @@ -16,9 +16,7 @@ @click="handleNameClick" > {{ picBedName }} {{ $T('SETTINGS') }} - + { $router.back() } -const linkToLogInList = ['GitHub', '腾讯云COS', '阿里云OSS', 'SM.MS', '七牛云', 'Imgur', '又拍云', 'githubPlus'] - function handleNameClick () { - switch ($route.params.type) { - case 'github': - case 'githubPlus': - sendToMain(OPEN_URL, 'https://github.com') - break - case 'tcyun': - sendToMain(OPEN_URL, 'https://cloud.tencent.com/login') - break - case 'aliyun': - sendToMain(OPEN_URL, 'https://account.aliyun.com/login/login.htm') - break - case 'smms': - sendToMain(OPEN_URL, 'https://smms.app') - break - case 'qiniu': - sendToMain(OPEN_URL, 'https://portal.qiniu.com') - break - case 'imgur': - sendToMain(OPEN_URL, 'https://imgur.com') - break - case 'upyun': - sendToMain(OPEN_URL, 'https://console.upyun.com') - break - default: - break + const typeUrlMap: IStringKeyMap = { + github: 'https://piclist.cn/configure.html#github%E5%9B%BE%E5%BA%8A', + githubPlus: 'https://piclist.cn/configure.html#github%E5%9B%BE%E5%BA%8A', + tcyun: 'https://piclist.cn/configure.html#%E8%85%BE%E8%AE%AF%E4%BA%91cos', + aliyun: 'https://piclist.cn/configure.html#%E9%98%BF%E9%87%8C%E4%BA%91oss', + smms: 'https://piclist.cn/configure.html#sm-ms', + qiniu: 'https://piclist.cn/configure.html#%E4%B8%83%E7%89%9B%E4%BA%91', + imgur: 'https://piclist.cn/configure.html#imgur', + upyun: 'https://piclist.cn/configure.html#%E5%8F%88%E6%8B%8D%E4%BA%91', + 'aws-s3-plist': 'https://piclist.cn/configure.html#%E5%86%85%E7%BD%AEaws-s3', + 'aws-s3': 'https://piclist.cn/configure.html#%E5%86%85%E7%BD%AEaws-s3', + local: 'https://piclist.cn/configure.html#%E6%9C%AC%E5%9C%B0%E5%9B%BE%E5%BA%8A', + lskyplist: 'https://piclist.cn/configure.html#%E5%85%B0%E7%A9%BA%E5%9B%BE%E5%BA%8A', + sftpplist: 'https://piclist.cn/configure.html#%E5%86%85%E7%BD%AEsftp', + telegraphplist: 'https://piclist.cn/configure.html#telegra-ph', + webdavplist: 'https://piclist.cn/configure.html#webdav', + piclist: 'https://piclist.cn/configure.html#piclist', + lankong: 'https://github.com/hellodk34/picgo-plugin-lankong' + } + const url = typeUrlMap[$route.params.type as string] + if (url) { + sendToMain(OPEN_URL, url) } } From d87a014ff2883f5e527395305109a55ce9896591 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Thu, 25 Jan 2024 20:02:25 -0800 Subject: [PATCH 4/7] :pencil: Docs(custom): add wechat group --- README.md | 6 ++++++ README_cn.md | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/README.md b/README.md index ec9bfe8a..e279ca9f 100644 --- a/README.md +++ b/README.md @@ -229,6 +229,12 @@ If you need to build it yourself, you can start building with `yarn run build`. - [PicHoro](https://github.com/Kuingsmile/PicHoro): A mobile APP that works with PicList - [VS-PicList](https://github.com/Kuingsmile/vs-PicList/): A VScode plugin that works with PicList +## Communication group + +If you have any questions, you can join the WeChat group for communication. + +![image](https://pichoro.msq.pub/wechat.png) + ## License This project is open source under the MIT license. Welcome everyone to use and contribute code. Thank you for the open source spirit of the original author Molunerfinn. diff --git a/README_cn.md b/README_cn.md index 092e8587..05f4035f 100644 --- a/README_cn.md +++ b/README_cn.md @@ -219,6 +219,12 @@ brew uninstall piclist - [PicHoro](https://github.com/Kuingsmile/PicHoro): 与 PicList 搭配使用的手机端 APP - [VS-PicList](https://github.com/Kuingsmile/vs-PicList/): 与 PicList 搭配使用的VScode插件 +## 交流群 + +如果有任何问题，可以加入微信群进行交流。 + +![image](https://pichoro.msq.pub/wechat.png) + ## License 本项目基于MIT协议开源，欢迎大家使用和贡献代码，感谢原作者Molunerfinn的开源精神。 From ea8260079782c9a26bf9c3964b5ec4a365b2164c Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Mon, 29 Jan 2024 17:56:20 -0800 Subject: [PATCH 5/7] :bug: Fix(custom): fix format convert bug --- package.json | 2 +- src/renderer/pages/PicGoSetting.vue | 24 +++++++++++++++--------- src/renderer/pages/Upload.vue | 24 +++++++++++++++--------- yarn.lock | 8 ++++---- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index c8c81a74..9a7b54a8 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "multer": "^1.4.5-lts.1", "node-ssh-no-cpu-features": "^1.0.1", "nodejs-file-downloader": "^4.12.1", - "piclist": "^1.7.8", + "piclist": "^1.7.9", "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.0", "proxy-agent": "^5.0.0", diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue index b1112e08..2646bc1b 100644 --- a/src/renderer/pages/PicGoSetting.vue +++ b/src/renderer/pages/PicGoSetting.vue @@ -1477,7 +1477,7 @@ :label="$T('UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT_SPECIFIC')" > ({ watermarkPosition: 'southeast' }) +const formatConvertObj = ref('{}') + const compressForm = reactive({ quality: 100, isConvert: false, @@ -1706,8 +1708,7 @@ const compressForm = reactive({ rotateDegree: 0, isRemoveExif: false, isFlip: false, - isFlop: false, - formatConvertObj: '{}' + isFlop: false }) function closeDialog () { @@ -1715,17 +1716,18 @@ function closeDialog () { } function handleSaveConfig () { - let formatConvertObj = {} + let iformatConvertObj = {} try { - formatConvertObj = JSON.parse(compressForm.formatConvertObj) + iformatConvertObj = JSON.parse(formatConvertObj.value) } catch (error) { } - const formatConvertObjEntries = Object.entries(formatConvertObj) + const formatConvertObjEntries = Object.entries(iformatConvertObj) const formatConvertObjEntriesFilter = formatConvertObjEntries.filter((item: any) => { return imageExtList.includes(item[0]) && availableFormat.includes(item[1]) }) const formatConvertObjFilter = Object.fromEntries(formatConvertObjEntriesFilter) - compressForm.formatConvertObj = JSON.stringify(formatConvertObjFilter) + formatConvertObj.value = JSON.stringify(formatConvertObjFilter) + compressForm.formatConvertObj = formatConvertObjFilter saveConfig('buildIn.compress', toRaw(compressForm)) saveConfig('buildIn.watermark', toRaw(waterMarkForm)) closeDialog() @@ -1750,9 +1752,13 @@ async function initForm () { compressForm.isFlip = compress.isFlip ?? false compressForm.isFlop = compress.isFlop ?? false try { - compressForm.formatConvertObj = JSON.stringify(compress.formatConvertObj ?? {}) + if (typeof compress.formatConvertObj === 'object') { + formatConvertObj.value = JSON.stringify(compress.formatConvertObj) + } else { + formatConvertObj.value = compress.formatConvertObj ?? '{}' + } } catch (error) { - compressForm.formatConvertObj = '{}' + formatConvertObj.value = '{}' } } if (watermark) { diff --git a/src/renderer/pages/Upload.vue b/src/renderer/pages/Upload.vue index 4d968dae..09ef5068 100644 --- a/src/renderer/pages/Upload.vue +++ b/src/renderer/pages/Upload.vue @@ -308,7 +308,7 @@ :label="$T('UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT_SPECIFIC')" > ({ rotateDegree: 0, isRemoveExif: false, isFlip: false, - isFlop: false, - formatConvertObj: '{}' + isFlop: false }) +const formatConvertObj = ref('{}') + function closeDialog () { imageProcessDialogVisible.value = false } function handleSaveConfig () { - let formatConvertObj = {} + let iformatConvertObj = {} try { - formatConvertObj = JSON.parse(compressForm.formatConvertObj) + iformatConvertObj = JSON.parse(formatConvertObj.value) } catch (error) { } - const formatConvertObjEntries = Object.entries(formatConvertObj) + const formatConvertObjEntries = Object.entries(iformatConvertObj) const formatConvertObjEntriesFilter = formatConvertObjEntries.filter((item: any) => { return imageExtList.includes(item[0]) && availableFormat.includes(item[1]) }) const formatConvertObjFilter = Object.fromEntries(formatConvertObjEntriesFilter) - compressForm.formatConvertObj = JSON.stringify(formatConvertObjFilter) + formatConvertObj.value = JSON.stringify(formatConvertObjFilter) + compressForm.formatConvertObj = formatConvertObjFilter saveConfig('buildIn.compress', toRaw(compressForm)) saveConfig('buildIn.watermark', toRaw(waterMarkForm)) closeDialog() @@ -560,9 +562,13 @@ async function initData () { compressForm.isFlip = compress.isFlip ?? false compressForm.isFlop = compress.isFlop ?? false try { - compressForm.formatConvertObj = JSON.stringify(compress.formatConvertObj ?? {}) + if (typeof compress.formatConvertObj === 'object') { + formatConvertObj.value = JSON.stringify(compress.formatConvertObj) + } else { + formatConvertObj.value = compress.formatConvertObj ?? '{}' + } } catch (error) { - compressForm.formatConvertObj = '{}' + formatConvertObj.value = '{}' } } if (watermark) { diff --git a/yarn.lock b/yarn.lock index ca53fbd8..672a5504 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12392,10 +12392,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.7.8: - version "1.7.8" - resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.7.8.tgz#7d013354608a9d45a52e1947b0591c3a60b6a37e" - integrity sha512-GXHGpq03J7aZKDJ/fMvuUrOy+aeE5g9mFObhfKRE2p89IPbv/Y1ll9OcQkjf8wcqWPdC1240u5p+GOMyUgr2Dg== +piclist@^1.7.9: + version "1.7.9" + resolved "https://registry.yarnpkg.com/piclist/-/piclist-1.7.9.tgz#1677f63c0596d0b23fd082ce4a3f10c6b4f7244a" + integrity sha512-+H32vNqfe3bCNhkreEJXzWT4fUOyPntNxCPjeo5btxAhbaVEfP8GwXA1XfX8NrJb3ml6sQzIk26FrQ2bzK+Bwg== dependencies: "@aws-sdk/client-s3" "3.421.0" "@aws-sdk/lib-storage" "3.421.0" From 3c9f13aa65ea0843c4fa4a50cb1b4e9b2a735e62 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Mon, 29 Jan 2024 18:10:07 -0800 Subject: [PATCH 6/7] :pencil: Docs(custom): update changelog --- currentVersion.md | 8 ++------ currentVersion_en.md | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/currentVersion.md b/currentVersion.md index 4ee6a944..5b3b6c5d 100644 --- a/currentVersion.md +++ b/currentVersion.md @@ -1,12 +1,8 @@ ✨ Features -- 新增内置S3 API兼容平台支持 -- 现在又拍云图床支持自定义接口地址 -- 七牛云新建存储桶新增`亚太-河内`支持 +- 现在配置页点击图床名会跳转至手册说明页 🐛 Bug Fixes -- 修复了修改s3图床相册链接后，拷贝图片链接没有对应修改的问题 -- 修复了修改s3图床相册连接后，云端删除失效的问题 -- 修复了设置精细转换格式时的序列化错误 +- 修复了设置精细转换格式时，配置没有起作用的问题 - 修复了界面翻译错误 diff --git a/currentVersion_en.md b/currentVersion_en.md index 1fe2f987..15067607 100644 --- a/currentVersion_en.md +++ b/currentVersion_en.md @@ -1,12 +1,8 @@ ✨ Features -- Add support for built-in S3 API compatible platform -- Upyun now supports custom interface addresses -- Qiniu Cloud new bucket supports `Asia-Pacific-Hanoi` +- Now clicking the image bed name on the configuration page will jump to the manual explanation page 🐛 Bug Fixes -- Fix the problem that the copied image link is not modified after modifying the s3 album link -- Fixed the problem that the cloud deletion is invalid after modifying the s3 album connection -- Fixed serialization error when setting fine conversion format +- Fixed the problem that the configuration did not take effect when setting the fine conversion format - Fixed interface translation error From 16e0a7cfc48677aeb9bdb394ceb470cca60918f5 Mon Sep 17 00:00:00 2001 From: Kuingsmile Date: Mon, 29 Jan 2024 18:19:45 -0800 Subject: [PATCH 7/7] :tada: Release: v2.7.3 --- CHANGELOG.md | 20 ++++++++++++++++++++ package.json | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bca4bc6..6e8a5a00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +## :tada: 2.7.3 (2024-01-30) + + +### :sparkles: Features + +* **custom:** support picbed name click to config page ([48cfaab](https://github.com/Kuingsmile/piclist/commit/48cfaab)) + + +### :bug: Bug Fixes + +* **custom:** fix format convert bug ([ea82600](https://github.com/Kuingsmile/piclist/commit/ea82600)) + + +### :pencil: Documentation + +* **custom:** add wechat group ([d87a014](https://github.com/Kuingsmile/piclist/commit/d87a014)) +* **custom:** update changelog ([3c9f13a](https://github.com/Kuingsmile/piclist/commit/3c9f13a)) + + + ## :tada: 2.7.2 (2024-01-23) diff --git a/package.json b/package.json index 9a7b54a8..0eaedaf4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "piclist", - "version": "2.7.2", + "version": "2.7.3", "author": { "name": "Kuingsmile", "email": "pkukuing@gmail.com"