From 60a171f1caf65ce80d61354446a6f3391933433e Mon Sep 17 00:00:00 2001 From: BTMuli Date: Wed, 25 Feb 2026 22:11:16 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20=E8=B0=83=E6=95=B4=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-tauri/src/tray.rs | 1 + src/components/func/dialog.vue | 69 +++++++++++++------ src/components/pageHome/ph-calendar-birth.vue | 2 + 3 files changed, 52 insertions(+), 20 deletions(-) diff --git a/src-tauri/src/tray.rs b/src-tauri/src/tray.rs index 699844ab..0fadc414 100644 --- a/src-tauri/src/tray.rs +++ b/src-tauri/src/tray.rs @@ -24,6 +24,7 @@ pub fn create_tray(app: &AppHandle) -> tauri::Result<()> { let show_item = MenuItemBuilder::with_id("show", "显示窗口").build(app)?; let separator = PredefinedMenuItem::separator(app)?; let quit_item = MenuItemBuilder::with_id("quit", "退出应用").build(app)?; + // TODO: 窗口回正&最大化 let menu = MenuBuilder::new(app).item(&show_item).item(&separator).item(&quit_item).build()?; diff --git a/src/components/func/dialog.vue b/src/components/func/dialog.vue index 6ddebaf2..2f391caf 100644 --- a/src/components/func/dialog.vue +++ b/src/components/func/dialog.vue @@ -23,10 +23,12 @@
@@ -243,25 +245,28 @@ defineExpose({ displayInputBox, displayCheckBox }); .dialog-box { position: relative; display: flex; - width: 520px; - height: 240px; + min-width: 400px; + max-width: 560px; + min-height: 160px; + max-height: 240px; flex-direction: column; align-items: center; justify-content: space-between; - padding: 10px; + padding: 8px; border: 1px solid var(--common-shadow-1); - border-radius: 15px; + border-radius: 8px; background: var(--dialog-bg); - box-shadow: 0 0 10px var(--common-shadow-t-1); + box-shadow: 0 0 10px var(--common-shadow-t-2); color: var(--tgc-yellow-3); } .dialog-title { width: 100%; + padding-bottom: 4px; border-bottom: 1px solid var(--dialog-title); color: var(--dialog-title); font-family: var(--font-title); - font-size: 30px; + font-size: 24px; text-align: center; } @@ -269,7 +274,7 @@ defineExpose({ displayInputBox, displayCheckBox }); overflow: hidden; width: 100%; font-family: var(--font-text); - font-size: 20px; + font-size: 16px; text-align: center; text-overflow: ellipsis; white-space: pre-wrap; @@ -291,29 +296,42 @@ defineExpose({ displayInputBox, displayCheckBox }); height: 100%; padding: 5px; border: 1px solid var(--dialog-title); - border-radius: 5px; + border-radius: 4px; background: inherit; color: var(--dialog-title); + + &:focus { + border: 1px solid var(--tgc-yellow-3); + outline: none; + } } .dialog-btn-box { + position: relative; display: flex; width: 100%; - align-items: flex-end; - justify-content: space-around; + align-items: center; + justify-content: flex-end; + margin-left: auto; + column-gap: 12px; } .dialog-btn { position: relative; display: flex; - width: 180px; - height: 60px; align-items: center; justify-content: center; - border-radius: 15px; + padding: 4px 8px; + border: unset; + border-radius: 4px; + background: unset; + column-gap: 8px; cursor: pointer; - font-family: var(--font-title); - font-size: 20px; + font-size: 14px; + + span:first-child { + font-weight: bold; + } } .dialog-close-btn { @@ -325,8 +343,11 @@ defineExpose({ displayInputBox, displayCheckBox }); height: 24px; align-items: center; justify-content: center; + padding-bottom: 3px; + padding-left: 1px; + border: 1px solid var(--common-shadow-1); border-radius: 50%; - background: var(--dialog-title); + background: var(--dialog-bg); color: var(--tgc-yellow-3); cursor: pointer; font-family: var(--font-title); @@ -337,10 +358,18 @@ defineExpose({ displayInputBox, displayCheckBox }); } .no-btn { - border: 1px solid var(--tgc-yellow-1); + color: var(--tgc-od-white); + + &:hover { + background: var(--common-shadow-1); + } } .ok-btn { - background: var(--dialog-title); + color: var(--box-text-1); + + &:hover { + background: var(--common-shadow-2); + } } diff --git a/src/components/pageHome/ph-calendar-birth.vue b/src/components/pageHome/ph-calendar-birth.vue index 925d1f4d..b5189fe2 100644 --- a/src/components/pageHome/ph-calendar-birth.vue +++ b/src/components/pageHome/ph-calendar-birth.vue @@ -111,6 +111,7 @@ async function toNews(): Promise { .pcb-top-none { position: relative; display: flex; + flex-wrap: wrap; align-items: center; justify-content: center; column-gap: 8px; @@ -179,6 +180,7 @@ async function toNews(): Promise { .pcb-item-title { position: relative; display: flex; + flex-wrap: wrap; column-gap: 8px; font-family: var(--font-title); font-size: 20px;