From bc8f7123657eb2dde8a328928140c94ea0cc3d29 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 16 May 2024 11:52:06 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dev.zhiheiot.com:29418/mob-components

---
 forms/imagePicker/CImagePicker.vue |   78 ++++++++++++++++++++++++++++-----------
 1 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/forms/imagePicker/CImagePicker.vue b/forms/imagePicker/CImagePicker.vue
index fc22f85..d9b581f 100644
--- a/forms/imagePicker/CImagePicker.vue
+++ b/forms/imagePicker/CImagePicker.vue
@@ -15,14 +15,15 @@
         <AtImagePicker
             ref="picker"
             mode="aspectFit"
+            :sourceType="sourceType"
             :multiple="count > 1"
             :count="count"
             :showAddBtn="!selectedFull"
             :length="3"
             :files="files"
-            :onChange="(files,operationType,index)=>handleChange(files,operationType,index)"
-            :onFail="evt=>handleFail(evt)"
-            :onImageClick="(index, file)=>handleImgView(index,file)"
+            :onChange="(files,operationType,index) => handleChange(files,operationType,index)"
+            :onFail="evt => handleFail(evt)"
+            :onImageClick="(index, file) => handleImgView(index,file)"
         />
         <CImageCompressor ref="compressor" />
         <CImagePreview ref="imgPreview" />
@@ -56,6 +57,21 @@
         count: {
             type: Number,
             default: 1,
+        },
+        // 图片来源
+        sourceType: {
+            type: Array,
+            default: () => ['album', 'camera'],
+        },
+        // 上传图片参数
+        params: {
+            type: Object,
+            default: () => {},
+        },
+        // 是否开启缩略图
+        needThumb: {
+            type: Boolean,
+            default: false,
         },
     },
     data() {
@@ -99,7 +115,7 @@
                     if (file.file && file.file.originalFileObj) {
                         if (
                             /image\/(gif|png|jpg|jpeg)/.test(
-                                file.file.originalFileObj.type
+                                file.file.originalFileObj.type,
                             )
                         ) {
                             return true;
@@ -190,16 +206,23 @@
                 file.fileName = this.fileNames[file.url];
                 files.push(file);
             });
-            uploadImage(files, (state, res) => {
-                if (state === 'success') {
-                    this.itemRes.onChange(res);
-                    setTimeout(() => {
-                        callback(state);
-                    }, 10);
-                } else if (state === 'error') {
-                    callback(state, res);
-                }
-            });
+            uploadImage(
+                files,
+                (state, res) => {
+                    if (state === 'success') {
+                        this.itemRes.onChange(res);
+                        setTimeout(() => {
+                            callback(state);
+                        }, 10);
+                    } else if (state === 'error') {
+                        callback(state, res);
+                    }
+                },
+                $fetchCommon.transKeyName('underline', {
+                    ...this.params,
+                    needThumb: this.needThumb ? 1 : 0,
+                }),
+            );
         },
     },
     mounted() {
@@ -218,7 +241,7 @@
 // 图片上传节流
 const _readyUpload = {};
 
-export const uploadImage = (files, callback) => {
+export const uploadImage = (files, callback, formData = {}) => {
     if (!files || files.length === 0) {
         callback('success', []);
         return;
@@ -262,17 +285,28 @@
                         ...requestFile,
                         header,
                         name: 'file',
-                        formData: {},
+                        formData,
+                        timeout: 30 * 1000,
                         success(res) {
-                            const res2 =
-                                typeof res.data === 'string'
-                                    ? JSON.parse(res.data)
-                                    : res.data;
+                            let res2;
+                            try {
+                                res2 =
+                                    typeof res.data === 'string'
+                                        ? JSON.parse(res.data)
+                                        : res.data;
+                            } catch (err) {
+                                reject({
+                                    ...requestFile,
+                                    response: res,
+                                    message: '上传图片异常！',
+                                });
+                                return;
+                            }
                             // 上传成功
                             if (res2.state.code === 2000) {
                                 const imgUrl = $fetchCommon.transImgPath(
                                     'fix',
-                                    res2.data.src || res2.data.file || res2.data.url
+                                    res2.data.src || res2.data.file || res2.data.url,
                                 );
                                 _readyUpload[file.url] = imgUrl;
                                 resolve(imgUrl);
@@ -299,7 +333,7 @@
                             });
                         },
                     });
-                })
+                }),
             );
         }
         // 其他类型视为 url，忽略

--
Gitblit v1.9.1