Skip to content

Commit

Permalink
fix close issue
Browse files Browse the repository at this point in the history
  • Loading branch information
TrumanDu committed Dec 31, 2024
1 parent 5e09a53 commit 7250085
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 20 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ on:

jobs:
publish:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [macos-latest]
include:
- os: macos-latest
platform: mac
- os: windows-latest
platform: win

runs-on: ${{ matrix.os }}

steps:
- name: Checkout git repo
Expand All @@ -30,13 +34,5 @@ jobs:
- name: Publish releases
env:
# The APPLE_* values are used for auto updates signing
# APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASS }}
# APPLE_ID: ${{ secrets.APPLE_ID }}
# APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
# CSC_LINK: ${{ secrets.CSC_LINK }}
# CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
# This is used for uploading release assets to github
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
npm exec electron-builder -- --publish always --win --mac --linux
run: npm exec electron-builder -- --publish always --${{ matrix.platform }}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Toolkit",
"version": "0.1.2",
"version": "0.1.3",
"description": "A toolkit for scalable desktop apps",
"keywords": [
"electron",
Expand Down
4 changes: 2 additions & 2 deletions release/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion release/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Toolkit",
"version": "0.1.2",
"version": "0.1.3",
"description": "A toolkit for scalable desktop apps",
"license": "MIT",
"author": {
Expand Down
6 changes: 2 additions & 4 deletions src/main/dashboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,8 @@ const createDashboardWindow = async () => {

newDashboardWindow.loadURL(resolveHtmlPath('dashboard.html'));
newDashboardWindow.on('close', (event) => {
if (process.platform === 'darwin') {
event.preventDefault();
newDashboardWindow?.hide();
}
newDashboardWindow.hide();
event.preventDefault();
});

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

0 comments on commit 7250085

Please sign in to comment.