From 0c23fd6c238203314155edb4de550c6c6c37be27 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 21 Jan 2026 00:56:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(import):=20=E4=BF=AE=E5=A4=8D=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE=E5=92=8C=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除手动fileList状态管理，改用Form组件内置字段
- 修复重置状态时的初始值设置，确保hasArchive和splitByLine默认值正确
- 更新文件上传验证逻辑，使用form.getFieldValue获取文件列表
- 修改拖拽上传组件配置，移除不必要的回调函数
- 修复按钮禁用条件判断，使用正确的字段路径检查文件长度
- 移除表单项的initialValue配置，统一在state初始化时设置默认值
- 调整Sidebar组件中的注释标记，修复任务中心弹窗显示逻辑
---
 .../Detail/components/ImportConfiguration.tsx | 43 ++++++++-----------
 frontend/src/pages/Layout/Sidebar.tsx         |  8 ++--
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/frontend/src/pages/DataManagement/Detail/components/ImportConfiguration.tsx b/frontend/src/pages/DataManagement/Detail/components/ImportConfiguration.tsx
index c41cc99..a50fbb3 100644
--- a/frontend/src/pages/DataManagement/Detail/components/ImportConfiguration.tsx
+++ b/frontend/src/pages/DataManagement/Detail/components/ImportConfiguration.tsx
@@ -63,24 +63,20 @@ export default function ImportConfiguration({
   const [collectionOptions, setCollectionOptions] = useState([]);
   const [importConfig, setImportConfig] = useState<any>({
     source: DataSource.UPLOAD,
+    hasArchive: true,
+    splitByLine: false,
   });
   const [currentPrefix, setCurrentPrefix] = useState<string>("");
 
-  const [fileList, setFileList] = useState<UploadFile[]>([]);
-
   // 本地上传文件相关逻辑
 
-  const resetFiles = () => {
-    setFileList([]);
-  };
-
   const handleUpload = async (dataset: Dataset) => {
-    let filesToUpload = fileList;
+    let filesToUpload = form.getFieldValue("files") || [];
 
     // 如果启用分行分割，处理文件
     if (importConfig.splitByLine) {
       const splitResults = await Promise.all(
-        fileList.map((file) => splitFileByLines(file))
+        filesToUpload.map((file) => splitFileByLines(file))
       );
       filesToUpload = splitResults.flat();
     }
@@ -109,16 +105,6 @@ export default function ImportConfiguration({
         },
       })
     );
-    resetFiles();
-  };
-
-  const handleBeforeUpload = (_, files: UploadFile[]) => {
-    setFileList([...fileList, ...files]);
-    return false;
-  };
-
-  const handleRemoveFile = (file: UploadFile) => {
-    setFileList((prev) => prev.filter((f) => f.uid !== file.uid));
   };
 
   const fetchCollectionTasks = async () => {
@@ -138,9 +124,12 @@ export default function ImportConfiguration({
   const resetState = () => {
     console.log('[ImportConfiguration] resetState called, preserving currentPrefix:', currentPrefix);
     form.resetFields();
-    setFileList([]);
     form.setFieldsValue({ files: null });
-    setImportConfig({ source: importConfig.source ? importConfig.source : DataSource.UPLOAD });
+    setImportConfig({
+      source: importConfig.source ? importConfig.source : DataSource.UPLOAD,
+      hasArchive: true,
+      splitByLine: false,
+    });
     console.log('[ImportConfiguration] resetState done, currentPrefix still:', currentPrefix);
   };
 
@@ -188,7 +177,7 @@ export default function ImportConfiguration({
           <Button onClick={onClose}>取消</Button>
           <Button
             type="primary"
-            disabled={!fileList?.length && !importConfig.dataSource}
+            disabled={!importConfig?.files?.length && !importConfig.dataSource}
             onClick={handleImportData}
           >
             确定
@@ -267,7 +256,6 @@ export default function ImportConfiguration({
               label="自动解压上传的压缩包"
               name="hasArchive"
               valuePropName="checked"
-              initialValue={true}
             >
               <Switch />
             </Form.Item>
@@ -282,13 +270,19 @@ export default function ImportConfiguration({
               }
               name="splitByLine"
               valuePropName="checked"
-              initialValue={false}
             >
               <Switch />
             </Form.Item>
             <Form.Item
               label="上传文件"
               name="files"
+              valuePropName="fileList"
+              getValueFromEvent={(e: any) => {
+                if (Array.isArray(e)) {
+                  return e;
+                }
+                return e && e.fileList;
+              }}
               rules={[
                 {
                   required: true,
@@ -298,8 +292,7 @@ export default function ImportConfiguration({
             >
               <Dragger
                 className="w-full"
-                onRemove={handleRemoveFile}
-                beforeUpload={handleBeforeUpload}
+                beforeUpload={() => false}
                 multiple
               >
                 <p className="ant-upload-drag-icon">
diff --git a/frontend/src/pages/Layout/Sidebar.tsx b/frontend/src/pages/Layout/Sidebar.tsx
index a0146b8..14b4fe1 100644
--- a/frontend/src/pages/Layout/Sidebar.tsx
+++ b/frontend/src/pages/Layout/Sidebar.tsx
@@ -117,7 +117,7 @@ const AsiderAndHeaderLayout = () => {
       <div className="p-4 border-t border-gray-200">
         {sidebarOpen ? (
           <div className="space-y-2">
-            {/* <Popover
+            <Popover
               forceRender
               title={
                 <div className="flex items-center justify-between gap-2 border-b border-gray-200 pb-2 mb-2">
@@ -136,7 +136,7 @@ const AsiderAndHeaderLayout = () => {
               <Button block onClick={() => setTaskCenterVisible(true)}>
                 任务中心
               </Button>
-            </Popover> */}
+            </Popover>
             <Button
               block
               onClick={() => {
@@ -148,7 +148,7 @@ const AsiderAndHeaderLayout = () => {
           </div>
         ) : (
           <div className="space-y-2">
-            {/* <div className="relative">
+            <div className="relative">
               <Popover
                 forceRender
                 title="任务中心"
@@ -163,7 +163,7 @@ const AsiderAndHeaderLayout = () => {
                   icon={<ClipboardList className="w-4 h-4" />}
                 ></Button>
               </Popover>
-            </div> */}
+            </div>
             <Button
               block
               onClick={() => {