fix: 切换数据库bug

shanhexi · shanhexi · commit c38210877fad · 2023-07-29T16:46:14.000+08:00
diff --git a/chat2db-client/src/components/CreateConnection/index.tsx b/chat2db-client/src/components/CreateConnection/index.tsx
@@ -176,7 +176,6 @@ export default function CreateConnection(props: IProps) {
               : i18n('connection.message.testConnectResult', i18n('common.text.successful')),
           );
         } else {
-          submitCallback?.();
           message.success(
             type === submitType.UPDATE
               ? i18n('common.message.modifySuccessfully')
@@ -189,6 +188,7 @@ export default function CreateConnection(props: IProps) {
               id: res,
             });
           }
+          submitCallback?.();
         }
       })
       .finally(() => {
@@ -284,8 +284,7 @@ function RenderForm(props: IRenderFormProps) {
   const [dataSourceFormConfig, setDataSourceFormConfig] = useState<IConnectionConfig>(dataSourceFormConfigProps);
 
   useEffect(() => {
-    setDataSourceFormConfig(dataSourceFormConfigProps)
-    console.log(dataSourceFormConfigProps)
+    setDataSourceFormConfig(dataSourceFormConfigProps);
   }, [dataSourceFormConfigProps])
 
   const initialValuesMemo = useMemo(() => {
diff --git a/chat2db-client/src/components/SearchResult/index.tsx b/chat2db-client/src/components/SearchResult/index.tsx
@@ -59,7 +59,6 @@ export default memo<IProps>(function SearchResult(props) {
       return;
     }
 
-    // debugger;
     if (!currentTab || !manageResultDataList.find((d) => d.uuid === currentTab)) {
       setCurrentTab(manageResultDataList[0].uuid);
     }
diff --git a/chat2db-client/src/hooks/useUpdateEffect.ts b/chat2db-client/src/hooks/useUpdateEffect.ts
@@ -1,4 +1,4 @@
-import {useRef, useEffect} from 'react';
+import { useRef, useEffect } from 'react';
 
 export function useUpdateEffect(fn: Function, arr: any[]) {
   const first = useRef(true);
diff --git a/chat2db-client/src/pages/main/connection/index.less b/chat2db-client/src/pages/main/connection/index.less
@@ -95,10 +95,12 @@
 
 .layoutRight {
   flex: 1;
+  overflow: auto;
   display: flex;
   justify-content: center;
   align-items: center;
   position: relative;
+
 }
 
 .dataBaseList {
diff --git a/chat2db-client/src/pages/main/connection/index.tsx b/chat2db-client/src/pages/main/connection/index.tsx
@@ -29,20 +29,10 @@ interface IProps {
 function Connections(props: IProps) {
   const { connectionModel, workspaceModel, dispatch } = props;
   const { connectionList } = connectionModel;
+  const { curWorkspaceParams } = workspaceModel;
   const volatileRef = useRef<any>();
-  // const [connectionList, setConnectionList] = useState<IConnectionDetails[]>();
   const [curConnection, setCurConnection] = useState<Partial<IConnectionDetails>>({});
 
-  useEffect(() => {
-    getConnectionList();
-  }, []);
-
-  const getConnectionList = () => {
-    dispatch({
-      type: 'connection/fetchConnectionList',
-    });
-  };
-
   function handleCreateConnections(database: IDatabase) {
     setCurConnection({
       type: database.code,
@@ -100,25 +90,42 @@ function Connections(props: IProps) {
                     {
                       key: 'EnterWorkSpace',
                       label: i18n('connection.button.connect'),
-                      onClick: () => {
+                      onClick: ({ domEvent }) => {
+                        domEvent.stopPropagation();
                         handleMenuItemDoubleClick(t);
                       },
                     },
                     {
                       key: 'Delete',
                       label: i18n('common.button.delete'),
-                      onClick: async ({ domEvent }) => {
+                      onClick: ({ domEvent }) => {
                         // 禁止冒泡到menuItem
                         domEvent.stopPropagation();
-                        await connectionService.remove({ id: key });
-                        setCurConnection({});
-                        getConnectionList();
+                        connectionService.remove({ id: key }).then(() => {
+                          if (curConnection.id === key) {
+                            setCurConnection({});
+                          }
+                          // // 如果当前工作区正好选中了这个连接，那么就把当前工作区的记录清空
+                          // if (curWorkspaceParams.dataSourceId === key) {
+                          //   dispatch({
+                          //     type: 'workspace/setCurWorkspaceParams',
+                          //     payload: {}
+                          //   })
+                          //   dispatch({
+                          //     type: 'connection/setCurConnection',
+                          //     payload: {}
+                          //   })
+                          // }
+                          dispatch({
+                            type: 'connection/fetchConnectionList',
+                          });
+                        })
                       },
                     },
                   ],
                 }}
               >
-                <div className={styles.moreButton}>
+                <div className={styles.moreButton} onClick={(e) => { e.stopPropagation() }}>
                   <Iconfont code="&#xe601;"></Iconfont>
                 </div>
               </Dropdown>
@@ -161,7 +168,14 @@ function Connections(props: IProps) {
                 closeCreateConnection={() => {
                   setCurConnection({});
                 }}
-                submitCallback={getConnectionList}
+                submitCallback={() => {
+                  dispatch({
+                    type: 'connection/fetchConnectionList',
+                    callback: (res: any) => {
+                      setCurConnection(res.data[res.data?.length - 1]);
+                    }
+                  });
+                }}
               />
             }
           </div>
diff --git a/chat2db-client/src/pages/main/index.tsx b/chat2db-client/src/pages/main/index.tsx
@@ -60,9 +60,14 @@ interface IProps {
 function MainPage(props: IProps) {
   const { mainModel, workspaceModel, connectionModel, dispatch } = props;
   const { curPage } = mainModel;
-  const { curConnection } = connectionModel;
   const [activeNav, setActiveNav] = useState<INavItem>(navConfig[activeIndex]);
 
+  useEffect(() => {
+    dispatch({
+      type: 'connection/fetchConnectionList',
+    });
+  }, []);
+
   useEffect(() => {
     // activeNav 发生变化，同步到全局状态管理
     activeNav.isLoad = true;
@@ -99,7 +104,7 @@ function MainPage(props: IProps) {
   return (
     <div className={styles.page}>
       <div className={styles.layoutLeft}>
-        <BrandLogo size={40} onClick={() => {}} className={styles.brandLogo} />
+        <BrandLogo size={40} onClick={() => { }} className={styles.brandLogo} />
         <ul className={styles.navList}>
           {navConfig.map((item, index) => {
             return (
diff --git a/chat2db-client/src/pages/main/workspace/components/WorkspaceHeader/index.tsx b/chat2db-client/src/pages/main/workspace/components/WorkspaceHeader/index.tsx

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ export default memo<IProps>(function SearchResult(props) {`
`59`	`59`	`return;`
`60`	`60`	`}`
`61`	`61`
`62`		`- // debugger;`
`63`	`62`	`if (!currentTab \|\| !manageResultDataList.find((d) => d.uuid === currentTab)) {`
`64`	`63`	`setCurrentTab(manageResultDataList[0].uuid);`
`65`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {useRef, useEffect} from 'react';`
	`1`	`+import { useRef, useEffect } from 'react';`
`2`	`2`
`3`	`3`	`export function useUpdateEffect(fn: Function, arr: any[]) {`
`4`	`4`	`const first = useRef(true);`