fix: beforeUpload调用后获取action & data值(#29563) (#300)

* fix: beforeUpload调用后获取action & data值

* test: add test case

Author: inottn

src/AjaxUploader.tsx

@@ -123,7 +123,7 @@ class AjaxUploader extends Component<UploadProps> {
    * Process file before upload. When all the file is ready, we start upload.
    */
   processFile = async (file: RcFile, fileList: RcFile[]): Promise<ParsedFileInfo> => {
-    const { beforeUpload, action, data } = this.props;
+    const { beforeUpload } = this.props;
 
     let transformedFile: BeforeUploadFileType | void = file;
     if (beforeUpload) {
@@ -143,6 +143,9 @@ class AjaxUploader extends Component<UploadProps> {
       }
     }
 
+    // Call beforeUpload could change action & data.
+    const { action, data } = this.props;
+
     let mergedAction: string;
     if (typeof action === 'function') {
       mergedAction = await action(file);

tests/uploader.spec.js

@@ -393,6 +393,53 @@ describe('uploader', () => {
     });
   });
 
+  describe('change action & data in beforeUpload', () => {
+    const files = [
+      {
+        name: 'success.png',
+        toString() {
+          return this.name;
+        },
+      },
+    ];
+
+    files.item = i => files[i];
+
+    it('get changed value in customRequest', done => {
+      const changedAction = '/test2';
+      const changedData = { b: 2 };
+
+      const Demo = () => {
+        const [action, setAction] = React.useState('/test1');
+        const [data, setData] = React.useState({ a: 1 });
+
+        return (
+          <Uploader
+            action={action}
+            data={data}
+            beforeUpload={() => {
+              setAction(changedAction);
+              setData(changedData);
+
+              return true;
+            }}
+            customRequest={options => {
+              expect(options.action).toEqual(changedAction);
+              expect(options.data).toEqual(changedData);
+
+              done();
+            }}
+          />
+        );
+      };
+
+      const wrapper = mount(<Demo />);
+      const input = wrapper.find('input').first();
+
+      input.simulate('change', { target: { files } });
+    });
+  });
+
   describe('transform file before request', () => {
     let uploader;
     beforeEach(() => {