From a6bb16a7788b3ac4de10183ebe42864100cf2cdd Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Mon, 18 Jul 2022 18:21:48 +0800
Subject: [PATCH] 发请求，支持捕获数据
---
forms/imagePicker/CImagePicker.vue | 160 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 90 insertions(+), 70 deletions(-)
diff --git a/forms/imagePicker/CImagePicker.vue b/forms/imagePicker/CImagePicker.vue
index a700fd6..32d9017 100644
--- a/forms/imagePicker/CImagePicker.vue
+++ b/forms/imagePicker/CImagePicker.vue
@@ -32,7 +32,7 @@
import Taro from '@tarojs/taro';
import { $ } from '@tarojs/extend';
import { AtInput, AtImagePicker, AtCurtain } from 'taro-ui-vue';
-import { Fetcher } from '@components/bases/Fetcher';
+import { $hostBoot } from '@components/bases/HostBoot';
import { $fetchCommon } from '@fetchers/FCommon';
import { Tools } from '@components/common/Tools';
import CImageCompressor from './CImageCompressor.vue';
@@ -167,6 +167,9 @@
this.showImg = false;
},
handleFail(msg) {
+ if (typeof msg === 'object') {
+ msg = msg.message;
+ }
Taro.showToast({
title: msg,
icon: 'none',
@@ -175,82 +178,24 @@
});
},
$uploadImage(callback) {
- const url = Fetcher.host + $fetchCommon.getUploadImgURL();
- const uploadTeam = [];
- const imgs = [];
+ const files = [];
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));
- }
+ file.fileName = this.fileNames[file.url];
+ files.push(file);
});
- Promise.all(uploadTeam)
- .then(res => {
+ uploadImage(files, (state, res) => {
+ if (state === 'success') {
this.itemRes.onChange(res);
setTimeout(() => {
- callback('success');
- }, 0);
- })
- .catch(err => {
- callback('error', err);
- });
+ callback(state);
+ }, 10);
+ } else if (state === 'error') {
+ callback(state, res);
+ }
+ });
},
},
mounted() {
@@ -265,4 +210,79 @@
}
},
};
+
+export const uploadImage = (files, callback) => {
+ if (!files || files.length === 0) {
+ callback('success', []);
+ }
+ let url = $fetchCommon.getUploadImgURL();
+ if (url.indexOf('http') < 0) {
+ url = $hostBoot.getHost() + url;
+ }
+ const uploadTeam = [];
+ const imgs = [];
+ files.forEach(file => {
+ // 临时文件才上传
+ 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: file.fileName || '',
+ 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 => {
+ callback('success', res);
+ })
+ .catch(err => {
+ callback('error', err);
+ });
+};
</script>
\ No newline at end of file
--
Gitblit v1.9.1