From 4a9f3c05f028b5e767bf30e7e317d628bc8fd89c Mon Sep 17 00:00:00 2001 From: chensiAb <chenchenco03@163.com> Date: Wed, 17 Apr 2024 10:16:30 +0800 Subject: [PATCH] feat:'小程序echarts文件 ,折线图已经过定制' --- forms/imagePicker/CImagePicker.vue | 84 ++++++++++++++++++++++++++++++----------- 1 files changed, 61 insertions(+), 23 deletions(-) diff --git a/forms/imagePicker/CImagePicker.vue b/forms/imagePicker/CImagePicker.vue index 6ebd882..d9b581f 100644 --- a/forms/imagePicker/CImagePicker.vue +++ b/forms/imagePicker/CImagePicker.vue @@ -15,16 +15,18 @@ <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" /> </view> </template> @@ -36,12 +38,14 @@ import { $fetchCommon } from '@fetchers/FCommon'; import { Tools } from '@components/common/Tools'; import CImageCompressor from './CImageCompressor.vue'; +import CImagePreview from './CImagePreview.vue'; import './cImagePicker.scss'; export default { name: 'CImagePicker', components: { CImageCompressor, + CImagePreview, AtInput, AtImagePicker, AtCurtain, @@ -53,6 +57,21 @@ count: { type: Number, default: 1, + }, + // 图片来源 + sourceType: { + type: Array, + default: () => ['album', 'camera'], + }, + // 上传图片参数 + params: { + type: Object, + default: () => {}, + }, + // 是否开启缩略图 + needThumb: { + type: Boolean, + default: false, }, }, data() { @@ -96,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; @@ -158,7 +177,8 @@ const urls = this.files .map(file => (file.type === 'btn' ? false : file.url)) .filter(Boolean); - Taro.previewImage({ + // 图片预览,支持H5模式下的双指缩放 + this.$refs.imgPreview.$preview({ current: file.url, // 当前显示图片的http链接 urls, // 需要预览的图片http链接列表 }); @@ -186,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() { @@ -214,7 +241,7 @@ // 图片上传节流 const _readyUpload = {}; -export const uploadImage = (files, callback) => { +export const uploadImage = (files, callback, formData = {}) => { if (!files || files.length === 0) { callback('success', []); return; @@ -258,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); @@ -295,7 +333,7 @@ }); }, }); - }) + }), ); } // 其他类型视为 url,忽略 -- Gitblit v1.9.1