Merge branch 'dev' into mas-build

.github/workflows/main.yml

@@ -68,7 +68,6 @@ jobs:
         run: |
           yarn
           yarn global add xvfb-maybe
-          npm rebuild --platform=win32 --arch=ia32 sharp
         
       - name: Yarn install linux
         if: matrix.os == 'ubuntu-latest'

package.json

@@ -64,12 +64,11 @@
     "mime-types": "^2.1.35",
     "mitt": "^3.0.0",
     "nodejs-file-downloader": "^4.10.6",
-    "piclist": "^0.3.0",
+    "piclist": "^0.3.2",
     "pinia": "^2.0.32",
     "pinia-plugin-persistedstate": "^3.1.0",
     "qiniu": "^7.8.0",
     "qrcode.vue": "^3.3.3",
-    "sharp": "^0.31.3",
     "shell-path": "2.1.0",
     "upyun": "^3.4.6",
     "uuid": "^9.0.0",

src/renderer/pages/PicGoSetting.vue

@@ -637,6 +637,13 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否移除Eixf信息">
+          <el-switch
+            v-model="compressForm.isRemoveExif"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+          />
+        </el-form-item>
         <el-form-item label="压缩质量">
           <el-input-number
             v-model="compressForm.quality"
@@ -797,7 +804,8 @@ const compressForm = reactive<any>({
   isReSizeByPercent: false,
   reSizePercent: 50,
   isRotate: false,
-  rotateDegree: 0
+  rotateDegree: 0,
+  isRemoveExif: false
 })
 
 function closeDialog () {
@@ -824,6 +832,7 @@ async function initForm () {
     compressForm.reSizePercent = compress.reSizePercent ?? 50
     compressForm.isRotate = compress.isRotate ?? false
     compressForm.rotateDegree = compress.rotateDegree ?? 0
+    compressForm.isRemoveExif = compress.isRemoveExif ?? false
   }
   if (watermark) {
     waterMarkForm.isAddWatermark = watermark.isAddWatermark ?? false

src/renderer/pages/Upload.vue

@@ -228,6 +228,13 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否移除Eixf信息">
+          <el-switch
+            v-model="compressForm.isRemoveExif"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+          />
+        </el-form-item>
         <el-form-item label="压缩质量">
           <el-input-number
             v-model="compressForm.quality"
@@ -391,7 +398,8 @@ const compressForm = reactive<any>({
   isReSizeByPercent: false,
   reSizePercent: 50,
   isRotate: false,
-  rotateDegree: 0
+  rotateDegree: 0,
+  isRemoveExif: false
 })
 
 function closeDialog () {
@@ -418,6 +426,7 @@ async function initData () {
     compressForm.reSizePercent = compress.reSizePercent ?? 50
     compressForm.isRotate = compress.isRotate ?? false
     compressForm.rotateDegree = compress.rotateDegree ?? 0
+    compressForm.isRemoveExif = compress.isRemoveExif ?? false
   }
   if (watermark) {
     waterMarkForm.isAddWatermark = watermark.isAddWatermark ?? false

yarn.lock

@@ -10989,10 +10989,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.3.0:
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/piclist/-/piclist-0.3.0.tgz#54cdc2273058e5181619aec06c141d1759ccbcc4"
-  integrity sha512-cmNWKY/whYO/RFDDmwnTkc5ojlp+4fDvrYzo/moZbwIIJWsgMZlnMpMFthAjJVfk3hAGHQrsJHxY2IZuMVg66w==
+piclist@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.npmjs.org/piclist/-/piclist-0.3.2.tgz#fd4354f8134fb1fa31acd7d583ae60259d7cd137"
+  integrity sha512-TLQnf9fdGbeSBshAFRfpYUKak/1YT53GqkOnFjpdLotnx2OL6NWrRB5xtnqmnNXYQ4QhCBiOCYDaGZVWjHam7w==
   dependencies:
     "@picgo/i18n" "^1.0.0"
     "@picgo/store" "^2.0.4"