diff --git a/package.json b/package.json index 6808846..5d981e6 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "mime-types": "^2.1.35", "mitt": "^3.0.0", "nodejs-file-downloader": "^4.12.1", - "piclist": "^0.8.4", + "piclist": "^0.8.5", "pinia": "^2.1.4", "pinia-plugin-persistedstate": "^3.1.0", "qiniu": "^7.8.0", diff --git a/public/i18n/en.yml b/public/i18n/en.yml index 264ec5a..3035e9d 100644 --- a/public/i18n/en.yml +++ b/public/i18n/en.yml @@ -120,6 +120,8 @@ UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: Destination Format UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: Resize to fixed size UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: Width(Set to 0 to scale by height) UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: Height(Set to 0 to scale by width) +UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_HEIGHT: Skip resize when image height is smaller than target height +UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_WIDTH: Skip resize when image width is smaller than target width UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: Resize by percentage (Higher priority) UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: Resize Percentage, enter 50 for 50% UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: Rotate diff --git a/public/i18n/zh-CN.yml b/public/i18n/zh-CN.yml index 7bbfbfd..1ef9fad 100644 --- a/public/i18n/zh-CN.yml +++ b/public/i18n/zh-CN.yml @@ -120,6 +120,8 @@ UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 转换目的格式 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: 是否按固定尺寸调整图片 UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: 调整尺寸宽度(设为0则按高度等比缩放) UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: 调整尺寸高度(设为0则按宽度等比缩放) +UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_HEIGHT: 当图片高度小于设定高度时跳过缩放 +UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_WIDTH: 当图片宽度小于设定宽度时跳过缩放 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: 是否按比例调整尺寸,优先级更高 UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: 调整尺寸比例, 输入50表示50% UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: 是否旋转 diff --git a/public/i18n/zh-TW.yml b/public/i18n/zh-TW.yml index a470c10..9cbf16e 100644 --- a/public/i18n/zh-TW.yml +++ b/public/i18n/zh-TW.yml @@ -118,8 +118,10 @@ UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: 壓縮質量 UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: 是否轉換格式 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 轉換目的格式 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: 是否按固定尺寸調整圖片 -UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: 調整尺寸寬度(设为0则按高度等比缩放) -UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: 調整尺寸高度(设为0则按寬度等比缩放) +UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: 調整尺寸寬度(設為0則按高度等比縮放) +UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: 調整尺寸高度(設為0則按寬度等比縮放) +UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_HEIGHT: 當圖片高度小於設定高度時跳過縮放 +UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_WIDTH: 當圖片寬度小於設定寬度時跳過縮放 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: 是否按比例調整尺寸,優先級更高 UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: 調整尺寸比例,輸入50表示50% UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: 是否旋轉 diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue index 30ed00f..fdba80b 100644 --- a/src/renderer/pages/PicGoSetting.vue +++ b/src/renderer/pages/PicGoSetting.vue @@ -1376,6 +1376,26 @@ :min="0" /> + + + + + + @@ -1523,6 +1543,7 @@ async function initForm () { compressForm.reSizeWidth = compress.reSizeWidth ?? 500 compressForm.reSizeHeight = compress.reSizeHeight ?? 500 compressForm.isReSizeByPercent = compress.isReSizeByPercent ?? false + compressForm.skipReSizeOfSmallImg = compress.skipReSizeOfSmallImg ?? false compressForm.reSizePercent = compress.reSizePercent ?? 50 compressForm.isRotate = compress.isRotate ?? false compressForm.rotateDegree = compress.rotateDegree ?? 0 diff --git a/src/renderer/pages/Upload.vue b/src/renderer/pages/Upload.vue index 47ecfac..c391c7b 100644 --- a/src/renderer/pages/Upload.vue +++ b/src/renderer/pages/Upload.vue @@ -327,6 +327,26 @@ :min="0" /> + + + + + + @@ -440,6 +460,7 @@ const compressForm = reactive({ isReSize: false, reSizeWidth: 500, reSizeHeight: 500, + skipReSizeOfSmallImg: false, isReSizeByPercent: false, reSizePercent: 50, isRotate: false, @@ -467,6 +488,7 @@ async function initData () { compressForm.isReSize = compress.isReSize ?? false compressForm.reSizeWidth = compress.reSizeWidth ?? 500 compressForm.reSizeHeight = compress.reSizeHeight ?? 500 + compressForm.skipReSizeOfSmallImg = compress.skipReSizeOfSmallImg ?? false compressForm.isReSizeByPercent = compress.isReSizeByPercent ?? false compressForm.reSizePercent = compress.reSizePercent ?? 50 compressForm.isRotate = compress.isRotate ?? false diff --git a/src/universal/types/i18n.d.ts b/src/universal/types/i18n.d.ts index f1f3240..758df67 100644 --- a/src/universal/types/i18n.d.ts +++ b/src/universal/types/i18n.d.ts @@ -117,6 +117,8 @@ interface ILocales { UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: string UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: string UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: string + UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_HEIGHT: string + UPLOAD_PAGE_IMAGE_PROCESS_SKIPRESIZEOfSMALLIMG_WIDTH: string UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZEBYPERCENT: string UPLOAD_PAGE_IMAGE_PROCESS_RESIZEPERCENT: string UPLOAD_PAGE_IMAGE_PROCESS_ISROTATE: string diff --git a/yarn.lock b/yarn.lock index d3eedc6..972b150 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11054,10 +11054,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@^0.8.4: - version "0.8.4" - resolved "https://registry.npmjs.org/piclist/-/piclist-0.8.4.tgz#deed21f50f4bfaad9641e22f2caeb717189538b4" - integrity sha512-+zFkBNVG5oRuk+ehb3Lu0FmUkKMcDczRvuGMBIfDX7rK8JY3aojc3HT4PbVlDwwugOVs6PkhVS5hLL2ejslb9w== +piclist@^0.8.5: + version "0.8.5" + resolved "https://registry.npmjs.org/piclist/-/piclist-0.8.5.tgz#0f0e5861451eef0a18a017001ee25f9c9af52bd6" + integrity sha512-Gop8vwVNfwENau/WVQGicNZeYoqyo9jUQB9GPwh8PaxzFY4mO6f3fHXgzKU7A8ejoskECUgo52i4sKuD1fTpvQ== dependencies: "@picgo/i18n" "^1.0.0" "@picgo/store" "^2.0.4"