From aabd317cddd3bdca11bdfcf6dc0122bf76f1a682 Mon Sep 17 00:00:00 2001
From: sakuya <81883387@qq.com>
Date: Thu, 20 May 2021 00:39:35 +0800
Subject: [PATCH] UP

---
 src/components/scUpload/multiple.vue | 68 ++++++++++++++++++++++------
 src/views/vab/upload.vue             |  6 +--
 2 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/src/components/scUpload/multiple.vue b/src/components/scUpload/multiple.vue
index 9c860194..766213c1 100644
--- a/src/components/scUpload/multiple.vue
+++ b/src/components/scUpload/multiple.vue
@@ -1,8 +1,9 @@
 <template>
-	<div class="">
+	<div class="sc-upload-multiple">
+
 		<div class="sc-upload-list">
 			<ul>
-				<li v-for="(file, index) in fileList" :key="index">
+				<li v-for="(file, index) in defaultFileList" :key="index">
 					<div v-if="file.status!='success'">
 						loading
 					</div>
@@ -10,15 +11,19 @@
 						<div class="mask">
 							<span class="del" @click.stop="del(index)"><i class="el-icon-delete"></i></span>
 						</div>
-						<el-image class="image" :src="file.url" :preview-src-list="[file.url]" fit="cover" hide-on-click-modal append-to-body></el-image>
+						<el-image class="image" :src="file.url" :preview-src-list="preview" :initial-index="index" fit="cover" hide-on-click-modal append-to-body></el-image>
 					</div>
 				</li>
 			</ul>
+			{{defaultFileList}}
 		</div>
 
 		<div class="sc-upload-uploader">
-			<el-upload ref="upload" :action="action" :accept="accept" multiple :show-file-list="true" :file-list="defaultList" :before-upload="before" :on-success="success" :on-remove="remove" :on-error="error">
-				<el-button size="small" type="primary">点击上传</el-button>
+			<el-upload ref="upload" class="uploader" :action="action" :accept="accept" multiple  :show-file-list="false" :before-upload="before" :on-progress="progress" :on-success="success" :on-change="change" :on-remove="remove" :on-error="error">
+				<div class="file-empty">
+					<i :class="icon"></i>
+					<h4>{{title}}</h4>
+				</div>
 			</el-upload>
 		</div>
 	</div>
@@ -30,30 +35,35 @@
 			modelValue: { type: String, default: "" },
 			action: { type: String, default: "#" },
 			accept: { type: String, default: ".jpg, .png, .jpeg, .gif" },
+			title: { type: String, default: "上传" },
+			icon: { type: String, default: "el-icon-plus" }
 		},
 		data(){
 			return {
-				defaultList: this.toArr(this.modelValue),
-				fileList: []
+				defaultFileList: this.toArr(this.modelValue)
 			}
 		},
 		watch:{
-			modelValue(){
-
+			modelValue(val){
+				this.defaultFileList = this.toArr(val)
 			},
-			fileList: {
+			defaultFileList: {
 				handler(val){
+					console.log(val);
 					this.$emit('update:modelValue', this.toStr(val));
 				},
-				deep: true
+				//deep: true
+			}
+		},
+		computed: {
+			preview(){
+				return this.defaultFileList.map(v => v.url)
 			}
 		},
 		mounted() {
-			this.fileList = this.$refs.upload.uploadFiles
 
 		},
 		methods: {
-
 			//默认值转换为数组
 			toArr(str){
 				var _arr = [];
@@ -79,10 +89,20 @@
 				return str;
 			},
 			before(){
-				console.log(this.$refs.upload.uploadFiles);
+
+			},
+			change(file){
+				if(file.status =='ready'){
+					file.aa = "123"
+					file.url = URL.createObjectURL(file.raw);
+					this.defaultFileList.push(file)
+				}
 			},
 			success(res, file){
 				file.url = res.data.src
+			},
+			progress(){
+
 			},
 			remove(){
 
@@ -94,13 +114,31 @@
 				})
 			},
 			del(index){
-				this.fileList.splice(index, 1);
+				this.defaultFileList.splice(index, 1);
+				this.$refs.upload.uploadFiles.splice(index-this.defaultFileList.length-1, 1);
 			}
 		}
 	}
 </script>
 
 <style scoped>
+
+	.sc-upload-multiple {display: inline-block;}
+
+
+
 	.sc-upload-list li {list-style: none;    display: inline-block;width: 120px;height: 120px;}
 	.sc-upload-list .image {width: 100%;height: 100%;}
+
+
+	.sc-upload-uploader {border: 1px dashed #d9d9d9;width: 120px;height: 120px;display: inline-block;vertical-align: top;box-sizing: border-box;}
+	.sc-upload-uploader:hover {border: 1px dashed #409eff;}
+	.sc-upload-uploader .uploader {width: 100%;height: 100%;}
+	.sc-upload-uploader:deep(.el-upload) {width: 100%;height: 100%;}
+
+	.sc-upload-uploader .file-empty {width: 100%;height: 100%;line-height: 1;display: flex;flex-direction: column;align-items: center;justify-content: center;}
+	.sc-upload-uploader .file-empty i {font-size: 28px;color: #8c939d;}
+	.sc-upload-uploader .file-empty h4 {font-size: 12px;font-weight: normal;color: #8c939d;margin-top: 10px;}
+
+
 </style>
diff --git a/src/views/vab/upload.vue b/src/views/vab/upload.vue
index e9ed0d04..16ac176f 100644
--- a/src/views/vab/upload.vue
+++ b/src/views/vab/upload.vue
@@ -60,13 +60,13 @@
 				},
 				rules: {
 					img1: [
-						{required: true, message: '请上传', trigger: 'blur'}
+						{required: true, message: '请上传', trigger: 'change'}
 					],
 					img2: [
-						{required: true, message: '请上传', trigger: 'blur'}
+						{required: true, message: '请上传', trigger: 'change'}
 					],
 					date: [
-						{required: true, message: '请选择日期', trigger: 'blur'}
+						{required: true, message: '请选择日期', trigger: 'change'}
 					]
 				}
 			}