From 5eac071595b5ed09440c96106c7f98767dcaabfa Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Fri, 26 Aug 2022 16:11:01 +0800
Subject: [PATCH] 增加显示调试面板的公共方法
---
forms/imagePicker/CImagePicker.vue | 136 ++++++++++++++-------------------------------
1 files changed, 43 insertions(+), 93 deletions(-)
diff --git a/forms/imagePicker/CImagePicker.vue b/forms/imagePicker/CImagePicker.vue
index 4d741be..6ebd882 100644
--- a/forms/imagePicker/CImagePicker.vue
+++ b/forms/imagePicker/CImagePicker.vue
@@ -167,6 +167,9 @@
this.showImg = false;
},
handleFail(msg) {
+ if (typeof msg === 'object') {
+ msg = msg.message;
+ }
Taro.showToast({
title: msg,
icon: 'none',
@@ -193,85 +196,6 @@
callback(state, res);
}
});
- // let url = $fetchCommon.getUploadImgURL();
- // if (url.indexOf('http') < 0) {
- // url = $hostBoot.getHost() + url;
- // }
- // const uploadTeam = [];
- // const imgs = [];
- // this.files.forEach(file => {
- // if (file.type === 'btn') {
- // return;
- // }
- // // 临时文件才上传
- // if (
- // file.url.indexOf('blob') >= 0 ||
- // file.url.indexOf('wxfile') >= 0 ||
- // file.url.indexOf('http://tmp/') >= 0
- // ) {
- // let header = {};
- // if (process.env.TARO_ENV === 'weapp') {
- // const localCookies = JSON.parse(
- // Taro.getStorageSync('cookies') || '{}'
- // );
- // const cookiesArr = [];
- // Object.keys(localCookies).forEach(key => {
- // cookiesArr.push(key + '=' + localCookies[key]);
- // });
- // header['Cookie'] = cookiesArr.join('; ');
- // }
- // uploadTeam.push(
- // new Promise((resolve, reject) => {
- // Taro.uploadFile({
- // url,
- // header,
- // filePath: file.url,
- // fileName: this.fileNames[file.url],
- // name: 'file',
- // formData: {},
- // success(res) {
- // const res2 =
- // typeof res.data === 'string'
- // ? JSON.parse(res.data)
- // : res.data;
- // if (res2.state.code === 2000) {
- // resolve(
- // $fetchCommon.transImgPath(
- // 'fix',
- // res2.data.src ||
- // res2.data.file ||
- // res2.data.url
- // )
- // );
- // } else {
- // reject({ message: res2.state.msg });
- // }
- // },
- // cancel() {
- // reject({ message: '上传图片已取消！' });
- // },
- // fail() {
- // reject({ message: '上传图片失败！' });
- // },
- // });
- // })
- // );
- // }
- // // 其他类型视为 url，忽略
- // else {
- // uploadTeam.push(Promise.resolve(file.url));
- // }
- // });
- // Promise.all(uploadTeam)
- // .then(res => {
- // this.itemRes.onChange(res);
- // setTimeout(() => {
- // callback('success');
- // }, 0);
- // })
- // .catch(err => {
- // callback('error', err);
- // });
},
},
mounted() {
@@ -287,9 +211,13 @@
},
};
+// 图片上传节流
+const _readyUpload = {};
+
export const uploadImage = (files, callback) => {
if (!files || files.length === 0) {
callback('success', []);
+ return;
}
let url = $fetchCommon.getUploadImgURL();
if (url.indexOf('http') < 0) {
@@ -304,7 +232,7 @@
file.url.indexOf('wxfile') >= 0 ||
file.url.indexOf('http://tmp/') >= 0
) {
- let header = {};
+ const header = {};
if (process.env.TARO_ENV === 'weapp') {
const localCookies = JSON.parse(Taro.getStorageSync('cookies') || '{}');
const cookiesArr = [];
@@ -313,13 +241,22 @@
});
header['Cookie'] = cookiesArr.join('; ');
}
+ const requestFile = {
+ url,
+ filePath: file.url,
+ fileName: file.fileName || '',
+ };
uploadTeam.push(
new Promise((resolve, reject) => {
+ // 如果本次已上传过，直接返回地址
+ if (_readyUpload[file.url] && _readyUpload[file.url].length > 5) {
+ resolve(_readyUpload[file.url]);
+ return;
+ }
+ // 上传
Taro.uploadFile({
- url,
+ ...requestFile,
header,
- filePath: file.url,
- fileName: file.fileName || '',
name: 'file',
formData: {},
success(res) {
@@ -327,22 +264,35 @@
typeof res.data === 'string'
? JSON.parse(res.data)
: res.data;
+ // 上传成功
if (res2.state.code === 2000) {
- resolve(
- $fetchCommon.transImgPath(
- 'fix',
- res2.data.src || res2.data.file || res2.data.url
- )
+ const imgUrl = $fetchCommon.transImgPath(
+ 'fix',
+ res2.data.src || res2.data.file || res2.data.url
);
- } else {
- reject({ message: res2.state.msg });
+ _readyUpload[file.url] = imgUrl;
+ resolve(imgUrl);
+ }
+ // 上传失败
+ else {
+ reject({
+ ...requestFile,
+ response: res2,
+ message: res2.state.msg,
+ });
}
},
- cancel() {
- reject({ message: '上传图片已取消！' });
+ cancel(err) {
+ reject({
+ ...requestFile,
+ message: '上传图片已取消！',
+ });
},
fail() {
- reject({ message: '上传图片失败！' });
+ reject({
+ ...requestFile,
+ message: '上传图片失败！',
+ });
},
});
})
--
Gitblit v1.9.1