feat:When you create a new console, the database or schema that the console is bound to is selected by default as the database or schema that you are focusing on

shanhexi · shanhexi · commit 1aa358809dab · 2024-01-30T19:39:05.000+08:00
diff --git a/chat2db-client/src/blocks/Tree/index.tsx b/chat2db-client/src/blocks/Tree/index.tsx
@@ -9,7 +9,7 @@ import { treeConfig, switchIcon, ITreeConfigItem } from './treeConfig';
 import { useCommonStore } from '@/store/common';
 import { setCurrentWorkspaceGlobalExtend } from '@/pages/main/workspace/store/common';
 import LoadingGracile from '@/components/Loading/LoadingGracile';
-import { setFocusId, useTreeStore } from './treeStore';
+import { setFocusId, setFocusTreeNode, useTreeStore, clearTreeStore } from './treeStore';
 import { useGetRightClickMenu } from './hooks/useGetRightClickMenu';
 import MenuLabel from '@/components/MenuLabel';
 import LoadingContent from '@/components/Loading/LoadingContent';
@@ -124,6 +124,13 @@ const Tree = (props: IProps) => {
 
   const top = itemHeight * startIdx; // 第一个渲染的 item 到顶部距离
 
+  // 清空treeStore
+  useEffect(() => {
+    return () => {
+      clearTreeStore();
+    }
+  }, [searchValue]);
+
   useEffect(() => {
     setTreeData(outerTreeData);
     setScrollTop(0);
@@ -336,6 +343,14 @@ const TreeNode = memo((props: TreeNodeIProps) => {
       });
     }
     setFocusId(treeNodeData.uuid || '');
+
+    setFocusTreeNode({
+      dataSourceId: treeNodeData.extraParams!.dataSourceId,
+      dataSourceName: treeNodeData.extraParams!.dataSourceName,
+      databaseType: treeNodeData.extraParams!.databaseType,
+      databaseName: treeNodeData.extraParams?.databaseName,
+      schemaName: treeNodeData.extraParams?.schemaName,
+    });
   };
 
   // 双击节点
diff --git a/chat2db-client/src/blocks/Tree/treeStore.ts b/chat2db-client/src/blocks/Tree/treeStore.ts
@@ -6,10 +6,19 @@ import { devtools } from 'zustand/middleware';
 
 export interface ITreeStore {
   focusId: number | string | null;
+  focusTreeNode: {
+    dataSourceId: number;
+    dataSourceName: string;
+    databaseType: string,
+    databaseName?: string;
+    schemaName?: string,
+    tableName?: string,
+  } | null;
 }
 
 const treeStore = {
   focusId: null,
+  focusTreeNode: null,
 }
 
 export const useTreeStore: UseBoundStore<StoreApi<ITreeStore>> = create(
@@ -19,3 +28,12 @@ export const useTreeStore: UseBoundStore<StoreApi<ITreeStore>> = create(
 export const setFocusId = (focusId: ITreeStore['focusId']) => {
   useTreeStore.setState({ focusId });
 }
+
+export const setFocusTreeNode = (focusTreeNode: ITreeStore['focusTreeNode']) => {
+  useTreeStore.setState({ focusTreeNode });
+}
+
+// 清除treeStore
+export const clearTreeStore = () => {
+  useTreeStore.setState(treeStore);
+}
diff --git a/chat2db-client/src/pages/main/workspace/components/WorkspaceTabs/index.tsx b/chat2db-client/src/pages/main/workspace/components/WorkspaceTabs/index.tsx
@@ -6,7 +6,6 @@ import { Button } from 'antd';
 // ----- constants -----
 import { WorkspaceTabType, workspaceTabConfig } from '@/constants';
 import { IWorkspaceTab } from '@/typings';
-// import WorkspaceExtend from '../WorkspaceExtend';
 
 // ----- components -----
 import Tabs, { ITabItem } from '@/components/Tabs';
@@ -25,6 +24,7 @@ import {
   createConsole,
 } from '@/pages/main/workspace/store/console';
 import { useWorkspaceStore } from '@/pages/main/workspace/store';
+import { useTreeStore } from '@/blocks/Tree/treeStore';
 
 // ----- services -----
 import historyService from '@/service/history';
@@ -83,12 +83,14 @@ const WorkspaceTabs = memo(() => {
   };
 
   const createNewConsole = () => {
+    const { databaseName, schemaName } =  useTreeStore.getState().focusTreeNode || {};
     if (currentConnectionDetails) {
       createConsole({
         dataSourceId: currentConnectionDetails.id,
         dataSourceName: currentConnectionDetails.alias,
         databaseType: currentConnectionDetails.type,
-        // databaseName: currentConnectionDetails.databaseName,
+        databaseName,
+        schemaName
       });
     }
   };
diff --git a/chat2db-client/src/pages/main/workspace/store/console.ts b/chat2db-client/src/pages/main/workspace/store/console.ts
@@ -65,7 +65,7 @@ export const createConsole = (params: ICreateConsoleParams) => {
     operationType: params.operationType || WorkspaceTabType.CONSOLE,
     type: params.databaseType,
     supportDatabase: currentConnectionDetails?.supportDatabase,
-    supportSchema: currentConnectionDetails?.supportSchema
+    supportSchema: currentConnectionDetails?.supportSchema,
   };
 
   return new Promise((resolve) => {
