Skip to content

Commit 7250085

Browse files
committed
fix close issue
1 parent 5e09a53 commit 7250085

File tree

5 files changed

+14
-20
lines changed

5 files changed

+14
-20
lines changed

.github/workflows/publish.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ on:
77

88
jobs:
99
publish:
10-
runs-on: ${{ matrix.os }}
11-
1210
strategy:
1311
matrix:
14-
os: [macos-latest]
12+
include:
13+
- os: macos-latest
14+
platform: mac
15+
- os: windows-latest
16+
platform: win
17+
18+
runs-on: ${{ matrix.os }}
1519

1620
steps:
1721
- name: Checkout git repo
@@ -30,13 +34,5 @@ jobs:
3034
3135
- name: Publish releases
3236
env:
33-
# The APPLE_* values are used for auto updates signing
34-
# APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASS }}
35-
# APPLE_ID: ${{ secrets.APPLE_ID }}
36-
# APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
37-
# CSC_LINK: ${{ secrets.CSC_LINK }}
38-
# CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
39-
# This is used for uploading release assets to github
4037
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
41-
run: |
42-
npm exec electron-builder -- --publish always --win --mac --linux
38+
run: npm exec electron-builder -- --publish always --${{ matrix.platform }}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Toolkit",
3-
"version": "0.1.2",
3+
"version": "0.1.3",
44
"description": "A toolkit for scalable desktop apps",
55
"keywords": [
66
"electron",

release/app/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

release/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Toolkit",
3-
"version": "0.1.2",
3+
"version": "0.1.3",
44
"description": "A toolkit for scalable desktop apps",
55
"license": "MIT",
66
"author": {

src/main/dashboard.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ const createDashboardWindow = async () => {
3131

3232
newDashboardWindow.loadURL(resolveHtmlPath('dashboard.html'));
3333
newDashboardWindow.on('close', (event) => {
34-
if (process.platform === 'darwin') {
35-
event.preventDefault();
36-
newDashboardWindow?.hide();
37-
}
34+
newDashboardWindow.hide();
35+
event.preventDefault();
3836
});
3937

4038
// 当窗口准备好时,最大化窗口

0 commit comments

Comments
 (0)