feat: Add defaultRequest to customRequest

Author: 刘欢

src/AjaxUploader.tsx

@@ -242,10 +242,24 @@ class AjaxUploader extends Component<UploadProps> {
       return;
     }
 
-    const { onStart, customRequest, name, headers, withCredentials, method } = this.props;
+    const {
+      onStart,
+      customRequest: propsCustomRequest,
+      name,
+      headers,
+      withCredentials,
+      method,
+    } = this.props;
 
     const { uid } = origin;
-    const request = customRequest || defaultRequest;
+
+    const customRequest = agu => {
+      return propsCustomRequest({ ...agu, info: { defaultRequest } });
+    };
+
+    const request =
+      (typeof propsCustomRequest === 'function' ? customRequest : propsCustomRequest) ||
+      defaultRequest;
 
     const requestOption = {
       action,

src/interface.tsx

@@ -31,7 +31,7 @@ export interface UploadProps
     file: RcFile,
     FileList: RcFile[],
   ) => BeforeUploadFileType | Promise<void | BeforeUploadFileType> | void;
-  customRequest?: (option: UploadRequestOption) => void | { abort: () => void };
+  customRequest?: (option: CustomUploadRequestOption) => void | { abort: () => void };
   withCredentials?: boolean;
   openFileDialogOnClick?: boolean;
   prefixCls?: string;
@@ -78,6 +78,11 @@ export interface UploadRequestOption<T = any> {
   method: UploadRequestMethod;
 }
 
+export interface CustomUploadRequestOption extends UploadRequestOption {
+  info: {
+    defaultRequest: (option: UploadRequestOption) => { abort: () => void } | void;
+  };
+}
 export interface RcFile extends File {
   uid: string;
 }

tests/uploader.spec.tsx

@@ -1266,4 +1266,40 @@ describe('uploader', () => {
     expect(container.querySelector('span')!.tabIndex).not.toBe(0);
     expect(container.querySelector('span')!).not.toHaveAttribute('role', 'button');
   });
+  it('should support defaultRequest in customRequest', done => {
+    const mockDefaultRequest = jest.fn();
+    const customRequest = jest.fn(({ file, onSuccess, onError, info }) => {
+      // 模拟条件判断后使用默认上传
+      if (file.name === 'success.png') {
+        info.defaultRequest = mockDefaultRequest;
+        info.defaultRequest({ file, onSuccess, onError });
+      } else {
+        onError(new Error('custom error'));
+      }
+    });
+    const onSuccess = jest.fn();
+    const onError = jest.fn();
+    const { container } = render(
+      <Upload customRequest={customRequest} onSuccess={onSuccess} onError={onError} />,
+    );
+    const input = container.querySelector('input')!;
+    const files = [new File([''], 'success.png', { type: 'image/png' })];
+    Object.defineProperty(files, 'item', {
+      value: i => files[i],
+    });
+    fireEvent.change(input, { target: { files } });
+    setTimeout(() => {
+      requests[0].respond(200, {}, `["","${files[0].name}"]`);
+      setTimeout(() => {
+        expect(customRequest).toHaveBeenCalled();
+        expect(onSuccess).toHaveBeenCalled();
+        expect(mockDefaultRequest).toHaveBeenCalledWith({
+          file: expect.any(File),
+          onSuccess: expect.any(Function),
+          onError: expect.any(Function),
+        });
+        done();
+      }, 100);
+    }, 100);
+  });
 });