From a7abc701dbf6515ee262d1a04b4a82fe33cf031a Mon Sep 17 00:00:00 2001
From: icssoa <2570063477@qq.com>
Date: Sun, 16 May 2021 21:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20cl-upload=20=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cool/modules/upload/components/index.vue | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/cool/modules/upload/components/index.vue b/src/cool/modules/upload/components/index.vue
index b8fa3b1..3461677 100644
--- a/src/cool/modules/upload/components/index.vue
+++ b/src/cool/modules/upload/components/index.vue
@@ -34,7 +34,7 @@
 				:on-preview="_onPreview"
 				:on-progress="onProgress"
 				:on-change="onChange"
-				:on-exceed="onExceed"
+				:on-exceed="_onExceed"
 				:before-upload="_beforeUpload"
 				:before-remove="beforeRemove"
 				:style="_style"
@@ -110,7 +110,7 @@
 <script>
 import { mapGetters } from "vuex";
 import path from "path";
-import { cloneDeep, last, isArray, isNumber, isBoolean } from "cl-admin/utils";
+import { cloneDeep, last, isArray, isNumber, isBoolean, isEmpty } from "cl-admin/utils";
 import { v4 as uuidv4 } from "uuid";
 
 export default {
@@ -222,7 +222,7 @@ export default {
 		},
 
 		_text() {
-			return this.text || this.conf.text || "选择文件";
+			return isEmpty(this.text) ? this.conf.text : this.text;
 		},
 
 		_accept() {
@@ -407,6 +407,15 @@ export default {
 			}
 		},
 
+		// 超出个数限制提示
+		_onExceed(file, fileList) {
+			if (this.onExceed) {
+				this.onExceed(file, fileList);
+			} else {
+				this.$message.warning(`当前限制选择 ${this.limit} 个文件`);
+			}
+		},
+
 		// 上传前
 		_beforeUpload(file) {
 			this.loading = true;
@@ -505,9 +514,7 @@ export default {
 					} else {
 						this.$service.common
 							.upload()
-							.then(res => {
-								next(res);
-							})
+							.then(next)
 							.catch(reject);
 					}
 				});