From c68d1062ffbcf07b6c0c7a9bc0a3689ad11cd17a Mon Sep 17 00:00:00 2001
From: zikai <1621362626@qq.com>
Date: Thu, 23 Jul 2026 04:24:04 +0000
Subject: [PATCH] =?UTF-8?q?style:=20=E5=89=8D=E7=AB=AF=E8=A7=86=E8=A7=89?=
=?UTF-8?q?=E4=B8=8E=20mainPage=20=E5=8D=8F=E8=B0=83=EF=BC=8C=E6=B5=85?=
=?UTF-8?q?=E8=89=B2=E6=9E=81=E7=AE=80=20+=20=E9=9D=9B=E8=93=9D=E4=B8=BB?=
=?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- global.css 加设计令牌（与 mainPage variables.css 对齐：bg/surface/accent/
border/text/success/danger/warn/radius/shadow/transition）
- App.vue 顶栏由深色(#2c3e50)改浅色(surface + border)，视图切换器改分段样式
- 全部组件硬编码颜色令牌化：accent(主操作)/success(下载)/danger(删除)/
warn(单次徽章)/surface/border/text-*
- 表单输入加 focus 描边、按钮统一 border+radius、阴影用令牌
- 月/周预览表头改浅灰、今日高亮改 accent-weak，网格边线用 border 令牌
- 事件配色 PALETTE 不变（数据可视化需高区分度）
- 独立运行 42 测试通过、build 通过
---
src/App.vue | 50 +++++++++++++++++-----------
src/components/DropZone.vue | 22 ++++++-------
src/components/EventDetail.vue | 52 ++++++++++++++++++-----------
src/components/EventList.vue | 37 +++++++++++----------
src/components/HeaderBar.vue | 22 +++++++------
src/components/MonthPreview.vue | 53 ++++++++++++++---------------
src/components/OccurrenceGrid.vue | 26 ++++++++-------
src/components/WeekPreview.vue | 55 ++++++++++++++++---------------
src/styles/global.css | 53 ++++++++++++++++++++++++++---
9 files changed, 222 insertions(+), 148 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index b8ffdc9..e9f7e04 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -48,18 +48,21 @@ const { isLoaded, state, setViewMode } = useCalendar()
diff --git a/src/components/DropZone.vue b/src/components/DropZone.vue
index 5c129b0..bea4f6d 100644
--- a/src/components/DropZone.vue
+++ b/src/components/DropZone.vue
@@ -55,39 +55,39 @@ function onPick(e) {
display: flex;
align-items: center;
justify-content: center;
- border: 2px dashed #bdc3c7;
- border-radius: 12px;
+ border: 2px dashed var(--border-strong);
+ border-radius: var(--radius);
margin: 40px;
- transition: all 0.2s;
+ transition: all var(--transition);
}
.dropzone.active {
- border-color: #3498db;
- background: #eaf4fc;
+ border-color: var(--accent);
+ background: var(--accent-weak);
}
.dropzone-content {
text-align: center;
}
.hint {
- color: #7f8c8d;
+ color: var(--text-secondary);
font-size: 14px;
margin-bottom: 16px;
}
.pick-btn {
display: inline-block;
padding: 10px 24px;
- background: #3498db;
+ background: var(--accent);
color: #fff;
- border-radius: 8px;
+ border-radius: var(--radius-sm);
cursor: pointer;
font-size: 14px;
font-weight: 500;
- transition: background 0.15s;
+ transition: background var(--transition);
}
.pick-btn:hover {
- background: #2980b9;
+ background: var(--accent-hover);
}
.error {
- color: #e74c3c;
+ color: var(--danger);
font-size: 13px;
margin-top: 16px;
}
diff --git a/src/components/EventDetail.vue b/src/components/EventDetail.vue
index 9da56aa..99930e0 100644
--- a/src/components/EventDetail.vue
+++ b/src/components/EventDetail.vue
@@ -198,22 +198,22 @@ function onToggleOcc(date) {
.empty {
text-align: center;
padding: 60px 20px;
- color: #95a5a6;
+ color: var(--text-tertiary);
}
.section-title {
font-size: 15px;
font-weight: 700;
- color: #2c3e50;
+ color: var(--text-primary);
margin: 20px 0 12px;
padding-bottom: 8px;
- border-bottom: 2px solid #ecf0f1;
+ border-bottom: 2px solid var(--border);
}
.form-group { margin-bottom: 16px; }
.form-group label {
display: block;
font-size: 13px;
font-weight: 600;
- color: #34495e;
+ color: var(--text-secondary);
margin-bottom: 5px;
}
.form-group input,
@@ -221,10 +221,19 @@ function onToggleOcc(date) {
.form-group select {
width: 100%;
padding: 8px 12px;
- border: 1px solid #d5dbdb;
- border-radius: 6px;
+ border: 1px solid var(--border-strong);
+ border-radius: var(--radius-sm);
font-size: 13px;
font-family: inherit;
+ background: var(--bg);
+ color: var(--text-primary);
+ transition: border-color var(--transition);
+}
+.form-group input:focus,
+.form-group textarea:focus,
+.form-group select:focus {
+ outline: none;
+ border-color: var(--accent);
}
.form-group textarea { resize: vertical; min-height: 60px; }
.form-row { display: flex; gap: 16px; }
@@ -234,35 +243,38 @@ function onToggleOcc(date) {
gap: 8px;
margin-top: 20px;
padding-top: 16px;
- border-top: 1px solid #ecf0f1;
+ border-top: 1px solid var(--border);
}
.btn {
padding: 7px 16px;
- border: none;
- border-radius: 6px;
+ border: 1px solid var(--border-strong);
+ border-radius: var(--radius-sm);
cursor: pointer;
font-size: 13px;
font-weight: 500;
- transition: background 0.15s;
+ transition: all var(--transition);
+ background: var(--bg);
+ color: var(--text-primary);
}
-.btn-primary { background: #3498db; color: #fff; }
-.btn-primary:hover { background: #2980b9; }
-.btn-secondary { background: #ecf0f1; color: #2c3e50; }
-.btn-secondary:hover { background: #d5dbdb; }
-.btn-danger { background: #e74c3c; color: #fff; }
-.btn-danger:hover { background: #c0392b; }
+.btn-primary { background: var(--accent); border-color: var(--accent); color: #fff; }
+.btn-primary:hover { background: var(--accent-hover); border-color: var(--accent-hover); }
+.btn-secondary { background: var(--bg); color: var(--text-secondary); }
+.btn-secondary:hover { background: var(--surface); color: var(--text-primary); }
+.btn-danger { background: var(--danger); border-color: var(--danger); color: #fff; }
+.btn-danger:hover { filter: brightness(0.92); }
.split-panel {
margin-top: 16px;
padding: 16px;
- background: #f8f9fa;
- border-radius: 8px;
+ background: var(--surface);
+ border: 1px solid var(--border);
+ border-radius: var(--radius-sm);
display: flex;
gap: 8px;
align-items: center;
flex-wrap: wrap;
}
-.split-panel p { width: 100%; font-size: 13px; color: #7f8c8d; margin-bottom: 8px; }
-.split-panel input { padding: 6px 10px; border: 1px solid #d5dbdb; border-radius: 6px; }
+.split-panel p { width: 100%; font-size: 13px; color: var(--text-secondary); margin-bottom: 8px; }
+.split-panel input { padding: 6px 10px; border: 1px solid var(--border-strong); border-radius: var(--radius-sm); }
@media (max-width: 768px) {
.detail { padding: 16px; }
diff --git a/src/components/EventList.vue b/src/components/EventList.vue
index 2825296..38cf710 100644
--- a/src/components/EventList.vue
+++ b/src/components/EventList.vue
@@ -42,38 +42,39 @@ function dowFor(ev) {
diff --git a/src/components/HeaderBar.vue b/src/components/HeaderBar.vue
index b5c8540..9b66f53 100644
--- a/src/components/HeaderBar.vue
+++ b/src/components/HeaderBar.vue
@@ -51,24 +51,26 @@ function onDownload() {
diff --git a/src/components/WeekPreview.vue b/src/components/WeekPreview.vue
index 938bcea..e557f9e 100644
--- a/src/components/WeekPreview.vue
+++ b/src/components/WeekPreview.vue
@@ -241,35 +241,36 @@ function tooltip(ev) {
}
.nav-btn {
padding: 5px 14px;
- border: 1px solid #d5dbdb;
- border-radius: 6px;
- background: #fff;
+ border: 1px solid var(--border-strong);
+ border-radius: var(--radius-sm);
+ background: var(--bg);
cursor: pointer;
font-size: 13px;
- color: #2c3e50;
+ color: var(--text-primary);
+ transition: background var(--transition);
}
-.nav-btn:hover { background: #ecf0f1; }
-.today-btn { border-color: #3498db; color: #3498db; font-weight: 600; }
-.today-btn:hover { background: #eaf4fc; }
-.collapse-btn { border-color: #9b59b6; color: #9b59b6; font-weight: 600; }
-.collapse-btn:hover { background: #f4ecf7; }
+.nav-btn:hover { background: var(--surface); }
+.today-btn { border-color: var(--accent); color: var(--accent); font-weight: 600; }
+.today-btn:hover { background: var(--accent-weak); }
+.collapse-btn { border-color: var(--accent); color: var(--accent); font-weight: 600; }
+.collapse-btn:hover { background: var(--accent-weak); }
.empty-hint {
font-size: 13px;
- color: #95a5a6;
+ color: var(--text-tertiary);
font-style: italic;
}
.week-label {
font-size: 16px;
font-weight: 600;
- color: #2c3e50;
+ color: var(--text-primary);
min-width: 200px;
text-align: center;
}
.week-grid-wrapper {
flex: 1;
overflow: auto;
- border: 1px solid #e0e3e6;
- border-radius: 8px;
+ border: 1px solid var(--border);
+ border-radius: var(--radius-sm);
}
.week-grid {
display: flex;
@@ -278,28 +279,28 @@ function tooltip(ev) {
.time-col {
width: 56px;
flex-shrink: 0;
- border-right: 1px solid #e0e3e6;
+ border-right: 1px solid var(--border);
}
.time-spacer {
height: 40px;
- border-bottom: 1px solid #e0e3e6;
+ border-bottom: 1px solid var(--border);
}
.time-slot {
font-size: 11px;
- color: #95a5a6;
+ color: var(--text-tertiary);
text-align: right;
padding-right: 6px;
- border-bottom: 1px solid #f0f0f0;
+ border-bottom: 1px solid var(--surface-2);
}
/* 非工作时段 (8:00 前 / 22:00 后) 淡灰 */
.time-slot.off-hour {
- color: #c4ccd0;
- background: #f7f8f9;
+ color: var(--text-tertiary);
+ background: var(--surface);
}
.day-col {
flex: 1;
min-width: 0;
- border-right: 1px solid #e0e3e6;
+ border-right: 1px solid var(--border);
}
.day-col:last-child { border-right: none; }
.day-header {
@@ -310,13 +311,13 @@ function tooltip(ev) {
justify-content: center;
font-size: 12px;
font-weight: 600;
- color: #2c3e50;
- border-bottom: 1px solid #e0e3e6;
- background: #f8f9fa;
+ color: var(--text-primary);
+ border-bottom: 1px solid var(--border);
+ background: var(--surface);
}
.day-header.is-today {
- background: #eaf4fc;
- color: #3498db;
+ background: var(--accent-weak);
+ color: var(--accent);
}
.day-date {
font-size: 14px;
@@ -329,10 +330,10 @@ function tooltip(ev) {
position: absolute;
left: 0;
right: 0;
- border-bottom: 1px solid #f0f0f0;
+ border-bottom: 1px solid var(--surface-2);
}
.hour-line.off-hour {
- background: #f7f8f9;
+ background: var(--surface);
}
.event-block {
position: absolute;
diff --git a/src/styles/global.css b/src/styles/global.css
index 7db76db..2feba2a 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -1,9 +1,52 @@
-/* 全局重置 -- 仅独立 app（main.js）加载。
- 作为组件被嵌入时由宿主提供重置，本文件不参与，避免污染宿主。 */
+/* 全局重置 + 设计令牌 -- 仅独立 app（main.js）加载。
+ 作为组件被嵌入时由宿主(mainPage)提供 :root 令牌，本文件的重置仍安全（与宿主一致）。
+ 令牌值与 mainPage src/styles/variables.css 对齐，保证独立与嵌入视觉一致。 */
* { box-sizing: border-box; margin: 0; padding: 0; }
body {
- font-family: -apple-system, "Segoe UI", Roboto, "Microsoft YaHei", sans-serif;
- background: #f5f6f8;
- color: #222;
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC",
+ "Microsoft YaHei", sans-serif;
+ background: var(--bg, #ffffff);
+ color: var(--text-primary, #1f2329);
line-height: 1.5;
+ -webkit-font-smoothing: antialiased;
+}
+
+:root {
+ /* 背景/表面 */
+ --bg: #ffffff;
+ --surface: #f7f8fa;
+ --surface-2: #f0f2f5;
+
+ /* 文字 */
+ --text-primary: #1f2329;
+ --text-secondary: #6b7280;
+ --text-tertiary: #9ca3af;
+
+ /* 强调色（靛蓝，与 mainPage 一致） */
+ --accent: #4f46e5;
+ --accent-weak: #eef2ff;
+ --accent-hover: #4338ca;
+
+ /* 线/边 */
+ --border: #eceef1;
+ --border-strong: #e0e2e6;
+
+ /* 语义色 */
+ --success: #2e7d32;
+ --success-weak: #e8f5e9;
+ --danger: #c62828;
+ --danger-weak: #fbe9e7;
+ --warn: #e65100;
+ --warn-weak: #fff3e0;
+
+ /* 圆角 */
+ --radius-sm: 8px;
+ --radius: 12px;
+
+ /* 阴影 */
+ --shadow: 0 1px 3px rgba(17, 24, 39, 0.06), 0 1px 2px rgba(17, 24, 39, 0.04);
+ --shadow-hover: 0 6px 16px rgba(17, 24, 39, 0.08), 0 2px 6px rgba(17, 24, 39, 0.05);
+
+ /* 过渡 */
+ --transition: 0.18s ease;
}