Repeated request

shanhexi · shanhexi · commit 886ec8a4fca9 · 2023-11-29T23:18:08.000+08:00
diff --git a/chat2db-client/src/components/ConsoleEditor/components/SelectBoundInfo/index.tsx b/chat2db-client/src/components/ConsoleEditor/components/SelectBoundInfo/index.tsx
@@ -67,6 +67,9 @@ const SelectBoundInfo = memo((props: IProps) => {
 
   // 当数据源变化时，重新获取数据库列表
   useEffect(() => {
+    if (!isActive) {
+      return;
+    }
     if (supportDatabase) {
       setSchemaList([]);
       setDatabaseNameList([]);
@@ -79,6 +82,9 @@ const SelectBoundInfo = memo((props: IProps) => {
 
   // 当数据库名变化时，重新获取schema列表
   useEffect(() => {
+    if (!isActive) {
+      return;
+    }
     if (supportSchema) {
       getSchemaList();
     }
@@ -88,6 +94,9 @@ const SelectBoundInfo = memo((props: IProps) => {
   }, [boundInfo.databaseName]);
 
   useEffect(() => {
+    if (!isActive) {
+      return;
+    }
     if (supportSchema && boundInfo.schemaName) {
       getAllTableNameList(boundInfo.dataSourceId, boundInfo.databaseName, boundInfo.schemaName);
     }
diff --git a/chat2db-client/src/pages/main/workspace/store/console.ts b/chat2db-client/src/pages/main/workspace/store/console.ts
@@ -8,76 +8,95 @@ export interface IConsoleStore {
   consoleList: IConsole[] | null;
   activeConsoleId: string | number | null;
   workspaceTabList: IWorkspaceTab[] | null;
+  createConsoleLoading: boolean
 }
 
 export const initConsoleStore = {
   consoleList: null,
   activeConsoleId: null,
   workspaceTabList: null,
-}
+  createConsoleLoading: false
+};
 
 export const getSavedConsoleList = () => {
-  historyService.getSavedConsoleList({
-    tabOpened: 'y',
-    pageNo: 1,
-    pageSize: 20,
-  }).then((res) => {
-    useWorkspaceStore.setState({ consoleList: res?.data });
-  });
-}
+  historyService
+    .getSavedConsoleList({
+      tabOpened: 'y',
+      pageNo: 1,
+      pageSize: 20,
+    })
+    .then((res) => {
+      useWorkspaceStore.setState({ consoleList: res?.data });
+    });
+};
 
 export const setActiveConsoleId = (id: IConsoleStore['activeConsoleId']) => {
   useWorkspaceStore.setState({ activeConsoleId: id });
-}
+};
 
 export const setWorkspaceTabList = (items: IConsoleStore['workspaceTabList']) => {
   useWorkspaceStore.setState({ workspaceTabList: items });
-}
+};
 
-export const createConsole = (params: ICreateConsoleParams)=>{
+export const createConsole = (params: ICreateConsoleParams) => {
   const workspaceTabList = useWorkspaceStore.getState().workspaceTabList;
   const newConsole = {
     ...params,
     name: params.name || 'new console',
     ddl: params.ddl || '',
     status: ConsoleStatus.DRAFT,
     operationType: WorkspaceTabType.CONSOLE,
-    type: params.databaseType
+    type: params.databaseType,
   };
 
-  return new Promise((resolve, j) => {
+  return new Promise((resolve) => {
     if ((workspaceTabList?.length || 0) > 20) {
-      j('tab数量超过上限');
-      return 
+      return;
     }
+    useWorkspaceStore.setState({ createConsoleLoading: true });
     historyService.createConsole(newConsole).then((res) => {
+      // 找到活跃的id的位置
+      // const activeIndex = workspaceTabList?.findIndex(
+      //   (item) => item?.id === useWorkspaceStore.getState().activeConsoleId,
+      // );
+      // // 向活跃的位置后插入数据
+      // if (activeIndex !== -1) {
+      //   workspaceTabList?.splice(activeIndex + 1, 0, {
+      //     id: res,
+      //     title: newConsole.name,
+      //     type: newConsole.operationType,
+      //     uniqueData: newConsole,
+      //   });
+      // }
+
       const newList = [
-        ...(workspaceTabList||[]),
+        ...(workspaceTabList || []),
         {
           id: res,
           title: newConsole.name,
           type: newConsole.operationType,
           uniqueData: newConsole,
         },
       ];
+
       setWorkspaceTabList(newList);
       setActiveConsoleId(res);
       resolve(res);
+    })
+      .finally(() => { 
+      useWorkspaceStore.setState({ createConsoleLoading: false });
     });
   });
-}
+};
 
 export const addWorkspaceTab = (params: IWorkspaceTab) => {
   const workspaceTabList = useWorkspaceStore.getState().workspaceTabList;
-  if(workspaceTabList?.findIndex((item) => item?.id === params?.id) !== -1){
+  if (workspaceTabList?.findIndex((item) => item?.id === params?.id) !== -1) {
     setActiveConsoleId(params.id);
     return;
   }
-  
-  const newList = [
-    ...(workspaceTabList||[]),
-    params,
-  ];
+
+  const newList = [...(workspaceTabList || []), params];
 
   setWorkspaceTabList(newList);
   setActiveConsoleId(params.id);
