Skip to content

Commit e7cb30b

Browse files
committed
fix:console save database
1 parent d967af9 commit e7cb30b

7 files changed

Lines changed: 30 additions & 6 deletions

File tree

chat2db-client/src/blocks/Setting/BaseSetting/index.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,13 @@
4848
margin-bottom: 20px;
4949
}
5050

51+
.sqlEditorFontSize {
52+
margin-bottom: 20px;
53+
}
54+
5155
.primaryColorList {
5256
display: flex;
57+
margin-bottom: 20px;
5358

5459
.themeColorItem {
5560
margin-right: 20px;

chat2db-client/src/blocks/Setting/BaseSetting/index.tsx

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import React, { useState } from 'react';
12
import { LangType, ThemeType } from '@/constants';
23
import i18n, { currentLang } from '@/i18n';
3-
import React, { useState } from 'react';
44
import classnames from 'classnames';
55
import themeDarkImg from '@/assets/img/theme-dark.png';
66
import themeLightImg from '@/assets/img/theme-light.png';
@@ -87,7 +87,6 @@ const colorList = [
8787

8888
// baseBody 基础设置
8989
export default function BaseSetting() {
90-
const [lang, setLang] = useState(currentLang);
9190
const [appTheme, setAppTheme] = useTheme();
9291
const [currentTheme, setCurrentTheme] = useState<ThemeType>(appTheme.backgroundColor);
9392
const [currentPrimaryColor, setCurrentPrimaryColor] = useState(localStorage.getItem('primary-color'));
@@ -111,7 +110,6 @@ export default function BaseSetting() {
111110
location.reload();
112111
}
113112

114-
// TODO: 这里写 ThemeType 为什么报错呢
115113
function handleChangeTheme(backgroundColor: any) {
116114
setAppTheme({
117115
...appTheme,
@@ -120,6 +118,11 @@ export default function BaseSetting() {
120118
setCurrentTheme(backgroundColor);
121119
}
122120

121+
122+
const changeSqlEditorFontSize = (e: any) => {
123+
124+
}
125+
123126
return (
124127
<>
125128
<div className={styles.title}>{i18n('setting.title.backgroundColor')}</div>
@@ -139,7 +142,7 @@ export default function BaseSetting() {
139142
</ul>
140143
<div className={styles.title}>{i18n('setting.title.language')}</div>
141144
<div className={styles.langBox}>
142-
<Radio.Group onChange={changeLang} value={lang}>
145+
<Radio.Group onChange={changeLang} value={currentLang}>
143146
<Radio value={LangType.ZH_CN}>简体中文</Radio>
144147
<Radio value={LangType.EN_US}>English</Radio>
145148
</Radio.Group>
@@ -172,6 +175,15 @@ export default function BaseSetting() {
172175
</div>
173176
</ColorPicker> */}
174177
</ul>
178+
{/* <div className={styles.title}>{i18n('setting.title.sqlEditorFontSize')}</div>
179+
<div className={styles.sqlEditorFontSize}>
180+
<Radio.Group onChange={changeSqlEditorFontSize}>
181+
<Radio value={12}>12</Radio>
182+
<Radio value={14}>14</Radio>
183+
<Radio value={16}>16</Radio>
184+
</Radio.Group>
185+
</div> */}
186+
175187
</>
176188
);
177189
}

chat2db-client/src/i18n/en-us/setting.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default {
66
'setting.nav.aboutUs': 'About Us',
77
'setting.title.backgroundColor': 'Background Color',
88
'setting.title.themeColor': 'Theme Color',
9+
'setting.title.sqlEditorFontSize': 'SQL Editor Font Size',
910
'setting.label.blue': 'Blue',
1011
'setting.label.green': 'Green',
1112
'setting.label.violet': 'Violet',

chat2db-client/src/i18n/zh-cn/setting.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default {
66
'setting.nav.aboutUs': '关于我们',
77
'setting.title.backgroundColor': '背景色',
88
'setting.title.themeColor': '主题色',
9+
'setting.title.sqlEditorFontSize': 'SQL编辑器字体大小',
910
'setting.label.blue': '蓝蓬釉',
1011
'setting.label.green': '极光绿',
1112
'setting.label.violet': '酱紫',

chat2db-client/src/pages/main/workspace/components/WorkspaceTabs/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ const WorkspaceTabs = memo(() => {
152152
consoleId: item.id as number,
153153
status: uniqueData.status,
154154
connectable: uniqueData.connectable,
155+
supportDatabase: uniqueData.supportDatabase,
156+
supportSchema: uniqueData.supportSchema,
155157
}}
156158
initDDL={uniqueData.ddl}
157159
loadSQL={uniqueData.loadSQL}

chat2db-client/src/pages/main/workspace/store/console.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,16 @@ export const setWorkspaceTabList = (items: IConsoleStore['workspaceTabList']) =>
5454

5555
export const createConsole = (params: ICreateConsoleParams) => {
5656
const workspaceTabList = useWorkspaceStore.getState().workspaceTabList;
57+
const currentConnectionDetails = useWorkspaceStore.getState().currentConnectionDetails;
5758
const newConsole = {
5859
...params,
5960
name: params.name || 'new console',
6061
ddl: params.ddl || '',
6162
status: ConsoleStatus.DRAFT,
6263
operationType: params.operationType || WorkspaceTabType.CONSOLE,
6364
type: params.databaseType,
65+
supportDatabase: currentConnectionDetails?.supportDatabase,
66+
supportSchema: currentConnectionDetails?.supportSchema
6467
};
6568

6669
return new Promise((resolve) => {

chat2db-client/src/typings/workspace.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { CreateTabIntroType, WorkspaceTabType, DatabaseTypeCode, ConsoleStatus } from '@/constants';
22
import { ITreeNode } from '@/typings';
33

4-
54
export interface ICreateTabIntro {
65
type: CreateTabIntroType;
76
workspaceTabType: WorkspaceTabType;
@@ -24,5 +23,6 @@ export interface IBoundInfo {
2423
schemaName?: string;
2524
status: ConsoleStatus;
2625
connectable: boolean;
26+
supportDatabase: boolean;
27+
supportSchema: boolean;
2728
}
28-

0 commit comments

Comments
 (0)