Skip to content

Commit 9b82de0

Browse files
committed
fix:bug
1 parent ee106c2 commit 9b82de0

3 files changed

Lines changed: 19 additions & 13 deletions

File tree

chat2db-client/src/components/CreateDatabase/index.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { v4 as uuid } from 'uuid';
77
import sqlService from '@/service/sql';
88
import i18n from '@/i18n';
99
import { debounce } from 'lodash';
10+
import { DatabaseTypeCode } from '@/constants';
1011

1112
interface IProps {
1213
className?: string;
@@ -26,6 +27,9 @@ export interface ICreateDatabase {
2627
comment?: string;
2728
}
2829

30+
// 创建database不支持注释的数据库
31+
const noCommentDatabase = [DatabaseTypeCode.MYSQL];
32+
2933
export default forwardRef((props: IProps, ref: ForwardedRef<ICreateDatabaseRef>) => {
3034
const { className, curWorkspaceParams, executedCallback } = props;
3135
const [form] = Form.useForm<ICreateDatabase>();
@@ -91,7 +95,7 @@ export default forwardRef((props: IProps, ref: ForwardedRef<ICreateDatabaseRef>)
9195
monacoEditorRef.current?.setValue(sql, 'cover');
9296
});
9397
}, 500),
94-
[],
98+
[curWorkspaceParams, createType, monacoEditorRef, config],
9599
);
96100

97101
const executeUpdateDataSql = (sql: string) => {
@@ -139,9 +143,11 @@ export default forwardRef((props: IProps, ref: ForwardedRef<ICreateDatabaseRef>)
139143
<Form.Item label={i18n('common.label.name')} name={config.formName}>
140144
<Input autoComplete="off" />
141145
</Form.Item>
142-
<Form.Item label={i18n('common.label.comment')} name="comment">
143-
<Input autoComplete="off" />
144-
</Form.Item>
146+
{noCommentDatabase.includes(curWorkspaceParams.databaseType) ? null : (
147+
<Form.Item label={i18n('common.label.comment')} name="comment">
148+
<Input autoComplete="off" />
149+
</Form.Item>
150+
)}
145151
</Form>
146152
<div className={styles.previewBox}>
147153
<div className={styles.previewText}>{i18n('common.title.preview')}</div>

chat2db-client/src/main/index.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function createWindow() {
3131
// 关闭window时触发下列事件.
3232
mainWindow.on('closed', function (event) {
3333
event.preventDefault();
34-
mainWindow = null;
34+
// mainWindow = null;
3535
});
3636

3737
// 监听打开新窗口事件 用默认浏览器打开
@@ -56,9 +56,9 @@ app.on('ready', () => {
5656
registerAnalysis();
5757

5858
app.on('activate', function () {
59-
if (mainWindow === null) {
60-
createWindow();
61-
}
59+
// if (mainWindow === null) {
60+
// }
61+
createWindow();
6262
});
6363
});
6464

@@ -69,7 +69,8 @@ app.on('window-all-closed', () => {
6969
});
7070

7171
app.on('before-quit', () => {
72-
mainWindow.webContents.send('before-quit-app');
72+
// 退出应用前触发before-quit-app
73+
// mainWindow.webContents.send('before-quit-app');
7374
});
7475

7576
ipcMain.handle('get-product-name', () => {

chat2db-client/src/main/preload.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,12 @@ contextBridge.exposeInMainWorld('electronApi', {
4343
quitApp: () => {
4444
ipcRenderer.send('quit-app');
4545
},
46-
beforeQuitApp: (callback)=>{
46+
beforeQuitApp: (callback) => {
4747
ipcRenderer.on('before-quit-app', () => {
4848
callback();
4949
});
5050
},
51-
registerAppMenu: (menuProps)=>{
51+
registerAppMenu: (menuProps) => {
5252
ipcRenderer.send('register-app-menu', menuProps);
53-
}
53+
},
5454
});
55-

0 commit comments

Comments
 (0)