i18n

shanhexi · shanhexi · commit 54bfdcf0a46e · 2023-11-06T17:39:34.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 3.0.11
+## 3.0.10
 
 `2023-11-06`
 
diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
@@ -1,4 +1,4 @@
-## 3.0.11
+## 3.0.10
 
 `2023-11-06`
 
diff --git a/chat2db-client/src/blocks/Setting/AiSetting/index.tsx b/chat2db-client/src/blocks/Setting/AiSetting/index.tsx
@@ -28,9 +28,6 @@ export default function SettingAI(props: IProps) {
     setLoading(true);
     try {
       const res = await getUser();
-      // 向cookie中写入当前用户id
-      // const date = new Date('2030-12-30 12:30:00').toUTCString();
-      // document.cookie = `CHAT2DB.USER_ID=${res?.id};Expires=${date}`;
       setUserInfo(res);
     } finally {
       setLoading(false);
diff --git a/chat2db-client/src/components/SearchResult/TableBox/index.tsx b/chat2db-client/src/components/SearchResult/TableBox/index.tsx
@@ -43,6 +43,7 @@ interface ITableProps {
   className?: string;
   outerQueryResultData: IManageResultData;
   executeSqlParams: any;
+  tableBoxId: string;
 }
 
 interface IViewTableCellData {
@@ -91,7 +92,7 @@ const defaultPaginationConfig: IResultConfig = {
 };
 
 export default function TableBox(props: ITableProps) {
-  const { className, outerQueryResultData } = props;
+  const { className, outerQueryResultData, tableBoxId } = props;
   const [viewTableCellData, setViewTableCellData] = useState<IViewTableCellData | null>(null);
   const [, contextHolder] = message.useMessage();
   const [paginationConfig, setPaginationConfig] = useState<IResultConfig>(defaultPaginationConfig);
@@ -1077,6 +1078,7 @@ export default function TableBox(props: ITableProps) {
               />
             </div>
             <div className={classnames(styles.toolBarItem, styles.refreshBar)}>
+              {/* 刷新 */}
               <Popover mouseEnterDelay={0.8} content={i18n('common.button.refresh')} trigger="hover">
                 <div
                   onClick={() => {
@@ -1210,7 +1212,7 @@ export default function TableBox(props: ITableProps) {
 
   return (
     <div className={classnames(className, styles.tableBox, { [styles.noDataTableBox]: !tableData.length })}>
-      {activeSearchResult.id === queryResultData.uuid && renderContent()}
+      {activeSearchResult.id === tableBoxId && renderContent()}
       <Modal
         title={viewTableCellData?.name}
         open={!!viewTableCellData?.name}
diff --git a/chat2db-client/src/components/SearchResult/index.tsx b/chat2db-client/src/components/SearchResult/index.tsx
@@ -103,6 +103,7 @@ export default forwardRef((props: IProps, ref: ForwardedRef<ISearchResultRef>) =
           <div className={styles.successResultContent}>
             {needTable ? (
               <TableBox
+                tableBoxId={queryResultData.uuid}
                 key={queryResultData.uuid}
                 outerQueryResultData={queryResultData}
                 executeSqlParams={props.executeSqlParams}
diff --git a/chat2db-client/src/components/Tabs/index.tsx b/chat2db-client/src/components/Tabs/index.tsx
@@ -3,6 +3,7 @@ import classnames from 'classnames';
 import Iconfont from '@/components/Iconfont';
 import styles from './index.less';
 import { Popover, Dropdown } from 'antd';
+import i18n from '@/i18n';
 
 export interface ITabItem {
   prefixIcon?: string | React.ReactNode;
@@ -163,21 +164,21 @@ export default memo<IProps>((props) => {
 
     const closeTabsMenu = [
       {
-        label: '关闭',
+        label: i18n('common.button.close'),
         key: 'close',
         onClick: () => {
           deleteTab(t);
         },
       },
-      {
-        label: '关闭其他',
+      { 
+        label: i18n('common.button.closeOthers'),
         key: 'closeOther',
         onClick: () => {
           deleteOtherTab(t);
         },
       },
       {
-        label: '关闭所有',
+        label: i18n('common.button.closeAll'),
         key: 'closeAll',
         onClick: () => {
           deleteAllTab();
diff --git a/chat2db-client/src/i18n/en-us/common.ts b/chat2db-client/src/i18n/en-us/common.ts
@@ -114,4 +114,7 @@ export default {
   'common.button.setNull': 'Set NULL',
   'common.button.setDefault': 'Set DEFAULT',
   'common.button.viewData': 'View/Edit Data',
+  'common.button.close': 'Close',
+  'common.button.closeAll': 'Close all',
+  'common.button.closeOthers': 'Close others',
 };  
diff --git a/chat2db-client/src/i18n/zh-cn/common.ts b/chat2db-client/src/i18n/zh-cn/common.ts
@@ -113,5 +113,9 @@ export default {
   'common.button.setNull': '设置为NULL',
   'common.button.setDefault': '设置为默认值',
   'common.button.viewData': '查看/修改数据',
+  'common.button.close': '关闭',
+  'common.button.closeAll': '全部关闭',
+  'common.button.closeOthers': '关闭其他',
+
 
 };

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## 3.0.11`
	`1`	`+## 3.0.10`
`2`	`2`
`3`	`3`	`2023-11-06`
`4`	`4`