diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 917a8b4..6627afa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,23 @@ jobs:
node-version: 24
cache: "npm"
- name: Install Dependencies
- run: npm install
+ run: npm install --ignore-scripts
+
+ - name: Ensure mac key helpers are executable
+ shell: bash
+ run: |
+ set -euo pipefail
+ for file in \
+ resources/key/macos/universal/xkey_helper \
+ resources/key/macos/universal/image_scan_helper \
+ resources/key/macos/universal/xkey_helper_macos \
+ resources/key/macos/universal/libwx_key.dylib
+ do
+ if [ -f "$file" ]; then
+ chmod +x "$file"
+ ls -l "$file"
+ fi
+ done
- name: Sync version with tag
shell: bash
@@ -52,9 +68,9 @@ jobs:
set -euo pipefail
export ELECTRON_BUILDER_BINARIES_MIRROR="https://github.com/electron-userland/electron-builder-binaries/releases/download/"
echo "Using ELECTRON_BUILDER_BINARIES_MIRROR=$ELECTRON_BUILDER_BINARIES_MIRROR"
- if ! npx electron-builder --mac dmg zip --arm64 --publish always '--config.publish.owner=${{ github.repository_owner }}' '--config.publish.repo=${{ github.event.repository.name }}'; then
+ if ! npx electron-builder --mac dmg zip --arm64 --publish always '--config.npmRebuild=false' '--config.publish.owner=${{ github.repository_owner }}' '--config.publish.repo=${{ github.event.repository.name }}'; then
echo "::warning::DMG packaging failed (hdiutil instability on runner). Retrying with ZIP only."
- npx electron-builder --mac zip --arm64 --publish always '--config.publish.owner=${{ github.repository_owner }}' '--config.publish.repo=${{ github.event.repository.name }}'
+ npx electron-builder --mac zip --arm64 --publish always '--config.npmRebuild=false' '--config.publish.owner=${{ github.repository_owner }}' '--config.publish.repo=${{ github.event.repository.name }}'
fi
- name: Inject minimumVersion into latest yml
@@ -327,33 +343,49 @@ jobs:
retry_cmd 5 3 gh release edit "$TAG" --repo "$REPO" --notes-file release_notes.md
deploy-aur:
- runs-on: ubuntu-latest
- needs: [release-linux]
- if: startsWith(github.ref, 'refs/tags/v')
- steps:
- - name: Checkout code
- uses: actions/checkout@v5
- with:
- fetch-depth: 0
+ runs-on: ubuntu-latest
+ needs: [release-linux]
+ if: startsWith(github.ref, 'refs/tags/v')
+ steps:
+ - name: Check AUR credentials
+ id: aur-credentials
+ shell: bash
+ env:
+ AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+ run: |
+ if [ -z "${AUR_SSH_PRIVATE_KEY}" ]; then
+ echo "::notice::AUR_SSH_PRIVATE_KEY is not configured; skipping AUR publish."
+ echo "enabled=false" >> "$GITHUB_OUTPUT"
+ else
+ echo "enabled=true" >> "$GITHUB_OUTPUT"
+ fi
- - name: Update PKGBUILD version
- run: |
- NEW_VER=$(echo "${{ github.ref_name }}" | sed 's/^v//')
- sed -i "s/^pkgver=.*/pkgver=${NEW_VER}/" resources/installer/linux/PKGBUILD
- sed -i "s/^pkgrel=.*/pkgrel=1/" resources/installer/linux/PKGBUILD
+ - name: Checkout code
+ if: steps.aur-credentials.outputs.enabled == 'true'
+ uses: actions/checkout@v5
+ with:
+ fetch-depth: 0
- - name: Publish AUR package
- uses: KSXGitHub/github-actions-deploy-aur@master
- with:
- pkgname: weflow
- pkgbuild: resources/installer/linux/PKGBUILD
- updpkgsums: true
- assets: |
- resources/installer/linux/weflow.desktop
- resources/installer/linux/icon.png
- resources/installer/linux/.gitignore
+ - name: Update PKGBUILD version
+ if: steps.aur-credentials.outputs.enabled == 'true'
+ run: |
+ NEW_VER=$(echo "${{ github.ref_name }}" | sed 's/^v//')
+ sed -i "s/^pkgver=.*/pkgver=${NEW_VER}/" resources/installer/linux/PKGBUILD
+ sed -i "s/^pkgrel=.*/pkgrel=1/" resources/installer/linux/PKGBUILD
- ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
- commit_username: H3CoF6
- commit_email: h3cof6@gmail.com
- ssh_keyscan_types: ed25519
+ - name: Publish AUR package
+ if: steps.aur-credentials.outputs.enabled == 'true'
+ uses: KSXGitHub/github-actions-deploy-aur@master
+ with:
+ pkgname: weflow
+ pkgbuild: resources/installer/linux/PKGBUILD
+ updpkgsums: true
+ assets: |
+ resources/installer/linux/weflow.desktop
+ resources/installer/linux/icon.png
+ resources/installer/linux/.gitignore
+
+ ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+ commit_username: H3CoF6
+ commit_email: h3cof6@gmail.com
+ ssh_keyscan_types: ed25519
diff --git a/electron/main.ts b/electron/main.ts
index 76688c3..e9bc512 100644
--- a/electron/main.ts
+++ b/electron/main.ts
@@ -1001,6 +1001,8 @@ function createAgreementWindow() {
*/
function createSplashWindow(): BrowserWindow {
const isDev = !!process.env.VITE_DEV_SERVER_URL
+ const splashThemeId = configService?.get('themeId') || 'cloud-dancer'
+ const splashThemeMode = configService?.get('theme') || 'system'
const iconPath = isDev
? join(__dirname, '../public/icon.ico')
: (process.platform === 'darwin'
@@ -1008,7 +1010,7 @@ function createSplashWindow(): BrowserWindow {
: join(process.resourcesPath, 'icon.ico'))
splashWindow = new BrowserWindow({
- width: 760,
+ width: 680,
height: 460,
resizable: false,
frame: false,
@@ -1027,9 +1029,17 @@ function createSplashWindow(): BrowserWindow {
})
if (isDev) {
- splashWindow.loadURL(`${process.env.VITE_DEV_SERVER_URL}splash.html`)
+ const splashUrl = new URL('splash.html', process.env.VITE_DEV_SERVER_URL)
+ splashUrl.searchParams.set('themeId', splashThemeId)
+ splashUrl.searchParams.set('themeMode', splashThemeMode)
+ splashWindow.loadURL(splashUrl.toString())
} else {
- splashWindow.loadFile(join(__dirname, '../dist/splash.html'))
+ splashWindow.loadFile(join(__dirname, '../dist/splash.html'), {
+ query: {
+ themeId: splashThemeId,
+ themeMode: splashThemeMode
+ }
+ })
}
splashWindow.once('ready-to-show', () => {
@@ -1309,9 +1319,6 @@ function createChatHistoryRouteWindow(route: string) {
? join(process.resourcesPath, 'icon.icns')
: join(process.resourcesPath, 'icon.ico'))
- // 根据系统主题设置窗口背景色
- const isDark = nativeTheme.shouldUseDarkColors
-
const win = new BrowserWindow({
width: 600,
height: 800,
@@ -1326,13 +1333,31 @@ function createChatHistoryRouteWindow(route: string) {
titleBarStyle: 'hidden',
titleBarOverlay: false,
show: false,
- backgroundColor: isDark ? '#1A1A1A' : '#F0F0F0',
+ backgroundColor: '#FFFFFF',
autoHideMenuBar: true
})
setupCustomTitleBarWindow(win)
- win.once('ready-to-show', () => {
+ let hasShown = false
+ let isReadyToShow = false
+ let hasLoadedRoute = false
+ const showChatHistoryWindow = () => {
+ if (hasShown || !isReadyToShow || !hasLoadedRoute || win.isDestroyed()) return
+ hasShown = true
win.show()
+ }
+
+ win.webContents.once('did-finish-load', () => {
+ hasLoadedRoute = true
+ setTimeout(showChatHistoryWindow, 30)
+ })
+ win.webContents.once('did-fail-load', () => {
+ hasLoadedRoute = true
+ showChatHistoryWindow()
+ })
+ win.once('ready-to-show', () => {
+ isReadyToShow = true
+ showChatHistoryWindow()
})
if (process.env.VITE_DEV_SERVER_URL) {
diff --git a/public/splash.html b/public/splash.html
index d71c241..0c50382 100644
--- a/public/splash.html
+++ b/public/splash.html
@@ -4,246 +4,478 @@
WeFlow
-
-
-
-
-
-
WeFlow
-
微信聊天记录管理工具
+
+
+
+
WeFlow
+ 微信聊天记录管理工具
+
+
+
-
-
-
+