Skip to content

Commit

Permalink
fix:Switching tab causes edit data reset problem
Browse files Browse the repository at this point in the history
  • Loading branch information
shanhexi committed Dec 15, 2023
1 parent 3aa781a commit f2a5bc3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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';

// 鑷畾涔塰ooks
import useCurdTableData from '../../hooks/useCurdTableData';
Expand All @@ -49,6 +48,7 @@ interface ITableProps {
outerQueryResultData: IManageResultData;
executeSqlParams: any;
tableBoxId: string;
isActive?: boolean;
}

interface IViewTableCellData {
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1142,5 +1142,6 @@ export default function TableBox(props: ITableProps) {
</Modal>
{contextHolder}
</div>
: false
);
}
5 changes: 1 addition & 4 deletions chat2db-client/src/components/SearchResult/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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}
Expand All @@ -137,8 +136,6 @@ export default forwardRef((props: IProps, ref: ForwardedRef<ISearchResultRef>) =
)}
</div>
</div>
:
false
);
}
return (
Expand Down
2 changes: 1 addition & 1 deletion chat2db-client/src/components/Tabs/index.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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璇︽儏
Expand Down

0 comments on commit f2a5bc3

Please sign in to comment.