From ecebc183da5f034ef4bdf049ddead53188887918 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 30 Mar 2023 13:40:59 +0800
Subject: [PATCH] bug 67631

---
 jero-web/src/common/lang/en-us.js              |  2 +-
 jero-web/src/common/lang/zh-cn.js              |  2 +-
 jero-web/src/components/uploadFile/file.vue    |  2 +-
 jero-web/src/components/uploadFileOta/file.vue | 11 ++++++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 4f0c90365..b07dc98e7 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1739,5 +1739,5 @@ module.exports = {
   verifyConformanceConfirmation:'Verify conformance confirmation',
   designConformanceVerification:'Design conformance verification',
   nomorethan:'No more than 10',
-  uploadedfilelarger:'The uploaded file is larger than 50 MB',
+  uploadedfilelarger:'The uploaded file is larger than',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index aaa978cf2..37ca1e33e 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1841,5 +1841,5 @@ module.exports = {
   verifyConformanceConfirmation:'验证符合性确认',
   designConformanceVerification:'设计符合性确认',
   nomorethan:'不能超过10个',
-  uploadedfilelarger:'文件大于50M',
+  uploadedfilelarger:'文件大于',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue
index 747211830..b5af5bf18 100644
--- a/jero-web/src/components/uploadFile/file.vue
+++ b/jero-web/src/components/uploadFile/file.vue
@@ -103,7 +103,7 @@
           const isLt2KB = file.size / 1024 /1024 < this.size
           let name = file.name
           if (!isLt2KB) {
-            this.$message.error(name + this.$t('uploadedfilelarger'))
+            this.$message.error(name + this.$t('uploadedfilelarger') + this.size + 'M')
             return false
           }
         }
diff --git a/jero-web/src/components/uploadFileOta/file.vue b/jero-web/src/components/uploadFileOta/file.vue
index eee02201e..06be66e1c 100644
--- a/jero-web/src/components/uploadFileOta/file.vue
+++ b/jero-web/src/components/uploadFileOta/file.vue
@@ -34,7 +34,7 @@
 
   export default {
     name: 'file',
-    props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
+    props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl','size', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
     data() {
       return {
         visible: false,
@@ -98,6 +98,15 @@
             return false
           }
         }
+        // 根据大小拦截
+        if(this.size){
+          const isLt2KB = file.size / 1024 /1024 < this.size
+          let name = file.name
+          if (!isLt2KB) {
+            this.$message.error(name + this.$t('uploadedfilelarger')  + this.size + 'M')
+            return false
+          }
+        }
         if (this.isMultiple) {
           if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) {
             this.$message.warning(this.$t('onlyOnefileUploaded'))