From 1a6c74377040c69b4d8a5f3bc48225b4d49f3ea6 Mon Sep 17 00:00:00 2001
From: nazmus <nazmus@webalive.com.au>
Date: Thu, 30 Jun 2022 16:24:20 +0600
Subject: [PATCH 1/2] Max Size limit meesage in mega byte support added

---
 upload-3.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/upload-3.vue b/upload-3.vue
index 2f20c30..487430e 100644
--- a/upload-3.vue
+++ b/upload-3.vue
@@ -170,6 +170,10 @@ export default {
 			type: Number,
 			'default': 10240
 		},
+		maxSizeErrorInMegaByte: {
+			type: Boolean,
+			'default': false
+		},
 		// 语言类型
 		langType: {
 			type: String,
@@ -500,7 +504,12 @@ export default {
 			// 超出大小
 			if (file.size / 1024 > maxSize) {
 				that.hasError = true;
-				that.errorMsg = lang.error.outOfSize + maxSize + 'kb';
+				if(maxSizeErrorInMegaByte) {
+					that.errorMsg = lang.error.outOfSize + Math.round(maxSize/1000) + 'mb';
+				}
+				else {
+					that.errorMsg = lang.error.outOfSize + maxSize + 'kb';
+				}
 				return false;
 			}
 			return true;

From 54f5dcc8abbd52498a740174f554e609368d9ee5 Mon Sep 17 00:00:00 2001
From: nazmus <nazmus@webalive.com.au>
Date: Thu, 30 Jun 2022 16:59:23 +0600
Subject: [PATCH 2/2] updated kb to mb conversion calculation

---
 upload-3.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/upload-3.vue b/upload-3.vue
index 487430e..645ae5c 100644
--- a/upload-3.vue
+++ b/upload-3.vue
@@ -492,7 +492,8 @@ export default {
 			let that = this,
 				{
 					lang,
-					maxSize
+					maxSize,
+					maxSizeErrorInMegaByte
 				} = that;
 			// 仅限图片
 			if (file.type.indexOf('image') === -1) {
@@ -505,11 +506,12 @@ export default {
 			if (file.size / 1024 > maxSize) {
 				that.hasError = true;
 				if(maxSizeErrorInMegaByte) {
-					that.errorMsg = lang.error.outOfSize + Math.round(maxSize/1000) + 'mb';
+					that.errorMsg = lang.error.outOfSize + Math.round((maxSize/1000)*10)/10 + 'mb';
 				}
 				else {
 					that.errorMsg = lang.error.outOfSize + maxSize + 'kb';
 				}
+				
 				return false;
 			}
 			return true;