diff --git a/blossom-editor/build/icon.icns b/blossom-editor/build/icon.icns index 4c089ff..42b8c05 100644 Binary files a/blossom-editor/build/icon.icns and b/blossom-editor/build/icon.icns differ diff --git a/blossom-editor/electron-builder.yml b/blossom-editor/electron-builder.yml index 6027854..62279d2 100644 --- a/blossom-editor/electron-builder.yml +++ b/blossom-editor/electron-builder.yml @@ -1,5 +1,5 @@ appId: com.xzzz.blossom -productName: blossom +productName: Blossom directories: buildResources: build files: @@ -13,7 +13,7 @@ asarUnpack: - resources/** afterSign: build/notarize.js win: - executableName: blossom + executableName: ${productName} # https://www.electron.build/configuration/nsis nsis: artifactName: ${name}-${version}-setup.${ext} diff --git a/blossom-editor/resources/imgs/iconBigSur.png b/blossom-editor/resources/imgs/iconBigSur.png new file mode 100644 index 0000000..c0ac221 Binary files /dev/null and b/blossom-editor/resources/imgs/iconBigSur.png differ diff --git a/blossom-editor/src/main/index.ts b/blossom-editor/src/main/index.ts index b6e93c9..82d5ec8 100644 --- a/blossom-editor/src/main/index.ts +++ b/blossom-editor/src/main/index.ts @@ -2,7 +2,7 @@ import { app, shell, ipcMain, BrowserWindow, Menu, IpcMainEvent, Tray, HandlerDe import { join } from 'path' import { electronApp, optimizer, is, platform } from '@electron-toolkit/utils' import icon from '../../resources/imgs/icon.ico?asset' -import iconPng from '../../resources/imgs/icon.png?asset' +// import iconPng from '../../resources/imgs/iconBigSur.png?asset' import printScreen from './printScreen' import ShortcutRegistrant from './shortcut' @@ -45,7 +45,7 @@ if (!gotTheLock) { if (platform.isMacOS) { // Mac 平台下要设置 dock 栏图标 - app.dock.setIcon(iconPng) + // app.dock.setIcon(iconPng) } setTimeout(() => { diff --git a/blossom-editor/src/renderer/src/assets/utils/hljsTest.ts b/blossom-editor/src/renderer/src/assets/utils/hljsTest.ts index eb99a4b..4bb616a 100644 --- a/blossom-editor/src/renderer/src/assets/utils/hljsTest.ts +++ b/blossom-editor/src/renderer/src/assets/utils/hljsTest.ts @@ -1,4 +1,3 @@ -import { log } from 'console' import hljs from 'highlight.js' hljs.addPlugin({