fix:electron version

shanhexi · shanhexi · commit 987b4f2ad794 · 2023-10-22T16:12:13.000+08:00
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/ColumnList/index.tsx
@@ -273,7 +273,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
     }
   };
 
-  const handelFieldsChange = (field: any) => {
+  const handleFieldsChange = (field: any) => {
     let { value } = field[0];
     const { name: nameList } = field[0];
     const name = nameList[0];
@@ -462,7 +462,7 @@ const ColumnList = forwardRef((props: IProps, ref: ForwardedRef<IColumnListRef>)
         <Button onClick={moveData.bind(null, 'up')}>{i18n('editTable.button.up')}</Button>
         <Button onClick={moveData.bind(null, 'down')}>{i18n('editTable.button.down')}</Button>
       </div> */}
-      <Form className={styles.formBox} form={form} onFieldsChange={handelFieldsChange}>
+      <Form className={styles.formBox} form={form} onFieldsChange={handleFieldsChange}>
         <div className={styles.tableBox}>
           <DndContext modifiers={[restrictToVerticalAxis]} onDragEnd={onDragEnd}>
             <SortableContext items={dataSource.map((i) => i.key!)} strategy={verticalListSortingStrategy}>
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/IncludeCol/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/IncludeCol/index.tsx
@@ -207,7 +207,7 @@ const IncludeCol = forwardRef((props: IProps, ref: ForwardedRef<IIncludeColRef>)
     });
   }
 
-  const handelFieldsChange = (field: any) => {
+  const handleFieldsChange = (field: any) => {
     const { value } = field[0];
     const { name: nameList } = field[0];
     const name = nameList[0];
@@ -241,7 +241,7 @@ const IncludeCol = forwardRef((props: IProps, ref: ForwardedRef<IIncludeColRef>)
         <Button onClick={addData}>{i18n('editTable.button.add')}</Button>
         {/* <Button onClick={deleteData}>{i18n('editTable.button.delete')}</Button> */}
       </div>
-      <Form className={styles.formBox} form={form} onFieldsChange={handelFieldsChange}>
+      <Form className={styles.formBox} form={form} onFieldsChange={handleFieldsChange}>
         <Table
           ref={tableRef}
           style={{
diff --git a/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx b/chat2db-client/src/blocks/DatabaseTableEditor/IndexList/index.tsx
@@ -137,7 +137,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
     setDataSource(newList || []);
   };
 
-  const handelFieldsChange = (field: any) => {
+  const handleFieldsChange = (field: any) => {
     let { value } = field[0];
     const { name: nameList } = field[0];
     const name = nameList[0];
@@ -376,7 +376,7 @@ const IndexList = forwardRef((props: IProps, ref: ForwardedRef<IIndexListRef>) =
         <Button onClick={moveData.bind(null, 'up')}>上移</Button>
         <Button onClick={moveData.bind(null, 'down')}>下移</Button>
       </div> */}
-      <Form className={styles.formBox} form={form} onFieldsChange={handelFieldsChange}>
+      <Form className={styles.formBox} form={form} onFieldsChange={handleFieldsChange}>
         <div className={styles.tableBox}>
           <DndContext modifiers={[restrictToVerticalAxis]} onDragEnd={onDragEnd}>
             <SortableContext items={dataSource.map((i) => i.key!)} strategy={verticalListSortingStrategy}>
diff --git a/chat2db-client/src/layouts/index.tsx b/chat2db-client/src/layouts/index.tsx
@@ -35,6 +35,7 @@ declare global {
       startServerForSpawn: () => void;
       quitApp: () => void;
       beforeQuitApp: (fn: () => void) => void;
+      registerAppMenu: (data:any) => void;
     };
   }
   const __APP_VERSION__: string;
@@ -107,8 +108,12 @@ function AppContainer() {
 
   // 注册Electron关闭时，关闭服务
   function registerElectronApi() {
+    window.electronApi?.registerAppMenu({
+      version: __APP_VERSION__,
+    })
+    
     window.electronApi?.beforeQuitApp(()=>{
-      configService.stopJavaService();
+      configService.stopJavaService()
     })
   }
 
diff --git a/chat2db-client/src/main/index.js b/chat2db-client/src/main/index.js
@@ -52,7 +52,7 @@ app.commandLine.appendSwitch('--disable-gpu-sandbox');
 
 app.on('ready', () => {
   createWindow();
-  registerAppMenu();
+  registerAppMenu(mainWindow);
   registerAnalysis();
 
   app.on('activate', function () {
@@ -68,20 +68,21 @@ app.on('window-all-closed', () => {
   }
 });
 
-app.on('before-quit', (event) => {
+app.on('before-quit', () => {
   mainWindow.webContents.send('before-quit-app');
 });
 
-ipcMain.handle('get-product-name', (event) => {
+ipcMain.handle('get-product-name', () => {
   const exePath = app.getPath('exe');
   const { name } = path.parse(exePath);
   return name;
 });
 
 // 注册退出应用事件
-ipcMain.on('quit-app', (event) => {
+ipcMain.on('quit-app', () => {
   app.quit();
 });
 
-
-
+ipcMain.on('register-app-menu', (event, orgs) => {
+  registerAppMenu(mainWindow, orgs);
+});
diff --git a/chat2db-client/src/main/menu.js b/chat2db-client/src/main/menu.js
@@ -1,7 +1,7 @@
 const { shell, app, dialog, BrowserWindow, Menu } = require('electron');
 const os = require('os');
 const path = require('path');
-const registerAppMenu = (mainWindow) => {
+const registerAppMenu = (mainWindow, orgs) => {
   const menuBar = [
     {
       label: 'Chat2DB',
@@ -11,7 +11,7 @@ const registerAppMenu = (mainWindow) => {
           click() {
             dialog.showMessageBox({
               title: '关于Chat2DB',
-              message: `关于Chat2DB v${app.getVersion()}`,
+              message: `关于Chat2DB v${orgs?.version || app.getVersion()}`,
               detail:
                 // An intelligent database client and smart BI reporting tool with integrated AI capabilities.
                 '一个集成AI能力的智能数据库客户端和智能BI报表工具。',
diff --git a/chat2db-client/src/main/preload.js b/chat2db-client/src/main/preload.js
@@ -43,11 +43,13 @@ contextBridge.exposeInMainWorld('electronApi', {
   quitApp: () => {
     ipcRenderer.send('quit-app');
   },
-
-  beforeQuitAPP: (callback)=>{
+  beforeQuitApp: (callback)=>{
     ipcRenderer.on('before-quit-app', () => {
       callback();
     });
+  },
+  registerAppMenu: (menuProps)=>{
+    ipcRenderer.send('register-app-menu', menuProps);
   }
 });
 
diff --git a/chat2db-client/src/pages/main/workspace/components/Tree/TreeNodeRightClick/index.tsx b/chat2db-client/src/pages/main/workspace/components/Tree/TreeNodeRightClick/index.tsx
@@ -155,12 +155,12 @@ function TreeNodeRightClick(props: IProps) {
       return {
         text: data.pinned ? i18n('workspace.menu.unPin') : i18n('workspace.menu.pin'),
         icon: data.pinned ? '\ue61d' : '\ue627',
-        handle: handelTop,
+        handle: handleTop,
       };
     },
   };
 
-  function handelTop() {
+  function handleTop() {
     const api = data.pinned ? 'deleteTablePin' : 'addTablePin';
     mysqlServer[api]({
       ...curWorkspaceParams,
