Merge remote-tracking branch 'origin/fix-1639' into fix-1639

# Conflicts:
#	templates/repo/editor/upload.tmpl

templates/repo/editor/upload.tmpl

@@ -27,7 +27,7 @@
 			</div>
 			<div class="field">
 				<div class="files"></div>
-				<div class="ui dropzone" id="dropzone" data-upload-url="{{.RepoLink}}/upload-file" data-remove-url="{{.RepoLink}}/upload-remove" data-csrf="{{.CsrfToken}}" data-accepts="{{.UploadAllowedTypes}}" data-max-file="{{.UploadMaxFiles}}" data-max-size="{{.UploadMaxSize}}" data-default-message="{{.i18n.Tr "dropzone.default_message"}}asdsadsad" data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}" data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}" data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"></div>
+				<div class="ui dropzone" id="dropzone" data-upload-url="{{.RepoLink}}/upload-file" data-remove-url="{{.RepoLink}}/upload-remove" data-csrf="{{.CsrfToken}}" data-accepts="{{.UploadAllowedTypes}}" data-max-file="{{.UploadMaxFiles}}" data-max-size="{{.UploadMaxSize}}" data-default-message="{{.i18n.Tr "dropzone.default_message"}}" data-invalid-input-type="{{.i18n.Tr "dropzone.invalid_input_type"}}" data-file-too-big="{{.i18n.Tr "dropzone.file_too_big"}}" data-remove-file="{{.i18n.Tr "dropzone.remove_file"}}"><div class="maxfilesize ui red message" style="display: none;margin: 2.5rem;"></div></div>
 			</div>
 			{{template "repo/editor/commit_form" .}}
 		</form>

web_src/js/index.js

@@ -2769,6 +2769,7 @@ $(document).ready(async () => {
       dictInvalidFileType: $dropzone.data('invalid-input-type'),
       dictFileTooBig: $dropzone.data('file-too-big'),
       dictRemoveFile: $dropzone.data('remove-file'),
+      dictMaxFilesExceeded:'上次超过限制',
       init() {
         this.on('success', (file, data) => {
           filenameDict[file.name] = data.uuid;
@@ -2788,6 +2789,21 @@ $(document).ready(async () => {
             });
           }
         });
+        this.on('addedfile',(file)=>{
+          console.log("addfile",file,filenameDict,this.files.length)
+          if(file.size/(1000*1000)>3){
+            this.removeFile(file)
+            $('.maxfilesize.ui.red.message').text('单次最多上传XX个文件，每个文件不超过XXM。')
+            $('.maxfilesize.ui.red.message').css('display','block')
+          }
+          
+        });
+        this.on('maxfilesexceeded',(file)=>{
+          this.removeFile(file)
+          $('.maxfilesize.ui.red.message').text('一次最多只能上传 5 个文件, 上传已达到上限，请勿再添加文件。')
+          $('.maxfilesize.ui.red.message').css('display','block')
+        })
+
       }
     });
   }