fix(): 上传支持自定义配置 (#684)

refs: CMDB_INSTANCE-1754
easyops-cn · Jul 8, 2024 · c209719 · c209719
1 parent 9c40061
commit c209719
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libs/cmdb-instances/src/components/cmdb-upload/index.spec.tsx b/libs/cmdb-instances/src/components/cmdb-upload/index.spec.tsx
@@ -30,7 +30,7 @@ describe("CmdbUpload", () => {
     const wrapper = mount(
       <CmdbUpload
         autoUpload
-        uploadConfig={{ method: "put", url: url }}
+        uploadConfig={{ method: "put", url: url, uploadButtonName: "Upload" }}
         value={fileList}
         onChange={onChange}
       />
@@ -101,7 +101,6 @@ describe("CmdbUpload", () => {
       ],
     });
     expect(wrapper.find(Upload).prop("disabled")).toBe(true);
-
     expect(wrapper.find("Button").text()).toBe("Upload");
     expect(wrapper.find("GeneralIcon").at(0).prop("icon")).toEqual({
       lib: "antd",

diff --git a/libs/cmdb-instances/src/components/cmdb-upload/index.tsx b/libs/cmdb-instances/src/components/cmdb-upload/index.tsx
@@ -90,7 +90,8 @@ export function CmdbUpload(props: CmdbUploadProps): React.ReactElement {
     method: "put",
     limitSize: 100,
   };
-  const { uploadButtonProps, uploadConfig = defaultUploadConfig } = props;
+  const { uploadButtonProps, uploadConfig: otherUploadConfig } = props;
+  const uploadConfig = { ...defaultUploadConfig, ...(otherUploadConfig ?? {}) };
   const [value, setValue] = React.useState([]);
   const [fileList, setFileList] = useState([]);
   const [disabled, setDisabled] = useState(false);