images/variant-form3-vite
2
0
Fork 0
mirror of https://github.com/vform666/variant-form3-vite.git synced 2024-11-10 09:39:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复合并#11号PR代码冲突的问题。

Browse Source
This commit is contained in:
vdpAdmin 2022-08-07 10:03:54 +08:00
parent 9077e828cd
commit 08a0730672
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/form-designer/form-widget/field-widget/picture-upload-widget.vue
View File

@ -8,9 +8,8 @@
:with-credentials="field.options.withCredentials" :with-credentials="field.options.withCredentials"
:multiple="field.options.multipleSelect" :file-list="fileList" :show-file-list="field.options.showFileList" :multiple="field.options.multipleSelect" :file-list="fileList" :show-file-list="field.options.showFileList"
list-type="picture-card" :class="{'hideUploadDiv': uploadBtnHidden}" list-type="picture-card" :class="{'hideUploadDiv': uploadBtnHidden}"
:limit="field.options.limit" :on-exceed="handlePictureExceed" :on-preview="handlePicturePreview" :limit="field.options.limit" :on-exceed="handlePictureExceed"
:before-upload="beforePictureUpload" :before-upload="beforePictureUpload" :on-preview="handlePictureCardPreview"
:on-preview="handlePictureCardPreview"
:on-success="handlePictureUpload" :on-error="handleUploadError" > :on-success="handlePictureUpload" :on-error="handleUploadError" >
<template #file="{ file }"> <template #file="{ file }">
<el-image <el-image
@ -148,11 +147,6 @@
this.$message.warning( this.i18nt('render.hint.uploadExceed').replace('${uploadLimit}', uploadLimit) ) this.$message.warning( this.i18nt('render.hint.uploadExceed').replace('${uploadLimit}', uploadLimit) )
}, },
handlePicturePreview(file) {
this.previewUrl = file.url
this.showPreviewDialogFlag = true
},
beforePictureUpload(file) { beforePictureUpload(file) {
let fileTypeCheckResult = false let fileTypeCheckResult = false
if (!!this.field.options && !!this.field.options.fileTypes) { if (!!this.field.options && !!this.field.options.fileTypes) {
@ -256,7 +250,6 @@
this.handleBeforeRemove(this.fileList) // 由于自定义了 #file slot，需要手动调用 handleBeforeRemove，并移除 @before-remove 和 @remove this.handleBeforeRemove(this.fileList) // 由于自定义了 #file slot，需要手动调用 handleBeforeRemove，并移除 @before-remove 和 @remove
this.fileList.splice(this.fileList.indexOf(file), 1) // 删除所点击的文件 this.fileList.splice(this.fileList.indexOf(file), 1) // 删除所点击的文件
this.updateFieldModelAndEmitDataChangeForRemove(file) this.updateFieldModelAndEmitDataChangeForRemove(file)
// this.fileList = deepClone(fileList // 由于是在自身进行的操作，故不需要重新赋值
let fileList = deepClone(this.fileList); // 进行深拷贝，避免用户自定义函数对 fileList 进行修改时，影响组件内的数据 let fileList = deepClone(this.fileList); // 进行深拷贝，避免用户自定义函数对 fileList 进行修改时，影响组件内的数据
this.uploadBtnHidden = fileList.length >= this.field.options.limit this.uploadBtnHidden = fileList.length >= this.field.options.limit