optim resp-show & fix file reupload function

AierLab · Dec 15, 2023 · ff90ea2 · ff90ea2
1 parent 6ff9dca
commit ff90ea2
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 19 deletions.
diff --git a/react-app/src/components/FileCard/index.module.css b/react-app/src/components/FileCard/index.module.css
@@ -71,3 +71,7 @@
     @apply text-indigo-500 text-lg;
     @apply dark:text-indigo-300;
 }
+
+h1, h2, h3, h4, h5, h6 {
+    font-size: none;
+}
diff --git a/react-app/src/components/FileCard/index.tsx b/react-app/src/components/FileCard/index.tsx
@@ -45,7 +45,7 @@ export interface FileCardCommonProps {
 
   done: boolean;
   // TODO
-  overview: string;
+  overview: any;
 
   mentionables: People[];
   mentioned: People[];
@@ -154,9 +154,26 @@ export function FileCard(props: FileCardProps) {
             <div className="w-full">
               <h2> 处理结果 </h2>
               <DashedSparator className={s("my-4")} />
-              <pre className={s("overview white-space:pre")}>
-                {props.overview}
-              </pre>
+              {props.overview && (
+                <div className={s("overview")}>
+                  {Object.entries(props.overview).map(([key, value]) => (
+                    <div key={key}>
+                      <h3 className={s("university-recommends")}>{key}</h3>
+
+                      {Object.entries(value as any).map(([key, value]) => (
+                        <div key={key}>
+                          <div className={s("university-info")}>
+                            <p>
+                              {key}: {value as string}
+                            </p>
+                          </div>
+                        </div>
+                      ))}
+                      <br></br>
+                    </div>
+                  ))}
+                </div>
+              )}
               <DashedSparator className={s("my-4")} />
               {/* <div className={s("card horizontal bordered")}>
                 <div className="flex flex-row space-x-4 items-center flex-1 w-0">

diff --git a/react-app/src/pages/home/index.tsx b/react-app/src/pages/home/index.tsx
@@ -142,10 +142,12 @@ const Home = () => {
     // TODO 组件还是单选状态
     const files = event.target.files;
     if (!files) return;
-
     for (let i = 0; i < files.length; i++) {
       processFile(files[i]);
     }
+
+    // 置空, 否则重复点同一个文件不触发
+    event.target.value = "";
   };
 
   // 处理文件拖拽/点击上传后的操作
@@ -160,7 +162,7 @@ const Home = () => {
       filesize: file.size,
       uploadProgress: 0,
       done: false,
-      overview: "",
+      overview: {},
       mentioned: [],
       mentionables: [],
     };
@@ -223,7 +225,9 @@ const Home = () => {
       case TabIDsEnum.StudyAbroadPlanning:
         updateProps({
           ...fileProps,
-          overview: "处理中, 请稍候...",
+          overview: {
+            提示: { "1": "处理中, 请稍候...", "2": "预计时长1~2分钟" },
+          },
         });
         GetStudyAboardPlanning(payload)
           .then((response) => {
@@ -233,7 +237,7 @@ const Home = () => {
               done: true,
               mentioned: [],
               mentionables: [],
-              overview: JSON.stringify(response.data, undefined, 2),
+              overview: response.data,
               grade: 0,
             });
           })
@@ -521,15 +525,13 @@ const Home = () => {
                           <p> 拖拽文件到此处发送 </p>
                         </div>
                         <div
+                          className={s("upload-button")}
                           onClick={() =>
-                            document
-                              .getElementById("reports-review-file-upload")
-                              ?.click()
+                            document.getElementById("file-input")?.click()
                           }
-                          className={s("upload-button")}
                         >
                           <input
-                            id="reports-review-file-upload"
+                            id="file-input"
                             type="file"
                             onChange={handleFileSelect}
                             style={{ display: "none" }}
@@ -608,15 +610,11 @@ const Home = () => {
                         <div
                           className={s("upload-button")}
                           onClick={() =>
-                            document
-                              .getElementById(
-                                "study-abroad-planning-file-upload"
-                              )
-                              ?.click()
+                            document.getElementById("file-input")?.click()
                           }
                         >
                           <input
-                            id="study-abroad-planning-file-upload"
+                            id="file-input"
                             type="file"
                             onChange={handleFileSelect}
                             style={{ display: "none" }}