From e2cef6c358e57c2bc63e67a05c88c52585bb96db Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 29 十二月 2023 11:22:29 +0800
Subject: [PATCH] 项目表
---
web/packages/components/zt-uploader/src/zt-uploader.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/web/packages/components/zt-uploader/src/zt-uploader.vue b/web/packages/components/zt-uploader/src/zt-uploader.vue
index a8f22b3..b5c5a29 100644
--- a/web/packages/components/zt-uploader/src/zt-uploader.vue
+++ b/web/packages/components/zt-uploader/src/zt-uploader.vue
@@ -1,5 +1,5 @@
<template>
- <div class="zt-upload">
+ <div class="zt-upload" :class="[{'lineHeight':lineHeight}]">
<!-- 鏂囦欢涓婁紶 -->
<el-upload
ref="upload"
@@ -59,7 +59,7 @@
</el-upload>
<br/>
<div v-show="progressFlag">
- <el-progress :text-inside="true" :stroke-width="30" :percentage="progressPercent" :format="format"></el-progress>
+ <el-progress :text-inside="true" :stroke-width="10" :percentage="progressPercent" :format="format"></el-progress>
</div>
<ul class="el-upload-list el-upload-list--text" v-if="!image && !crop && !onlyUploadFile">
@@ -206,6 +206,10 @@
}
},
dataForm: Object,
+ lineHeight:{
+ type: Boolean,
+ default: false
+ },
action: {
type: String,
default: '/sys/oss/uploadNew'
@@ -335,8 +339,8 @@
cropData: {},
isShowCrop: false,
uploading: false,
- fileList: this.getUploadList(this.value),
- uploadList: this.getUploadList(this.value),
+ fileList: this.getUploadList(this.value) || [],
+ uploadList: this.getUploadList(this.value) || [],
progressFlag: false
}
},
@@ -420,10 +424,8 @@
if (val) {
if (val.length > 0) {
if (!this.multiple) { // 鍗曢��
- console.log(val, 'getUploadList val')
return val
} else {
- console.log([...val], 'getUploadList [...val]')
return [...val]
}
} else {
@@ -549,7 +551,7 @@
},
async handleRemove(index) {
let file = this.uploadList[index]
- if (file.status === 1) { // 璇佷功鏂囦欢锛岀洿鎺ヤ粠鍒楄〃鍒犻櫎锛屼笉淇濆瓨鏁版嵁搴�
+ if (file.status === 2) { // 璇佷功鏂囦欢锛岀洿鎺ヤ粠鍒楄〃鍒犻櫎锛屼笉淇濆瓨鏁版嵁搴�
this.handRemoveAndSetValue(index)
} else {
if (await this.$tip.confirm(this.$t('prompt.info', {'handle': this.$t('delete')}))) {
@@ -956,7 +958,9 @@
.zt-upload {
line-height: 1;
}
-
+ .zt-upload.lineHeight{
+ line-height: 0;
+ }
.zt .upload-input .upload-btn {
padding: 8px 12px;
}
--
Gitblit v1.9.1