From 055392b41cc0a839a52c51573fd329a22ede0fe1 Mon Sep 17 00:00:00 2001 From: stapxs <1007028430.stapx@gmail.com> Date: Tue, 30 Apr 2024 16:37:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=96=B0=20UI=20=E4=BD=A0=E5=80=BC?= =?UTF-8?q?=E5=BE=97=E6=8B=A5=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/icons/icon.png | Bin 13118 -> 0 bytes package.json | 2 +- src/App.vue | 6 +-- src/assets/css/append/append_darwin.css | 8 +++ src/assets/css/append/append_vibrancy.css | 5 +- src/assets/css/append/append_win32.css | 59 ++++++++++++++-------- src/background.ts | 23 ++++----- src/function/utils/appUtil.ts | 5 +- vue.config.js | 3 +- 9 files changed, 65 insertions(+), 46 deletions(-) delete mode 100644 build/icons/icon.png diff --git a/build/icons/icon.png b/build/icons/icon.png deleted file mode 100644 index a5f1fb8029dac304af1fa4e26a6a878f9e6a4d61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13118 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 diff --git a/package.json b/package.json index d63790c5..97856fee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stapxs-qq-lite", - "version": "2.7.2", + "version": "2.7.3", "private": false, "author": "Stapx Steve [林槐]", "description": "一个兼容 OneBot 的非官方网页版 QQ 客户端，使用 Vue 重制的全新版本。", diff --git a/src/App.vue b/src/App.vue index 2d57e244..002a7572 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ -
+
    @@ -251,7 +251,6 @@ export default defineComponent({ data () { return { dev: process.env.NODE_ENV == 'development', - platform: undefined, Connector: Connector, defineAsyncComponent: defineAsyncComponent, save: Option.runASWEvent, @@ -448,8 +447,7 @@ export default defineComponent({ const reader = electron ? electron.ipcRenderer : null runtimeData.reader = reader if (reader) { - this.platform = await reader.invoke('sys:getPlatform') - runtimeData.tags.platform = this.platform + runtimeData.tags.platform = await reader.invoke('sys:getPlatform') } app.config.globalProperties.$viewer = this.viewerBody // 初始化波浪动画 diff --git a/src/assets/css/append/append_darwin.css b/src/assets/css/append/append_darwin.css index 6deae8e4..3cb07630 100644 --- a/src/assets/css/append/append_darwin.css +++ b/src/assets/css/append/append_darwin.css @@ -1,3 +1,7 @@ +body { + font: 14px -apple-system !important; +} + .main-body > ul { height: calc(100% - 25px); padding-top: 25px; @@ -5,4 +9,8 @@ .opt-main > div:last-child { padding: 33px 10px 0 10px; +} + +.friend-list { + padding-top: 20px; } \ No newline at end of file diff --git a/src/assets/css/append/append_vibrancy.css b/src/assets/css/append/append_vibrancy.css index 04cd422c..c7bf3412 100644 --- a/src/assets/css/append/append_vibrancy.css +++ b/src/assets/css/append/append_vibrancy.css @@ -22,7 +22,6 @@ } .friend-list { background: rgba(var(--color-card-rgb), 0.6); - padding-top: 20px; } .friend-list > div:first-child { margin: 15px 15px 15px 0; @@ -59,10 +58,10 @@ .opt-main > div:last-child { margin-left: -65px !important; background: var(--color-bg); - margin: -3px -5px 0 5px; + margin: -5px -5px 0 5px; box-shadow: -5px 0px 4px -5px var(--color-shader); transition: margin .3s; - height: calc(100% + 5px); + height: calc(100% + 7px); padding: 3px 10px 0 10px; } diff --git a/src/assets/css/append/append_win32.css b/src/assets/css/append/append_win32.css index 5bc4f0c3..488130a2 100644 --- a/src/assets/css/append/append_win32.css +++ b/src/assets/css/append/append_win32.css @@ -1,22 +1,17 @@ -#app { - margin: 10px; - border-radius: 7px; - overflow: hidden; - box-shadow: 0 0 10px #0005; - height: calc(100% - 20px); +body { + font: 14px 'SF Pro Text', 'Source Han Sans', sans-serif !important; } #base-app.withBar { - height: calc(100% - 36px); - padding-top: 36px; + height: calc(100% - 35px); + padding-top: 35px; } + .top-bar { - border-bottom: 1px solid var(--color-card-2); border-radius: 7px 7px 0 0; + background: transparent; box-shadow: unset; - background: var(--color-bg); height: 35px; - width: calc(100% - 20px); } .top-bar>img, .top-bar>svg { height: 16px; @@ -29,21 +24,41 @@ .top-bar>div.controller>div { padding: 7px; } -.top-bar>div.controller>div>svg{ +.top-bar>div.controller>div>svg { height: 14px; } -.chat-pan { - height: calc(100% - 50px) !important; - border-radius: 0 0 7px 0; - margin-right: 10px; +.main-body > div { + margin-top: -35px; + height: calc(100% + 35px); +} +.main-body > ul { + margin-top: -35px; + height: calc(100% + 35px); + padding-left: 5px; +} + +.top-bar { + margin-bottom: 0 !important; } -.pop-box>div:last-child { +.top-bar>span, +.top-bar>img, .top-bar>svg { + display: none; +} + +.chat-pan.withBar { + left: 275px !important; + top: 0; height: calc(100% - 20px); - margin-top: 10px; - width: calc(100% - 20px); - margin-left: 10px; + padding-top: 20px; +} +.card-info-pan-bg { + margin-top: -20px; +} +.chat-info { + margin: calc(50vh - 20px) 0 0 50%; } -.chat-pan>div.bg { - border-radius: 0 0 7px 0; +.opt-main>div:last-child { + padding-top: 25px !important; + height: calc(100% - 17px) !important; } diff --git a/src/background.ts b/src/background.ts index 1d52da1b..9b190cac 100644 --- a/src/background.ts +++ b/src/background.ts @@ -41,7 +41,6 @@ async function createWindow() { defaultHeight: 800 }) const store = new Store() - const noWindow = await store.get('opt_no_window') let windowConfig = { x: mainWindowState.x, y: mainWindowState.y, @@ -49,32 +48,28 @@ async function createWindow() { height: mainWindowState.height, icon: path.join(__dirname,'./public/img/icons/icon.png'), webPreferences: { - nodeIntegration: true, + nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION, contextIsolation: false - }, - transparent: true + } } as Electron.BrowserWindowConstructorOptions - // macOS if(process.platform === 'darwin') { + // macOS windowConfig = { ...windowConfig, maximizable: false, fullscreen: false, - titleBarStyle: process.platform === 'darwin' ? 'hidden' : 'default', + titleBarStyle: 'hidden', trafficLightPosition: { x: 11, y: 10 }, vibrancy: 'fullscreen-ui', + transparent: true, // visualEffectState: 'active' } - } else { - windowConfig = { - ...windowConfig, - frame: noWindow === "true" ? false : true - } - } - // Windows - if(process.platform === 'win32') { + } else if(process.platform === 'win32') { + // Windows windowConfig = { ...windowConfig, + backgroundColor: '#00000000', + backgroundMaterial: 'acrylic', frame: false } store.set('opt_no_window', 'true') diff --git a/src/function/utils/appUtil.ts b/src/function/utils/appUtil.ts index b0e440e1..ccc4f315 100644 --- a/src/function/utils/appUtil.ts +++ b/src/function/utils/appUtil.ts @@ -389,6 +389,9 @@ export function createIpc() { runtimeData.reader.on('app:openLink', (event, link) => { openLink(link) }) + runtimeData.reader.on('app:logger', (event, config) => { + new Logger().add(config.type, config.text) + }) } } @@ -407,7 +410,7 @@ export function loadAppendStyle() { } catch (e) { logger.info('未找到对应平台的附加样式') } - if (platform == 'darwin') { + if (platform != 'linux') { import('@/assets/css/append/append_vibrancy.css').then(() => { logger.info('透明 UI 附加样式加载完成') }) diff --git a/vue.config.js b/vue.config.js index 88c3fe3c..c3f21f70 100644 --- a/vue.config.js +++ b/vue.config.js @@ -19,7 +19,7 @@ module.exports = { { test: /\.yaml$/, use: 'js-yaml-loader', - } + } ] } }, @@ -71,6 +71,7 @@ module.exports = { * @type {import('vue-cli-plugin-electron-builder').PluginOptions} */ electronBuilder: { + nodeIntegration: true, builderOptions: { appId: 'com.stapxs.qqweb', productName: 'Stapxs QQ Lite',