diff --git a/package.json b/package.json index e23f16c8..012d45c6 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "mitt": "^3.0.1", "node-ssh-no-cpu-features": "^1.0.1", "nodejs-file-downloader": "^4.12.1", - "piclist": "^1.0.2", + "piclist": "^1.0.3", "pinia": "^2.1.6", "pinia-plugin-persistedstate": "^3.2.0", "qiniu": "^7.9.0", diff --git a/public/i18n/en.yml b/public/i18n/en.yml index 92967df9..d7a66a21 100644 --- a/public/i18n/en.yml +++ b/public/i18n/en.yml @@ -118,6 +118,8 @@ UPLOAD_PAGE_IMAGE_PROCESS_ISREMOVEEXIF: Remove EXIF Info UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: Compression Quality UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: Convert Format UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: Destination Format +UPLOAD_PAGE_IMAGE_PROCESS_ISFLIP: Whether to flip vertically +UPLOAD_PAGE_IMAGE_PROCESS_ISFLOP: Whether to flip horizontally 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) diff --git a/public/i18n/zh-CN.yml b/public/i18n/zh-CN.yml index 700810ac..bed1bae7 100644 --- a/public/i18n/zh-CN.yml +++ b/public/i18n/zh-CN.yml @@ -118,6 +118,8 @@ UPLOAD_PAGE_IMAGE_PROCESS_ISREMOVEEXIF: 是否移除EXIF信息 UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: 压缩质量 UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: 是否转换格式 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 转换目的格式 +UPLOAD_PAGE_IMAGE_PROCESS_ISFLIP: 是否进行垂直翻转 +UPLOAD_PAGE_IMAGE_PROCESS_ISFLOP: 是否进行水平翻转 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: 是否按固定尺寸调整图片 UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: 调整尺寸宽度(设为0则按高度等比缩放) UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: 调整尺寸高度(设为0则按宽度等比缩放) diff --git a/public/i18n/zh-TW.yml b/public/i18n/zh-TW.yml index 2b2adb1d..8a1b1fc7 100644 --- a/public/i18n/zh-TW.yml +++ b/public/i18n/zh-TW.yml @@ -118,6 +118,8 @@ UPLOAD_PAGE_IMAGE_PROCESS_ISREMOVEEXIF: 是否移除EXIF信息 UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: 壓縮質量 UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: 是否轉換格式 UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: 轉換目的格式 +UPLOAD_PAGE_IMAGE_PROCESS_ISFLIP: 是否進行垂直翻轉 +UPLOAD_PAGE_IMAGE_PROCESS_ISFLOP: 是否進行水平翻轉 UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: 是否按固定尺寸調整圖片 UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: 調整尺寸寬度(設為0則按高度等比縮放) UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: 調整尺寸高度(設為0則按寬度等比縮放) diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue index ec67b4ba..106b4453 100644 --- a/src/renderer/pages/PicGoSetting.vue +++ b/src/renderer/pages/PicGoSetting.vue @@ -1369,6 +1369,24 @@ /> + + + + + + @@ -1566,7 +1584,9 @@ const compressForm = reactive({ reSizePercent: 50, isRotate: false, rotateDegree: 0, - isRemoveExif: false + isRemoveExif: false, + isFlip: false, + isFlop: false }) function closeDialog () { @@ -1595,6 +1615,8 @@ async function initForm () { compressForm.isRotate = compress.isRotate ?? false compressForm.rotateDegree = compress.rotateDegree ?? 0 compressForm.isRemoveExif = compress.isRemoveExif ?? false + compressForm.isFlip = compress.isFlip ?? false + compressForm.isFlop = compress.isFlop ?? false } if (watermark) { waterMarkForm.isAddWatermark = watermark.isAddWatermark ?? false diff --git a/src/renderer/pages/Upload.vue b/src/renderer/pages/Upload.vue index 40267656..7b8cc449 100644 --- a/src/renderer/pages/Upload.vue +++ b/src/renderer/pages/Upload.vue @@ -300,6 +300,24 @@ /> + + + + + + @@ -486,7 +504,9 @@ const compressForm = reactive({ reSizePercent: 50, isRotate: false, rotateDegree: 0, - isRemoveExif: false + isRemoveExif: false, + isFlip: false, + isFlop: false }) function closeDialog () { @@ -515,6 +535,8 @@ async function initData () { compressForm.isRotate = compress.isRotate ?? false compressForm.rotateDegree = compress.rotateDegree ?? 0 compressForm.isRemoveExif = compress.isRemoveExif ?? false + compressForm.isFlip = compress.isFlip ?? false + compressForm.isFlop = compress.isFlop ?? false } if (watermark) { waterMarkForm.isAddWatermark = watermark.isAddWatermark ?? false diff --git a/src/universal/types/i18n.d.ts b/src/universal/types/i18n.d.ts index a0615f2d..217745bf 100644 --- a/src/universal/types/i18n.d.ts +++ b/src/universal/types/i18n.d.ts @@ -115,6 +115,8 @@ interface ILocales { UPLOAD_PAGE_IMAGE_PROCESS_QUALITY: string UPLOAD_PAGE_IMAGE_PROCESS_ISCONVERT: string UPLOAD_PAGE_IMAGE_PROCESS_CONVERTFORMAT: string + UPLOAD_PAGE_IMAGE_PROCESS_ISFLIP: string + UPLOAD_PAGE_IMAGE_PROCESS_ISFLOP: string UPLOAD_PAGE_IMAGE_PROCESS_ISRESIZE: string UPLOAD_PAGE_IMAGE_PROCESS_RESIZEWIDTH: string UPLOAD_PAGE_IMAGE_PROCESS_RESIZEHEIGHT: string diff --git a/yarn.lock b/yarn.lock index 3ef3ad08..c10fad54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12532,10 +12532,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.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/piclist/-/piclist-1.0.2.tgz#7a064ef88cf364568aef1e36ea6d9582ebc6119f" - integrity sha512-AUuD7n72ZI9eui1q+QVCdsM7nCYiP3c2bJajOtxYT4UuppRVPoIekM+UBoeTMgSTuzT9yxXAhQH0JXZ27Iy+qg== +piclist@^1.0.3: + version "1.0.3" + resolved "https://registry.npmjs.org/piclist/-/piclist-1.0.3.tgz#391c0a5fcdbed35a397c01a730711a4066a5511b" + integrity sha512-X9bBb3FbuyoYZx0BFriYU0lZdO1avbehUf7qhWMIwOdzTfY1eMtkJoNglVZ3pAfrugF2BofKco1NbUtKLfFGVA== dependencies: "@picgo/i18n" "^1.0.0" "@picgo/store" "^2.0.4"