support macOs

Author: TrumanDu

README.md

@@ -33,6 +33,12 @@ To package apps for the local platform:
 npm run package
 ```
 
+分发mac 安装包
+
+```
+npm run package -- --mac
+```
+
 ## Docs
 
 See our [docs and guides here]()

assets/icon.icns

@@ -1,6 +1,6 @@
 {
   "name": "Toolkit",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "A toolkit for scalable desktop apps",
   "keywords": [
     "electron",
@@ -86,15 +86,16 @@
     }
   },
   "dependencies": {
+    "@electron/notarize": "^2.3.2",
     "antd": "^5.10.1",
     "axios": "^1.6.2",
-    "electron-store": "^8.1.0",
-    "express": "^4.19.2",
-    "portfinder": "^1.0.32",
-    "@electron/notarize": "^2.3.2",
     "electron-debug": "^3.2.0",
     "electron-log": "^4.4.8",
+    "electron-store": "^8.1.0",
     "electron-updater": "^6.1.4",
+    "express": "^4.19.2",
+    "fix-path": "^4.0.0",
+    "portfinder": "^1.0.32",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.16.0"
@@ -243,4 +244,4 @@
     ],
     "logLevel": "quiet"
   }
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Toolkit",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "A toolkit for scalable desktop apps",
   "license": "MIT",
   "author": {

release/app/package-lock.json

@@ -10,7 +10,15 @@
  * `./src/main.js` using webpack. This gives us some performance wins.
  */
 import path from 'path';
-import { app, BrowserWindow, globalShortcut, shell, ipcMain } from 'electron';
+import fixPath from 'fix-path';
+import {
+  app,
+  BrowserWindow,
+  globalShortcut,
+  shell,
+  ipcMain,
+  Menu,
+} from 'electron';
 
 import log from 'electron-log';
 import { resolveHtmlPath, getAssetPath, getAppDir } from './util';
@@ -22,6 +30,8 @@ import InitCheck from './init_check';
 app.commandLine.appendSwitch('enable-experimental-web-platform-features');
 app.setAppUserModelId('top.trumandu.Toolkit');
 
+fixPath();
+
 let mainWindow: BrowserWindow | null = null;
 let dashboardWindow: BrowserWindow | null = null;
 
@@ -68,6 +78,11 @@ const createDashboardWindow = async () => {
     },
   });
 
+  if (process.platform === 'darwin') {
+    app.dock.setIcon(getAssetPath('icon.png'));
+    app.dock.bounce();
+  }
+
   newDashboardWindow.loadURL(resolveHtmlPath('dashboard.html'));
   newDashboardWindow.on('close', (event) => {
     newDashboardWindow.hide();
@@ -216,6 +231,13 @@ app
   })
   .catch(console.log);
 
+// 拦截系统默认的 Quit 行为
+app.on('before-quit', (event) => {
+  event.preventDefault(); // 阻止默认退出
+  // 强制退出
+  app.exit();
+});
+
 app.on('ready', () => {
   const appInstallDir = getAppDir();
   // 将应用程序安装目录发送给渲染进程

release/app/package.json

@@ -3,15 +3,14 @@ import pkg from '../../package.json';
 import { getAppDir, getAssetPath } from './util';
 import API from './api';
 
-const isMac = process.platform === 'darwin';
-
 function createTray(
   window: BrowserWindow,
   dashboard: BrowserWindow,
   api: API,
 ): Promise<Tray> {
   return new Promise((resolve) => {
-    const iconPath = getAssetPath('icon.png');
+    const iconPath = getAssetPath('icons/16x16.png');
+
     const appTray = new Tray(iconPath);
 
     const openInstallDirectory = () => {
@@ -68,17 +67,12 @@ function createTray(
         },
 
         { type: 'separator' },
-        isMac
-          ? {
-              role: 'close',
-              label: '        退出        ',
-            }
-          : {
-              label: '        退出        ',
-              click() {
-                app.exit();
-              },
-            },
+        {
+          label: '        退出        ',
+          click() {
+            app.exit();
+          },
+        },
         {
           label: '        重启        ',
           click() {

src/main/main.ts

@@ -25,7 +25,10 @@ export function getAssetPath(...paths: string[]): string {
 }
 
 export function getAppDir(): string {
-  return app.isPackaged ? path.dirname(app.getPath('exe')) : app.getAppPath();
+  const homedir = os.homedir();
+  // 用户配置信息，插件，data目录
+  const appDataPath = path.join(homedir, 'Toolkit');
+  return app.isPackaged ? appDataPath : app.getAppPath();
 }
 
 export function deleteFolder(filePath: string) {

src/main/tray.ts

@@ -12,6 +12,15 @@
         overflow: hidden;
       }
     </style>
+    <script>
+      var _hmt = _hmt || [];
+      (function () {
+        var hm = document.createElement('script');
+        hm.src = 'https://hm.baidu.com/hm.js?077ebf5af4b96181076eefc3db60ad2c';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(hm, s);
+      })();
+    </script>
   </head>
   <body>
     <div id="root"></div>