fix:Switching tab causes edit data reset problem

shanhexi · shanhexi · commit f2a5bc3d6a1d · 2023-12-15T17:05:40.000+08:00
diff --git a/chat2db-client/src/components/SearchResult/components/TableBox/index.tsx b/chat2db-client/src/components/SearchResult/components/TableBox/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState, useContext } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { Dropdown, Input, MenuProps, message, Modal, Space, Popover, Spin, Button } from 'antd';
 import { BaseTable, ArtColumn, useTablePipeline, features, SortItem } from 'ali-react-table';
 import styled from 'styled-components';
@@ -37,7 +37,6 @@ import MonacoEditor from '../../../MonacoEditor';
 import MyPagination from '../Pagination';
 import StatusBar from '../StatusBar';
 import RightClickMenu, { AllSupportedMenusType } from '../RightClickMenu';
-import { Context } from '../../index';
 
 // 自定义hooks
 import useCurdTableData from '../../hooks/useCurdTableData';
@@ -49,6 +48,7 @@ interface ITableProps {
   outerQueryResultData: IManageResultData;
   executeSqlParams: any;
   tableBoxId: string;
+  isActive?: boolean;
 }
 
 interface IViewTableCellData {
@@ -102,10 +102,9 @@ const defaultPaginationConfig: IResultConfig = {
 export const TableContext = React.createContext({} as any);
 
 export default function TableBox(props: ITableProps) {
-  const { className, outerQueryResultData, tableBoxId } = props;
+  const { className, outerQueryResultData, isActive } = props;
   const [viewTableCellData, setViewTableCellData] = useState<IViewTableCellData | null>(null);
   const [, contextHolder] = message.useMessage();
-  const { activeTabId } = useContext(Context);
   const [paginationConfig, setPaginationConfig] = useState<IResultConfig>(defaultPaginationConfig);
   // sql查询结果
   const [queryResultData, setQueryResultData] = useState<IManageResultData>(outerQueryResultData);
@@ -1096,6 +1095,7 @@ export default function TableBox(props: ITableProps) {
   }, [queryResultData, viewTableCellData]);
 
   return (
+    isActive ?
     <div className={classnames(className, styles.tableBox, { [styles.noDataTableBox]: !tableData.length })}>
       {renderContent()}
       <Modal
@@ -1142,5 +1142,6 @@ export default function TableBox(props: ITableProps) {
       </Modal>
       {contextHolder}
     </div>
+    : false
   );
 }
diff --git a/chat2db-client/src/components/SearchResult/index.tsx b/chat2db-client/src/components/SearchResult/index.tsx
@@ -24,7 +24,6 @@ import i18n from '@/i18n';
 import sqlServer, { IExecuteSqlParams } from '@/service/sql';
 import { v4 as uuidV4 } from 'uuid';
 import { Spin } from 'antd';
-import { useWorkspaceStore } from '@/pages/main/workspace/store';
 
 interface IProps {
   className?: string;
@@ -113,11 +112,11 @@ export default forwardRef((props: IProps, ref: ForwardedRef<ISearchResultRef>) =
     function renderSuccessResult() {
       const needTable = queryResultData?.headerList?.length > 1;
       return (
-        isActive ?
         <div className={styles.successResult}>
           <div className={styles.successResultContent}>
             {needTable ? (
               <TableBox
+                isActive={isActive}
                 tableBoxId={queryResultData.uuid}
                 key={queryResultData.uuid}
                 outerQueryResultData={queryResultData}
@@ -137,8 +136,6 @@ export default forwardRef((props: IProps, ref: ForwardedRef<ISearchResultRef>) =
             )}
           </div>
         </div>
-        :
-        false
       );
     }
     return (
diff --git a/chat2db-client/src/components/Tabs/index.tsx b/chat2db-client/src/components/Tabs/index.tsx
@@ -1,7 +1,7 @@
 import React, { memo, useEffect, useState, useRef } from 'react';
 import classnames from 'classnames';
 import Iconfont from '@/components/Iconfont';
-import { Popover, Dropdown, MenuProps } from 'antd';
+import { Popover, Dropdown } from 'antd';
 import i18n from '@/i18n';
 import { isValid } from '@/utils/check';
 import _ from 'lodash';
diff --git a/chat2db-client/src/pages/main/workspace/components/WorkspaceTabs/index.tsx b/chat2db-client/src/pages/main/workspace/components/WorkspaceTabs/index.tsx
@@ -124,6 +124,17 @@ const WorkspaceTabs = memo(() => {
       name: t.label,
     };
     historyService.updateSavedConsole(_params);
+    
+    const _workspaceTabList:any = workspaceTabList?.map((item) => {
+      if (item.id === t.key) {
+        return {
+          ...item,
+          title: t.label,
+        };
+      }
+      return item;
+    }) || []
+    setWorkspaceTabList(_workspaceTabList)
   };
 
   // 修改tab详情
