Browse Source

start loading before format data

tumao 4 years ago
parent
commit
173a887b70

+ 4 - 4
client/src/components/insert/Container.tsx

@@ -53,7 +53,7 @@ const InsertContainer: FC<InsertContentProps> = ({
   const [activeStep, setActiveStep] = useState<InsertStepperEnum>(
   const [activeStep, setActiveStep] = useState<InsertStepperEnum>(
     InsertStepperEnum.import
     InsertStepperEnum.import
   );
   );
-  const [insertStatus, setInsertStauts] = useState<InsertStatusEnum>(
+  const [insertStatus, setInsertStatus] = useState<InsertStatusEnum>(
     InsertStatusEnum.init
     InsertStatusEnum.init
   );
   );
   const [insertFailMsg, setInsertFailMsg] = useState<string>('');
   const [insertFailMsg, setInsertFailMsg] = useState<string>('');
@@ -232,11 +232,11 @@ const InsertContainer: FC<InsertContentProps> = ({
   };
   };
 
 
   const handleInsertData = async () => {
   const handleInsertData = async () => {
+    // start loading
+    setInsertStatus(InsertStatusEnum.loading);
     // combine table heads and data
     // combine table heads and data
     const tableData = isContainFieldNames ? csvData.slice(1) : csvData;
     const tableData = isContainFieldNames ? csvData.slice(1) : csvData;
     const data = combineHeadsAndData(tableHeads, tableData);
     const data = combineHeadsAndData(tableHeads, tableData);
-
-    setInsertStauts(InsertStatusEnum.loading);
     const { result, msg } = await handleInsert(
     const { result, msg } = await handleInsert(
       collectionValue,
       collectionValue,
       partitionValue,
       partitionValue,
@@ -247,7 +247,7 @@ const InsertContainer: FC<InsertContentProps> = ({
       setInsertFailMsg(msg);
       setInsertFailMsg(msg);
     }
     }
     const status = result ? InsertStatusEnum.success : InsertStatusEnum.error;
     const status = result ? InsertStatusEnum.success : InsertStatusEnum.error;
-    setInsertStauts(status);
+    setInsertStatus(status);
   };
   };
 
 
   const handleCollectionChange = (name: string) => {
   const handleCollectionChange = (name: string) => {

+ 2 - 0
client/src/components/uploader/Uploader.tsx

@@ -51,6 +51,8 @@ const Uploader: FC<UploaderProps> = ({
       }
       }
       if (isSizeOverLimit) {
       if (isSizeOverLimit) {
         openSnackBar(overSizeWarning, 'error');
         openSnackBar(overSizeWarning, 'error');
+        const uploader = inputRef.current! as HTMLFormElement;
+        uploader.value = null;
         return;
         return;
       }
       }