fix(file-upload): 修复file-upload组件多选合并上传的bug

Author: chenxi-20

packages/renderless/src/file-upload/index.ts

@@ -205,6 +205,15 @@ const onBeforeIsPromise = ({
   )
 }
 
+const isAcceptType = (acceptArray, file, constants, fileType) => {
+  return acceptArray.some((type) => {
+    if (type.toLowerCase() === constants.IMAGE_TYPE) {
+      return constants.FILE_TYPE.PICTURE.split('/').includes(fileType)
+    }
+    return new RegExp(`(${type.trim()})$`, 'i').test(file.name)
+  })
+}
+
 const getFileType = ({ file }: { file: IFileUploadFile }): string => {
   const { name, url } = file
   let fileType = ''
@@ -241,7 +250,7 @@ export const beforeUpload =
     t,
     state
   }: Pick<IFileUploadRenderlessParams, 'props' | 'api' | 'constants' | 't' | 'state'> & IFileUploadModalVm) =>
-  (file: IFileUploadFile, autoRemove: boolean, doUpload: Function) => {
+  (file: IFileUploadFile, autoRemove: boolean, doUpload: Function, isMergeUpload) => {
     if (state.isEdm && file.name.length > 255) {
       remove({ api, file, autoRemove })
       return Modal.message({
@@ -254,16 +263,26 @@ export const beforeUpload =
       let isValid = true
       const accept = state.isEdm ? state.accept : props.accept
       const types = constants.FILE_TYPE[state.triggerClickType.toUpperCase()]
-      const fileType = getFileType({ file })
-
-      if (accept) {
-        const isExist = accept.split(',').some((type) => {
-          if (type.toLowerCase() === constants.IMAGE_TYPE) {
-            return constants.FILE_TYPE.PICTURE.split('/').includes(fileType)
+      const acceptArray = accept ? accept.split(',') : []
+      let fileType = ''
+      if (isMergeUpload) {
+        const fileRow = []
+        fileType = file.raw.flatMap((f) => {
+          const type = getFileType({ file: f })
+          if (accept) {
+            const isExist = isAcceptType(acceptArray, f, constants, type)
+            isExist ? fileRow.push(f) : remove({ api, file: f, autoRemove })
           }
-          return new RegExp(`(${type.trim()})$`, 'i').test(file.name)
+          return type
         })
-        !isExist && (isValid = false)
+        file.raw = fileRow
+      } else {
+        fileType = getFileType({ file })
+
+        if (accept) {
+          const isExist = isAcceptType(acceptArray, file, constants, fileType)
+          !isExist && (isValid = false)
+        }
       }
 
       if (state.triggerClickType && types) {
@@ -612,7 +631,7 @@ export const handleStart =
         const handler = (file) =>
           vm.$refs[constants.UPLOAD_INNER].$refs[constants.UPLOAD_INNER_TEMPLATE].upload(file.raw)
 
-        rawFiles.length && api.beforeUpload({ raw: rawFiles }, true, handler)
+        rawFiles.length && api.beforeUpload({ raw: rawFiles }, true, handler, true)
       } else {
         rawFiles.forEach((rawFile) => {
           const file = api.getFile(rawFile)