feat(comp:upload): actions and files are optional (#1128)

IDuxFE · Sep 27, 2022 · 7e9bee3 · 7e9bee3
1 parent 464ca5b
commit 7e9bee3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/packages/components/upload/src/composables/useRequest.ts b/packages/components/upload/src/composables/useRequest.ts
@@ -13,7 +13,7 @@ import { ref } from 'vue'
 
 import { isFunction, isUndefined } from 'lodash-es'
 
-import { callEmit, throwError } from '@idux/cdk/utils'
+import { callEmit } from '@idux/cdk/utils'
 import { useGlobalConfig } from '@idux/components/config'
 
 import { getTargetFile, getTargetFileIndex, setFileStatus } from '../util/fileHandle'
@@ -165,14 +165,9 @@ export function useRequest(props: UploadProps, files: ComputedRef<UploadFile[]>)
 }
 
 async function getAction(props: UploadProps, file: UploadFile) {
-  if (!props.action) {
-    throwError('components/upload', 'action not found.')
-  }
-  const action = isFunction(props.action) ? await props.action(file) : props.action
-  return action
+  return isFunction(props.action) ? await props.action(file) : props.action
 }
 
 async function getRequestData(props: UploadProps, file: UploadFile) {
-  const requestData = isFunction(props.requestData) ? await props.requestData(file) : props.requestData ?? {}
-  return requestData
+  return isFunction(props.requestData) ? await props.requestData(file) : props.requestData ?? {}
 }
diff --git a/packages/components/upload/src/types.ts b/packages/components/upload/src/types.ts
@@ -62,12 +62,12 @@ export interface UploadRequestChangeOption<K = VKey> {
 export const uploadProps = {
   files: {
     type: Array as PropType<UploadFile[]>,
-    required: true,
+    default: [],
   },
   accept: String,
   action: {
     type: [String, Function] as PropType<string | ((file: UploadFile<any>) => Promise<string>)>,
-    required: true,
+    default: undefined,
   },
   dragable: {
     type: Boolean,

diff --git a/packages/components/upload/src/util/request.ts b/packages/components/upload/src/util/request.ts
@@ -16,15 +16,23 @@ type UploadReturnType = {
   abort: () => void
 }
 
-function getError(option: UploadRequestOption, xhr: XMLHttpRequest) {
-  let msg: string
-  if (xhr.response) {
-    msg = `${xhr.response.error || xhr.response}`
-  } else if (xhr.responseText) {
-    msg = `${xhr.responseText}`
-  } else {
-    msg = `fail to ${option.requestMethod} ${option.action} ${xhr.status}`
+function getErrorMsg(option: UploadRequestOption, xhr: XMLHttpRequest) {
+  const errorMap = new Map<(option: UploadRequestOption, xhr: XMLHttpRequest) => boolean, string>([])
+    .set((option, xhr) => !!xhr.response, `${xhr.response?.error || xhr.response}`)
+    .set((option, xhr) => !!xhr.responseText, `${xhr.responseText}`)
+    .set(option => !option.action, 'action not found.')
+    .set(() => true, `fail to ${option.requestMethod} ${option.action} ${xhr.status}`)
+
+  for (const [testFn, errorMsg] of errorMap) {
+    if (testFn(option, xhr)) {
+      return errorMsg
+    }
   }
+  return ''
+}
+
+function getError(option: UploadRequestOption, xhr: XMLHttpRequest) {
+  const msg = getErrorMsg(option, xhr)
   const err = new Error(msg) as UploadRequestError
   err.status = xhr.status
   err.method = option.requestMethod
@@ -45,7 +53,7 @@ function getBody(xhr: XMLHttpRequest) {
   }
 }
 
-export default function upload(option: UploadRequestOption): UploadReturnType {
+export default function upload(option: UploadRequestOption): UploadReturnType | null {
   const xhr = new XMLHttpRequest()
 
   if (option.onProgress && xhr.upload) {
@@ -87,6 +95,10 @@ export default function upload(option: UploadRequestOption): UploadReturnType {
     return option.onSuccess?.(getBody(xhr))
   }
 
+  if (!option.action) {
+    option.onError?.(getError(option, xhr))
+    return null
+  }
   xhr.open(option.requestMethod, option.action, true)
 
   if (option.withCredentials && 'withCredentials' in xhr) {