From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor
---
zy-acs-flow/src/page/components/ImportButton.jsx | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/zy-acs-flow/src/page/components/ImportButton.jsx b/zy-acs-flow/src/page/components/ImportButton.jsx
index 147ec9e..f382b9f 100644
--- a/zy-acs-flow/src/page/components/ImportButton.jsx
+++ b/zy-acs-flow/src/page/components/ImportButton.jsx
@@ -2,11 +2,18 @@
import { useState } from 'react';
import { Button } from 'react-admin';
import ImportModal from './ImportModal';
+import ImportTxtModal from './ImportTxtModal';
+import ImportXlsxModal from './ImportXlsxModal';
-const ImportButton = (props) => {
+const ImportButton = ({
+ type = 'csv', // csv, txt, xlsx,
+ variant = 'text',
+ ...props
+}) => {
const [modalOpen, setModalOpen] = useState(false);
- const handleOpenModal = () => {
+ const handleOpenModal = (e) => {
+ e.stopPropagation();
setModalOpen(true);
};
@@ -17,12 +24,14 @@
return (
<>
<Button
+ variant={variant}
startIcon={<UploadIcon />}
label="common.action.import.title"
onClick={handleOpenModal}
/>
-
- <ImportModal open={modalOpen} onClose={handleCloseModal} {...props} />
+ {type === 'csv' && (<ImportModal open={modalOpen} onClose={handleCloseModal} {...props} />)}
+ {type === 'txt' && (<ImportTxtModal open={modalOpen} onClose={handleCloseModal} {...props} />)}
+ {type === 'xlsx' && (<ImportXlsxModal open={modalOpen} onClose={handleCloseModal} {...props} />)}
</>
);
};
--
Gitblit v1.9.1