From 3d261331e05d536a9724cb13a73adbab5577d8f7 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Tue, 20 Feb 2024 14:50:19 +0800
Subject: [PATCH] 注释细节微调

---
 forms/imagePicker/CImagePicker.vue |   52 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/forms/imagePicker/CImagePicker.vue b/forms/imagePicker/CImagePicker.vue
index fc22f85..16f04f9 100644
--- a/forms/imagePicker/CImagePicker.vue
+++ b/forms/imagePicker/CImagePicker.vue
@@ -57,6 +57,11 @@
             type: Number,
             default: 1,
         },
+        // 上传图片参数
+        params: {
+            type: Object,
+            default: () => {},
+        },
     },
     data() {
         return {
@@ -190,16 +195,20 @@
                 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);
+                    }
+                },
+                this.params
+            );
         },
     },
     mounted() {
@@ -218,7 +227,7 @@
 // 图片上传节流
 const _readyUpload = {};
 
-export const uploadImage = (files, callback) => {
+export const uploadImage = (files, callback, params) => {
     if (!files || files.length === 0) {
         callback('success', []);
         return;
@@ -262,12 +271,23 @@
                         ...requestFile,
                         header,
                         name: 'file',
-                        formData: {},
+                        formData: { ...params },
+                        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(

--
Gitblit v1.9.1