From 50191a8a4bb6415b2cc08fca54a8260cefae59b2 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Sun, 11 Jan 2026 22:10:33 +0800
Subject: [PATCH 01/20] =?UTF-8?q?refactor:=20:sparkles:=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8json=E5=AD=98=E5=82=A8=E4=BD=9C=E4=B8=9A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 homework.js         | 104 ++++++++++++++++++++++++++++++++++++++++++++
 main.js             |  39 +++++++++++++++++
 pages/homework.html |  46 +++++++++++---------
 pages/index.html    |  80 +++++++++++++++++++++-------------
 4 files changed, 218 insertions(+), 51 deletions(-)
 create mode 100644 homework.js

diff --git a/homework.js b/homework.js
new file mode 100644
index 0000000..4e10bd5
--- /dev/null
+++ b/homework.js
@@ -0,0 +1,104 @@
+const path = require('path');
+const fs = require('fs');
+const { app } = require('electron/main');
+
+let HOMEWORK_PATH;
+
+// 初始化作业数据路径
+const initHomeworkPath = () => {
+  if (app.isPackaged) {
+    // 在打包应用中，将作业数据存储在可执行文件的同级目录
+    const appDir = path.dirname(app.getPath('exe'));
+    const DATA_DIR = path.join(appDir, 'data');
+    HOMEWORK_PATH = path.join(DATA_DIR, 'homework.json');
+  } else {
+    HOMEWORK_PATH = path.join(__dirname, 'data/homework.json');
+  }
+};
+
+// 确保数据目录存在
+const ensureDataDir = () => {
+  const dir = path.dirname(HOMEWORK_PATH);
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+};
+
+// 读取作业数据
+const loadHomework = () => {
+  try {
+    if (fs.existsSync(HOMEWORK_PATH)) {
+      const data = fs.readFileSync(HOMEWORK_PATH, 'utf8');
+      const parsed = JSON.parse(data);
+      // 确保返回的是数组格式
+      return Array.isArray(parsed) ? parsed : [];
+    }
+  } catch (err) {
+    console.warn('读取作业数据失败:', err);
+  }
+  return [];
+};
+
+// 保存作业数据
+const saveHomework = (homeworkList) => {
+  try {
+    ensureDataDir();
+    fs.writeFileSync(HOMEWORK_PATH, JSON.stringify(homeworkList, null, 2));
+  } catch (err) {
+    console.error('保存作业数据失败:', err);
+  }
+};
+
+// 添加新作业
+const addHomework = (homework) => {
+  try {
+    const homeworkList = loadHomework();
+    homeworkList.unshift(homework); // 添加到开头
+    saveHomework(homeworkList);
+    return homeworkList;
+  } catch (err) {
+    console.error('添加作业失败:', err);
+    return [];
+  }
+};
+
+// 删除作业
+const deleteHomework = (index) => {
+  try {
+    const homeworkList = loadHomework();
+    if (index >= 0 && index < homeworkList.length) {
+      homeworkList.splice(index, 1);
+      saveHomework(homeworkList);
+      return homeworkList;
+    }
+    return homeworkList;
+  } catch (err) {
+    console.error('删除作业失败:', err);
+    return [];
+  }
+};
+
+// 更新作业
+const updateHomework = (index, homework) => {
+  try {
+    const homeworkList = loadHomework();
+    if (index >= 0 && index < homeworkList.length) {
+      homeworkList[index] = homework;
+      saveHomework(homeworkList);
+      return homeworkList;
+    }
+    return homeworkList;
+  } catch (err) {
+    console.error('更新作业失败:', err);
+    return [];
+  }
+};
+
+module.exports = {
+  initHomeworkPath,
+  loadHomework,
+  saveHomework,
+  addHomework,
+  deleteHomework,
+  updateHomework
+};
\ No newline at end of file
diff --git a/main.js b/main.js
index 79e4334..01060db 100644
--- a/main.js
+++ b/main.js
@@ -19,6 +19,15 @@ const {
 	createSettingHandler,
 } = require('./config');
 
+// 作业数据管理
+const {
+	initHomeworkPath,
+	loadHomework,
+	addHomework,
+	deleteHomework,
+	updateHomework
+} = require('./homework');
+
 // 启动台
 const {
 	addLaunchpadApp,
@@ -33,6 +42,9 @@ let resourcesRoot = path.resolve(app.getAppPath());
 // 初始化配置路径
 initConfigPath(resourcesRoot);
 
+// 初始化作业数据路径
+initHomeworkPath();
+
 if (app.isPackaged) {
 	iconPath = path.join(resourcesRoot, "assets/logo.png");
 } else {
@@ -423,10 +435,37 @@ app.whenReady().then(() => {
 
 	// 监听保存作业的请求
 	ipcMain.on('save-homework', (event, homework) => {
+		// 添加新作业到JSON文件
+		const updatedHomeworkList = addHomework(homework);
+		
 		// 将作业数据发送回主窗口
 		if (mainWindow) {
 			mainWindow.webContents.send('new-homework', homework);
 		}
+		
+		// 通知作业列表窗口刷新数据
+		if (homeworkListWindow) {
+			homeworkListWindow.webContents.send('refresh-homework-list');
+		}
+	});
+
+	// 监听获取作业列表的请求
+	ipcMain.on('get-homework-list', (event) => {
+		const homeworkList = loadHomework();
+		event.reply('homework-list-response', homeworkList);
+	});
+
+	// 监听删除作业的请求
+	ipcMain.on('delete-homework', (event, index) => {
+		const updatedHomeworkList = deleteHomework(index);
+		
+		// 通知所有相关窗口更新作业列表
+		if (mainWindow) {
+			mainWindow.webContents.send('refresh-homework-list');
+		}
+		if (homeworkListWindow) {
+			homeworkListWindow.webContents.send('refresh-homework-list');
+		}
 	});
 
 	// 监听作业窗口关闭事件
diff --git a/pages/homework.html b/pages/homework.html
index 05be468..9490353 100644
--- a/pages/homework.html
+++ b/pages/homework.html
@@ -62,7 +62,6 @@ <h2>作业列表</h2>
 
     <script>
         const { ipcRenderer } = require('electron');
-
         // 作业数据
         let homeworkData = [];
         let filteredHomework = [];
@@ -79,14 +78,32 @@ <h2>作业列表</h2>
         // 获取所有作业数据
         function getAllHomework() {
             try {
-                const data = localStorage.getItem('homeworkData');
-                return data ? JSON.parse(data) : [];
+                // 请求作业列表
+                ipcRenderer.send('get-homework-list');
+                
+                // 监听响应
+                ipcRenderer.on('homework-list-response', (event, homeworkList) => {
+                    homeworkData = homeworkList;
+                    filterAndSortHomework();
+                });
             } catch (e) {
                 console.error('获取作业数据失败:', e);
                 return [];
             }
         }
 
+        // 删除作业
+        function deleteHomework(index) {
+            if (confirm('确定要删除这个作业吗？')) {
+                try {
+                    const { ipcRenderer } = require('electron');
+                    ipcRenderer.send('delete-homework', index);
+                } catch (e) {
+                    console.error('删除作业失败:', e);
+                }
+            }
+        }
+
         // 渲染作业列表
         function renderHomeworkList(homeworkList) {
             if (homeworkList.length === 0) {
@@ -235,15 +252,6 @@ <h2>作业列表</h2>
             });
         }
 
-        // 删除作业
-        function deleteHomework(index) {
-            if (confirm('确定要删除这个作业吗？')) {
-                homeworkData.splice(index, 1);
-                localStorage.setItem('homeworkData', JSON.stringify(homeworkData));
-                filterAndSortHomework();
-            }
-        }
-
         // 打开作业详情
         function openHomeworkDetail(homework) {
             ipcRenderer.send('open-homework-detail-window', homework);
@@ -259,10 +267,9 @@ <h2>作业列表</h2>
 
         // 初始化
         function init() {
-            homeworkData = getAllHomework();
-            filterAndSortHomework();
-
-            // 事件监听器
+            getAllHomework(); // 改为从主进程获取作业数据
+            
+            // 其他初始化代码保持不变
             searchInput.addEventListener('input', filterAndSortHomework);
             subjectFilter.addEventListener('change', filterAndSortHomework);
             sortOrder.addEventListener('change', filterAndSortHomework);
@@ -277,15 +284,12 @@ <h2>作业列表</h2>
 
             // 监听来自主进程的新作业通知
             ipcRenderer.on('new-homework', (event, homework) => {
-                homeworkData.unshift(homework); // 添加到开头
-                localStorage.setItem('homeworkData', JSON.stringify(homeworkData));
-                filterAndSortHomework();
+                getAllHomework(); // 重新获取作业列表
             });
 
             // 监听作业更新通知
             ipcRenderer.on('refresh-homework-list', () => {
-                homeworkData = getAllHomework();
-                filterAndSortHomework();
+                getAllHomework(); // 重新获取作业列表
             });
         }
 
diff --git a/pages/index.html b/pages/index.html
index 84b7113..2af33a5 100644
--- a/pages/index.html
+++ b/pages/index.html
@@ -277,9 +277,39 @@ <h3>启动台</h3>
         const addHomeworkBtn = document.getElementById('addHomeworkBtn');
         const homeworkList = document.getElementById('homeworkList');
         const launchpadCard = document.getElementById('launchpadCard');
+        // 从json加载作业数据
+        let homeworkData = [];
+
+        // 获取作业列表
+        function fetchHomeworkList() {
+            const { ipcRenderer } = require('electron');
+            // 请求作业列表
+            ipcRenderer.send('get-homework-list');
+            
+            // 监听响应
+            ipcRenderer.on('homework-list-response', (event, homeworkList) => {
+                homeworkData = homeworkList;
+                renderHomeworkList();
+            });
+        }
 
-        // 从localStorage加载作业数据
-        let homeworkData = JSON.parse(localStorage.getItem('homeworkData')) || [];
+        // 添加获取科目名称的函数
+        function getSubjectName(subjectKey) {
+            const subjectNames = {
+                'chinese': '语文',
+                'math': '数学',
+                'english': '英语',
+                'physics': '物理',
+                'chemistry': '化学',
+                'biology': '生物',
+                'politics': '政治',
+                'history': '历史',
+                'geography': '地理',
+                'technology': '技术'
+            };
+            
+            return subjectNames[subjectKey] || subjectKey; // 如果找不到对应名称，则返回原始键值
+        }
 
         // 显示作业列表
         function renderHomeworkList() {
@@ -327,30 +357,20 @@ <h3>启动台</h3>
             document.querySelectorAll('.delete-btn').forEach(button => {
                 button.addEventListener('click', function() {
                     const index = parseInt(this.getAttribute('data-index'));
-                    homeworkData.splice(index, 1);
-                    localStorage.setItem('homeworkData', JSON.stringify(homeworkData));
-                    renderHomeworkList();
+                    if (typeof require !== 'undefined') {
+                        try {
+                            const { ipcRenderer } = require('electron');
+                            ipcRenderer.send('delete-homework', index);
+                        } catch (e) {
+                            console.log('Not in Electron environment');
+                        }
+                    } else {
+                        console.log('Not in Electron environment');
+                    }
                 });
             });
         }
 
-        // 获取科目名称
-        function getSubjectName(subjectValue) {
-            const subjects = {
-                'chinese': '语文',
-                'math': '数学',
-                'english': '英语',
-                'physics': '物理',
-                'chemistry': '化学',
-                'biology': '生物',
-                'history': '历史',
-                'geography': '地理',
-                'politics': '道法',
-                'other': '其他'
-            };
-            return subjects[subjectValue] || subjectValue;
-        }
-
         // 打开新窗口添加作业
         addHomeworkBtn.addEventListener('click', () => {
             // 检查是否在 Electron 环境中
@@ -367,6 +387,7 @@ <h3>启动台</h3>
                 console.log('Not in Electron environment');
             }
         });
+
         // 接收来自新窗口的作业数据和开关状态
         if (typeof require !== 'undefined') {
             try {
@@ -376,14 +397,13 @@ <h3>启动台</h3>
 
                 // 监听新作业数据
                 ipcRenderer.on('new-homework', (event, homework) => {
-                    // 添加新作业
-                    homeworkData.push(homework);
-
-                    // 保存到localStorage
-                    localStorage.setItem('homeworkData', JSON.stringify(homeworkData));
+                    // 重新获取最新的作业列表
+                    fetchHomeworkList();
+                });
 
-                    // 重新渲染作业列表
-                    renderHomeworkList();
+                // 监听作业列表刷新
+                ipcRenderer.on('refresh-homework-list', (event) => {
+                    fetchHomeworkList();
                 });
 
                 // 监听时钟开关事件
@@ -424,7 +444,7 @@ <h3>启动台</h3>
 
         // 初始化作业列表
         updateHomeworkVisibility(); // 初始化作业可见性
-        renderHomeworkList();
+        fetchHomeworkList(); // 改为从主进程获取作业列表
 
         // 初始化启动台
         updateLaunchpadVisibility();

From 29c806a1e4050e7aeb75c19fd1d6146a90610347 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 00:00:18 +0800
Subject: [PATCH 02/20] =?UTF-8?q?refactor:=20:fire:=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E4=B8=BA=E5=A4=9A=E4=B8=AA=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/settings.css  |  55 ++++-
 main.js                  | 358 +++++++++++++++++++++++------
 pages/clock.html         | 173 ++++++++++++++
 pages/homework-list.html | 310 +++++++++++++++++++++++++
 pages/homework.html      | 483 +++++++++++++++++++--------------------
 pages/index.html         | 454 ------------------------------------
 pages/launchpad.html     | 196 ++++++++++++++++
 pages/settings.html      | 167 +++++++++-----
 8 files changed, 1367 insertions(+), 829 deletions(-)
 create mode 100644 pages/clock.html
 create mode 100644 pages/homework-list.html
 delete mode 100644 pages/index.html
 create mode 100644 pages/launchpad.html

diff --git a/assets/css/settings.css b/assets/css/settings.css
index 1d86297..2aa1852 100644
--- a/assets/css/settings.css
+++ b/assets/css/settings.css
@@ -1,7 +1,60 @@
 .container {
     background: white;
-    padding: 24px;
+    padding-top: 40px;
     box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+    height: calc(100vh - 32px); /* 调整高度以适应标题栏 */
+}
+
+.settings-layout {
+    display: flex;
+    height: 100%;
+    gap: 24px;
+}
+
+.sidebar {
+    width: 200px;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+}
+
+.tab {
+    height: 50px;
+    padding: 10px 12px;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 14px;
+    color: #605e5c;
+    transition: all 0.2s ease;
+}
+
+.tab:hover {
+    background-color: #f3f2f1;
+}
+
+.tab.active {
+    background-color: #0078d4;
+    color: #323130;
+    font-weight: 600;
+}
+
+.content {
+    flex: 1;
+    overflow-y: auto;
+}
+
+.tab-content {
+    display: none;
+}
+
+.tab-content.active {
+    display: block;
+    animation: fadeIn 0.3s ease;
+}
+
+@keyframes fadeIn {
+    from { opacity: 0; }
+    to { opacity: 1; }
 }
 
 /* 标题栏样式 */
diff --git a/main.js b/main.js
index 01060db..d9e33ff 100644
--- a/main.js
+++ b/main.js
@@ -77,10 +77,10 @@ const saveWindowPosition = (x, y) => {
 	saveConfig(config);
 };
 
-// 主窗口
-let mainWindow;
+// 时钟窗口
+let clockWindow;
 
-const createWindow = () => {
+const createClockWindow = () => {
 	const [defaultX, defaultY] = loadWindowPosition();
 
 	// 读取置顶设置
@@ -88,8 +88,9 @@ const createWindow = () => {
 	const isAlwaysOnTop = config.alwaysOnTop !== undefined ? config.alwaysOnTop : false;
 	const isDarkThemeEnabled = config.darkThemeEnabled !== undefined ? config.darkThemeEnabled : false; // 读取暗色主题设置
 
-	mainWindow = new BrowserWindow({
+	clockWindow = new BrowserWindow({
 		width: 300,
+		height: 150,
 		x: defaultX,
 		y: defaultY,
 		// 设置为无边框窗口
@@ -113,44 +114,215 @@ const createWindow = () => {
 		}
 	});
 
-	// 加载页面内容
-	mainWindow.loadFile('pages/index.html');
+	// 加载时钟页面内容
+	clockWindow.loadFile('pages/clock.html');
 
-	// 当主窗口 DOM 就绪时发送初始状态（时钟/作业/启动台/置顶/暗色主题）
-	mainWindow.webContents.once('dom-ready', () => {
-		mainWindow.webContents.send('clock-toggle', isClockEnabled);
-		mainWindow.webContents.send('homework-toggle', isHomeworkEnabled);
-		mainWindow.webContents.send('always-on-top-toggle', isAlwaysOnTop); // 发送置顶状态
-		mainWindow.webContents.send('dark-theme-toggle', isDarkThemeEnabled); // 发送暗色主题状态
-		mainWindow.webContents.send('launchpad-apps-updated', getLaunchpadApps());
+	// 当窗口 DOM 就绪时发送初始状态
+	clockWindow.webContents.once('dom-ready', () => {
+		clockWindow.webContents.send('clock-toggle', isClockEnabled);
+		clockWindow.webContents.send('always-on-top-toggle', isAlwaysOnTop); // 发送置顶状态
+		clockWindow.webContents.send('dark-theme-toggle', isDarkThemeEnabled); // 发送暗色主题状态
 	});
 
 	// 监听窗口移动事件，保存位置
-	mainWindow.on('moved', () => {
-		const [x, y] = mainWindow.getPosition();
-		saveWindowPosition(x, y);
+	clockWindow.on('moved', () => {
+		const [x, y] = clockWindow.getPosition();
+		// 保存时钟窗口位置
+		const config = loadConfig();
+		config.clockWindow = { x, y };
+		saveConfig(config);
 	});
 
 	// 监听窗口关闭事件，保存位置
-	mainWindow.on('close', () => {
-		const [x, y] = mainWindow.getPosition();
-		saveWindowPosition(x, y);
+	clockWindow.on('close', () => {
+		const [x, y] = clockWindow.getPosition();
+		// 保存时钟窗口位置
+		const config = loadConfig();
+		config.clockWindow = { x, y };
+		saveConfig(config);
 	});
 
-	return mainWindow;
+	return clockWindow;
 };
 
-// 作业添加窗口
-let homeworkWindow;
+// 作业窗口
+let homeworkWindowSplit;
 
-const createHomeworkWindow = () => {
+const createHomeworkWindowSplit = () => {
+	const config = loadConfig();
+	let defaultX, defaultY;
+	
+	// 尝试从配置中读取作业窗口位置，如果没有则使用默认位置
+	if (config.homeworkWindow?.x !== undefined && config.homeworkWindow?.y !== undefined) {
+		defaultX = config.homeworkWindow.x;
+		defaultY = config.homeworkWindow.y;
+	} else {
+		const [origX, origY] = loadWindowPosition(); // 使用原始默认位置作为基础
+		defaultX = origX;
+		defaultY = origY + 160; // 在时钟窗口下方
+	}
+
+	const isAlwaysOnTop = config.alwaysOnTop !== undefined ? config.alwaysOnTop : false;
+	const isDarkThemeEnabled = config.darkThemeEnabled !== undefined ? config.darkThemeEnabled : false; // 读取暗色主题设置
+
+	homeworkWindowSplit = new BrowserWindow({
+		width: 300,
+		height: 300,
+		x: defaultX,
+		y: defaultY,
+		// 设置为无边框窗口
+		frame: false,
+		// 根据配置设置是否置顶
+		alwaysOnTop: isAlwaysOnTop,
+		// 设置窗口层级为桌面窗口
+		type: 'desktop',
+		// 背景透明
+		transparent: true,
+		// 可调整大小
+		resizable: true,
+		// 不显示在任务栏
+		skipTaskbar: true,
+		// 焦点丢失时是否隐藏窗口
+		focusable: false,
+		webPreferences: {
+			nodeIntegration: true,
+			contextIsolation: false,
+			preload: path.join(__dirname, 'assets/js/main.js')
+		}
+	});
+
+	// 加载作业页面内容
+	homeworkWindowSplit.loadFile('pages/homework.html');
+
+	// 当窗口 DOM 就绪时发送初始状态
+	homeworkWindowSplit.webContents.once('dom-ready', () => {
+		homeworkWindowSplit.webContents.send('homework-toggle', isHomeworkEnabled);
+		homeworkWindowSplit.webContents.send('always-on-top-toggle', isAlwaysOnTop); // 发送置顶状态
+		homeworkWindowSplit.webContents.send('dark-theme-toggle', isDarkThemeEnabled); // 发送暗色主题状态
+		homeworkWindowSplit.webContents.send('launchpad-apps-updated', getLaunchpadApps()); // 发送启动台应用数据
+	});
+
+	// 监听窗口移动事件，保存位置
+	homeworkWindowSplit.on('moved', () => {
+		const [x, y] = homeworkWindowSplit.getPosition();
+		// 保存作业窗口位置
+		const config = loadConfig();
+		config.homeworkWindow = { x, y };
+		saveConfig(config);
+	});
+
+	// 监听窗口关闭事件，保存位置
+	homeworkWindowSplit.on('close', () => {
+		const [x, y] = homeworkWindowSplit.getPosition();
+		// 保存作业窗口位置
+		const config = loadConfig();
+		config.homeworkWindow = { x, y };
+		saveConfig(config);
+	});
+
+	return homeworkWindowSplit;
+};
+
+// 启动台窗口
+let launchpadWindow;
+
+const createLaunchpadWindow = () => {
+	const config = loadConfig();
+	let defaultX, defaultY;
+	
+	// 尝试从配置中读取启动台窗口位置，如果没有则使用默认位置
+	if (config.launchpadWindow?.x !== undefined && config.launchpadWindow?.y !== undefined) {
+		defaultX = config.launchpadWindow.x;
+		defaultY = config.launchpadWindow.y;
+	} else {
+		const [origX, origY] = loadWindowPosition(); // 使用原始默认位置作为基础
+		defaultX = origX;
+		defaultY = origY + 470; // 在作业窗口下方
+	}
+
+	const isAlwaysOnTop = config.alwaysOnTop !== undefined ? config.alwaysOnTop : false;
+	const isDarkThemeEnabled = config.darkThemeEnabled !== undefined ? config.darkThemeEnabled : false; // 读取暗色主题设置
+
+	launchpadWindow = new BrowserWindow({
+		width: 300,
+		height: 200,
+		x: defaultX,
+		y: defaultY,
+		// 设置为无边框窗口
+		frame: false,
+		// 根据配置设置是否置顶
+		alwaysOnTop: isAlwaysOnTop,
+		// 设置窗口层级为桌面窗口
+		type: 'desktop',
+		// 背景透明
+		transparent: true,
+		// 可调整大小
+		resizable: true,
+		// 不显示在任务栏
+		skipTaskbar: true,
+		// 焦点丢失时是否隐藏窗口
+		focusable: false,
+		webPreferences: {
+			nodeIntegration: true,
+			contextIsolation: false,
+			preload: path.join(__dirname, 'assets/js/main.js')
+		}
+	});
+
+	// 加载启动台页面内容
+	launchpadWindow.loadFile('pages/launchpad.html');
+
+	// 当窗口 DOM 就绪时发送初始状态
+	launchpadWindow.webContents.once('dom-ready', () => {
+		launchpadWindow.webContents.send('always-on-top-toggle', isAlwaysOnTop); // 发送置顶状态
+		launchpadWindow.webContents.send('dark-theme-toggle', isDarkThemeEnabled); // 发送暗色主题状态
+		launchpadWindow.webContents.send('launchpad-apps-updated', getLaunchpadApps()); // 发送启动台应用数据
+	});
+
+	// 监听窗口移动事件，保存位置
+	launchpadWindow.on('moved', () => {
+		const [x, y] = launchpadWindow.getPosition();
+		// 保存启动台窗口位置
+		const config = loadConfig();
+		config.launchpadWindow = { x, y };
+		saveConfig(config);
+	});
+
+	// 监听窗口关闭事件，保存位置
+	launchpadWindow.on('close', () => {
+		const [x, y] = launchpadWindow.getPosition();
+		// 保存启动台窗口位置
+		const config = loadConfig();
+		config.launchpadWindow = { x, y };
+		saveConfig(config);
+	});
+
+	return launchpadWindow;
+};
+
+// 创建所有组件窗口
+const createAllWindows = () => {
+	if (isClockEnabled) {
+		createClockWindow();
+	}
+	if (isHomeworkEnabled) {
+		createHomeworkWindowSplit();
+	}
+	// 启动台总是创建，因为它依赖于应用列表，即使没有应用也需要显示
+	createLaunchpadWindow();
+};
+
+// 作业添加窗口 (用于添加新作业的小窗口)
+let homeworkAddWindow;
+
+const createHomeworkAddWindow = () => {
 	// 如果窗口已经存在，就聚焦它
-	if (homeworkWindow) {
-		homeworkWindow.focus();
+	if (homeworkAddWindow) {
+		homeworkAddWindow.focus();
 		return;
 	}
 
-	homeworkWindow = new BrowserWindow({
+	homeworkAddWindow = new BrowserWindow({
 		icon: iconPath,
 		frame: false,
 		alwaysOnTop: true,
@@ -162,12 +334,12 @@ const createHomeworkWindow = () => {
 	});
 
 	// 加载作业表单页面
-	homeworkWindow.loadFile('pages/homework-form.html');
-	homeworkWindow.setMenu(null);
+	homeworkAddWindow.loadFile('pages/homework-form.html');
+	homeworkAddWindow.setMenu(null);
 
 	// 窗口关闭时清理引用
-	homeworkWindow.on('closed', () => {
-		homeworkWindow = null;
+	homeworkAddWindow.on('closed', () => {
+		homeworkAddWindow = null;
 	});
 };
 // 作业列表窗口
@@ -192,7 +364,7 @@ const createHomeworkListWindow = () => {
 		}
 	});
 
-	homeworkListWindow.loadFile('pages/homework.html');
+	homeworkListWindow.loadFile('pages/homework-list.html');
 	homeworkListWindow.setMenu(null);
 
 	// 窗口关闭时清理引用
@@ -299,40 +471,37 @@ const alwaysOnTopSettingHandler = createSettingHandler('alwaysOnTop', 'always-on
 // 添加暗色主题设置处理程序
 const darkThemeSettingHandler = createSettingHandler('darkThemeEnabled', 'dark-theme-toggle');
 
+// 添加开机自启设置处理程序
+const startupSettingHandler = createSettingHandler('startupEnabled', 'startup-toggle');
+
 let isClockEnabled = clockSettingHandler.load();
 let isHomeworkEnabled = homeworkSettingHandler.load();
-let isAlwaysOnTop = alwaysOnTopSettingHandler.load(); // 添加置顶状态变量
-let isDarkThemeEnabled = darkThemeSettingHandler.load(); // 添加暗色主题状态变量
+let isAlwaysOnTop = alwaysOnTopSettingHandler.load(); // 置顶状态变量
+let isDarkThemeEnabled = darkThemeSettingHandler.load(); // 暗色主题状态变量
+let isStartupEnabled = startupSettingHandler.load(); // 开机自启状态变量
 
 const handleClockToggle = (isEnabled) => {
 	isClockEnabled = isEnabled;
-	clockSettingHandler.handleToggle(isEnabled, mainWindow);
+	clockSettingHandler.handleToggle(isEnabled, clockWindow);
 };
 
 const handleHomeworkToggle = (isEnabled) => {
 	isHomeworkEnabled = isEnabled;
-	homeworkSettingHandler.handleToggle(isEnabled, mainWindow);
-};
-
-// 添加置顶切换处理函数
-const handleAlwaysOnTopToggle = (isEnabled) => {
-	isAlwaysOnTop = isEnabled;
-	alwaysOnTopSettingHandler.handleToggle(isEnabled, mainWindow);
-
-	// 立即应用置顶设置
-	if (mainWindow) {
-		mainWindow.setAlwaysOnTop(isEnabled);
-	}
+	homeworkSettingHandler.handleToggle(isEnabled, homeworkWindowSplit);
 };
 
 // 暗色主题切换处理函数
 const handleDarkThemeToggle = (isEnabled) => {
 	isDarkThemeEnabled = isEnabled;
-	darkThemeSettingHandler.handleToggle(isEnabled, mainWindow);
-
-	// 通知主窗口更新主题
-	if (mainWindow) {
-		mainWindow.webContents.send('dark-theme-toggle', isEnabled);
+	// 通知所有窗口更新主题
+	if (clockWindow) {
+		clockWindow.webContents.send('dark-theme-toggle', isEnabled);
+	}
+	if (homeworkWindowSplit) {
+		homeworkWindowSplit.webContents.send('dark-theme-toggle', isEnabled);
+	}
+	if (launchpadWindow) {
+		launchpadWindow.webContents.send('dark-theme-toggle', isEnabled);
 	}
 };
 
@@ -341,11 +510,12 @@ let tray;
 const icon = nativeImage.createFromPath(iconPath);
 
 // 应用准备就绪时
-app.whenReady().then(() => {
-	isClockEnabled = clockSettingHandler.load();
-	isHomeworkEnabled = homeworkSettingHandler.load();
-	isAlwaysOnTop = alwaysOnTopSettingHandler.load(); // 加载置顶设置
-	isDarkThemeEnabled = darkThemeSettingHandler.load(); // 加载暗色主题设置
+	app.whenReady().then(() => {
+		isClockEnabled = clockSettingHandler.load();
+		isHomeworkEnabled = homeworkSettingHandler.load();
+		isAlwaysOnTop = alwaysOnTopSettingHandler.load(); // 加载置顶设置
+		isDarkThemeEnabled = darkThemeSettingHandler.load(); // 加载暗色主题设置
+		isStartupEnabled = startupSettingHandler.load(); // 加载开机自启设置
 
 	// 如果是首次运行，显示欢迎页；否则直接创建主窗口
 	const appConfig = loadConfig();
@@ -371,7 +541,7 @@ app.whenReady().then(() => {
 	if (appConfig.firstRun === undefined || appConfig.firstRun) {
 		createWelcomeWindow();
 	} else {
-		createWindow();
+		createAllWindows();
 	}
 
 	tray = new Tray(icon);
@@ -429,7 +599,7 @@ app.whenReady().then(() => {
 	// 监听打开作业窗口的请求
 	ipcMain.on('open-homework-window', () => {
 		if (isHomeworkEnabled) { // 只有时作业功能启用时才打开窗口
-			createHomeworkWindow();
+			createHomeworkAddWindow();
 		}
 	});
 
@@ -438,9 +608,9 @@ app.whenReady().then(() => {
 		// 添加新作业到JSON文件
 		const updatedHomeworkList = addHomework(homework);
 		
-		// 将作业数据发送回主窗口
-		if (mainWindow) {
-			mainWindow.webContents.send('new-homework', homework);
+		// 将作业数据发送回作业窗口
+		if (homeworkWindowSplit) {
+			homeworkWindowSplit.webContents.send('new-homework', homework);
 		}
 		
 		// 通知作业列表窗口刷新数据
@@ -460,8 +630,8 @@ app.whenReady().then(() => {
 		const updatedHomeworkList = deleteHomework(index);
 		
 		// 通知所有相关窗口更新作业列表
-		if (mainWindow) {
-			mainWindow.webContents.send('refresh-homework-list');
+		if (homeworkWindowSplit) {
+			homeworkWindowSplit.webContents.send('refresh-homework-list');
 		}
 		if (homeworkListWindow) {
 			homeworkListWindow.webContents.send('refresh-homework-list');
@@ -470,7 +640,7 @@ app.whenReady().then(() => {
 
 	// 监听作业窗口关闭事件
 	ipcMain.on('homework-window-closed', () => {
-		homeworkWindow = null;
+		homeworkAddWindow = null;
 	});
 
 	// 监听获取设置的请求
@@ -481,6 +651,7 @@ app.whenReady().then(() => {
 				homeworkEnabled: isHomeworkEnabled,
 				alwaysOnTop: isAlwaysOnTop, // 添加置顶状态
 				darkThemeEnabled: isDarkThemeEnabled, // 添加暗色主题状态
+				startupEnabled: isStartupEnabled, // 添加开机自启状态
 				launchpadApps: getLaunchpadApps()
 			});
 		}
@@ -489,16 +660,37 @@ app.whenReady().then(() => {
 	// 监听时钟开关变化
 	ipcMain.on('toggle-clock', (event, isEnabled) => {
 		handleClockToggle(isEnabled);
+		if (isEnabled && !clockWindow) {
+			createClockWindow();
+		} else if (!isEnabled && clockWindow) {
+			clockWindow.close();
+			clockWindow = null;
+		}
 	});
 
 	// 监听作业开关变化
 	ipcMain.on('toggle-homework', (event, isEnabled) => {
 		handleHomeworkToggle(isEnabled);
+		if (isEnabled && !homeworkWindowSplit) {
+			createHomeworkWindowSplit();
+		} else if (!isEnabled && homeworkWindowSplit) {
+			homeworkWindowSplit.close();
+			homeworkWindowSplit = null;
+		}
 	});
 
 	// 监听置顶开关变化
 	ipcMain.on('toggle-always-on-top', (event, isEnabled) => {
-		handleAlwaysOnTopToggle(isEnabled);
+		// 更新所有窗口的置顶状态
+		if (clockWindow) {
+			clockWindow.setAlwaysOnTop(isEnabled);
+		}
+		if (homeworkWindowSplit) {
+			homeworkWindowSplit.setAlwaysOnTop(isEnabled);
+		}
+		if (launchpadWindow) {
+			launchpadWindow.setAlwaysOnTop(isEnabled);
+		}
 	});
 
 	// 监听暗色主题开关变化
@@ -506,13 +698,36 @@ app.whenReady().then(() => {
 		handleDarkThemeToggle(isEnabled);
 	});
 
+	// 监听开机自启开关变化
+	ipcMain.on('toggle-startup', (event, isEnabled) => {
+		isStartupEnabled = isEnabled;
+		startupSettingHandler.handleToggle(isEnabled);
+		
+		if (isEnabled) {
+			// 启用开机自启
+			app.setLoginItemSettings({
+				openAtLogin: true,
+				path: app.getPath('exe')
+			});
+		} else {
+			// 禁用开机自启
+			app.setLoginItemSettings({
+				openAtLogin: false,
+				path: app.getPath('exe')
+			});
+		}
+	});
+
 	// 监听添加启动台应用
 	ipcMain.on('add-launchpad-app', (event, app) => {
 		const updatedApps = addLaunchpadApp(app);
 		if (updatedApps) {
 			// 通知所有窗口更新启动台应用列表
-			if (mainWindow) {
-				mainWindow.webContents.send('launchpad-apps-updated', updatedApps);
+			if (homeworkWindowSplit) {
+				homeworkWindowSplit.webContents.send('launchpad-apps-updated', updatedApps);
+			}
+			if (launchpadWindow) {
+				launchpadWindow.webContents.send('launchpad-apps-updated', updatedApps);
 			}
 			if (settingsWindow) {
 				settingsWindow.webContents.send('launchpad-apps-updated', updatedApps);
@@ -525,8 +740,11 @@ app.whenReady().then(() => {
 		const updatedApps = removeLaunchpadApp(index);
 		if (updatedApps !== null) {
 			// 通知所有窗口更新启动台应用列表
-			if (mainWindow) {
-				mainWindow.webContents.send('launchpad-apps-updated', updatedApps);
+			if (homeworkWindowSplit) {
+				homeworkWindowSplit.webContents.send('launchpad-apps-updated', updatedApps);
+			}
+			if (launchpadWindow) {
+				launchpadWindow.webContents.send('launchpad-apps-updated', updatedApps);
 			}
 			if (settingsWindow) {
 				settingsWindow.webContents.send('launchpad-apps-updated', updatedApps);
@@ -550,7 +768,7 @@ app.whenReady().then(() => {
 
 	app.on('activate', () => {
 		if (BrowserWindow.getAllWindows().length === 0) {
-			createWindow();
+			createAllWindows();
 		}
 	});
 });
diff --git a/pages/clock.html b/pages/clock.html
new file mode 100644
index 0000000..b100959
--- /dev/null
+++ b/pages/clock.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>时钟</title>
+    <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
+    <link rel="stylesheet" href="../assets/css/main.css">
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
+</head>
+
+<body>
+    <!-- 加载动画 -->
+    <div id="loading" class="loading-overlay">
+        <div class="loading-spinner"></div>
+        <p>加载中...</p>
+    </div>
+
+    <div class="content">
+        <!-- 时钟卡片 -->
+        <div class="card time-card" id="timeCard">
+            <h3>时间</h3>
+            <div class="time" id="time">00:00:00</div>
+            <div class="date" id="date">加载中</div>
+        </div>
+    </div>
+</body>
+<script>
+    // 导入 IPC 通信
+    const { ipcRenderer } = require('electron');
+
+    // 防止click事件在空白区域时被拦截
+    const timeCard = document.getElementById('timeCard');
+    if (timeCard) {
+        timeCard.addEventListener('mouseenter', () => 
+            ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
+        );
+        
+        timeCard.addEventListener('mouseleave', () => 
+            ipcRenderer.send('set-ignore-mouse-events', { 
+                ignore: true,
+                forward: true
+            })
+        );
+    }
+
+    // 添加时钟显示状态变量
+    let isClockVisible = true;
+    // 添加暗色主题状态变量
+    let isDarkThemeEnabled = false;
+
+    // 更新时间函数
+    function updateTime() {
+        if (!isClockVisible) {
+            // 如果时钟被禁用，隐藏时间元素
+            document.getElementById('timeCard').style.display = 'none';
+            return;
+        }
+
+        // 如果时钟启用，确保元素可见
+        document.getElementById('timeCard').style.display = 'block';
+        document.getElementById('time').style.display = 'block';
+        document.getElementById('date').style.display = 'block';
+        const timeHeaders = document.querySelectorAll('h3');
+        if (timeHeaders[0]) {
+            timeHeaders[0].style.display = 'block';
+        }
+
+        const now = new Date();
+
+        // 格式化时间
+        const hours = String(now.getHours()).padStart(2, '0');
+        const minutes = String(now.getMinutes()).padStart(2, '0');
+        const seconds = String(now.getSeconds()).padStart(2, '0');
+        const timeString = `${hours}:${minutes}:${seconds}`;
+
+        // 格式化日期
+        const year = now.getFullYear();
+        const month = String(now.getMonth() + 1).padStart(2, '0');
+        const day = String(now.getDate()).padStart(2, '0');
+        const weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+        const weekday = weekdays[now.getDay()];
+        const dateString = `${year}年${month}月${day}日 ${weekday}`;
+
+        // 更新显示
+        document.getElementById('time').textContent = timeString;
+        document.getElementById('date').textContent = dateString;
+    }
+
+    // 添加切换主题的函数
+    function toggleTheme(enabled) {
+        isDarkThemeEnabled = enabled;
+        
+        if (enabled) {
+            // 使用暗色主题CSS
+            const darkThemeLink = document.createElement('link');
+            darkThemeLink.rel = 'stylesheet';
+            darkThemeLink.href = '../assets/css/main-dark.css';
+            darkThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
+            
+            // 移除现有的主题链接
+            const existingTheme = document.querySelector('link[href*="main.css"]');
+            if (existingTheme && !existingTheme.href.includes('main-dark.css')) {
+                existingTheme.remove();
+            }
+            
+            // 添加暗色主题链接
+            document.head.appendChild(darkThemeLink);
+        } else {
+            // 使用默认主题CSS
+            const lightThemeLink = document.createElement('link');
+            lightThemeLink.rel = 'stylesheet';
+            lightThemeLink.href = '../assets/css/main.css';
+            lightThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
+            
+            // 移除现有的主题链接
+            const existingTheme = document.querySelector('link[href*="main-dark.css"]');
+            if (existingTheme) {
+                existingTheme.remove();
+            }
+            
+            // 添加浅色主题链接
+            document.head.appendChild(lightThemeLink);
+        }
+    }
+
+    // 立即显示时间
+    updateTime();
+
+    // 每秒更新时间
+    const timeInterval = setInterval(updateTime, 1000);
+
+    // DOM加载完成后的初始化
+    document.addEventListener('DOMContentLoaded', () => {
+        // 隐藏加载动画并显示内容
+        const loadingOverlay = document.getElementById('loading');
+        const content = document.querySelector('.content');
+
+        // 稍微延迟隐藏加载动画，让用户看到加载过程
+        setTimeout(() => {
+            loadingOverlay.style.display = 'none';
+            content.classList.add('loaded');
+        }, 500);
+
+        // 接收来自主进程的开关状态
+        if (typeof require !== 'undefined') {
+            try {
+                const { ipcRenderer } = require('electron');
+
+                // 监听时钟开关事件
+                ipcRenderer.on('clock-toggle', (event, isEnabled) => {
+                    isClockVisible = isEnabled;
+                    // 重新设置时间更新逻辑
+                    if (isClockVisible) {
+                        updateTime(); // 立即更新一次显示
+                    } else {
+                        // 隐藏时间元素
+                        document.getElementById('timeCard').style.display = 'none';
+                    }
+                });
+
+                // 监听暗色主题切换事件
+                ipcRenderer.on('dark-theme-toggle', (event, isEnabled) => {
+                    toggleTheme(isEnabled);
+                });
+
+            } catch (e) {
+                console.log('Not in Electron environment');
+            }
+        }
+    });
+</script>
+</html>
\ No newline at end of file
diff --git a/pages/homework-list.html b/pages/homework-list.html
new file mode 100644
index 0000000..9490353
--- /dev/null
+++ b/pages/homework-list.html
@@ -0,0 +1,310 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>全部作业</title>
+    <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
+    <link rel="stylesheet" href="../assets/css/homework-list.css">
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+</head>
+
+<body>
+    <!-- 标题栏 -->
+    <div class="title-bar">
+        <div class="title">全部作业</div>
+        <div class="title-bar-buttons">
+            <div class="title-bar-button close-button" title="关闭" id="titleCloseBtn"></div>
+        </div>
+    </div>
+
+    <div class="container">
+        <div class="header">
+            <h2>作业列表</h2>
+            <fluent-button appearance="accent" id="addHomeworkBtn">添加作业</fluent-button>
+        </div>
+        
+        <div class="search-bar">
+            <fluent-text-field id="searchInput" placeholder="搜索作业..." type="text"></fluent-text-field>
+        </div>
+        
+        <div class="filter-controls">
+            <fluent-select id="subjectFilter">
+                <option value="">全部科目</option>
+                <option value="chinese">语文</option>
+                <option value="math">数学</option>
+                <option value="english">英语</option>
+                <option value="physics">物理</option>
+                <option value="chemistry">化学</option>
+                <option value="biology">生物</option>
+                <option value="history">历史</option>
+                <option value="geography">地理</option>
+                <option value="politics">道德与法治</option>
+                <option value="other">其他</option>
+            </fluent-select>
+            
+            <fluent-select id="sortOrder">
+                <option value="newest">按最新添加</option>
+                <option value="oldest">按最早添加</option>
+                <option value="dueDateAsc">按截止日期（升序）</option>
+                <option value="dueDateDesc">按截止日期（降序）</option>
+            </fluent-select>
+        </div>
+        
+        <div class="homework-list-container" id="homeworkListContainer">
+            <!-- 作业列表将在这里显示 -->
+        </div>
+        
+        <div class="empty-state" id="emptyState" style="display: none;">
+            <p>暂无作业</p>
+            <fluent-button appearance="accent" id="emptyAddBtn">添加第一个作业</fluent-button>
+        </div>
+    </div>
+
+    <script>
+        const { ipcRenderer } = require('electron');
+        // 作业数据
+        let homeworkData = [];
+        let filteredHomework = [];
+
+        // DOM 元素
+        const homeworkListContainer = document.getElementById('homeworkListContainer');
+        const emptyState = document.getElementById('emptyState');
+        const searchInput = document.getElementById('searchInput');
+        const subjectFilter = document.getElementById('subjectFilter');
+        const sortOrder = document.getElementById('sortOrder');
+        const addHomeworkBtn = document.getElementById('addHomeworkBtn');
+        const emptyAddBtn = document.getElementById('emptyAddBtn');
+
+        // 获取所有作业数据
+        function getAllHomework() {
+            try {
+                // 请求作业列表
+                ipcRenderer.send('get-homework-list');
+                
+                // 监听响应
+                ipcRenderer.on('homework-list-response', (event, homeworkList) => {
+                    homeworkData = homeworkList;
+                    filterAndSortHomework();
+                });
+            } catch (e) {
+                console.error('获取作业数据失败:', e);
+                return [];
+            }
+        }
+
+        // 删除作业
+        function deleteHomework(index) {
+            if (confirm('确定要删除这个作业吗？')) {
+                try {
+                    const { ipcRenderer } = require('electron');
+                    ipcRenderer.send('delete-homework', index);
+                } catch (e) {
+                    console.error('删除作业失败:', e);
+                }
+            }
+        }
+
+        // 渲染作业列表
+        function renderHomeworkList(homeworkList) {
+            if (homeworkList.length === 0) {
+                homeworkListContainer.innerHTML = '';
+                emptyState.style.display = 'flex';
+                return;
+            }
+
+            emptyState.style.display = 'none';
+            homeworkListContainer.innerHTML = '';
+
+            homeworkList.forEach((item, index) => {
+                const homeworkItem = document.createElement('div');
+                homeworkItem.className = 'homework-item';
+
+                // 格式化截止日期
+                let dueDateStr = '无截止日期';
+                let isOverdue = false;
+                if (item.dueDate) {
+                    const dueDate = new Date(item.dueDate);
+                    const now = new Date();
+                    // 检查是否过期
+                    if (dueDate < now) {
+                        isOverdue = true;
+                    }
+                    
+                    const formattedDate = `${dueDate.getFullYear()}-${String(dueDate.getMonth()+1).padStart(2, '0')}-${String(dueDate.getDate()).padStart(2, '0')}`;
+                    dueDateStr = `截止: ${formattedDate}`;
+                }
+
+                // 格式化时间戳
+                const timestamp = item.timestamp ? new Date(item.timestamp) : new Date();
+                const timeStr = `${timestamp.getFullYear()}-${String(timestamp.getMonth()+1).padStart(2, '0')}-${String(timestamp.getDate()).padStart(2, '0')}`;
+
+                // 将换行符替换为<br>标签
+                const contentWithLineBreaks = item.content.replace(/\n/g, '<br>');
+
+                homeworkItem.innerHTML = `
+                    <div class="item-header">
+                        <span class="subject-tag ${item.subject}">${getSubjectName(item.subject)}</span>
+                        <div class="item-meta">
+                            <span class="item-date">${timeStr}</span>
+                            <span class="due-date ${isOverdue ? 'overdue' : ''}">${dueDateStr}</span>
+                        </div>
+                    </div>
+                    <div class="item-content">${contentWithLineBreaks}</div>
+                    <div class="item-actions">
+                        <fluent-button appearance="neutral" class="detail-btn" data-index="${index}">详情</fluent-button>
+                        <fluent-button appearance="neutral" class="edit-btn" data-index="${index}">编辑</fluent-button>
+                        <fluent-button appearance="accent" class="delete-btn" data-index="${index}">删除</fluent-button>
+                    </div>
+                `;
+
+                homeworkListContainer.appendChild(homeworkItem);
+            });
+
+            // 添加事件监听器
+            addEventListeners();
+        }
+
+        // 获取科目名称
+        function getSubjectName(subjectValue) {
+            const subjects = {
+                'chinese': '语文',
+                'math': '数学',
+                'english': '英语',
+                'physics': '物理',
+                'chemistry': '化学',
+                'biology': '生物',
+                'history': '历史',
+                'geography': '地理',
+                'politics': '道法',
+                'other': '其他'
+            };
+            return subjects[subjectValue] || subjectValue;
+        }
+
+        // 过滤和排序作业
+        function filterAndSortHomework() {
+            let result = [...homeworkData];
+
+            // 搜索过滤
+            const searchTerm = searchInput.value.trim().toLowerCase();
+            if (searchTerm) {
+                result = result.filter(item => 
+                    item.content.toLowerCase().includes(searchTerm) ||
+                    getSubjectName(item.subject).toLowerCase().includes(searchTerm)
+                );
+            }
+
+            // 科目过滤
+            const selectedSubject = subjectFilter.value;
+            if (selectedSubject) {
+                result = result.filter(item => item.subject === selectedSubject);
+            }
+
+            // 排序
+            const order = sortOrder.value;
+            result.sort((a, b) => {
+                switch (order) {
+                    case 'newest':
+                        return new Date(b.timestamp || b.dateAdded || 0) - new Date(a.timestamp || a.dateAdded || 0);
+                    case 'oldest':
+                        return new Date(a.timestamp || a.dateAdded || 0) - new Date(b.timestamp || b.dateAdded || 0);
+                    case 'dueDateAsc':
+                        const dateA = a.dueDate ? new Date(a.dueDate) : new Date(8640000000000000); // 最大日期
+                        const dateB = b.dueDate ? new Date(b.dueDate) : new Date(8640000000000000);
+                        return dateA - dateB;
+                    case 'dueDateDesc':
+                        const dateA2 = a.dueDate ? new Date(a.dueDate) : new Date(-8640000000000000); // 最小日期
+                        const dateB2 = b.dueDate ? new Date(b.dueDate) : new Date(-8640000000000000);
+                        return dateB2 - dateA2;
+                    default:
+                        return 0;
+                }
+            });
+
+            filteredHomework = result;
+            renderHomeworkList(filteredHomework);
+        }
+
+        // 添加事件监听器
+        function addEventListeners() {
+            // 删除按钮
+            document.querySelectorAll('.delete-btn').forEach(button => {
+                button.addEventListener('click', function() {
+                    const index = parseInt(this.getAttribute('data-index'));
+                    deleteHomework(index);
+                });
+            });
+
+            // 详情按钮
+            document.querySelectorAll('.detail-btn').forEach(button => {
+                button.addEventListener('click', function() {
+                    const index = parseInt(this.getAttribute('data-index'));
+                    openHomeworkDetail(homeworkData[index]);
+                });
+            });
+
+            // 编辑按钮
+            document.querySelectorAll('.edit-btn').forEach(button => {
+                button.addEventListener('click', function() {
+                    const index = parseInt(this.getAttribute('data-index'));
+                    editHomework(index);
+                });
+            });
+        }
+
+        // 打开作业详情
+        function openHomeworkDetail(homework) {
+            ipcRenderer.send('open-homework-detail-window', homework);
+        }
+
+        // 编辑作业（目前先打开添加窗口并传入数据）
+        function editHomework(index) {
+            // 这里可以实现编辑功能，暂时先提示
+            alert('编辑功能正在开发中');
+            // 实际实现时，可以发送作业数据到编辑窗口
+            // ipcRenderer.send('edit-homework', homeworkData[index]);
+        }
+
+        // 初始化
+        function init() {
+            getAllHomework(); // 改为从主进程获取作业数据
+            
+            // 其他初始化代码保持不变
+            searchInput.addEventListener('input', filterAndSortHomework);
+            subjectFilter.addEventListener('change', filterAndSortHomework);
+            sortOrder.addEventListener('change', filterAndSortHomework);
+            
+            addHomeworkBtn.addEventListener('click', () => {
+                ipcRenderer.send('open-homework-window');
+            });
+            
+            emptyAddBtn.addEventListener('click', () => {
+                ipcRenderer.send('open-homework-window');
+            });
+
+            // 监听来自主进程的新作业通知
+            ipcRenderer.on('new-homework', (event, homework) => {
+                getAllHomework(); // 重新获取作业列表
+            });
+
+            // 监听作业更新通知
+            ipcRenderer.on('refresh-homework-list', () => {
+                getAllHomework(); // 重新获取作业列表
+            });
+        }
+
+        // 标题栏按钮事件
+        document.getElementById('titleCloseBtn').addEventListener('click', () => {
+            window.close();
+        });
+
+        // 关闭窗口时清理引用
+        window.addEventListener('beforeunload', () => {
+            ipcRenderer.send('homework-list-window-closed');
+        });
+
+        // 页面加载完成后初始化
+        document.addEventListener('DOMContentLoaded', init);
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pages/homework.html b/pages/homework.html
index 9490353..045fdfa 100644
--- a/pages/homework.html
+++ b/pages/homework.html
@@ -1,310 +1,295 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="UTF-8">
-    <title>全部作业</title>
+    <title>作业</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/homework-list.css">
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+    <link rel="stylesheet" href="../assets/css/main.css">
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
 </head>
 
 <body>
-    <!-- 标题栏 -->
-    <div class="title-bar">
-        <div class="title">全部作业</div>
-        <div class="title-bar-buttons">
-            <div class="title-bar-button close-button" title="关闭" id="titleCloseBtn"></div>
-        </div>
+    <!-- 加载动画 -->
+    <div id="loading" class="loading-overlay">
+        <div class="loading-spinner"></div>
+        <p>加载中...</p>
     </div>
 
-    <div class="container">
-        <div class="header">
-            <h2>作业列表</h2>
-            <fluent-button appearance="accent" id="addHomeworkBtn">添加作业</fluent-button>
-        </div>
-        
-        <div class="search-bar">
-            <fluent-text-field id="searchInput" placeholder="搜索作业..." type="text"></fluent-text-field>
-        </div>
-        
-        <div class="filter-controls">
-            <fluent-select id="subjectFilter">
-                <option value="">全部科目</option>
-                <option value="chinese">语文</option>
-                <option value="math">数学</option>
-                <option value="english">英语</option>
-                <option value="physics">物理</option>
-                <option value="chemistry">化学</option>
-                <option value="biology">生物</option>
-                <option value="history">历史</option>
-                <option value="geography">地理</option>
-                <option value="politics">道德与法治</option>
-                <option value="other">其他</option>
-            </fluent-select>
-            
-            <fluent-select id="sortOrder">
-                <option value="newest">按最新添加</option>
-                <option value="oldest">按最早添加</option>
-                <option value="dueDateAsc">按截止日期（升序）</option>
-                <option value="dueDateDesc">按截止日期（降序）</option>
-            </fluent-select>
-        </div>
-        
-        <div class="homework-list-container" id="homeworkListContainer">
-            <!-- 作业列表将在这里显示 -->
-        </div>
-        
-        <div class="empty-state" id="emptyState" style="display: none;">
-            <p>暂无作业</p>
-            <fluent-button appearance="accent" id="emptyAddBtn">添加第一个作业</fluent-button>
+    <div class="content">
+        <!-- 作业卡片 -->
+        <div class="card homework-card" id="homeworkCard">
+            <h3>作业</h3>
+            <div class="homework-list" id="homeworkList">
+                <!-- 作业将在这里显示 -->
+            </div>
+            <div class="homework-btn-container">
+                <fluent-button appearance="accent" id="addHomeworkBtn">添加作业</fluent-button>
+                <fluent-button appearance="primary" id="viewAllHomeworkBtn">查看全部</fluent-button>
+            </div>
         </div>
     </div>
-
-    <script>
-        const { ipcRenderer } = require('electron');
-        // 作业数据
-        let homeworkData = [];
-        let filteredHomework = [];
-
-        // DOM 元素
-        const homeworkListContainer = document.getElementById('homeworkListContainer');
-        const emptyState = document.getElementById('emptyState');
-        const searchInput = document.getElementById('searchInput');
-        const subjectFilter = document.getElementById('subjectFilter');
-        const sortOrder = document.getElementById('sortOrder');
-        const addHomeworkBtn = document.getElementById('addHomeworkBtn');
-        const emptyAddBtn = document.getElementById('emptyAddBtn');
-
-        // 获取所有作业数据
-        function getAllHomework() {
+</body>
+<script>
+    // 导入 IPC 通信
+    const { ipcRenderer } = require('electron');
+
+    // 防止click事件在空白区域时被拦截
+    const homeworkCard = document.getElementById('homeworkCard');
+    if (homeworkCard) {
+        homeworkCard.addEventListener('mouseenter', () => 
+            ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
+        );
+        
+        homeworkCard.addEventListener('mouseleave', () => 
+            ipcRenderer.send('set-ignore-mouse-events', { 
+                ignore: true,
+                forward: true
+            })
+        );
+    }
+
+    // 添加作业显示状态变量
+    let isHomeworkVisible = true;
+    // 添加暗色主题状态变量
+    let isDarkThemeEnabled = false;
+    // 在 DOMContentLoaded 事件中添加
+    const viewAllHomeworkBtn = document.getElementById('viewAllHomeworkBtn');
+
+    // 打开全部作业窗口
+    viewAllHomeworkBtn.addEventListener('click', () => {
+        // 检查是否在 Electron 环境中
+        if (typeof require !== 'undefined') {
             try {
-                // 请求作业列表
-                ipcRenderer.send('get-homework-list');
-                
-                // 监听响应
-                ipcRenderer.on('homework-list-response', (event, homeworkList) => {
-                    homeworkData = homeworkList;
-                    filterAndSortHomework();
-                });
+                ipcRenderer.send('open-homework-list-window');
             } catch (e) {
-                console.error('获取作业数据失败:', e);
-                return [];
+                console.log('Not in Electron environment');
             }
+        } else {
+            console.log('Not in Electron environment');
         }
-
-        // 删除作业
-        function deleteHomework(index) {
-            if (confirm('确定要删除这个作业吗？')) {
-                try {
-                    const { ipcRenderer } = require('electron');
-                    ipcRenderer.send('delete-homework', index);
-                } catch (e) {
-                    console.error('删除作业失败:', e);
-                }
+    });
+
+    // 控制作业显示的函数
+    function updateHomeworkVisibility() {
+        if (!isHomeworkVisible) {
+            // 如果作业被禁用，隐藏作业相关元素
+            document.getElementById('homeworkCard').style.display = 'none';
+        } else {
+            // 如果作业启用，确保元素可见
+            document.getElementById('homeworkCard').style.display = 'block';
+            document.getElementById('addHomeworkBtn').style.display = 'inline-block';
+            document.getElementById('homeworkList').style.display = 'block';
+            const homeworkHeaders = document.querySelectorAll('h3');
+            if (homeworkHeaders[0]) {
+                homeworkHeaders[0].style.display = 'block';
             }
         }
+    }
 
-        // 渲染作业列表
-        function renderHomeworkList(homeworkList) {
-            if (homeworkList.length === 0) {
-                homeworkListContainer.innerHTML = '';
-                emptyState.style.display = 'flex';
-                return;
+    // 添加切换主题的函数
+    function toggleTheme(enabled) {
+        isDarkThemeEnabled = enabled;
+        
+        if (enabled) {
+            // 使用暗色主题CSS
+            const darkThemeLink = document.createElement('link');
+            darkThemeLink.rel = 'stylesheet';
+            darkThemeLink.href = '../assets/css/main-dark.css';
+            darkThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
+            
+            // 移除现有的主题链接
+            const existingTheme = document.querySelector('link[href*="main.css"]');
+            if (existingTheme && !existingTheme.href.includes('main-dark.css')) {
+                existingTheme.remove();
             }
+            
+            // 添加暗色主题链接
+            document.head.appendChild(darkThemeLink);
+        } else {
+            // 使用默认主题CSS
+            const lightThemeLink = document.createElement('link');
+            lightThemeLink.rel = 'stylesheet';
+            lightThemeLink.href = '../assets/css/main.css';
+            lightThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
+            
+            // 移除现有的主题链接
+            const existingTheme = document.querySelector('link[href*="main-dark.css"]');
+            if (existingTheme) {
+                existingTheme.remove();
+            }
+            
+            // 添加浅色主题链接
+            document.head.appendChild(lightThemeLink);
+        }
+    }
 
-            emptyState.style.display = 'none';
-            homeworkListContainer.innerHTML = '';
-
-            homeworkList.forEach((item, index) => {
-                const homeworkItem = document.createElement('div');
-                homeworkItem.className = 'homework-item';
-
-                // 格式化截止日期
-                let dueDateStr = '无截止日期';
-                let isOverdue = false;
-                if (item.dueDate) {
-                    const dueDate = new Date(item.dueDate);
-                    const now = new Date();
-                    // 检查是否过期
-                    if (dueDate < now) {
-                        isOverdue = true;
-                    }
-                    
-                    const formattedDate = `${dueDate.getFullYear()}-${String(dueDate.getMonth()+1).padStart(2, '0')}-${String(dueDate.getDate()).padStart(2, '0')}`;
-                    dueDateStr = `截止: ${formattedDate}`;
-                }
-
-                // 格式化时间戳
-                const timestamp = item.timestamp ? new Date(item.timestamp) : new Date();
-                const timeStr = `${timestamp.getFullYear()}-${String(timestamp.getMonth()+1).padStart(2, '0')}-${String(timestamp.getDate()).padStart(2, '0')}`;
+    // DOM加载完成后的初始化
+    document.addEventListener('DOMContentLoaded', () => {
+        // 隐藏加载动画并显示内容
+        const loadingOverlay = document.getElementById('loading');
+        const content = document.querySelector('.content');
 
-                // 将换行符替换为<br>标签
-                const contentWithLineBreaks = item.content.replace(/\n/g, '<br>');
+        // 稍微延迟隐藏加载动画，让用户看到加载过程
+        setTimeout(() => {
+            loadingOverlay.style.display = 'none';
+            content.classList.add('loaded');
+        }, 500);
 
-                homeworkItem.innerHTML = `
-                    <div class="item-header">
-                        <span class="subject-tag ${item.subject}">${getSubjectName(item.subject)}</span>
-                        <div class="item-meta">
-                            <span class="item-date">${timeStr}</span>
-                            <span class="due-date ${isOverdue ? 'overdue' : ''}">${dueDateStr}</span>
-                        </div>
-                    </div>
-                    <div class="item-content">${contentWithLineBreaks}</div>
-                    <div class="item-actions">
-                        <fluent-button appearance="neutral" class="detail-btn" data-index="${index}">详情</fluent-button>
-                        <fluent-button appearance="neutral" class="edit-btn" data-index="${index}">编辑</fluent-button>
-                        <fluent-button appearance="accent" class="delete-btn" data-index="${index}">删除</fluent-button>
-                    </div>
-                `;
+        // 获取DOM元素
+        const addHomeworkBtn = document.getElementById('addHomeworkBtn');
+        const homeworkList = document.getElementById('homeworkList');
+        // 从json加载作业数据
+        let homeworkData = [];
 
-                homeworkListContainer.appendChild(homeworkItem);
+        // 获取作业列表
+        function fetchHomeworkList() {
+            const { ipcRenderer } = require('electron');
+            // 请求作业列表
+            ipcRenderer.send('get-homework-list');
+            
+            // 监听响应
+            ipcRenderer.on('homework-list-response', (event, homeworkList) => {
+                homeworkData = homeworkList;
+                renderHomeworkList();
             });
-
-            // 添加事件监听器
-            addEventListeners();
         }
 
-        // 获取科目名称
-        function getSubjectName(subjectValue) {
-            const subjects = {
+        // 添加获取科目名称的函数
+        function getSubjectName(subjectKey) {
+            const subjectNames = {
                 'chinese': '语文',
                 'math': '数学',
                 'english': '英语',
                 'physics': '物理',
                 'chemistry': '化学',
                 'biology': '生物',
+                'politics': '政治',
                 'history': '历史',
                 'geography': '地理',
-                'politics': '道法',
-                'other': '其他'
+                'technology': '技术'
             };
-            return subjects[subjectValue] || subjectValue;
+            
+            return subjectNames[subjectKey] || subjectKey; // 如果找不到对应名称，则返回原始键值
         }
 
-        // 过滤和排序作业
-        function filterAndSortHomework() {
-            let result = [...homeworkData];
-
-            // 搜索过滤
-            const searchTerm = searchInput.value.trim().toLowerCase();
-            if (searchTerm) {
-                result = result.filter(item => 
-                    item.content.toLowerCase().includes(searchTerm) ||
-                    getSubjectName(item.subject).toLowerCase().includes(searchTerm)
-                );
+        // 显示作业列表
+        function renderHomeworkList() {
+            if (!isHomeworkVisible) {
+                return; // 如果作业功能被禁用，则不渲染
             }
 
-            // 科目过滤
-            const selectedSubject = subjectFilter.value;
-            if (selectedSubject) {
-                result = result.filter(item => item.subject === selectedSubject);
+            homeworkList.innerHTML = '';
+            if (homeworkData.length === 0) {
+                homeworkList.innerHTML = '<p style="text-align:center; opacity:0.7;">暂无作业</p>';
+                return;
             }
 
-            // 排序
-            const order = sortOrder.value;
-            result.sort((a, b) => {
-                switch (order) {
-                    case 'newest':
-                        return new Date(b.timestamp || b.dateAdded || 0) - new Date(a.timestamp || a.dateAdded || 0);
-                    case 'oldest':
-                        return new Date(a.timestamp || a.dateAdded || 0) - new Date(b.timestamp || b.dateAdded || 0);
-                    case 'dueDateAsc':
-                        const dateA = a.dueDate ? new Date(a.dueDate) : new Date(8640000000000000); // 最大日期
-                        const dateB = b.dueDate ? new Date(b.dueDate) : new Date(8640000000000000);
-                        return dateA - dateB;
-                    case 'dueDateDesc':
-                        const dateA2 = a.dueDate ? new Date(a.dueDate) : new Date(-8640000000000000); // 最小日期
-                        const dateB2 = b.dueDate ? new Date(b.dueDate) : new Date(-8640000000000000);
-                        return dateB2 - dateA2;
-                    default:
-                        return 0;
-                }
-            });
+            homeworkData.forEach((item, index) => {
+                const homeworkItem = document.createElement('div');
+                homeworkItem.className = 'homework-item';
 
-            filteredHomework = result;
-            renderHomeworkList(filteredHomework);
-        }
+                // 格式化截止日期
+                let dueDateStr = '';
+                if (item.dueDate) {
+                    const date = new Date(item.dueDate);
+                    // 检查是否是当天
+                    const today = new Date();
+                    if (!(date.getFullYear() === today.getFullYear() &&
+                            date.getMonth() === today.getMonth() &&
+                            date.getDate() === today.getDate())) {
+                        dueDateStr = `<br> 截止: ${date.getFullYear()}-${String(date.getMonth()+1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+                    }
+                }
 
-        // 添加事件监听器
-        function addEventListeners() {
-            // 删除按钮
-            document.querySelectorAll('.delete-btn').forEach(button => {
-                button.addEventListener('click', function() {
-                    const index = parseInt(this.getAttribute('data-index'));
-                    deleteHomework(index);
-                });
-            });
+                // 将换行符替换为<br>标签
+                const contentWithLineBreaks = item.content.replace(/\n/g, '<br>');
 
-            // 详情按钮
-            document.querySelectorAll('.detail-btn').forEach(button => {
-                button.addEventListener('click', function() {
-                    const index = parseInt(this.getAttribute('data-index'));
-                    openHomeworkDetail(homeworkData[index]);
-                });
+                homeworkItem.innerHTML = `
+          <div>
+            <span class="subject-tag ${item.subject}">${getSubjectName(item.subject)}</span>
+            ${contentWithLineBreaks}${dueDateStr}
+          </div>
+          <button class="delete-btn" id="delete-btn" data-index="${index}">删除</button>
+        `;
+                homeworkList.appendChild(homeworkItem);
             });
 
-            // 编辑按钮
-            document.querySelectorAll('.edit-btn').forEach(button => {
+            // 添加删除按钮事件监听
+            document.querySelectorAll('.delete-btn').forEach(button => {
                 button.addEventListener('click', function() {
                     const index = parseInt(this.getAttribute('data-index'));
-                    editHomework(index);
+                    if (typeof require !== 'undefined') {
+                        try {
+                            const { ipcRenderer } = require('electron');
+                            ipcRenderer.send('delete-homework', index);
+                        } catch (e) {
+                            console.log('Not in Electron environment');
+                        }
+                    } else {
+                        console.log('Not in Electron environment');
+                    }
                 });
             });
         }
 
-        // 打开作业详情
-        function openHomeworkDetail(homework) {
-            ipcRenderer.send('open-homework-detail-window', homework);
-        }
+        // 打开新窗口添加作业
+        addHomeworkBtn.addEventListener('click', () => {
+            // 检查是否在 Electron 环境中
+            if (typeof require !== 'undefined') {
+                try {
+                    const { ipcRenderer } = require('electron');
+                    ipcRenderer.send('open-homework-window');
+                } catch (e) {
+                    console.log('Not in Electron environment');
+                }
+            } else {
+                console.log('Not in Electron environment');
+            }
+        });
 
-        // 编辑作业（目前先打开添加窗口并传入数据）
-        function editHomework(index) {
-            // 这里可以实现编辑功能，暂时先提示
-            alert('编辑功能正在开发中');
-            // 实际实现时，可以发送作业数据到编辑窗口
-            // ipcRenderer.send('edit-homework', homeworkData[index]);
-        }
+        // 接收来自新窗口的作业数据和开关状态
+        if (typeof require !== 'undefined') {
+            try {
+                const { ipcRenderer } = require('electron');
 
-        // 初始化
-        function init() {
-            getAllHomework(); // 改为从主进程获取作业数据
-            
-            // 其他初始化代码保持不变
-            searchInput.addEventListener('input', filterAndSortHomework);
-            subjectFilter.addEventListener('change', filterAndSortHomework);
-            sortOrder.addEventListener('change', filterAndSortHomework);
-            
-            addHomeworkBtn.addEventListener('click', () => {
-                ipcRenderer.send('open-homework-window');
-            });
-            
-            emptyAddBtn.addEventListener('click', () => {
-                ipcRenderer.send('open-homework-window');
-            });
+                // 监听新作业数据
+                ipcRenderer.on('new-homework', (event, homework) => {
+                    // 重新获取最新的作业列表
+                    fetchHomeworkList();
+                });
 
-            // 监听来自主进程的新作业通知
-            ipcRenderer.on('new-homework', (event, homework) => {
-                getAllHomework(); // 重新获取作业列表
-            });
+                // 监听作业列表刷新
+                ipcRenderer.on('refresh-homework-list', (event) => {
+                    fetchHomeworkList();
+                });
 
-            // 监听作业更新通知
-            ipcRenderer.on('refresh-homework-list', () => {
-                getAllHomework(); // 重新获取作业列表
-            });
-        }
+                // 监听作业开关事件
+                ipcRenderer.on('homework-toggle', (event, isEnabled) => {
+                    isHomeworkVisible = isEnabled;
+                    updateHomeworkVisibility();
+                    renderHomeworkList(); // 重新渲染作业列表
+                });
 
-        // 标题栏按钮事件
-        document.getElementById('titleCloseBtn').addEventListener('click', () => {
-            window.close();
-        });
+                // 监听启动台应用更新事件（从主进程传递过来）
+                ipcRenderer.on('launchpad-apps-updated', (event, apps) => {
+                    launchpadApps = apps;
+                    // 这里不需要做任何操作，因为作业窗口不显示启动台
+                });
 
-        // 关闭窗口时清理引用
-        window.addEventListener('beforeunload', () => {
-            ipcRenderer.send('homework-list-window-closed');
-        });
+                // 监听暗色主题切换事件
+                ipcRenderer.on('dark-theme-toggle', (event, isEnabled) => {
+                    toggleTheme(isEnabled);
+                });
 
-        // 页面加载完成后初始化
-        document.addEventListener('DOMContentLoaded', init);
-    </script>
-</body>
+            } catch (e) {
+                console.log('Not in Electron environment');
+            }
+        }
+
+        // 初始化作业列表
+        updateHomeworkVisibility(); // 初始化作业可见性
+        fetchHomeworkList(); // 改为从主进程获取作业列表
+    });
+</script>
 </html>
\ No newline at end of file
diff --git a/pages/index.html b/pages/index.html
deleted file mode 100644
index 2af33a5..0000000
--- a/pages/index.html
+++ /dev/null
@@ -1,454 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="UTF-8">
-    <title>桌面悬浮窗</title>
-    <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/main.css">
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
-</head>
-
-<body>
-    <!-- 加载动画 -->
-    <div id="loading" class="loading-overlay">
-        <div class="loading-spinner"></div>
-        <p>加载中...</p>
-    </div>
-
-    <div class="content">
-        <!-- 时钟卡片 -->
-        <div class="card time-card" id="timeCard">
-            <h3>时间</h3>
-            <div class="time" id="time">00:00:00</div>
-            <div class="date" id="date">加载中</div>
-        </div>
-
-        <!-- 作业卡片 -->
-        <div class="card homework-card" id="homeworkCard">
-            <h3>作业</h3>
-            <div class="homework-list" id="homeworkList">
-                <!-- 作业将在这里显示 -->
-            </div>
-            <div class="homework-btn-container">
-                <fluent-button appearance="accent" id="addHomeworkBtn">添加作业</fluent-button>
-                <fluent-button appearance="primary" id="viewAllHomeworkBtn">查看全部</fluent-button>
-            </div>
-        </div>
-
-        <!-- 启动台卡片 -->
-        <div class="card launchpad-card" id="launchpadCard">
-            <h3>启动台</h3>
-            <div class="launchpad-container" id="launchpadContainer">
-                <!-- 启动台应用将在这里显示 -->
-            </div>
-        </div>
-    </div>
-</body>
-<script>
-    // 导入 IPC 通信
-    const { ipcRenderer } = require('electron');
-
-    // 防止click事件在空白区域时被拦截
-    ['timeCard', 'homeworkCard', 'launchpadCard'].forEach(id => {
-        const card = document.getElementById(id);
-        if (card) {
-            card.addEventListener('mouseenter', () => 
-                ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
-            );
-            
-            card.addEventListener('mouseleave', () => 
-                ipcRenderer.send('set-ignore-mouse-events', { 
-                    ignore: true,
-                    forward: true
-                })
-            );
-        }
-    });
-
-    // 添加时钟显示状态变量
-    let isClockVisible = true;
-    // 添加作业显示状态变量
-    let isHomeworkVisible = true;
-    // 添加启动台显示状态变量
-    let isLaunchpadVisible = true;
-    // 添加置顶状态变量
-    let isAlwaysOnTop = true;
-    // 添加暗色主题状态变量
-    let isDarkThemeEnabled = false;
-    // 启动台应用列表
-    let launchpadApps = [];
-    // 在 DOMContentLoaded 事件中添加
-    const viewAllHomeworkBtn = document.getElementById('viewAllHomeworkBtn');
-
-    // 打开全部作业窗口
-    viewAllHomeworkBtn.addEventListener('click', () => {
-        // 检查是否在 Electron 环境中
-        if (typeof require !== 'undefined') {
-            try {
-                ipcRenderer.send('open-homework-list-window');
-            } catch (e) {
-                console.log('Not in Electron environment');
-            }
-        } else {
-            console.log('Not in Electron environment');
-        }
-    });
-
-    // 更新时间函数
-    function updateTime() {
-        if (!isClockVisible) {
-            // 如果时钟被禁用，隐藏时间元素
-            document.getElementById('timeCard').style.display = 'none';
-            return;
-        }
-
-        // 如果时钟启用，确保元素可见
-        document.getElementById('timeCard').style.display = 'block';
-        document.getElementById('time').style.display = 'block';
-        document.getElementById('date').style.display = 'block';
-        const timeHeaders = document.querySelectorAll('h3');
-        if (timeHeaders[0]) {
-            timeHeaders[0].style.display = 'block';
-        }
-
-        const now = new Date();
-
-        // 格式化时间
-        const hours = String(now.getHours()).padStart(2, '0');
-        const minutes = String(now.getMinutes()).padStart(2, '0');
-        const seconds = String(now.getSeconds()).padStart(2, '0');
-        const timeString = `${hours}:${minutes}:${seconds}`;
-
-        // 格式化日期
-        const year = now.getFullYear();
-        const month = String(now.getMonth() + 1).padStart(2, '0');
-        const day = String(now.getDate()).padStart(2, '0');
-        const weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
-        const weekday = weekdays[now.getDay()];
-        const dateString = `${year}年${month}月${day}日 ${weekday}`;
-
-        // 更新显示
-        document.getElementById('time').textContent = timeString;
-        document.getElementById('date').textContent = dateString;
-    }
-
-    // 控制作业显示的函数
-    function updateHomeworkVisibility() {
-        if (!isHomeworkVisible) {
-            // 如果作业被禁用，隐藏作业相关元素
-            document.getElementById('homeworkCard').style.display = 'none';
-        } else {
-            // 如果作业启用，确保元素可见
-            document.getElementById('homeworkCard').style.display = 'block';
-            document.getElementById('addHomeworkBtn').style.display = 'inline-block';
-            document.getElementById('homeworkList').style.display = 'block';
-            const homeworkHeaders = document.querySelectorAll('h3');
-            if (homeworkHeaders[1]) { // 注意：这里索引可能需要调整
-                homeworkHeaders[1].style.display = 'block';
-            }
-        }
-    }
-
-    // 控制启动台显示的函数
-    function updateLaunchpadVisibility() {
-        if (!isLaunchpadVisible || launchpadApps.length === 0) {
-            // 如果启动台被禁用或没有应用，隐藏启动台
-            document.getElementById('launchpadCard').style.display = 'none';
-        } else {
-            // 如果启动台启用且有应用，确保元素可见
-            document.getElementById('launchpadCard').style.display = 'block';
-            const launchpadHeaders = document.querySelectorAll('h3');
-            if (launchpadHeaders[2]) { // 启动台标题是第三个h3（因为现在启动台在最后）
-                launchpadHeaders[2].style.display = 'block';
-            }
-        }
-    }
-
-    // 添加切换主题的函数
-    function toggleTheme(enabled) {
-        isDarkThemeEnabled = enabled;
-        
-        if (enabled) {
-            // 使用暗色主题CSS
-            const darkThemeLink = document.createElement('link');
-            darkThemeLink.rel = 'stylesheet';
-            darkThemeLink.href = '../assets/css/main-dark.css';
-            darkThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
-            
-            // 移除现有的主题链接
-            const existingTheme = document.querySelector('link[href*="main.css"]');
-            if (existingTheme && !existingTheme.href.includes('main-dark.css')) {
-                existingTheme.remove();
-            }
-            
-            // 添加暗色主题链接
-            document.head.appendChild(darkThemeLink);
-        } else {
-            // 使用默认主题CSS
-            const lightThemeLink = document.createElement('link');
-            lightThemeLink.rel = 'stylesheet';
-            lightThemeLink.href = '../assets/css/main.css';
-            lightThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
-            
-            // 移除现有的主题链接
-            const existingTheme = document.querySelector('link[href*="main-dark.css"]');
-            if (existingTheme) {
-                existingTheme.remove();
-            }
-            
-            // 添加浅色主题链接
-            document.head.appendChild(lightThemeLink);
-        }
-    }
-
-    // 渲染启动台应用
-    function renderLaunchpadApps() {
-        if (!isLaunchpadVisible || launchpadApps.length === 0) {
-            return; // 如果启动台功能被禁用或没有应用，则不渲染
-        }
-
-        const container = document.getElementById('launchpadContainer');
-        container.innerHTML = '';
-        launchpadApps.forEach((app, index) => {
-            const appElement = document.createElement('div');
-            appElement.className = 'launchpad-app';
-
-            // 为链接类型添加特殊类名
-            if (app.type === 'link') {
-                appElement.classList.add('link-type');
-                appElement.title = `链接: ${app.name}`;
-            } else {
-                appElement.title = `应用: ${app.name}`;
-            }
-
-            let iconElement = '';
-            if (app.icon) {
-                // 如果有自定义图标，使用图片
-                iconElement = `<img class="launchpad-icon" src="${app.icon}" alt="${app.name}">`;
-            } else {
-                // 否则使用首字母
-                const iconText = app.name.charAt(0).toUpperCase();
-                iconElement = `<div class="launchpad-icon">${iconText}</div>`;
-            }
-
-            appElement.innerHTML = `
-                    ${iconElement}
-                    <div class="launchpad-name">${app.name}</div>
-                `;
-
-            appElement.addEventListener('click', () => {
-                // 发送启动应用或打开链接请求
-                if (typeof require !== 'undefined') {
-                    try {
-                        const {
-                            ipcRenderer
-                        } = require('electron');
-                        ipcRenderer.send('launch-app', app);
-                    } catch (e) {
-                        console.log('Not in Electron environment');
-                    }
-                }
-            });
-
-            container.appendChild(appElement);
-        });
-    }
-
-    // 立即显示时间
-    updateTime();
-
-    // 每秒更新时间
-    const timeInterval = setInterval(updateTime, 1000);
-
-    // 作业功能相关代码
-    document.addEventListener('DOMContentLoaded', () => {
-        // 隐藏加载动画并显示内容
-        const loadingOverlay = document.getElementById('loading');
-        const content = document.querySelector('.content');
-
-        // 稍微延迟隐藏加载动画，让用户看到加载过程
-        setTimeout(() => {
-            loadingOverlay.style.display = 'none';
-            content.classList.add('loaded');
-        }, 500);
-
-        // 获取DOM元素
-        const addHomeworkBtn = document.getElementById('addHomeworkBtn');
-        const homeworkList = document.getElementById('homeworkList');
-        const launchpadCard = document.getElementById('launchpadCard');
-        // 从json加载作业数据
-        let homeworkData = [];
-
-        // 获取作业列表
-        function fetchHomeworkList() {
-            const { ipcRenderer } = require('electron');
-            // 请求作业列表
-            ipcRenderer.send('get-homework-list');
-            
-            // 监听响应
-            ipcRenderer.on('homework-list-response', (event, homeworkList) => {
-                homeworkData = homeworkList;
-                renderHomeworkList();
-            });
-        }
-
-        // 添加获取科目名称的函数
-        function getSubjectName(subjectKey) {
-            const subjectNames = {
-                'chinese': '语文',
-                'math': '数学',
-                'english': '英语',
-                'physics': '物理',
-                'chemistry': '化学',
-                'biology': '生物',
-                'politics': '政治',
-                'history': '历史',
-                'geography': '地理',
-                'technology': '技术'
-            };
-            
-            return subjectNames[subjectKey] || subjectKey; // 如果找不到对应名称，则返回原始键值
-        }
-
-        // 显示作业列表
-        function renderHomeworkList() {
-            if (!isHomeworkVisible) {
-                return; // 如果作业功能被禁用，则不渲染
-            }
-
-            homeworkList.innerHTML = '';
-            if (homeworkData.length === 0) {
-                homeworkList.innerHTML = '<p style="text-align:center; opacity:0.7;">暂无作业</p>';
-                return;
-            }
-
-            homeworkData.forEach((item, index) => {
-                const homeworkItem = document.createElement('div');
-                homeworkItem.className = 'homework-item';
-
-                // 格式化截止日期
-                let dueDateStr = '';
-                if (item.dueDate) {
-                    const date = new Date(item.dueDate);
-                    // 检查是否是当天
-                    const today = new Date();
-                    if (!(date.getFullYear() === today.getFullYear() &&
-                            date.getMonth() === today.getMonth() &&
-                            date.getDate() === today.getDate())) {
-                        dueDateStr = `<br> 截止: ${date.getFullYear()}-${String(date.getMonth()+1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
-                    }
-                }
-
-                // 将换行符替换为<br>标签
-                const contentWithLineBreaks = item.content.replace(/\n/g, '<br>');
-
-                homeworkItem.innerHTML = `
-          <div>
-            <span class="subject-tag ${item.subject}">${getSubjectName(item.subject)}</span>
-            ${contentWithLineBreaks}${dueDateStr}
-          </div>
-          <button class="delete-btn" id="delete-btn" data-index="${index}">删除</button>
-        `;
-                homeworkList.appendChild(homeworkItem);
-            });
-
-            // 添加删除按钮事件监听
-            document.querySelectorAll('.delete-btn').forEach(button => {
-                button.addEventListener('click', function() {
-                    const index = parseInt(this.getAttribute('data-index'));
-                    if (typeof require !== 'undefined') {
-                        try {
-                            const { ipcRenderer } = require('electron');
-                            ipcRenderer.send('delete-homework', index);
-                        } catch (e) {
-                            console.log('Not in Electron environment');
-                        }
-                    } else {
-                        console.log('Not in Electron environment');
-                    }
-                });
-            });
-        }
-
-        // 打开新窗口添加作业
-        addHomeworkBtn.addEventListener('click', () => {
-            // 检查是否在 Electron 环境中
-            if (typeof require !== 'undefined') {
-                try {
-                    const {
-                        ipcRenderer
-                    } = require('electron');
-                    ipcRenderer.send('open-homework-window');
-                } catch (e) {
-                    console.log('Not in Electron environment');
-                }
-            } else {
-                console.log('Not in Electron environment');
-            }
-        });
-
-        // 接收来自新窗口的作业数据和开关状态
-        if (typeof require !== 'undefined') {
-            try {
-                const {
-                    ipcRenderer
-                } = require('electron');
-
-                // 监听新作业数据
-                ipcRenderer.on('new-homework', (event, homework) => {
-                    // 重新获取最新的作业列表
-                    fetchHomeworkList();
-                });
-
-                // 监听作业列表刷新
-                ipcRenderer.on('refresh-homework-list', (event) => {
-                    fetchHomeworkList();
-                });
-
-                // 监听时钟开关事件
-                ipcRenderer.on('clock-toggle', (event, isEnabled) => {
-                    isClockVisible = isEnabled;
-                    // 重新设置时间更新逻辑
-                    if (isClockVisible) {
-                        updateTime(); // 立即更新一次显示
-                    } else {
-                        // 隐藏时间元素
-                        document.getElementById('timeCard').style.display = 'none';
-                    }
-                });
-
-                // 监听作业开关事件
-                ipcRenderer.on('homework-toggle', (event, isEnabled) => {
-                    isHomeworkVisible = isEnabled;
-                    updateHomeworkVisibility();
-                    renderHomeworkList(); // 重新渲染作业列表
-                });
-
-                // 监听启动台应用更新事件
-                ipcRenderer.on('launchpad-apps-updated', (event, apps) => {
-                    launchpadApps = apps;
-                    updateLaunchpadVisibility();
-                    renderLaunchpadApps();
-                });
-
-                // 监听暗色主题切换事件
-                ipcRenderer.on('dark-theme-toggle', (event, isEnabled) => {
-                    toggleTheme(isEnabled);
-                });
-
-            } catch (e) {
-                console.log('Not in Electron environment');
-            }
-        }
-
-        // 初始化作业列表
-        updateHomeworkVisibility(); // 初始化作业可见性
-        fetchHomeworkList(); // 改为从主进程获取作业列表
-
-        // 初始化启动台
-        updateLaunchpadVisibility();
-    });
-</script>
-
-</html>
\ No newline at end of file
diff --git a/pages/launchpad.html b/pages/launchpad.html
new file mode 100644
index 0000000..b9426f4
--- /dev/null
+++ b/pages/launchpad.html
@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>启动台</title>
+    <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
+    <link rel="stylesheet" href="../assets/css/main.css">
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
+</head>
+
+<body>
+    <!-- 加载动画 -->
+    <div id="loading" class="loading-overlay">
+        <div class="loading-spinner"></div>
+        <p>加载中...</p>
+    </div>
+
+    <div class="content">
+        <!-- 启动台卡片 -->
+        <div class="card launchpad-card" id="launchpadCard">
+            <h3>启动台</h3>
+            <div class="launchpad-container" id="launchpadContainer">
+                <!-- 启动台应用将在这里显示 -->
+            </div>
+        </div>
+    </div>
+</body>
+<script>
+    // 导入 IPC 通信
+    const { ipcRenderer } = require('electron');
+
+    // 防止click事件在空白区域时被拦截
+    const launchpadCard = document.getElementById('launchpadCard');
+    if (launchpadCard) {
+        launchpadCard.addEventListener('mouseenter', () => 
+            ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
+        );
+        
+        launchpadCard.addEventListener('mouseleave', () => 
+            ipcRenderer.send('set-ignore-mouse-events', { 
+                ignore: true,
+                forward: true
+            })
+        );
+    }
+
+    // 添加启动台显示状态变量
+    let isLaunchpadVisible = true;
+    // 添加暗色主题状态变量
+    let isDarkThemeEnabled = false;
+    // 启动台应用列表
+    let launchpadApps = [];
+
+    // 控制启动台显示的函数
+    function updateLaunchpadVisibility() {
+        if (!isLaunchpadVisible || launchpadApps.length === 0) {
+            // 如果启动台被禁用或没有应用，隐藏启动台
+            document.getElementById('launchpadCard').style.display = 'none';
+        } else {
+            // 如果启动台启用且有应用，确保元素可见
+            document.getElementById('launchpadCard').style.display = 'block';
+            const launchpadHeaders = document.querySelectorAll('h3');
+            if (launchpadHeaders[0]) {
+                launchpadHeaders[0].style.display = 'block';
+            }
+        }
+    }
+
+    // 添加切换主题的函数
+    function toggleTheme(enabled) {
+        isDarkThemeEnabled = enabled;
+        
+        if (enabled) {
+            // 使用暗色主题CSS
+            const darkThemeLink = document.createElement('link');
+            darkThemeLink.rel = 'stylesheet';
+            darkThemeLink.href = '../assets/css/main-dark.css';
+            darkThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
+            
+            // 移除现有的主题链接
+            const existingTheme = document.querySelector('link[href*="main.css"]');
+            if (existingTheme && !existingTheme.href.includes('main-dark.css')) {
+                existingTheme.remove();
+            }
+            
+            // 添加暗色主题链接
+            document.head.appendChild(darkThemeLink);
+        } else {
+            // 使用默认主题CSS
+            const lightThemeLink = document.createElement('link');
+            lightThemeLink.rel = 'stylesheet';
+            lightThemeLink.href = '../assets/css/main.css';
+            lightThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
+            
+            // 移除现有的主题链接
+            const existingTheme = document.querySelector('link[href*="main-dark.css"]');
+            if (existingTheme) {
+                existingTheme.remove();
+            }
+            
+            // 添加浅色主题链接
+            document.head.appendChild(lightThemeLink);
+        }
+    }
+
+    // 渲染启动台应用
+    function renderLaunchpadApps() {
+        if (!isLaunchpadVisible || launchpadApps.length === 0) {
+            return; // 如果启动台功能被禁用或没有应用，则不渲染
+        }
+
+        const container = document.getElementById('launchpadContainer');
+        container.innerHTML = '';
+        launchpadApps.forEach((app, index) => {
+            const appElement = document.createElement('div');
+            appElement.className = 'launchpad-app';
+
+            // 为链接类型添加特殊类名
+            if (app.type === 'link') {
+                appElement.classList.add('link-type');
+                appElement.title = `链接: ${app.name}`;
+            } else {
+                appElement.title = `应用: ${app.name}`;
+            }
+
+            let iconElement = '';
+            if (app.icon) {
+                // 如果有自定义图标，使用图片
+                iconElement = `<img class="launchpad-icon" src="${app.icon}" alt="${app.name}">`;
+            } else {
+                // 否则使用首字母
+                const iconText = app.name.charAt(0).toUpperCase();
+                iconElement = `<div class="launchpad-icon">${iconText}</div>`;
+            }
+
+            appElement.innerHTML = `
+                    ${iconElement}
+                    <div class="launchpad-name">${app.name}</div>
+                `;
+
+            appElement.addEventListener('click', () => {
+                // 发送启动应用或打开链接请求
+                if (typeof require !== 'undefined') {
+                    try {
+                        const { ipcRenderer } = require('electron');
+                        ipcRenderer.send('launch-app', app);
+                    } catch (e) {
+                        console.log('Not in Electron environment');
+                    }
+                }
+            });
+
+            container.appendChild(appElement);
+        });
+    }
+
+    // DOM加载完成后的初始化
+    document.addEventListener('DOMContentLoaded', () => {
+        // 隐藏加载动画并显示内容
+        const loadingOverlay = document.getElementById('loading');
+        const content = document.querySelector('.content');
+
+        // 稍微延迟隐藏加载动画，让用户看到加载过程
+        setTimeout(() => {
+            loadingOverlay.style.display = 'none';
+            content.classList.add('loaded');
+        }, 500);
+
+        // 接收来自主进程的开关状态
+        if (typeof require !== 'undefined') {
+            try {
+                const { ipcRenderer } = require('electron');
+
+                // 监听启动台应用更新事件
+                ipcRenderer.on('launchpad-apps-updated', (event, apps) => {
+                    launchpadApps = apps;
+                    updateLaunchpadVisibility();
+                    renderLaunchpadApps();
+                });
+
+                // 监听暗色主题切换事件
+                ipcRenderer.on('dark-theme-toggle', (event, isEnabled) => {
+                    toggleTheme(isEnabled);
+                });
+
+            } catch (e) {
+                console.log('Not in Electron environment');
+            }
+        }
+
+        // 初始化启动台
+        updateLaunchpadVisibility();
+    });
+</script>
+</html>
\ No newline at end of file
diff --git a/pages/settings.html b/pages/settings.html
index e087631..2f96716 100644
--- a/pages/settings.html
+++ b/pages/settings.html
@@ -18,71 +18,108 @@
     </div>
 
     <div class="container">
-        <div class="content">
-            <div class="setting-group">
-                <div class="setting-item">
-                    <div class="setting-info">
-                        <div class="setting-title">启用时钟</div>
-                        <div class="setting-description">在主窗口显示时钟功能</div>
-                    </div>
-                    <div class="actions">
-                        <fluent-switch id="clockToggle" label="时钟"></fluent-switch>
-                    </div>
-                </div>
-                
-                <div class="setting-item">
-                    <div class="setting-info">
-                        <div class="setting-title">启用作业</div>
-                        <div class="setting-description">在主窗口显示作业功能</div>
-                    </div>
-                    <div class="actions">
-                        <fluent-switch id="homeworkToggle" label="作业"></fluent-switch>
+        <div class="settings-layout">
+            <!-- 左侧选项卡 -->
+            <div class="sidebar">
+                <fluent-card class="tab active" data-tab="general">常规</fluent-card>
+                <fluent-card class="tab" data-tab="appearance">外观</fluent-card>
+                <fluent-card class="tab" data-tab="launchpad">启动台</fluent-card>
+                <fluent-card class="tab" data-tab="advanced">高级</fluent-card>
+            </div>
+            
+            <!-- 右侧内容区域 -->
+            <div class="content">
+                <!-- 常规设置 -->
+                <div class="tab-content active" id="general-tab">
+                    <div class="setting-group">
+                        <div class="setting-item">
+                            <div class="setting-info">
+                                <div class="setting-title">启用时钟</div>
+                                <div class="setting-description">在主窗口显示时钟功能</div>
+                            </div>
+                            <div class="actions">
+                                <fluent-switch id="clockToggle" label="时钟"></fluent-switch>
+                            </div>
+                        </div>
+                        
+                        <div class="setting-item">
+                            <div class="setting-info">
+                                <div class="setting-title">启用作业</div>
+                                <div class="setting-description">在主窗口显示作业功能</div>
+                            </div>
+                            <div class="actions">
+                                <fluent-switch id="homeworkToggle" label="作业"></fluent-switch>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 
-                <div class="setting-item">
-                    <div class="setting-info">
-                        <div class="setting-title">窗口置顶</div>
-                        <div class="setting-description">主窗口始终保持在最前端</div>
-                    </div>
-                    <div class="actions">
-                        <fluent-switch id="alwaysOnTopToggle" label="置顶"></fluent-switch>
+                <!-- 外观设置 -->
+                <div class="tab-content" id="appearance-tab">
+                    <div class="setting-group">
+                        <div class="setting-item">
+                            <div class="setting-info">
+                                <div class="setting-title">使用暗色主题</div>
+                                <div class="setting-description">启用深色模式，使用黑色背景</div>
+                            </div>
+                            <div class="actions">
+                                <fluent-switch id="darkThemeToggle" label="暗色主题"></fluent-switch>
+                            </div>
+                        </div>
+                        
+                        <div class="setting-item">
+                            <div class="setting-info">
+                                <div class="setting-title">窗口置顶</div>
+                                <div class="setting-description">主窗口始终保持在最前端</div>
+                            </div>
+                            <div class="actions">
+                                <fluent-switch id="alwaysOnTopToggle" label="置顶"></fluent-switch>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 
-                <div class="setting-item">
-                    <div class="setting-info">
-                        <div class="setting-title">使用暗色主题</div>
-                        <div class="setting-description">启用深色模式，使用黑色背景</div>
-                    </div>
-                    <div class="actions">
-                        <fluent-switch id="darkThemeToggle" label="暗色主题"></fluent-switch>
+                <!-- 启动台设置 -->
+                <div class="tab-content" id="launchpad-tab">
+                    <!-- 启动台设置部分 -->
+                    <div class="launchpad-section">
+                        <div class="launchpad-header">
+                            <div class="launchpad-title">启动台</div>
+                        </div>
+                        <p style="color: #605e5c; margin-bottom: 16px;">管理快捷启动的应用程序和链接</p>
+                        
+                        <div class="launchpad-list" id="launchpadList">
+                            <!-- 启动项将在这里显示 -->
+                        </div>
+                        
+                        <div class="add-form">
+                            <div class="form-row">
+                                <input type="text" class="add-input" id="appNameInput" placeholder="名称">
+                                <select class="type-selector" id="appTypeInput">
+                                    <option value="app">应用程序</option>
+                                    <option value="link">链接</option>
+                                </select>
+                            </div>
+                            <input type="text" class="add-input" id="appPathInput" placeholder="应用程序路径或链接地址">
+                            <input type="text" class="add-input" id="appIconInput" placeholder="图标路径（可选）">
+                            <fluent-button id="addAppBtn" appearance="accent" class="add-btn">添加</fluent-button>
+                        </div>
                     </div>
                 </div>
-            </div>
-            
-            <!-- 启动台设置部分 -->
-            <div class="launchpad-section">
-                <div class="launchpad-header">
-                    <div class="launchpad-title">启动台</div>
-                </div>
-                <p style="color: #605e5c; margin-bottom: 16px;">管理快捷启动的应用程序和链接</p>
-                
-                <div class="launchpad-list" id="launchpadList">
-                    <!-- 启动项将在这里显示 -->
-                </div>
                 
-                <div class="add-form">
-                    <div class="form-row">
-                        <input type="text" class="add-input" id="appNameInput" placeholder="名称">
-                        <select class="type-selector" id="appTypeInput">
-                            <option value="app">应用程序</option>
-                            <option value="link">链接</option>
-                        </select>
+                <!-- 高级设置 -->
+                <div class="tab-content" id="advanced-tab">
+                    <div class="setting-group">
+                        <div class="setting-item">
+                            <div class="setting-info">
+                                <div class="setting-title">开机自启</div>
+                                <div class="setting-description">系统启动时自动运行应用</div>
+                            </div>
+                            <div class="actions">
+                                <fluent-switch id="startupToggle" label="开机自启"></fluent-switch>
+                            </div>
+                        </div>
                     </div>
-                    <input type="text" class="add-input" id="appPathInput" placeholder="应用程序路径或链接地址">
-                    <input type="text" class="add-input" id="appIconInput" placeholder="图标路径（可选）">
-                    <fluent-button id="addAppBtn" appearance="accent" class="add-btn">添加</fluent-button>
                 </div>
             </div>
         </div>
@@ -103,6 +140,7 @@
             document.querySelector('#homeworkToggle').checked = settings.homeworkEnabled;
             document.querySelector('#alwaysOnTopToggle').checked = settings.alwaysOnTop; // 添加置顶状态
             document.querySelector('#darkThemeToggle').checked = settings.darkThemeEnabled || false; // 添加暗色主题状态
+            document.querySelector('#startupToggle').checked = settings.startupEnabled || false; // 添加开机自启状态
             
             // 渲染启动台应用列表
             renderLaunchpadList(settings.launchpadApps || []);
@@ -128,6 +166,11 @@
             ipcRenderer.send('toggle-dark-theme', this.checked);
         });
         
+        // 监听开机自启开关变化
+        document.querySelector('#startupToggle').addEventListener('change', function() {
+            ipcRenderer.send('toggle-startup', this.checked);
+        });
+        
         // 添加启动台应用
         document.querySelector('#addAppBtn').addEventListener('click', function() {
             const nameInput = document.getElementById('appNameInput');
@@ -219,6 +262,20 @@
             renderLaunchpadList(apps);
         });
         
+        // 选项卡切换功能
+        document.querySelectorAll('.tab').forEach(tab => {
+            tab.addEventListener('click', () => {
+                // 移除所有活动状态
+                document.querySelectorAll('.tab').forEach(t => t.classList.remove('active'));
+                document.querySelectorAll('.tab-content').forEach(c => c.classList.remove('active'));
+                
+                // 添加当前活动状态
+                tab.classList.add('active');
+                const tabId = `${tab.dataset.tab}-tab`;
+                document.getElementById(tabId).classList.add('active');
+            });
+        });
+        
         // 监听关闭按钮
         document.querySelector('#titleCloseBtn').addEventListener('click', () => {
             window.close();

From 7f75f79019ddd47f6df53040b6a77c57585ae067 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 00:10:25 +0800
Subject: [PATCH 03/20] =?UTF-8?q?style:=20:art:=20=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E6=89=80=E6=9C=89=E6=96=87=E6=A1=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 launchpad.js             |  4 +-
 main.js                  | 84 +++++++++++++++++-----------------
 pages/about.html         | 20 ++++++---
 pages/clock.html         | 22 ++++-----
 pages/homework-form.html | 12 +++--
 pages/homework-list.html | 34 +++++++-------
 pages/homework.html      | 34 +++++++-------
 pages/launchpad.html     | 22 ++++-----
 pages/settings.html      | 97 +++++++++++++++++++++-------------------
 pages/welcome.html       | 32 ++++++-------
 10 files changed, 193 insertions(+), 168 deletions(-)

diff --git a/launchpad.js b/launchpad.js
index aabb22b..7432f67 100644
--- a/launchpad.js
+++ b/launchpad.js
@@ -53,7 +53,7 @@ const addLaunchpadApp = (app) => {
     config.launchpadApps.push(app);
     config.timestamp = Date.now();
     fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2));
-    
+
     return config.launchpadApps;
   } catch (err) {
     console.error('添加启动台应用失败:', err);
@@ -69,7 +69,7 @@ const removeLaunchpadApp = (index) => {
       config.launchpadApps.splice(index, 1);
       config.timestamp = Date.now();
       fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2));
-      
+
       return config.launchpadApps;
     }
     return null;
diff --git a/main.js b/main.js
index d9e33ff..beee090 100644
--- a/main.js
+++ b/main.js
@@ -151,7 +151,7 @@ let homeworkWindowSplit;
 const createHomeworkWindowSplit = () => {
 	const config = loadConfig();
 	let defaultX, defaultY;
-	
+
 	// 尝试从配置中读取作业窗口位置，如果没有则使用默认位置
 	if (config.homeworkWindow?.x !== undefined && config.homeworkWindow?.y !== undefined) {
 		defaultX = config.homeworkWindow.x;
@@ -229,7 +229,7 @@ let launchpadWindow;
 const createLaunchpadWindow = () => {
 	const config = loadConfig();
 	let defaultX, defaultY;
-	
+
 	// 尝试从配置中读取启动台窗口位置，如果没有则使用默认位置
 	if (config.launchpadWindow?.x !== undefined && config.launchpadWindow?.y !== undefined) {
 		defaultX = config.launchpadWindow.x;
@@ -510,12 +510,12 @@ let tray;
 const icon = nativeImage.createFromPath(iconPath);
 
 // 应用准备就绪时
-	app.whenReady().then(() => {
-		isClockEnabled = clockSettingHandler.load();
-		isHomeworkEnabled = homeworkSettingHandler.load();
-		isAlwaysOnTop = alwaysOnTopSettingHandler.load(); // 加载置顶设置
-		isDarkThemeEnabled = darkThemeSettingHandler.load(); // 加载暗色主题设置
-		isStartupEnabled = startupSettingHandler.load(); // 加载开机自启设置
+app.whenReady().then(() => {
+	isClockEnabled = clockSettingHandler.load();
+	isHomeworkEnabled = homeworkSettingHandler.load();
+	isAlwaysOnTop = alwaysOnTopSettingHandler.load(); // 加载置顶设置
+	isDarkThemeEnabled = darkThemeSettingHandler.load(); // 加载暗色主题设置
+	isStartupEnabled = startupSettingHandler.load(); // 加载开机自启设置
 
 	// 如果是首次运行，显示欢迎页；否则直接创建主窗口
 	const appConfig = loadConfig();
@@ -547,35 +547,35 @@ const icon = nativeImage.createFromPath(iconPath);
 	tray = new Tray(icon);
 
 	const contextMenu = Menu.buildFromTemplate([{
-			label: '课堂窗 - ClassWindow',
-			role: "about"
-		},
-		{
-			label: '设置',
-			click: () => {
-				createSettingsWindow();
-			}
-		},
-		{
-			label: '重新加载页面',
-			role: "forceReload"
-		},
-		{
-			label: '关于',
-			click: () => {
-				createAboutWindow();
-			}
-		},
-    {
-			label: '查看作业列表',
-			click: () => {
-				createHomeworkListWindow();
-			}
-		},
-		{
-			label: '退出',
-			role: "quit"
-		},
+		label: '课堂窗 - ClassWindow',
+		role: "about"
+	},
+	{
+		label: '设置',
+		click: () => {
+			createSettingsWindow();
+		}
+	},
+	{
+		label: '重新加载页面',
+		role: "forceReload"
+	},
+	{
+		label: '关于',
+		click: () => {
+			createAboutWindow();
+		}
+	},
+	{
+		label: '查看作业列表',
+		click: () => {
+			createHomeworkListWindow();
+		}
+	},
+	{
+		label: '退出',
+		role: "quit"
+	},
 	]);
 
 	tray.setContextMenu(contextMenu);
@@ -607,12 +607,12 @@ const icon = nativeImage.createFromPath(iconPath);
 	ipcMain.on('save-homework', (event, homework) => {
 		// 添加新作业到JSON文件
 		const updatedHomeworkList = addHomework(homework);
-		
+
 		// 将作业数据发送回作业窗口
 		if (homeworkWindowSplit) {
 			homeworkWindowSplit.webContents.send('new-homework', homework);
 		}
-		
+
 		// 通知作业列表窗口刷新数据
 		if (homeworkListWindow) {
 			homeworkListWindow.webContents.send('refresh-homework-list');
@@ -628,7 +628,7 @@ const icon = nativeImage.createFromPath(iconPath);
 	// 监听删除作业的请求
 	ipcMain.on('delete-homework', (event, index) => {
 		const updatedHomeworkList = deleteHomework(index);
-		
+
 		// 通知所有相关窗口更新作业列表
 		if (homeworkWindowSplit) {
 			homeworkWindowSplit.webContents.send('refresh-homework-list');
@@ -702,7 +702,7 @@ const icon = nativeImage.createFromPath(iconPath);
 	ipcMain.on('toggle-startup', (event, isEnabled) => {
 		isStartupEnabled = isEnabled;
 		startupSettingHandler.handleToggle(isEnabled);
-		
+
 		if (isEnabled) {
 			// 启用开机自启
 			app.setLoginItemSettings({
@@ -773,4 +773,4 @@ const icon = nativeImage.createFromPath(iconPath);
 	});
 });
 
-app.on('window-all-closed', () => {});
\ No newline at end of file
+app.on('window-all-closed', () => { });
\ No newline at end of file
diff --git a/pages/about.html b/pages/about.html
index 58af596..b6ef7d0 100644
--- a/pages/about.html
+++ b/pages/about.html
@@ -1,13 +1,17 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="UTF-8">
     <title>关于 - 课堂窗</title>
     <!-- 引入 Fluent UI Web Components -->
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/about.css"></link>
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
+    <link rel="stylesheet" href="../assets/css/about.css">
+    </link>
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+    </link>
 </head>
+
 <body>
     <!-- 标题栏 -->
     <div class="title-bar">
@@ -23,12 +27,13 @@
             <fluent-card class="info-card">
                 <div class="about-content">
                     <div class="about-text">一个美丽，精巧的桌面悬浮窗。</div>
-                    <div class="about-text">作者: <fluent-anchor href="https://github.com/yeying-xingchen">夜影星辰</fluent-anchor></div>
+                    <div class="about-text">作者: <fluent-anchor
+                            href="https://github.com/yeying-xingchen">夜影星辰</fluent-anchor></div>
                     <div class="about-text">版本: <fluent-badge>1.1.1</fluent-badge></div>
-                    <div class="about-text">相关地址： 
+                    <div class="about-text">相关地址：
                         <fluent-anchor href="https://github.com/xinghai-smartedu/classwindow">GitHub 仓库</fluent-anchor>
                     </div>
-                    
+
                     <div class="about-text" style="margin-top: 20px;">
                         <fluent-button appearance="accent" onclick="openGitHub()">
                             访问项目页面
@@ -36,7 +41,7 @@
                     </div>
                 </div>
             </fluent-card>
-            
+
             <div class="about-text" style="margin-top: 30px; font-size: 12px; opacity: 0.7;">
                 © 2026 星海智教. 保留所有权利.
             </div>
@@ -49,9 +54,10 @@
     document.querySelector('#titleCloseBtn').addEventListener('click', () => {
         window.close();
     });
-    
+
     function openGitHub() {
         window.open('https://github.com/xinghai-smartedu/classwindow', '_blank');
     }
 </script>
+
 </html>
\ No newline at end of file
diff --git a/pages/clock.html b/pages/clock.html
index b100959..53eca07 100644
--- a/pages/clock.html
+++ b/pages/clock.html
@@ -6,7 +6,8 @@
     <title>时钟</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
     <link rel="stylesheet" href="../assets/css/main.css">
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+    </link>
 </head>
 
 <body>
@@ -32,12 +33,12 @@ <h3>时间</h3>
     // 防止click事件在空白区域时被拦截
     const timeCard = document.getElementById('timeCard');
     if (timeCard) {
-        timeCard.addEventListener('mouseenter', () => 
+        timeCard.addEventListener('mouseenter', () =>
             ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
         );
-        
-        timeCard.addEventListener('mouseleave', () => 
-            ipcRenderer.send('set-ignore-mouse-events', { 
+
+        timeCard.addEventListener('mouseleave', () =>
+            ipcRenderer.send('set-ignore-mouse-events', {
                 ignore: true,
                 forward: true
             })
@@ -90,20 +91,20 @@ <h3>时间</h3>
     // 添加切换主题的函数
     function toggleTheme(enabled) {
         isDarkThemeEnabled = enabled;
-        
+
         if (enabled) {
             // 使用暗色主题CSS
             const darkThemeLink = document.createElement('link');
             darkThemeLink.rel = 'stylesheet';
             darkThemeLink.href = '../assets/css/main-dark.css';
             darkThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
-            
+
             // 移除现有的主题链接
             const existingTheme = document.querySelector('link[href*="main.css"]');
             if (existingTheme && !existingTheme.href.includes('main-dark.css')) {
                 existingTheme.remove();
             }
-            
+
             // 添加暗色主题链接
             document.head.appendChild(darkThemeLink);
         } else {
@@ -112,13 +113,13 @@ <h3>时间</h3>
             lightThemeLink.rel = 'stylesheet';
             lightThemeLink.href = '../assets/css/main.css';
             lightThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
-            
+
             // 移除现有的主题链接
             const existingTheme = document.querySelector('link[href*="main-dark.css"]');
             if (existingTheme) {
                 existingTheme.remove();
             }
-            
+
             // 添加浅色主题链接
             document.head.appendChild(lightThemeLink);
         }
@@ -170,4 +171,5 @@ <h3>时间</h3>
         }
     });
 </script>
+
 </html>
\ No newline at end of file
diff --git a/pages/homework-form.html b/pages/homework-form.html
index 70f0135..2f01c1e 100644
--- a/pages/homework-form.html
+++ b/pages/homework-form.html
@@ -1,11 +1,14 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="UTF-8">
     <title>添加作业</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/homework-form.css"></link>
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
+    <link rel="stylesheet" href="../assets/css/homework-form.css">
+    </link>
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+    </link>
 </head>
 
 <body>
@@ -19,7 +22,7 @@
 
     <div class="container">
         <h2>添加作业</h2>
-        
+
         <!-- 模板选择部分 -->
         <div class="input-group">
             <label>使用模板:</label>
@@ -30,7 +33,7 @@ <h2>添加作业</h2>
                 <fluent-button appearance="outline" id="saveTemplateBtn" title="保存当前内容为模板">保存模板</fluent-button>
             </div>
         </div>
-        
+
         <div class="input-group">
             <label>科目:</label>
             <fluent-select id="subjectSelect">
@@ -104,4 +107,5 @@ <h2>添加作业</h2>
         });
     </script>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/pages/homework-list.html b/pages/homework-list.html
index 9490353..233a516 100644
--- a/pages/homework-list.html
+++ b/pages/homework-list.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="UTF-8">
     <title>全部作业</title>
@@ -22,11 +23,11 @@
             <h2>作业列表</h2>
             <fluent-button appearance="accent" id="addHomeworkBtn">添加作业</fluent-button>
         </div>
-        
+
         <div class="search-bar">
             <fluent-text-field id="searchInput" placeholder="搜索作业..." type="text"></fluent-text-field>
         </div>
-        
+
         <div class="filter-controls">
             <fluent-select id="subjectFilter">
                 <option value="">全部科目</option>
@@ -41,7 +42,7 @@ <h2>作业列表</h2>
                 <option value="politics">道德与法治</option>
                 <option value="other">其他</option>
             </fluent-select>
-            
+
             <fluent-select id="sortOrder">
                 <option value="newest">按最新添加</option>
                 <option value="oldest">按最早添加</option>
@@ -49,11 +50,11 @@ <h2>作业列表</h2>
                 <option value="dueDateDesc">按截止日期（降序）</option>
             </fluent-select>
         </div>
-        
+
         <div class="homework-list-container" id="homeworkListContainer">
             <!-- 作业列表将在这里显示 -->
         </div>
-        
+
         <div class="empty-state" id="emptyState" style="display: none;">
             <p>暂无作业</p>
             <fluent-button appearance="accent" id="emptyAddBtn">添加第一个作业</fluent-button>
@@ -80,7 +81,7 @@ <h2>作业列表</h2>
             try {
                 // 请求作业列表
                 ipcRenderer.send('get-homework-list');
-                
+
                 // 监听响应
                 ipcRenderer.on('homework-list-response', (event, homeworkList) => {
                     homeworkData = homeworkList;
@@ -129,14 +130,14 @@ <h2>作业列表</h2>
                     if (dueDate < now) {
                         isOverdue = true;
                     }
-                    
-                    const formattedDate = `${dueDate.getFullYear()}-${String(dueDate.getMonth()+1).padStart(2, '0')}-${String(dueDate.getDate()).padStart(2, '0')}`;
+
+                    const formattedDate = `${dueDate.getFullYear()}-${String(dueDate.getMonth() + 1).padStart(2, '0')}-${String(dueDate.getDate()).padStart(2, '0')}`;
                     dueDateStr = `截止: ${formattedDate}`;
                 }
 
                 // 格式化时间戳
                 const timestamp = item.timestamp ? new Date(item.timestamp) : new Date();
-                const timeStr = `${timestamp.getFullYear()}-${String(timestamp.getMonth()+1).padStart(2, '0')}-${String(timestamp.getDate()).padStart(2, '0')}`;
+                const timeStr = `${timestamp.getFullYear()}-${String(timestamp.getMonth() + 1).padStart(2, '0')}-${String(timestamp.getDate()).padStart(2, '0')}`;
 
                 // 将换行符替换为<br>标签
                 const contentWithLineBreaks = item.content.replace(/\n/g, '<br>');
@@ -188,7 +189,7 @@ <h2>作业列表</h2>
             // 搜索过滤
             const searchTerm = searchInput.value.trim().toLowerCase();
             if (searchTerm) {
-                result = result.filter(item => 
+                result = result.filter(item =>
                     item.content.toLowerCase().includes(searchTerm) ||
                     getSubjectName(item.subject).toLowerCase().includes(searchTerm)
                 );
@@ -229,7 +230,7 @@ <h2>作业列表</h2>
         function addEventListeners() {
             // 删除按钮
             document.querySelectorAll('.delete-btn').forEach(button => {
-                button.addEventListener('click', function() {
+                button.addEventListener('click', function () {
                     const index = parseInt(this.getAttribute('data-index'));
                     deleteHomework(index);
                 });
@@ -237,7 +238,7 @@ <h2>作业列表</h2>
 
             // 详情按钮
             document.querySelectorAll('.detail-btn').forEach(button => {
-                button.addEventListener('click', function() {
+                button.addEventListener('click', function () {
                     const index = parseInt(this.getAttribute('data-index'));
                     openHomeworkDetail(homeworkData[index]);
                 });
@@ -245,7 +246,7 @@ <h2>作业列表</h2>
 
             // 编辑按钮
             document.querySelectorAll('.edit-btn').forEach(button => {
-                button.addEventListener('click', function() {
+                button.addEventListener('click', function () {
                     const index = parseInt(this.getAttribute('data-index'));
                     editHomework(index);
                 });
@@ -268,16 +269,16 @@ <h2>作业列表</h2>
         // 初始化
         function init() {
             getAllHomework(); // 改为从主进程获取作业数据
-            
+
             // 其他初始化代码保持不变
             searchInput.addEventListener('input', filterAndSortHomework);
             subjectFilter.addEventListener('change', filterAndSortHomework);
             sortOrder.addEventListener('change', filterAndSortHomework);
-            
+
             addHomeworkBtn.addEventListener('click', () => {
                 ipcRenderer.send('open-homework-window');
             });
-            
+
             emptyAddBtn.addEventListener('click', () => {
                 ipcRenderer.send('open-homework-window');
             });
@@ -307,4 +308,5 @@ <h2>作业列表</h2>
         document.addEventListener('DOMContentLoaded', init);
     </script>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/pages/homework.html b/pages/homework.html
index 045fdfa..52e9116 100644
--- a/pages/homework.html
+++ b/pages/homework.html
@@ -6,7 +6,8 @@
     <title>作业</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
     <link rel="stylesheet" href="../assets/css/main.css">
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+    </link>
 </head>
 
 <body>
@@ -37,12 +38,12 @@ <h3>作业</h3>
     // 防止click事件在空白区域时被拦截
     const homeworkCard = document.getElementById('homeworkCard');
     if (homeworkCard) {
-        homeworkCard.addEventListener('mouseenter', () => 
+        homeworkCard.addEventListener('mouseenter', () =>
             ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
         );
-        
-        homeworkCard.addEventListener('mouseleave', () => 
-            ipcRenderer.send('set-ignore-mouse-events', { 
+
+        homeworkCard.addEventListener('mouseleave', () =>
+            ipcRenderer.send('set-ignore-mouse-events', {
                 ignore: true,
                 forward: true
             })
@@ -90,20 +91,20 @@ <h3>作业</h3>
     // 添加切换主题的函数
     function toggleTheme(enabled) {
         isDarkThemeEnabled = enabled;
-        
+
         if (enabled) {
             // 使用暗色主题CSS
             const darkThemeLink = document.createElement('link');
             darkThemeLink.rel = 'stylesheet';
             darkThemeLink.href = '../assets/css/main-dark.css';
             darkThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
-            
+
             // 移除现有的主题链接
             const existingTheme = document.querySelector('link[href*="main.css"]');
             if (existingTheme && !existingTheme.href.includes('main-dark.css')) {
                 existingTheme.remove();
             }
-            
+
             // 添加暗色主题链接
             document.head.appendChild(darkThemeLink);
         } else {
@@ -112,13 +113,13 @@ <h3>作业</h3>
             lightThemeLink.rel = 'stylesheet';
             lightThemeLink.href = '../assets/css/main.css';
             lightThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
-            
+
             // 移除现有的主题链接
             const existingTheme = document.querySelector('link[href*="main-dark.css"]');
             if (existingTheme) {
                 existingTheme.remove();
             }
-            
+
             // 添加浅色主题链接
             document.head.appendChild(lightThemeLink);
         }
@@ -147,7 +148,7 @@ <h3>作业</h3>
             const { ipcRenderer } = require('electron');
             // 请求作业列表
             ipcRenderer.send('get-homework-list');
-            
+
             // 监听响应
             ipcRenderer.on('homework-list-response', (event, homeworkList) => {
                 homeworkData = homeworkList;
@@ -169,7 +170,7 @@ <h3>作业</h3>
                 'geography': '地理',
                 'technology': '技术'
             };
-            
+
             return subjectNames[subjectKey] || subjectKey; // 如果找不到对应名称，则返回原始键值
         }
 
@@ -196,9 +197,9 @@ <h3>作业</h3>
                     // 检查是否是当天
                     const today = new Date();
                     if (!(date.getFullYear() === today.getFullYear() &&
-                            date.getMonth() === today.getMonth() &&
-                            date.getDate() === today.getDate())) {
-                        dueDateStr = `<br> 截止: ${date.getFullYear()}-${String(date.getMonth()+1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+                        date.getMonth() === today.getMonth() &&
+                        date.getDate() === today.getDate())) {
+                        dueDateStr = `<br> 截止: ${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
                     }
                 }
 
@@ -217,7 +218,7 @@ <h3>作业</h3>
 
             // 添加删除按钮事件监听
             document.querySelectorAll('.delete-btn').forEach(button => {
-                button.addEventListener('click', function() {
+                button.addEventListener('click', function () {
                     const index = parseInt(this.getAttribute('data-index'));
                     if (typeof require !== 'undefined') {
                         try {
@@ -292,4 +293,5 @@ <h3>作业</h3>
         fetchHomeworkList(); // 改为从主进程获取作业列表
     });
 </script>
+
 </html>
\ No newline at end of file
diff --git a/pages/launchpad.html b/pages/launchpad.html
index b9426f4..2417731 100644
--- a/pages/launchpad.html
+++ b/pages/launchpad.html
@@ -6,7 +6,8 @@
     <title>启动台</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
     <link rel="stylesheet" href="../assets/css/main.css">
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+    </link>
 </head>
 
 <body>
@@ -33,12 +34,12 @@ <h3>启动台</h3>
     // 防止click事件在空白区域时被拦截
     const launchpadCard = document.getElementById('launchpadCard');
     if (launchpadCard) {
-        launchpadCard.addEventListener('mouseenter', () => 
+        launchpadCard.addEventListener('mouseenter', () =>
             ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
         );
-        
-        launchpadCard.addEventListener('mouseleave', () => 
-            ipcRenderer.send('set-ignore-mouse-events', { 
+
+        launchpadCard.addEventListener('mouseleave', () =>
+            ipcRenderer.send('set-ignore-mouse-events', {
                 ignore: true,
                 forward: true
             })
@@ -70,20 +71,20 @@ <h3>启动台</h3>
     // 添加切换主题的函数
     function toggleTheme(enabled) {
         isDarkThemeEnabled = enabled;
-        
+
         if (enabled) {
             // 使用暗色主题CSS
             const darkThemeLink = document.createElement('link');
             darkThemeLink.rel = 'stylesheet';
             darkThemeLink.href = '../assets/css/main-dark.css';
             darkThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
-            
+
             // 移除现有的主题链接
             const existingTheme = document.querySelector('link[href*="main.css"]');
             if (existingTheme && !existingTheme.href.includes('main-dark.css')) {
                 existingTheme.remove();
             }
-            
+
             // 添加暗色主题链接
             document.head.appendChild(darkThemeLink);
         } else {
@@ -92,13 +93,13 @@ <h3>启动台</h3>
             lightThemeLink.rel = 'stylesheet';
             lightThemeLink.href = '../assets/css/main.css';
             lightThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
-            
+
             // 移除现有的主题链接
             const existingTheme = document.querySelector('link[href*="main-dark.css"]');
             if (existingTheme) {
                 existingTheme.remove();
             }
-            
+
             // 添加浅色主题链接
             document.head.appendChild(lightThemeLink);
         }
@@ -193,4 +194,5 @@ <h3>启动台</h3>
         updateLaunchpadVisibility();
     });
 </script>
+
 </html>
\ No newline at end of file
diff --git a/pages/settings.html b/pages/settings.html
index 2f96716..1ac9e47 100644
--- a/pages/settings.html
+++ b/pages/settings.html
@@ -1,13 +1,17 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="UTF-8">
     <title>设置 - 课堂窗</title>
     <!-- 引入 Fluent UI Web Components -->
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/settings.css"></link>
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
+    <link rel="stylesheet" href="../assets/css/settings.css">
+    </link>
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+    </link>
 </head>
+
 <body>
     <!-- 标题栏 -->
     <div class="title-bar">
@@ -26,7 +30,7 @@
                 <fluent-card class="tab" data-tab="launchpad">启动台</fluent-card>
                 <fluent-card class="tab" data-tab="advanced">高级</fluent-card>
             </div>
-            
+
             <!-- 右侧内容区域 -->
             <div class="content">
                 <!-- 常规设置 -->
@@ -41,7 +45,7 @@
                                 <fluent-switch id="clockToggle" label="时钟"></fluent-switch>
                             </div>
                         </div>
-                        
+
                         <div class="setting-item">
                             <div class="setting-info">
                                 <div class="setting-title">启用作业</div>
@@ -53,7 +57,7 @@
                         </div>
                     </div>
                 </div>
-                
+
                 <!-- 外观设置 -->
                 <div class="tab-content" id="appearance-tab">
                     <div class="setting-group">
@@ -66,7 +70,7 @@
                                 <fluent-switch id="darkThemeToggle" label="暗色主题"></fluent-switch>
                             </div>
                         </div>
-                        
+
                         <div class="setting-item">
                             <div class="setting-info">
                                 <div class="setting-title">窗口置顶</div>
@@ -78,7 +82,7 @@
                         </div>
                     </div>
                 </div>
-                
+
                 <!-- 启动台设置 -->
                 <div class="tab-content" id="launchpad-tab">
                     <!-- 启动台设置部分 -->
@@ -87,11 +91,11 @@
                             <div class="launchpad-title">启动台</div>
                         </div>
                         <p style="color: #605e5c; margin-bottom: 16px;">管理快捷启动的应用程序和链接</p>
-                        
+
                         <div class="launchpad-list" id="launchpadList">
                             <!-- 启动项将在这里显示 -->
                         </div>
-                        
+
                         <div class="add-form">
                             <div class="form-row">
                                 <input type="text" class="add-input" id="appNameInput" placeholder="名称">
@@ -106,7 +110,7 @@
                         </div>
                     </div>
                 </div>
-                
+
                 <!-- 高级设置 -->
                 <div class="tab-content" id="advanced-tab">
                     <div class="setting-group">
@@ -127,13 +131,13 @@
 
     <script>
         const { ipcRenderer } = require('electron');
-        
+
         // 页面加载完成后获取当前设置状态
         window.addEventListener('DOMContentLoaded', () => {
             // 请求获取当前设置
             ipcRenderer.send('get-settings');
         });
-        
+
         // 监听设置状态更新
         ipcRenderer.on('settings-updated', (event, settings) => {
             document.querySelector('#clockToggle').checked = settings.clockEnabled;
@@ -141,73 +145,73 @@
             document.querySelector('#alwaysOnTopToggle').checked = settings.alwaysOnTop; // 添加置顶状态
             document.querySelector('#darkThemeToggle').checked = settings.darkThemeEnabled || false; // 添加暗色主题状态
             document.querySelector('#startupToggle').checked = settings.startupEnabled || false; // 添加开机自启状态
-            
+
             // 渲染启动台应用列表
             renderLaunchpadList(settings.launchpadApps || []);
         });
-        
+
         // 监听时钟开关变化
-        document.querySelector('#clockToggle').addEventListener('change', function() {
+        document.querySelector('#clockToggle').addEventListener('change', function () {
             ipcRenderer.send('toggle-clock', this.checked);
         });
-        
+
         // 监听作业开关变化
-        document.querySelector('#homeworkToggle').addEventListener('change', function() {
+        document.querySelector('#homeworkToggle').addEventListener('change', function () {
             ipcRenderer.send('toggle-homework', this.checked);
         });
-        
+
         // 监听置顶开关变化
-        document.querySelector('#alwaysOnTopToggle').addEventListener('change', function() {
+        document.querySelector('#alwaysOnTopToggle').addEventListener('change', function () {
             ipcRenderer.send('toggle-always-on-top', this.checked);
         });
-        
+
         // 监听暗色主题开关变化
-        document.querySelector('#darkThemeToggle').addEventListener('change', function() {
+        document.querySelector('#darkThemeToggle').addEventListener('change', function () {
             ipcRenderer.send('toggle-dark-theme', this.checked);
         });
-        
+
         // 监听开机自启开关变化
-        document.querySelector('#startupToggle').addEventListener('change', function() {
+        document.querySelector('#startupToggle').addEventListener('change', function () {
             ipcRenderer.send('toggle-startup', this.checked);
         });
-        
+
         // 添加启动台应用
-        document.querySelector('#addAppBtn').addEventListener('click', function() {
+        document.querySelector('#addAppBtn').addEventListener('click', function () {
             const nameInput = document.getElementById('appNameInput');
             const pathInput = document.getElementById('appPathInput');
             const typeInput = document.getElementById('appTypeInput');
             const iconInput = document.getElementById('appIconInput'); // 新增图标输入
-            
+
             const name = nameInput.value.trim();
             const path = pathInput.value.trim();
             const type = typeInput.value;
             const icon = iconInput.value.trim(); // 获取图标路径
-            
+
             if (!name || !path) {
                 alert('请输入名称和路径/链接');
                 return;
             }
-            
+
             // 如果是链接类型，验证URL格式
             if (type === 'link' && !isValidUrl(path)) {
                 alert('请输入有效的链接地址（以http://或https://开头）');
                 return;
             }
-            
+
             // 发送包含图标信息的应用数据
-            ipcRenderer.send('add-launchpad-app', { 
-                name, 
-                path, 
+            ipcRenderer.send('add-launchpad-app', {
+                name,
+                path,
                 type,
                 icon: icon || null // 如果没有提供图标，则为null
             });
-            
+
             // 清空输入框
             nameInput.value = '';
             pathInput.value = '';
             iconInput.value = ''; // 清空图标输入框
         });
-        
+
         // 验证URL格式
         function isValidUrl(string) {
             try {
@@ -217,30 +221,30 @@
                 return false;
             }
         }
-        
-        
+
+
         // 删除启动台应用
         function removeLaunchpadApp(index) {
             ipcRenderer.send('remove-launchpad-app', index);
         }
-        
+
         // 渲染启动台应用列表
         function renderLaunchpadList(apps) {
             const listContainer = document.getElementById('launchpadList');
             listContainer.innerHTML = '';
-            
+
             if (apps.length === 0) {
                 listContainer.innerHTML = '<p style="text-align: center; color: #605e5c; padding: 10px;">暂无启动项</p>';
                 return;
             }
-            
+
             apps.forEach((app, index) => {
                 const item = document.createElement('div');
                 item.className = 'launchpad-item';
-                
+
                 const typeLabel = app.type === 'link' ? '链接' : '应用';
                 const typeClass = app.type === 'link' ? 'link' : 'app';
-                
+
                 item.innerHTML = `
                     <div class="launchpad-item-info">
                         <div class="launchpad-item-name">
@@ -256,33 +260,34 @@
                 listContainer.appendChild(item);
             });
         }
-        
+
         // 监听启动台应用更新
         ipcRenderer.on('launchpad-apps-updated', (event, apps) => {
             renderLaunchpadList(apps);
         });
-        
+
         // 选项卡切换功能
         document.querySelectorAll('.tab').forEach(tab => {
             tab.addEventListener('click', () => {
                 // 移除所有活动状态
                 document.querySelectorAll('.tab').forEach(t => t.classList.remove('active'));
                 document.querySelectorAll('.tab-content').forEach(c => c.classList.remove('active'));
-                
+
                 // 添加当前活动状态
                 tab.classList.add('active');
                 const tabId = `${tab.dataset.tab}-tab`;
                 document.getElementById(tabId).classList.add('active');
             });
         });
-        
+
         // 监听关闭按钮
         document.querySelector('#titleCloseBtn').addEventListener('click', () => {
             window.close();
         });
-        
+
         // 使 removeLaunchpadApp 函数全局可用
         window.removeLaunchpadApp = removeLaunchpadApp;
     </script>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/pages/welcome.html b/pages/welcome.html
index 647d80c..bf09259 100644
--- a/pages/welcome.html
+++ b/pages/welcome.html
@@ -1,12 +1,16 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
+
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>ClassWindow - 欢迎</title>
-  <link rel="stylesheet" href="../assets/css/welcome.css"></link>
-  <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
+  <link rel="stylesheet" href="../assets/css/welcome.css">
+  </link>
+  <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+  </link>
 </head>
+
 <body>
   <!-- 标题栏 -->
   <div class="title-bar">
@@ -42,9 +46,9 @@ <h1 class="title">选项设置</h1>
       <p class="description">
         个性化配置您的 ClassWindow 体验
       </p>
-      
+
       <button class="btn btn-primary" id="openSettingsWindow">打开设置窗口</button>
-      
+
       <div class="button-container" style="margin-top: 30px;">
         <button class="btn btn-primary" onclick="showPage('start')">下一步</button>
         <button class="btn btn-secondary" onclick="showPage('welcome')">返回</button>
@@ -65,41 +69,39 @@ <h1 class="title">开始使用！</h1>
     const { ipcRenderer } = require('electron');
 
     startBtn.addEventListener('click', () => {
-        ipcRenderer.send('first-run-complete');
+      ipcRenderer.send('first-run-complete');
     });
 
     openSettingsWindow.addEventListener('click', () => {
-        ipcRenderer.send('open-settings-window');
+      ipcRenderer.send('open-settings-window');
     });
-    
+
     // 页面切换功能
     function showPage(pageName) {
       // 隐藏所有页面
       document.querySelectorAll('.page').forEach(page => {
         page.classList.remove('active');
       });
-      
+
       // 显示指定页面
       document.getElementById(`${pageName}-page`).classList.add('active');
-      
+
       // 更新导航标签状态
       document.querySelectorAll('.tab').forEach(tab => {
         tab.classList.remove('active');
       });
-      
+
       document.querySelector(`[data-page="${pageName}"]`).classList.add('active');
     }
-    
+
     // 为导航标签添加点击事件
     document.querySelectorAll('.tab').forEach(tab => {
-      tab.addEventListener('click', function() {
+      tab.addEventListener('click', function () {
         const pageName = this.getAttribute('data-page');
         showPage(pageName);
       });
     });
   </script>
 </body>
-</html>
-
-
 
+</html>
\ No newline at end of file

From f3c8debc2d0d0d19a57c8fbaa0b304ce27a0ef5a Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 00:16:31 +0800
Subject: [PATCH 04/20] =?UTF-8?q?feat:=20:sparkles:=20=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 homework.js              | 77 +++++++++++++++++++++++++++++++-
 main.js                  | 33 +++++++++++++-
 pages/homework-form.html | 94 +++++++++++++++++++++++++++++++++++++---
 3 files changed, 195 insertions(+), 9 deletions(-)

diff --git a/homework.js b/homework.js
index 4e10bd5..fcfb158 100644
--- a/homework.js
+++ b/homework.js
@@ -3,6 +3,7 @@ const fs = require('fs');
 const { app } = require('electron/main');
 
 let HOMEWORK_PATH;
+let TEMPLATES_PATH;
 
 // 初始化作业数据路径
 const initHomeworkPath = () => {
@@ -11,8 +12,10 @@ const initHomeworkPath = () => {
     const appDir = path.dirname(app.getPath('exe'));
     const DATA_DIR = path.join(appDir, 'data');
     HOMEWORK_PATH = path.join(DATA_DIR, 'homework.json');
+    TEMPLATES_PATH = path.join(DATA_DIR, 'templates.json');
   } else {
     HOMEWORK_PATH = path.join(__dirname, 'data/homework.json');
+    TEMPLATES_PATH = path.join(__dirname, 'data/templates.json');
   }
 };
 
@@ -94,11 +97,83 @@ const updateHomework = (index, homework) => {
   }
 };
 
+// 读取模板数据
+const loadTemplates = () => {
+  try {
+    if (fs.existsSync(TEMPLATES_PATH)) {
+      const data = fs.readFileSync(TEMPLATES_PATH, 'utf8');
+      const parsed = JSON.parse(data);
+      // 确保返回的是数组格式
+      return Array.isArray(parsed) ? parsed : [];
+    }
+  } catch (err) {
+    console.warn('读取模板数据失败:', err);
+  }
+  return [];
+};
+
+// 保存模板数据
+const saveTemplates = (templatesList) => {
+  try {
+    ensureDataDir();
+    fs.writeFileSync(TEMPLATES_PATH, JSON.stringify(templatesList, null, 2));
+  } catch (err) {
+    console.error('保存模板数据失败:', err);
+  }
+};
+
+// 添加新模板
+const addTemplate = (template) => {
+  try {
+    const templatesList = loadTemplates();
+    // 检查是否已存在相同名称的模板
+    const existingIndex = templatesList.findIndex(t => t.name === template.name);
+    if (existingIndex !== -1) {
+      // 如果存在，则更新该模板
+      templatesList[existingIndex] = template;
+    } else {
+      // 否则添加到列表开头
+      templatesList.unshift(template);
+    }
+    saveTemplates(templatesList);
+    return templatesList;
+  } catch (err) {
+    console.error('添加模板失败:', err);
+    return [];
+  }
+};
+
+// 删除模板
+const deleteTemplate = (index) => {
+  try {
+    const templatesList = loadTemplates();
+    if (index >= 0 && index < templatesList.length) {
+      templatesList.splice(index, 1);
+      saveTemplates(templatesList);
+      return templatesList;
+    }
+    return templatesList;
+  } catch (err) {
+    console.error('删除模板失败:', err);
+    return [];
+  }
+};
+
+// 获取所有模板
+const getAllTemplates = () => {
+  return loadTemplates();
+};
+
 module.exports = {
   initHomeworkPath,
   loadHomework,
   saveHomework,
   addHomework,
   deleteHomework,
-  updateHomework
+  updateHomework,
+  loadTemplates,
+  saveTemplates,
+  addTemplate,
+  deleteTemplate,
+  getAllTemplates
 };
\ No newline at end of file
diff --git a/main.js b/main.js
index beee090..da7b33b 100644
--- a/main.js
+++ b/main.js
@@ -25,7 +25,12 @@ const {
 	loadHomework,
 	addHomework,
 	deleteHomework,
-	updateHomework
+	updateHomework,
+	loadTemplates,
+	saveTemplates,
+	addTemplate,
+	deleteTemplate,
+	getAllTemplates
 } = require('./homework');
 
 // 启动台
@@ -643,6 +648,32 @@ app.whenReady().then(() => {
 		homeworkAddWindow = null;
 	});
 
+	// 监听获取模板列表的请求
+	ipcMain.on('get-template-list', (event) => {
+		const templateList = getAllTemplates();
+		event.reply('template-list-response', templateList);
+	});
+
+	// 监听保存模板的请求
+	ipcMain.on('save-template', (event, template) => {
+		const updatedTemplateList = addTemplate(template);
+
+		// 通知作业表单窗口刷新模板列表（如果存在）
+		if (homeworkAddWindow && !homeworkAddWindow.isDestroyed()) {
+			homeworkAddWindow.webContents.send('template-saved');
+		}
+	});
+
+	// 监听删除模板的请求
+	ipcMain.on('delete-template', (event, index) => {
+		const updatedTemplateList = deleteTemplate(index);
+		
+		// 通知作业表单窗口刷新模板列表（如果存在）
+		if (homeworkAddWindow && !homeworkAddWindow.isDestroyed()) {
+			homeworkAddWindow.webContents.send('template-deleted');
+		}
+	});
+
 	// 监听获取设置的请求
 	ipcMain.on('get-settings', () => {
 		if (settingsWindow) {
diff --git a/pages/homework-form.html b/pages/homework-form.html
index 2f01c1e..48981a1 100644
--- a/pages/homework-form.html
+++ b/pages/homework-form.html
@@ -66,23 +66,104 @@ <h2>添加作业</h2>
     <script>
         const { ipcRenderer } = require('electron');
 
+        // DOM 元素
+        const templateSelect = document.getElementById('templateSelect');
+        const subjectSelect = document.getElementById('subjectSelect');
+        const homeworkContent = document.getElementById('homeworkContent');
+        const dueDate = document.getElementById('dueDate');
+        const saveBtn = document.getElementById('saveBtn');
+        const saveTemplateBtn = document.getElementById('saveTemplateBtn');
+
         // 设置截止日期为当天
         document.addEventListener('DOMContentLoaded', () => {
             const today = new Date().toISOString().split('T')[0]; // 格式: YYYY-MM-DD
-            document.getElementById('dueDate').value = today;
+            dueDate.value = today;
+
+            // 加载模板列表
+            loadTemplateList();
+        });
+
+        // 加载模板列表
+        function loadTemplateList() {
+            ipcRenderer.send('get-template-list');
+            
+            ipcRenderer.once('template-list-response', (event, templateList) => {
+                // 清空现有选项（保留第一个"选择模板..."选项）
+                while (templateSelect.options.length > 1) {
+                    templateSelect.remove(1);
+                }
+
+                // 添加模板选项
+                templateList.forEach((template, index) => {
+                    const option = document.createElement('option');
+                    option.value = index;
+                    option.textContent = template.name;
+                    templateSelect.appendChild(option);
+                });
+            });
+        }
+
+        // 模板选择改变事件
+        templateSelect.addEventListener('change', () => {
+            const selectedIndex = templateSelect.value;
+            if (selectedIndex !== '') {
+                ipcRenderer.send('get-template-list');
+                
+                ipcRenderer.once('template-list-response', (event, templateList) => {
+                    const selectedTemplate = templateList[parseInt(selectedIndex)];
+                    if (selectedTemplate) {
+                        // 填充表单字段
+                        subjectSelect.value = selectedTemplate.subject;
+                        homeworkContent.value = selectedTemplate.content;
+                        
+                        // 如果模板中有截止日期，使用模板的日期，否则使用今天
+                        if (selectedTemplate.dueDate) {
+                            dueDate.value = selectedTemplate.dueDate;
+                        } else {
+                            const today = new Date().toISOString().split('T')[0];
+                            dueDate.value = today;
+                        }
+                    }
+                });
+            }
+        });
+
+        // 保存模板按钮点击事件
+        saveTemplateBtn.addEventListener('click', () => {
+            const subject = subjectSelect.value;
+            const content = homeworkContent.value.trim();
+            
+            if (!content) {
+                alert('请先输入作业内容再保存模板');
+                return;
+            }
+
+            // 弹出对话框获取模板名称
+            const templateName = prompt('请输入模板名称:');
+            if (templateName) {
+                const template = {
+                    name: templateName,
+                    subject: subject,
+                    content: content,
+                    dueDate: dueDate.value || null
+                };
+
+                ipcRenderer.send('save-template', template);
+                alert('模板已保存！');
+            }
         });
 
         // 保存作业
-        document.getElementById('saveBtn').addEventListener('click', () => {
-            const subject = document.getElementById('subjectSelect').value;
-            const content = document.getElementById('homeworkContent').value.trim();
-            const dueDate = document.getElementById('dueDate').value;
+        saveBtn.addEventListener('click', () => {
+            const subject = subjectSelect.value;
+            const content = homeworkContent.value.trim();
+            const dueDateValue = dueDate.value;
 
             if (content) {
                 ipcRenderer.send('save-homework', {
                     subject: subject,
                     content: content,
-                    dueDate: dueDate || null,
+                    dueDate: dueDateValue || null,
                     timestamp: new Date().toISOString()
                 });
 
@@ -107,5 +188,4 @@ <h2>添加作业</h2>
         });
     </script>
 </body>
-
 </html>
\ No newline at end of file

From dd36ff0c3f6b906b637bebbf10452413860a14c3 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 00:27:36 +0800
Subject: [PATCH 05/20] =?UTF-8?q?ci:=20:construction=5Fworker:=20=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=91=E5=B8=83=E6=9E=84=E5=BB=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/conventional-changelog-config.json |  15 +++
 .github/conventional-changelog-custom.js   |  19 +++
 .github/generate-conventional-changelog.js |  87 ++++++++++++++
 .github/workflows/build.yml                |  26 +++++
 .github/workflows/release.yml              | 128 +++++++++++++++++++++
 README.md                                  |   2 +-
 package.json                               |   1 +
 7 files changed, 277 insertions(+), 1 deletion(-)
 create mode 100644 .github/conventional-changelog-config.json
 create mode 100644 .github/conventional-changelog-custom.js
 create mode 100644 .github/generate-conventional-changelog.js
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/conventional-changelog-config.json b/.github/conventional-changelog-config.json
new file mode 100644
index 0000000..724d497
--- /dev/null
+++ b/.github/conventional-changelog-config.json
@@ -0,0 +1,15 @@
+{
+  "types": [
+    {"type": "feat", "section": "✨ 新功能"},
+    {"type": "feature", "section": "✨ 新功能"},
+    {"type": "fix", "section": "🐛 问题修复"},
+    {"type": "perf", "section": "⚡ 性能优化"},
+    {"type": "docs", "section": "📚 文档"},
+    {"type": "style", "section": "🎨 样式调整"},
+    {"type": "refactor", "section": "🔨 重构"},
+    {"type": "test", "section": "🧪 测试"},
+    {"type": "build", "section": "📦 构建系统"},
+    {"type": "ci", "section": "🔄 CI/CD"},
+    {"type": "chore", "section": "🧹 其他变更"}
+  ]
+}
\ No newline at end of file
diff --git a/.github/conventional-changelog-custom.js b/.github/conventional-changelog-custom.js
new file mode 100644
index 0000000..47b98c3
--- /dev/null
+++ b/.github/conventional-changelog-custom.js
@@ -0,0 +1,19 @@
+module.exports = {
+  types: [
+    { type: 'feat', section: '✨ 新功能 Features' },
+    { type: 'feature', section: '✨ 新功能 Features' },
+    { type: 'fix', section: '🐛 问题修复 Bug Fixes' },
+    { type: 'perf', section: '⚡ 性能优化 Performance Improvements' },
+    { type: 'docs', section: '📚 文档 Documentation' },
+    { type: 'style', section: '🎨 样式调整 Style Changes' },
+    { type: 'refactor', section: '🔨 重构 Refactoring' },
+    { type: 'test', section: '🧪 测试 Tests' },
+    { type: 'build', section: '📦 构建系统 Build System' },
+    { type: 'ci', section: '🔄 CI/CD' },
+    { type: 'chore', section: '🧹 其他变更 Chore' }
+  ],
+  commitUrlFormat: '{{host}}/{{owner}}/{{repository}}/commit/{{hash}}',
+  compareUrlFormat: '{{host}}/{{owner}}/{{repository}}/compare/{{previousTag}}...{{currentTag}}',
+  issueUrlFormat: '{{host}}/{{owner}}/{{repository}}/issues/{{id}}',
+  userUrlFormat: '{{host}}/{{owner}}/{{username}}'
+};
\ No newline at end of file
diff --git a/.github/generate-conventional-changelog.js b/.github/generate-conventional-changelog.js
new file mode 100644
index 0000000..5f5cfbb
--- /dev/null
+++ b/.github/generate-conventional-changelog.js
@@ -0,0 +1,87 @@
+const { execSync } = require('child_process');
+const fs = require('fs');
+
+// 自定义配置
+const config = {
+  types: [
+    { type: 'feat', section: '✨ 新功能 Features' },
+    { type: 'feature', section: '✨ 新功能 Features' },
+    { type: 'fix', section: '🐛 问题修复 Bug Fixes' },
+    { type: 'perf', section: '⚡ 性能优化 Performance Improvements' },
+    { type: 'docs', section: '📚 文档 Documentation' },
+    { type: 'style', section: '🎨 样式调整 Style Changes' },
+    { type: 'refactor', section: '🔨 重构 Refactoring' },
+    { type: 'test', section: '🧪 测试 Tests' },
+    { type: 'build', section: '📦 构建系统 Build System' },
+    { type: 'ci', section: '🔄 CI/CD' },
+    { type: 'chore', section: '🧹 其他变更 Chore' }
+  ]
+};
+
+// 获取最新的标签
+let latestTag = '';
+try {
+  latestTag = execSync('git describe --tags $(git rev-list --tags --max-count=1)', { encoding: 'utf8' }).trim();
+} catch (e) {
+  // 如果没有标签，则使用初始标签
+  latestTag = '';
+}
+
+// 获取提交历史
+let commits;
+if (!latestTag) {
+  commits = execSync('git log --pretty=format:"%s||%b||%an" --reverse HEAD', { encoding: 'utf8' });
+} else {
+  commits = execSync(`git log --pretty=format:"%s||%b||%an" --reverse ${latestTag}..HEAD`, { encoding: 'utf8' });
+}
+
+// 解析提交
+const commitList = commits.split('\n').filter(c => c.trim() !== '');
+
+// 按类型分组提交
+const groupedCommits = {};
+commitList.forEach(commit => {
+  const [subject, body, author] = commit.split('||');
+  const match = subject.match(/^(feat|feature|fix|perf|docs|style|refactor|test|build|ci|chore)(?:\(.+\))?:\s*(.+)$/i);
+  
+  let type = 'chore'; // 默认类型
+  let message = subject;
+  
+  if (match) {
+    type = match[1].toLowerCase();
+    message = match[2];
+  }
+  
+  // 查找对应的分组名
+  const typeConfig = config.types.find(t => t.type === type);
+  const sectionName = typeConfig ? typeConfig.section : '🧹 其他变更 Chore';
+  
+  if (!groupedCommits[sectionName]) {
+    groupedCommits[sectionName] = [];
+  }
+  
+  groupedCommits[sectionName].push({
+    type,
+    message,
+    author: author || 'Unknown'
+  });
+});
+
+// 生成 changelog 内容
+let changelogContent = '## 更新日志\n\n';
+
+Object.keys(groupedCommits).forEach(section => {
+  if (groupedCommits[section].length > 0) {
+    changelogContent += `### ${section}\n\n`;
+    
+    groupedCommits[section].forEach(commit => {
+      changelogContent += `- ${commit.message} (${commit.author})\n`;
+    });
+    
+    changelogContent += '\n';
+  }
+});
+
+// 输出到文件
+fs.writeFileSync('temp_changelog.md', changelogContent);
+console.log('Changelog generated successfully');
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e901ba..593a142 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,6 +20,8 @@ jobs:
        run: npm install -g yarn
      - name: Install Dependencies
        run: yarn
+     - name: Install conventional-changelog
+       run: npm install -g conventional-changelog-cli conventional-changelog-angular
      - name: Delete Unnecessary Files on Windows
        if: matrix.os == 'windows-latest'
        run: |
@@ -37,6 +39,30 @@ jobs:
        if: matrix.os != 'windows-latest'
        run: rm -rf README.md && rm -rf .git && rm -rf .github && rm -rf .gitignore && rm -rf .gitattributes && rm -rf .vscode && rm -rf readme && rm -rf installer && rm -rf changelog
        shell: bash
+     - name: Generate changelog
+       run: |
+         # 生成 changelog
+         LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
+         echo "Latest tag: $LATEST_TAG"
+         
+         # 如果没有标签，则使用所有提交
+         if [ -z "$LATEST_TAG" ]; then
+           # 为首次发布创建初始标签
+           git config --global user.name 'GitHub Action'
+           git config --global user.email 'action@github.com'
+           git tag v0.0.0
+           LATEST_TAG="v0.0.0"
+         fi
+         
+         # 使用自定义脚本生成 changelog
+         node .github/generate-conventional-changelog.js
+         
+         # 复制 changelog 到输出目录（如果存在）
+         if [ -f temp_changelog.md ]; then
+           mkdir -p ./out/
+           cp temp_changelog.md ./out/changelog.md
+         fi
+         
      - name: Build with electron-forge
        run: "yarn make"
      - name: Upload Build Artifacts (Windows)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..463597c
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,128 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_version:
+        description: 'Release Version (e.g., v1.2.0)'
+        required: true
+        default: 'v1.0.0'
+      release_title:
+        description: 'Release Title'
+        required: true
+        default: 'New Release'
+      build_run_id:
+        description: 'Build Run ID to download artifacts from'
+        required: true
+        default: ''
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # 获取所有历史记录以便生成changelog
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+          
+      - name: Install conventional-changelog
+        run: |
+          npm install -g conventional-changelog-cli conventional-changelog-angular
+
+      - name: Generate changelog
+        id: changelog
+        run: |
+          # 生成 changelog
+          LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
+          echo "Latest tag: $LATEST_TAG"
+          
+          # 如果没有标签，则使用所有提交
+          if [ -z "$LATEST_TAG" ]; then
+            # 为首次发布创建初始标签
+            git config --global user.name 'GitHub Action'
+            git config --global user.email 'action@github.com'
+            git tag v0.0.0
+            LATEST_TAG="v0.0.0"
+          fi
+          
+          # 使用自定义脚本生成 changelog
+          node .github/generate-conventional-changelog.js
+          
+          # 检查是否生成了有效的 changelog
+          if [ -f temp_changelog.md ] && [ -s temp_changelog.md ]; then
+            echo "Custom changelog generated successfully"
+          else
+            echo "Custom changelog generation failed, using manual approach"
+            if [ "$LATEST_TAG" = "v0.0.0" ]; then
+              COMMITS=$(git log --pretty=format:"- %h %s (%an)" --reverse HEAD)
+            else
+              COMMITS=$(git log --pretty=format:"- %h %s (%an)" --reverse $LATEST_TAG..HEAD)
+            fi
+            echo "$COMMITS" > temp_changelog.md
+          fi
+          
+          # 读取changelog内容并设置输出
+          CHANGELOG_CONTENT=$(cat temp_changelog.md)
+          echo "changelog_content<<EOF" >> $GITHUB_OUTPUT
+          echo "$CHANGELOG_CONTENT" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.inputs.build_run_id }}
+          merge-multiple: true
+          path: ./downloaded_artifacts
+
+      - name: Display downloaded artifacts
+        run: |
+          echo "Downloaded artifacts:"
+          find ./downloaded_artifacts -type f
+
+      - name: Organize assets for release
+        run: |
+          mkdir -p ./release_assets
+          find ./downloaded_artifacts -name "*.exe" -o -name "*.deb" -o -name "*.rpm" -o -name "*.zip" -o -name "*.dmg" -o -name "*.nupkg" -o -name "*.AppImage" | xargs -I {} cp {} ./release_assets/
+          echo "Release assets prepared:"
+          ls -la ./release_assets/
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.event.inputs.release_version }}
+          release_name: ${{ github.event.inputs.release_title }}
+          body: |
+            ## Changelog
+            
+            ${{ steps.changelog.outputs.changelog_content }}
+            
+            ## Assets
+            本次发布使用的构建产物来自构建运行 #${{ github.event.inputs.build_run_id }}:
+            
+            此版本包含以下文件:
+          draft: false
+          prerelease: false
+
+      - name: Upload release assets
+        run: |
+          # 上传所有release assets
+          for file in ./release_assets/*; do
+            if [ -f "$file" ]; then
+              asset_name=$(basename "$file")
+              echo "Uploading $asset_name..."
+              
+              # 使用GitHub CLI上传资产
+              gh release upload ${{ github.event.inputs.release_version }} "$file" --repo ${{ github.repository }} || echo "Failed to upload $asset_name"
+            fi
+          done
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/README.md b/README.md
index 55eecf0..95937f2 100644
--- a/README.md
+++ b/README.md
@@ -24,4 +24,4 @@ QQ群：925490458
 ## 技术栈
 
 - [Electron](https://www.electronjs.org/)
-- [FluentUI](https://developer.microsoft.com/zh-cn/fluentui)
+- [FluentUI](https://developer.microsoft.com/zh-cn/fluentui)
\ No newline at end of file
diff --git a/package.json b/package.json
index 38f3e07..9f854b2 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "@electron-forge/maker-deb": "^7.10.2",
     "@electron-forge/maker-squirrel": "^7.10.2",
     "@electron-forge/maker-zip": "^7.10.2",
+    "conventional-changelog-cli": "^5.0.0",
     "electron": "^39.2.7"
   }
 }
\ No newline at end of file

From 24e3dd82e6aa00712c437057c0b69ed5a6fa0198 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 00:29:09 +0800
Subject: [PATCH 06/20] =?UTF-8?q?ci:=20:bug:=20=E6=97=A0=E6=B3=95=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96commit=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 593a142..e1a29e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,6 @@ jobs:
        if: matrix.os == 'windows-latest'
        run: |
          del /f /q README.md
-         rmdir /S /Q .git
          rmdir /S /Q .github
          del /f /q .gitignore
          del /f /q .gitattributes

From a72113b6168558b3ec4374fb16121519197623f1 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 00:30:01 +0800
Subject: [PATCH 07/20] chore: :bookmark: 1.1.1-rc3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9f854b2..fcac9a0 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "classwindow",
   "productName": "ClassWindow",
   "description": "ClassWindow",
-  "version": "1.1.1-rc2",
+  "version": "1.1.1-rc3",
   "main": "main.js",
   "repository": "git@github.com:xinghai-smartedu/classwindow.git",
   "author": "Yeying-Xingchen <yeyingxingchen@yeah.net>",

From a92c7837a9e71ed95b0bb2c2ab45f9389db62246 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 00:31:38 +0800
Subject: [PATCH 08/20] =?UTF-8?q?ci:=20:bug:=20=E9=9D=9Ewindows=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=94=9F=E6=88=90changelog.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e1a29e6..f020952 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
        shell: cmd
      - name: Delete Unnecessary Files on Unix
        if: matrix.os != 'windows-latest'
-       run: rm -rf README.md && rm -rf .git && rm -rf .github && rm -rf .gitignore && rm -rf .gitattributes && rm -rf .vscode && rm -rf readme && rm -rf installer && rm -rf changelog
+       run: rm -rf README.md && rm -rf .github && rm -rf .gitignore && rm -rf .gitattributes && rm -rf .vscode && rm -rf readme && rm -rf installer && rm -rf changelog
        shell: bash
      - name: Generate changelog
        run: |

From cb4d691d46580aac3afa439be54fadc21376ce0d Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 00:32:58 +0800
Subject: [PATCH 09/20] =?UTF-8?q?ci:=20:bug:=20Windows=E4=B8=8B=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8bash=E8=AF=AD=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml   | 33 +++++++++++++++++++++++++++++++--
 .github/workflows/release.yml |  2 +-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f020952..4e03189 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,10 +38,38 @@ jobs:
        if: matrix.os != 'windows-latest'
        run: rm -rf README.md && rm -rf .github && rm -rf .gitignore && rm -rf .gitattributes && rm -rf .vscode && rm -rf readme && rm -rf installer && rm -rf changelog
        shell: bash
-     - name: Generate changelog
+     - name: Generate changelog (Windows)
+       if: matrix.os == 'windows-latest'
+       run: |
+         # 生成 changelog
+         # 检查是否有标签
+         $LATEST_TAG = $(git describe --tags $(git rev-list --tags --max-count=1) 2>$null)
+         Write-Output "Latest tag: $LATEST_TAG"
+         
+         # 如果没有标签，则使用所有提交
+         if (-not $LATEST_TAG) {
+           # 为首次发布创建初始标签
+           git config --global user.name 'GitHub Action'
+           git config --global user.email 'action@github.com'
+           git tag v0.0.0
+           $LATEST_TAG = "v0.0.0"
+         }
+         
+         # 使用自定义脚本生成 changelog
+         node .github/generate-conventional-changelog.js
+         
+         # 复制 changelog 到输出目录（如果存在）
+         if (Test-Path "temp_changelog.md") {
+           New-Item -ItemType Directory -Force -Path "./out/"
+           Copy-Item "temp_changelog.md" -Destination "./out/changelog.md"
+         }
+       shell: pwsh
+     - name: Generate changelog (Unix)
+       if: matrix.os != 'windows-latest'
        run: |
          # 生成 changelog
-         LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
+         # 检查是否有标签
+         LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1) 2>/dev/null)
          echo "Latest tag: $LATEST_TAG"
          
          # 如果没有标签，则使用所有提交
@@ -61,6 +89,7 @@ jobs:
            mkdir -p ./out/
            cp temp_changelog.md ./out/changelog.md
          fi
+       shell: bash
          
      - name: Build with electron-forge
        run: "yarn make"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 463597c..72e14ef 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '24'
           
       - name: Install conventional-changelog
         run: |

From 3a4f5921a08a66db26a409b989c093938dfe936a Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 00:43:16 +0800
Subject: [PATCH 10/20] =?UTF-8?q?ci:=20:green=5Fheart:=20=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=94=9F=E6=88=90Changelog.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml   | 55 -----------------------------------
 .github/workflows/release.yml | 20 ++-----------
 2 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4e03189..8faf5db 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,8 +20,6 @@ jobs:
        run: npm install -g yarn
      - name: Install Dependencies
        run: yarn
-     - name: Install conventional-changelog
-       run: npm install -g conventional-changelog-cli conventional-changelog-angular
      - name: Delete Unnecessary Files on Windows
        if: matrix.os == 'windows-latest'
        run: |
@@ -38,59 +36,6 @@ jobs:
        if: matrix.os != 'windows-latest'
        run: rm -rf README.md && rm -rf .github && rm -rf .gitignore && rm -rf .gitattributes && rm -rf .vscode && rm -rf readme && rm -rf installer && rm -rf changelog
        shell: bash
-     - name: Generate changelog (Windows)
-       if: matrix.os == 'windows-latest'
-       run: |
-         # 生成 changelog
-         # 检查是否有标签
-         $LATEST_TAG = $(git describe --tags $(git rev-list --tags --max-count=1) 2>$null)
-         Write-Output "Latest tag: $LATEST_TAG"
-         
-         # 如果没有标签，则使用所有提交
-         if (-not $LATEST_TAG) {
-           # 为首次发布创建初始标签
-           git config --global user.name 'GitHub Action'
-           git config --global user.email 'action@github.com'
-           git tag v0.0.0
-           $LATEST_TAG = "v0.0.0"
-         }
-         
-         # 使用自定义脚本生成 changelog
-         node .github/generate-conventional-changelog.js
-         
-         # 复制 changelog 到输出目录（如果存在）
-         if (Test-Path "temp_changelog.md") {
-           New-Item -ItemType Directory -Force -Path "./out/"
-           Copy-Item "temp_changelog.md" -Destination "./out/changelog.md"
-         }
-       shell: pwsh
-     - name: Generate changelog (Unix)
-       if: matrix.os != 'windows-latest'
-       run: |
-         # 生成 changelog
-         # 检查是否有标签
-         LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1) 2>/dev/null)
-         echo "Latest tag: $LATEST_TAG"
-         
-         # 如果没有标签，则使用所有提交
-         if [ -z "$LATEST_TAG" ]; then
-           # 为首次发布创建初始标签
-           git config --global user.name 'GitHub Action'
-           git config --global user.email 'action@github.com'
-           git tag v0.0.0
-           LATEST_TAG="v0.0.0"
-         fi
-         
-         # 使用自定义脚本生成 changelog
-         node .github/generate-conventional-changelog.js
-         
-         # 复制 changelog 到输出目录（如果存在）
-         if [ -f temp_changelog.md ]; then
-           mkdir -p ./out/
-           cp temp_changelog.md ./out/changelog.md
-         fi
-       shell: bash
-         
      - name: Build with electron-forge
        run: "yarn make"
      - name: Upload Build Artifacts (Windows)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 72e14ef..fb9e2cb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -94,12 +94,12 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.event.inputs.release_version }}
-          release_name: ${{ github.event.inputs.release_title }}
+          name: ${{ github.event.inputs.release_title }}
           body: |
             ## Changelog
             
@@ -111,18 +111,4 @@ jobs:
             此版本包含以下文件:
           draft: false
           prerelease: false
-
-      - name: Upload release assets
-        run: |
-          # 上传所有release assets
-          for file in ./release_assets/*; do
-            if [ -f "$file" ]; then
-              asset_name=$(basename "$file")
-              echo "Uploading $asset_name..."
-              
-              # 使用GitHub CLI上传资产
-              gh release upload ${{ github.event.inputs.release_version }} "$file" --repo ${{ github.repository }} || echo "Failed to upload $asset_name"
-            fi
-          done
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          files: ./release_assets/*
\ No newline at end of file

From e7aff976bd56942dade0cc6418bc6571ded60ea8 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 19:41:49 +0800
Subject: [PATCH 11/20] =?UTF-8?q?perf:=20:zap:=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/conventional-changelog-config.json | 15 ----
 .github/conventional-changelog-custom.js   | 19 -----
 .github/generate-conventional-changelog.js | 87 ----------------------
 .github/workflows/build.yml                |  3 +-
 main.js                                    |  2 +-
 pages/clock.html                           | 15 ----
 pages/homework.html                        | 15 ----
 pages/launchpad.html                       | 15 ----
 8 files changed, 3 insertions(+), 168 deletions(-)
 delete mode 100644 .github/conventional-changelog-config.json
 delete mode 100644 .github/conventional-changelog-custom.js
 delete mode 100644 .github/generate-conventional-changelog.js

diff --git a/.github/conventional-changelog-config.json b/.github/conventional-changelog-config.json
deleted file mode 100644
index 724d497..0000000
--- a/.github/conventional-changelog-config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "types": [
-    {"type": "feat", "section": "✨ 新功能"},
-    {"type": "feature", "section": "✨ 新功能"},
-    {"type": "fix", "section": "🐛 问题修复"},
-    {"type": "perf", "section": "⚡ 性能优化"},
-    {"type": "docs", "section": "📚 文档"},
-    {"type": "style", "section": "🎨 样式调整"},
-    {"type": "refactor", "section": "🔨 重构"},
-    {"type": "test", "section": "🧪 测试"},
-    {"type": "build", "section": "📦 构建系统"},
-    {"type": "ci", "section": "🔄 CI/CD"},
-    {"type": "chore", "section": "🧹 其他变更"}
-  ]
-}
\ No newline at end of file
diff --git a/.github/conventional-changelog-custom.js b/.github/conventional-changelog-custom.js
deleted file mode 100644
index 47b98c3..0000000
--- a/.github/conventional-changelog-custom.js
+++ /dev/null
@@ -1,19 +0,0 @@
-module.exports = {
-  types: [
-    { type: 'feat', section: '✨ 新功能 Features' },
-    { type: 'feature', section: '✨ 新功能 Features' },
-    { type: 'fix', section: '🐛 问题修复 Bug Fixes' },
-    { type: 'perf', section: '⚡ 性能优化 Performance Improvements' },
-    { type: 'docs', section: '📚 文档 Documentation' },
-    { type: 'style', section: '🎨 样式调整 Style Changes' },
-    { type: 'refactor', section: '🔨 重构 Refactoring' },
-    { type: 'test', section: '🧪 测试 Tests' },
-    { type: 'build', section: '📦 构建系统 Build System' },
-    { type: 'ci', section: '🔄 CI/CD' },
-    { type: 'chore', section: '🧹 其他变更 Chore' }
-  ],
-  commitUrlFormat: '{{host}}/{{owner}}/{{repository}}/commit/{{hash}}',
-  compareUrlFormat: '{{host}}/{{owner}}/{{repository}}/compare/{{previousTag}}...{{currentTag}}',
-  issueUrlFormat: '{{host}}/{{owner}}/{{repository}}/issues/{{id}}',
-  userUrlFormat: '{{host}}/{{owner}}/{{username}}'
-};
\ No newline at end of file
diff --git a/.github/generate-conventional-changelog.js b/.github/generate-conventional-changelog.js
deleted file mode 100644
index 5f5cfbb..0000000
--- a/.github/generate-conventional-changelog.js
+++ /dev/null
@@ -1,87 +0,0 @@
-const { execSync } = require('child_process');
-const fs = require('fs');
-
-// 自定义配置
-const config = {
-  types: [
-    { type: 'feat', section: '✨ 新功能 Features' },
-    { type: 'feature', section: '✨ 新功能 Features' },
-    { type: 'fix', section: '🐛 问题修复 Bug Fixes' },
-    { type: 'perf', section: '⚡ 性能优化 Performance Improvements' },
-    { type: 'docs', section: '📚 文档 Documentation' },
-    { type: 'style', section: '🎨 样式调整 Style Changes' },
-    { type: 'refactor', section: '🔨 重构 Refactoring' },
-    { type: 'test', section: '🧪 测试 Tests' },
-    { type: 'build', section: '📦 构建系统 Build System' },
-    { type: 'ci', section: '🔄 CI/CD' },
-    { type: 'chore', section: '🧹 其他变更 Chore' }
-  ]
-};
-
-// 获取最新的标签
-let latestTag = '';
-try {
-  latestTag = execSync('git describe --tags $(git rev-list --tags --max-count=1)', { encoding: 'utf8' }).trim();
-} catch (e) {
-  // 如果没有标签，则使用初始标签
-  latestTag = '';
-}
-
-// 获取提交历史
-let commits;
-if (!latestTag) {
-  commits = execSync('git log --pretty=format:"%s||%b||%an" --reverse HEAD', { encoding: 'utf8' });
-} else {
-  commits = execSync(`git log --pretty=format:"%s||%b||%an" --reverse ${latestTag}..HEAD`, { encoding: 'utf8' });
-}
-
-// 解析提交
-const commitList = commits.split('\n').filter(c => c.trim() !== '');
-
-// 按类型分组提交
-const groupedCommits = {};
-commitList.forEach(commit => {
-  const [subject, body, author] = commit.split('||');
-  const match = subject.match(/^(feat|feature|fix|perf|docs|style|refactor|test|build|ci|chore)(?:\(.+\))?:\s*(.+)$/i);
-  
-  let type = 'chore'; // 默认类型
-  let message = subject;
-  
-  if (match) {
-    type = match[1].toLowerCase();
-    message = match[2];
-  }
-  
-  // 查找对应的分组名
-  const typeConfig = config.types.find(t => t.type === type);
-  const sectionName = typeConfig ? typeConfig.section : '🧹 其他变更 Chore';
-  
-  if (!groupedCommits[sectionName]) {
-    groupedCommits[sectionName] = [];
-  }
-  
-  groupedCommits[sectionName].push({
-    type,
-    message,
-    author: author || 'Unknown'
-  });
-});
-
-// 生成 changelog 内容
-let changelogContent = '## 更新日志\n\n';
-
-Object.keys(groupedCommits).forEach(section => {
-  if (groupedCommits[section].length > 0) {
-    changelogContent += `### ${section}\n\n`;
-    
-    groupedCommits[section].forEach(commit => {
-      changelogContent += `- ${commit.message} (${commit.author})\n`;
-    });
-    
-    changelogContent += '\n';
-  }
-});
-
-// 输出到文件
-fs.writeFileSync('temp_changelog.md', changelogContent);
-console.log('Changelog generated successfully');
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8faf5db..963675a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,10 +31,11 @@ jobs:
          rmdir /S /Q readme
          rmdir /S /Q installer
          rmdir /S /Q changelog
+         rmdir /S /Q node_modules/.cache
        shell: cmd
      - name: Delete Unnecessary Files on Unix
        if: matrix.os != 'windows-latest'
-       run: rm -rf README.md && rm -rf .github && rm -rf .gitignore && rm -rf .gitattributes && rm -rf .vscode && rm -rf readme && rm -rf installer && rm -rf changelog
+       run: rm -rf README.md && rm -rf .github && rm -rf .gitignore && rm -rf .gitattributes && rm -rf .vscode && rm -rf readme && rm -rf installer && rm -rf changelog && rm -rf node_modules/.cache
        shell: bash
      - name: Build with electron-forge
        run: "yarn make"
diff --git a/main.js b/main.js
index da7b33b..b834769 100644
--- a/main.js
+++ b/main.js
@@ -804,4 +804,4 @@ app.whenReady().then(() => {
 	});
 });
 
-app.on('window-all-closed', () => { });
\ No newline at end of file
+app.on('window-all-closed', () => { });
diff --git a/pages/clock.html b/pages/clock.html
index 53eca07..8b2e01e 100644
--- a/pages/clock.html
+++ b/pages/clock.html
@@ -30,21 +30,6 @@ <h3>时间</h3>
     // 导入 IPC 通信
     const { ipcRenderer } = require('electron');
 
-    // 防止click事件在空白区域时被拦截
-    const timeCard = document.getElementById('timeCard');
-    if (timeCard) {
-        timeCard.addEventListener('mouseenter', () =>
-            ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
-        );
-
-        timeCard.addEventListener('mouseleave', () =>
-            ipcRenderer.send('set-ignore-mouse-events', {
-                ignore: true,
-                forward: true
-            })
-        );
-    }
-
     // 添加时钟显示状态变量
     let isClockVisible = true;
     // 添加暗色主题状态变量
diff --git a/pages/homework.html b/pages/homework.html
index 52e9116..64965c3 100644
--- a/pages/homework.html
+++ b/pages/homework.html
@@ -35,21 +35,6 @@ <h3>作业</h3>
     // 导入 IPC 通信
     const { ipcRenderer } = require('electron');
 
-    // 防止click事件在空白区域时被拦截
-    const homeworkCard = document.getElementById('homeworkCard');
-    if (homeworkCard) {
-        homeworkCard.addEventListener('mouseenter', () =>
-            ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
-        );
-
-        homeworkCard.addEventListener('mouseleave', () =>
-            ipcRenderer.send('set-ignore-mouse-events', {
-                ignore: true,
-                forward: true
-            })
-        );
-    }
-
     // 添加作业显示状态变量
     let isHomeworkVisible = true;
     // 添加暗色主题状态变量
diff --git a/pages/launchpad.html b/pages/launchpad.html
index 2417731..d252a02 100644
--- a/pages/launchpad.html
+++ b/pages/launchpad.html
@@ -31,21 +31,6 @@ <h3>启动台</h3>
     // 导入 IPC 通信
     const { ipcRenderer } = require('electron');
 
-    // 防止click事件在空白区域时被拦截
-    const launchpadCard = document.getElementById('launchpadCard');
-    if (launchpadCard) {
-        launchpadCard.addEventListener('mouseenter', () =>
-            ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
-        );
-
-        launchpadCard.addEventListener('mouseleave', () =>
-            ipcRenderer.send('set-ignore-mouse-events', {
-                ignore: true,
-                forward: true
-            })
-        );
-    }
-
     // 添加启动台显示状态变量
     let isLaunchpadVisible = true;
     // 添加暗色主题状态变量

From 2f1da4bc201a764ad09f3b232961a6698cf8698b Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 19:51:55 +0800
Subject: [PATCH 12/20] =?UTF-8?q?refactor:=20:art:=20=E6=8B=86=E5=88=86mai?=
 =?UTF-8?q?n.css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/card/clock.css     |  14 ++
 assets/css/card/homework.css  | 119 ++++++++++++++++
 assets/css/card/launchpad.css |  67 +++++++++
 assets/css/card/shared.css    |  52 +++++++
 assets/css/main.css           | 260 ----------------------------------
 pages/clock.html              |   3 +-
 pages/homework.html           |   3 +-
 pages/launchpad.html          |   3 +-
 8 files changed, 258 insertions(+), 263 deletions(-)
 create mode 100644 assets/css/card/clock.css
 create mode 100644 assets/css/card/homework.css
 create mode 100644 assets/css/card/launchpad.css
 create mode 100644 assets/css/card/shared.css

diff --git a/assets/css/card/clock.css b/assets/css/card/clock.css
new file mode 100644
index 0000000..82a105f
--- /dev/null
+++ b/assets/css/card/clock.css
@@ -0,0 +1,14 @@
+.time {
+    font-size: 26px;
+    font-weight: bold;
+    margin: 8px 0;
+    letter-spacing: 1px;
+    text-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+}
+
+.date {
+    font-size: 13px;
+    opacity: 0.85;
+    margin-top: 5px;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+}
\ No newline at end of file
diff --git a/assets/css/card/homework.css b/assets/css/card/homework.css
new file mode 100644
index 0000000..158421c
--- /dev/null
+++ b/assets/css/card/homework.css
@@ -0,0 +1,119 @@
+.homework-card {
+    display: flex;
+    flex-direction: column;
+}
+
+.homework-list {
+    margin-top: 8px;
+    max-height: 300px;
+    overflow-y: auto;
+}
+
+.homework-item {
+    background: rgba(255, 255, 255, 0.12);
+    backdrop-filter: blur(4px);
+    -webkit-backdrop-filter: blur(4px);
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    padding: 12px; /* 统一内边距 */
+    margin: 8px 0; /* 统一外边距 */
+    border-radius: 6px; /* 统一圆角 */
+    text-align: left;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+}
+
+.homework-item:hover {
+    background: rgba(255, 255, 255, 0.18); /* 悬停效果 */
+    border-color: rgba(255, 255, 255, 0.2);
+}
+
+.homework-item > div:first-child {
+    flex: 1;
+    word-wrap: break-word;
+    word-break: break-word;
+    margin-right: 12px;
+}
+
+.subject-tag {
+    display: inline-block;
+    padding: 3px 8px; /* 标签内边距 */
+    border-radius: 12px; /* 圆角标签 */
+    font-size: 12px;
+    font-weight: 500;
+    margin-right: 6px; /* 右边距 */
+    vertical-align: middle;
+    backdrop-filter: blur(2px);
+    -webkit-backdrop-filter: blur(2px);
+}
+
+.chinese {
+    background-color: #E74C3C; /* 深红色 - 语文课本的红色 */
+    color: white;
+}
+
+.math {
+    background-color: #3498DB; /* 深蓝色 - 数学课本的蓝色 */
+    color: white;
+}
+
+.english {
+    background-color: #F39C12;
+    color: white;
+}
+
+.physics {
+    background-color: #2980B9;
+    color: white;
+}
+
+.chemistry {
+    background-color: #9B59B6;
+    color: white;
+}
+
+.biology {
+    background-color: #27AE60;
+    color: white;
+}
+
+.history {
+    background-color: #E67E22;
+    color: white;
+}
+
+.geography {
+    background-color: #27AE60;
+    color: white;
+}
+
+.politics {
+    background-color: #1ABC9C;
+    color: white;
+}
+
+.other {
+    background-color: #95A5A6;
+}
+
+.delete-btn {
+    background: rgba(255, 107, 107, 0.3);
+    backdrop-filter: blur(2px);
+    -webkit-backdrop-filter: blur(2px);
+    color: white;
+    border: 1px solid rgba(255, 107, 107, 0.5);
+    padding: 3px 6px;
+    border-radius: 3px;
+    cursor: pointer;
+    font-size: 12px;
+    transition: all 0.2s ease;
+}
+
+.delete-btn:hover {
+    background: rgba(255, 107, 107, 0.5);
+    border-color: rgba(255, 107, 107, 0.7);
+}
+
+fluent-button { 
+    height: 20px;
+}
\ No newline at end of file
diff --git a/assets/css/card/launchpad.css b/assets/css/card/launchpad.css
new file mode 100644
index 0000000..7590126
--- /dev/null
+++ b/assets/css/card/launchpad.css
@@ -0,0 +1,67 @@
+/* 启动台样式 */
+.launchpad-card {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    padding: 17px;
+    /* 与其他卡片保持一致 */
+    margin: 10px;
+    /* 与其他卡片保持一致 */
+    background: rgba(255, 255, 255, 0.15);
+    /* 与其他卡片保持一致 */
+    border-radius: 8px;
+    /* 与其他卡片保持一致 */
+    backdrop-filter: blur(8px);
+    -webkit-backdrop-filter: blur(8px);
+    border: 1px solid rgba(255, 255, 255, 0.2);
+}
+
+.launchpad-app {
+    width: 48px;
+    height: 48px;
+    background: rgba(255, 255, 255, 0.2);
+    backdrop-filter: blur(4px);
+    -webkit-backdrop-filter: blur(4px);
+    border: 1px solid rgba(255, 255, 255, 0.15);
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;    
+    cursor: pointer;
+    transition: all 0.2s ease;
+}
+
+.launchpad-app:hover {
+    background: rgba(255, 255, 255, 0.3);
+    border-color: rgba(255, 255, 255, 0.3);
+    transform: scale(1.1);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+}
+
+.launchpad-icon {
+    font-size: 24px;
+    margin-bottom: 2px;
+}
+
+.launchpad-container {
+    display: flex; /* 启用 Flexbox 布局 */
+    justify-content: space-between; /* 水平分布 */
+    align-items: center; /* 垂直居中 */
+}
+
+.launchpad-name {
+    font-size: 10px;
+    text-align: center;
+    word-break: break-all;
+}
+
+/* 链接类型应用的特殊样式 */
+.launchpad-app.link-type {
+    background: rgba(0, 120, 212, 0.3);
+    /* 蓝色背景表示链接 */
+}
+
+.launchpad-app.link-type:hover {
+    background: rgba(0, 120, 212, 0.4);
+}
\ No newline at end of file
diff --git a/assets/css/card/shared.css b/assets/css/card/shared.css
new file mode 100644
index 0000000..2c6f10e
--- /dev/null
+++ b/assets/css/card/shared.css
@@ -0,0 +1,52 @@
+body {
+    margin: 0;
+    padding: 10px;
+    color: white;
+    opacity: 0.9;
+    font-family: Arial, sans-serif;
+    border-radius: 10px;
+    user-select: none;
+    width: 300px;
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
+.card {
+    background: rgba(255, 255, 255, 0.15);
+    backdrop-filter: blur(8px);
+    -webkit-backdrop-filter: blur(8px);
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    border-radius: 8px;
+    /* 卡片圆角 */
+    padding: 17px;
+    margin: 10px;
+    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+    transition: all 0.3s ease;
+}
+
+.card:hover {
+    background: rgba(255, 255, 255, 0.2);
+    box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
+    transform: translateY(-2px);
+}
+
+
+.card h3 {
+    margin: 0 0 12px 0; /* 统一标题下边距 */
+    font-size: 16px; /* 统一标题字体大小 */
+    font-weight: 600;
+    color: rgba(255, 255, 255, 0.9);
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+
+
+.content {
+    width: 100%;
+    opacity: 0;
+    transition: opacity 0.3s ease-in-out;
+}
+
+.content.loaded {
+    opacity: 1;
+}
diff --git a/assets/css/main.css b/assets/css/main.css
index ad3f059..6a57047 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -1,191 +1,3 @@
-body {
-    margin: 0;
-    padding: 10px;
-    color: white;
-    opacity: 0.9;
-    font-family: Arial, sans-serif;
-    border-radius: 10px;
-    user-select: none;
-    width: 300px;
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-}
-
-.card {
-    background: rgba(255, 255, 255, 0.15);
-    backdrop-filter: blur(8px);
-    -webkit-backdrop-filter: blur(8px);
-    border: 1px solid rgba(255, 255, 255, 0.2);
-    border-radius: 8px;
-    /* 卡片圆角 */
-    padding: 17px;
-    margin: 10px;
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
-    transition: all 0.3s ease;
-}
-
-.card:hover {
-    background: rgba(255, 255, 255, 0.2);
-    box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
-    transform: translateY(-2px);
-}
-
-.homework-card {
-    display: flex;
-    flex-direction: column;
-}
-
-.content {
-    width: 100%;
-    opacity: 0;
-    transition: opacity 0.3s ease-in-out;
-}
-
-.content.loaded {
-    opacity: 1;
-}
-
-.time {
-    font-size: 26px;
-    font-weight: bold;
-    margin: 8px 0;
-    letter-spacing: 1px;
-    text-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
-}
-
-.date {
-    font-size: 13px;
-    opacity: 0.85;
-    margin-top: 5px;
-    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
-}
-
-.time-card h3,
-.homework-card h3,
-.launchpad-card h3 {
-    margin: 0 0 12px 0; /* 统一标题下边距 */
-    font-size: 16px; /* 统一标题字体大小 */
-    font-weight: 600;
-    color: rgba(255, 255, 255, 0.9);
-    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-
-h3 {
-    margin: 5px 0;
-}
-
-.homework-list {
-    margin-top: 8px;
-    max-height: 300px;
-    overflow-y: auto;
-}
-
-.homework-item {
-    background: rgba(255, 255, 255, 0.12);
-    backdrop-filter: blur(4px);
-    -webkit-backdrop-filter: blur(4px);
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    padding: 12px; /* 统一内边距 */
-    margin: 8px 0; /* 统一外边距 */
-    border-radius: 6px; /* 统一圆角 */
-    text-align: left;
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-start;
-}
-
-.homework-item:hover {
-    background: rgba(255, 255, 255, 0.18); /* 悬停效果 */
-    border-color: rgba(255, 255, 255, 0.2);
-}
-
-.homework-item > div:first-child {
-    flex: 1;
-    word-wrap: break-word;
-    word-break: break-word;
-    margin-right: 12px;
-}
-
-.subject-tag {
-    display: inline-block;
-    padding: 3px 8px; /* 标签内边距 */
-    border-radius: 12px; /* 圆角标签 */
-    font-size: 12px;
-    font-weight: 500;
-    margin-right: 6px; /* 右边距 */
-    vertical-align: middle;
-    backdrop-filter: blur(2px);
-    -webkit-backdrop-filter: blur(2px);
-}
-
-.chinese {
-    background-color: #E74C3C; /* 深红色 - 语文课本的红色 */
-    color: white;
-}
-
-.math {
-    background-color: #3498DB; /* 深蓝色 - 数学课本的蓝色 */
-    color: white;
-}
-
-.english {
-    background-color: #F39C12;
-    color: white;
-}
-
-.physics {
-    background-color: #2980B9;
-    color: white;
-}
-
-.chemistry {
-    background-color: #9B59B6;
-    color: white;
-}
-
-.biology {
-    background-color: #27AE60;
-    color: white;
-}
-
-.history {
-    background-color: #E67E22;
-    color: white;
-}
-
-.geography {
-    background-color: #27AE60;
-    color: white;
-}
-
-.politics {
-    background-color: #1ABC9C;
-    color: white;
-}
-
-.other {
-    background-color: #95A5A6;
-}
-
-.delete-btn {
-    background: rgba(255, 107, 107, 0.3);
-    backdrop-filter: blur(2px);
-    -webkit-backdrop-filter: blur(2px);
-    color: white;
-    border: 1px solid rgba(255, 107, 107, 0.5);
-    padding: 3px 6px;
-    border-radius: 3px;
-    cursor: pointer;
-    font-size: 12px;
-    transition: all 0.2s ease;
-}
-
-.delete-btn:hover {
-    background: rgba(255, 107, 107, 0.5);
-    border-color: rgba(255, 107, 107, 0.7);
-}
-
 /* 加载动画样式 */
 .loading-overlay {
     position: fixed;
@@ -224,76 +36,4 @@ h3 {
     100% {
         transform: rotate(360deg);
     }
-}
-
-/* 启动台样式 */
-.launchpad-card {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-    padding: 17px;
-    /* 与其他卡片保持一致 */
-    margin: 10px;
-    /* 与其他卡片保持一致 */
-    background: rgba(255, 255, 255, 0.15);
-    /* 与其他卡片保持一致 */
-    border-radius: 8px;
-    /* 与其他卡片保持一致 */
-    backdrop-filter: blur(8px);
-    -webkit-backdrop-filter: blur(8px);
-    border: 1px solid rgba(255, 255, 255, 0.2);
-}
-
-.launchpad-app {
-    width: 48px;
-    height: 48px;
-    background: rgba(255, 255, 255, 0.2);
-    backdrop-filter: blur(4px);
-    -webkit-backdrop-filter: blur(4px);
-    border: 1px solid rgba(255, 255, 255, 0.15);
-    border-radius: 8px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;    
-    cursor: pointer;
-    transition: all 0.2s ease;
-}
-
-.launchpad-app:hover {
-    background: rgba(255, 255, 255, 0.3);
-    border-color: rgba(255, 255, 255, 0.3);
-    transform: scale(1.1);
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-}
-
-.launchpad-icon {
-    font-size: 24px;
-    margin-bottom: 2px;
-}
-
-.launchpad-container {
-    display: flex; /* 启用 Flexbox 布局 */
-    justify-content: space-between; /* 水平分布 */
-    align-items: center; /* 垂直居中 */
-}
-
-.launchpad-name {
-    font-size: 10px;
-    text-align: center;
-    word-break: break-all;
-}
-
-/* 链接类型应用的特殊样式 */
-.launchpad-app.link-type {
-    background: rgba(0, 120, 212, 0.3);
-    /* 蓝色背景表示链接 */
-}
-
-.launchpad-app.link-type:hover {
-    background: rgba(0, 120, 212, 0.4);
-}
-
-fluent-button { 
-    height: 20px;
 }
\ No newline at end of file
diff --git a/pages/clock.html b/pages/clock.html
index 8b2e01e..9fc756d 100644
--- a/pages/clock.html
+++ b/pages/clock.html
@@ -5,7 +5,8 @@
     <meta charset="UTF-8">
     <title>时钟</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/main.css">
+    <link rel="stylesheet" href="../assets/css/card/shared.css">
+    <link rel="stylesheet" href="../assets/css/card/clock.css">
     <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
     </link>
 </head>
diff --git a/pages/homework.html b/pages/homework.html
index 64965c3..0994b8f 100644
--- a/pages/homework.html
+++ b/pages/homework.html
@@ -5,7 +5,8 @@
     <meta charset="UTF-8">
     <title>作业</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/main.css">
+    <link rel="stylesheet" href="../assets/css/card/shared.css">
+    <link rel="stylesheet" href="../assets/css/card/homework.css">
     <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
     </link>
 </head>
diff --git a/pages/launchpad.html b/pages/launchpad.html
index d252a02..2da43cd 100644
--- a/pages/launchpad.html
+++ b/pages/launchpad.html
@@ -5,7 +5,8 @@
     <meta charset="UTF-8">
     <title>启动台</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/main.css">
+    <link rel="stylesheet" href="../assets/css/card/shared.css">
+    <link rel="stylesheet" href="../assets/css/card/launchpad.css">
     <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
     </link>
 </head>

From c46f095020aa96b321f01ffba7228c52f5c79b3b Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 20:11:56 +0800
Subject: [PATCH 13/20] =?UTF-8?q?refactor:=20:art:=20=E6=8B=86=E5=88=86mai?=
 =?UTF-8?q?n.dark.css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/card/clock-dark.css     |  14 ++
 assets/css/card/homework-dark.css  | 119 ++++++++++++
 assets/css/card/launchpad-dark.css |  63 ++++++
 assets/css/card/shared-dark.css    |  55 ++++++
 assets/css/loading-dark.css        |  39 ++++
 assets/css/loading.css             |  39 ++++
 assets/css/main-dark.css           | 300 +----------------------------
 assets/css/main.css                |  45 +----
 assets/css/settings.css            |  58 +++++-
 pages/clock.html                   |   3 +-
 pages/homework.html                |   3 +-
 pages/launchpad.html               |   3 +-
 pages/settings.html                |   8 +-
 13 files changed, 403 insertions(+), 346 deletions(-)
 create mode 100644 assets/css/card/clock-dark.css
 create mode 100644 assets/css/card/homework-dark.css
 create mode 100644 assets/css/card/launchpad-dark.css
 create mode 100644 assets/css/card/shared-dark.css
 create mode 100644 assets/css/loading-dark.css
 create mode 100644 assets/css/loading.css

diff --git a/assets/css/card/clock-dark.css b/assets/css/card/clock-dark.css
new file mode 100644
index 0000000..82a105f
--- /dev/null
+++ b/assets/css/card/clock-dark.css
@@ -0,0 +1,14 @@
+.time {
+    font-size: 26px;
+    font-weight: bold;
+    margin: 8px 0;
+    letter-spacing: 1px;
+    text-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+}
+
+.date {
+    font-size: 13px;
+    opacity: 0.85;
+    margin-top: 5px;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+}
\ No newline at end of file
diff --git a/assets/css/card/homework-dark.css b/assets/css/card/homework-dark.css
new file mode 100644
index 0000000..4637612
--- /dev/null
+++ b/assets/css/card/homework-dark.css
@@ -0,0 +1,119 @@
+.homework-card {
+    display: flex;
+    flex-direction: column;
+}
+
+.homework-list {
+    margin-top: 8px;
+    max-height: 300px;
+    overflow-y: auto;
+}
+
+.homework-item {
+    background: rgba(0, 0, 0, 0.12);
+    backdrop-filter: blur(4px);
+    -webkit-backdrop-filter: blur(4px);
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    padding: 12px;
+    margin: 8px 0;
+    border-radius: 6px;
+    text-align: left;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+}
+
+.homework-item:hover {
+    background: rgba(0, 0, 0, 0.18);
+    border-color: rgba(255, 255, 255, 0.2);
+}
+
+.homework-item > div:first-child {
+    flex: 1;
+    word-wrap: break-word;
+    word-break: break-word;
+    margin-right: 12px;
+}
+
+.subject-tag {
+    display: inline-block;
+    padding: 3px 8px; /* 标签内边距 */
+    border-radius: 12px; /* 圆角标签 */
+    font-size: 12px;
+    font-weight: 500;
+    margin-right: 6px; /* 右边距 */
+    vertical-align: middle;
+    backdrop-filter: blur(2px);
+    -webkit-backdrop-filter: blur(2px);
+}
+
+.chinese {
+    background-color: #E74C3C; /* 深红色 - 语文课本的红色 */
+    color: white;
+}
+
+.math {
+    background-color: #3498DB; /* 深蓝色 - 数学课本的蓝色 */
+    color: white;
+}
+
+.english {
+    background-color: #F39C12;
+    color: white;
+}
+
+.physics {
+    background-color: #2980B9;
+    color: white;
+}
+
+.chemistry {
+    background-color: #9B59B6;
+    color: white;
+}
+
+.biology {
+    background-color: #27AE60;
+    color: white;
+}
+
+.history {
+    background-color: #E67E22;
+    color: white;
+}
+
+.geography {
+    background-color: #27AE60;
+    color: white;
+}
+
+.politics {
+    background-color: #1ABC9C;
+    color: white;
+}
+
+.other {
+    background-color: #95A5A6;
+}
+
+.delete-btn {
+    background: rgba(255, 107, 107, 0.3);
+    backdrop-filter: blur(2px);
+    -webkit-backdrop-filter: blur(2px);
+    color: white;
+    border: 1px solid rgba(255, 107, 107, 0.5);
+    padding: 3px 6px;
+    border-radius: 3px;
+    cursor: pointer;
+    font-size: 12px;
+    transition: all 0.2s ease;
+}
+
+.delete-btn:hover {
+    background: rgba(255, 107, 107, 0.5);
+    border-color: rgba(255, 107, 107, 0.7);
+}
+
+fluent-button { 
+    height: 20px;
+}
\ No newline at end of file
diff --git a/assets/css/card/launchpad-dark.css b/assets/css/card/launchpad-dark.css
new file mode 100644
index 0000000..c94ff83
--- /dev/null
+++ b/assets/css/card/launchpad-dark.css
@@ -0,0 +1,63 @@
+/* 启动台样式 */
+.launchpad-card {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    padding: 17px;
+    margin: 10px;
+    background: rgba(0, 0, 0, 0.15);
+    border-radius: 8px;
+    backdrop-filter: blur(8px);
+    -webkit-backdrop-filter: blur(8px);
+    border: 1px solid rgba(255, 255, 255, 0.2);
+}
+
+.launchpad-app {
+    width: 48px;
+    height: 48px;
+    background: rgba(0, 0, 0, 0.2);
+    backdrop-filter: blur(4px);
+    -webkit-backdrop-filter: blur(4px);
+    border: 1px solid rgba(255, 255, 255, 0.15);
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;    
+    cursor: pointer;
+    transition: all 0.2s ease;
+}
+
+.launchpad-app:hover {
+    background: rgba(0, 0, 0, 0.3);
+    border-color: rgba(255, 255, 255, 0.3);
+    transform: scale(1.1);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+}
+
+.launchpad-icon {
+    font-size: 24px;
+    margin-bottom: 2px;
+}
+
+.launchpad-container {
+    display: flex; /* 启用 Flexbox 布局 */
+    justify-content: space-between; /* 水平分布 */
+    align-items: center; /* 垂直居中 */
+}
+
+.launchpad-name {
+    font-size: 10px;
+    text-align: center;
+    word-break: break-all;
+}
+
+/* 链接类型应用的特殊样式 */
+.launchpad-app.link-type {
+    background: rgba(0, 120, 212, 0.3);
+    /* 蓝色背景表示链接 */
+}
+
+.launchpad-app.link-type:hover {
+    background: rgba(0, 120, 212, 0.4);
+}
\ No newline at end of file
diff --git a/assets/css/card/shared-dark.css b/assets/css/card/shared-dark.css
new file mode 100644
index 0000000..8aff0c2
--- /dev/null
+++ b/assets/css/card/shared-dark.css
@@ -0,0 +1,55 @@
+body {
+    margin: 0;
+    padding: 10px;
+    color: white;
+    opacity: 0.9;
+    font-family: Arial, sans-serif;
+    border-radius: 10px;
+    user-select: none;
+    width: 300px;
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
+.card {
+    background: rgba(0, 0, 0, 0.15);
+    backdrop-filter: blur(8px);
+    -webkit-backdrop-filter: blur(8px);
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    border-radius: 8px;
+    padding: 17px;
+    margin: 10px;
+    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+    transition: all 0.3s ease;
+}
+
+.card:hover {
+    background: rgba(0, 0, 0, 0.2);
+    box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
+    transform: translateY(-2px);
+}
+
+.time-card h3,
+.homework-card h3,
+.launchpad-card h3 {
+    margin: 0 0 12px 0; /* 统一标题下边距 */
+    font-size: 16px; /* 统一标题字体大小 */
+    font-weight: 600;
+    color: rgba(255, 255, 255, 0.9);
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+
+h3 {
+    margin: 5px 0;
+}
+
+.content {
+    width: 100%;
+    opacity: 0;
+    transition: opacity 0.3s ease-in-out;
+}
+
+.content.loaded {
+    opacity: 1;
+}
\ No newline at end of file
diff --git a/assets/css/loading-dark.css b/assets/css/loading-dark.css
new file mode 100644
index 0000000..6a57047
--- /dev/null
+++ b/assets/css/loading-dark.css
@@ -0,0 +1,39 @@
+/* 加载动画样式 */
+.loading-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(135deg, rgba(30, 30, 40, 0.9), rgba(40, 40, 50, 0.9)); /* 渐变背景 */
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    z-index: 9999;
+    color: white;
+    font-size: 16px;
+    border-radius: 12px; /* 与主体保持一致 */
+    backdrop-filter: blur(10px);
+    -webkit-backdrop-filter: blur(10px);
+}
+
+.loading-spinner {
+    width: 44px;
+    height: 44px;
+    border: 4px solid rgba(255, 255, 255, 0.3);
+    border-top: 4px solid #0078d4; /* 使用主题色 */
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 15px;
+}
+
+@keyframes spin {
+    0% {
+        transform: rotate(0deg);
+    }
+
+    100% {
+        transform: rotate(360deg);
+    }
+}
\ No newline at end of file
diff --git a/assets/css/loading.css b/assets/css/loading.css
new file mode 100644
index 0000000..6a57047
--- /dev/null
+++ b/assets/css/loading.css
@@ -0,0 +1,39 @@
+/* 加载动画样式 */
+.loading-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(135deg, rgba(30, 30, 40, 0.9), rgba(40, 40, 50, 0.9)); /* 渐变背景 */
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    z-index: 9999;
+    color: white;
+    font-size: 16px;
+    border-radius: 12px; /* 与主体保持一致 */
+    backdrop-filter: blur(10px);
+    -webkit-backdrop-filter: blur(10px);
+}
+
+.loading-spinner {
+    width: 44px;
+    height: 44px;
+    border: 4px solid rgba(255, 255, 255, 0.3);
+    border-top: 4px solid #0078d4; /* 使用主题色 */
+    border-radius: 50%;
+    animation: spin 1s linear infinite;
+    margin-bottom: 15px;
+}
+
+@keyframes spin {
+    0% {
+        transform: rotate(0deg);
+    }
+
+    100% {
+        transform: rotate(360deg);
+    }
+}
\ No newline at end of file
diff --git a/assets/css/main-dark.css b/assets/css/main-dark.css
index e34cdb4..7d4268e 100644
--- a/assets/css/main-dark.css
+++ b/assets/css/main-dark.css
@@ -1,294 +1,12 @@
-body {
-    margin: 0;
-    padding: 10px;
-    color: white;
-    opacity: 0.9;
-    font-family: Arial, sans-serif;
-    border-radius: 10px;
-    user-select: none;
-    width: 300px;
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-}
+/* Import dark theme components */
 
-.card {
-    background: rgba(0, 0, 0, 0.15);
-    backdrop-filter: blur(8px);
-    -webkit-backdrop-filter: blur(8px);
-    border: 1px solid rgba(255, 255, 255, 0.2);
-    border-radius: 8px;
-    padding: 17px;
-    margin: 10px;
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
-    transition: all 0.3s ease;
-}
+/* Base styles */
+@import "./card/shared-dark.css";
 
-.card:hover {
-    background: rgba(0, 0, 0, 0.2);
-    box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
-    transform: translateY(-2px);
-}
+/* Card-specific styles */
+@import "./card/clock-dark.css";
+@import "./card/homework-dark.css";
+@import "./card/launchpad-dark.css";
 
-.homework-card {
-    display: flex;
-    flex-direction: column;
-}
-
-.content {
-    width: 100%;
-    opacity: 0;
-    transition: opacity 0.3s ease-in-out;
-}
-
-.content.loaded {
-    opacity: 1;
-}
-
-.time {
-    font-size: 26px;
-    font-weight: bold;
-    margin: 8px 0;
-    letter-spacing: 1px;
-    text-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
-}
-
-.date {
-    font-size: 13px;
-    opacity: 0.85;
-    margin-top: 5px;
-    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
-}
-
-.time-card h3,
-.homework-card h3,
-.launchpad-card h3 {
-    margin: 0 0 12px 0; /* 统一标题下边距 */
-    font-size: 16px; /* 统一标题字体大小 */
-    font-weight: 600;
-    color: rgba(255, 255, 255, 0.9);
-    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-
-h3 {
-    margin: 5px 0;
-}
-
-.homework-list {
-    margin-top: 8px;
-    max-height: 300px;
-    overflow-y: auto;
-}
-
-.homework-item {
-    background: rgba(0, 0, 0, 0.12);
-    backdrop-filter: blur(4px);
-    -webkit-backdrop-filter: blur(4px);
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    padding: 12px;
-    margin: 8px 0;
-    border-radius: 6px;
-    text-align: left;
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-start;
-}
-
-.homework-item:hover {
-    background: rgba(0, 0, 0, 0.18);
-    border-color: rgba(255, 255, 255, 0.2);
-}
-
-.homework-item > div:first-child {
-    flex: 1;
-    word-wrap: break-word;
-    word-break: break-word;
-    margin-right: 12px;
-}
-
-.subject-tag {
-    display: inline-block;
-    padding: 3px 8px; /* 标签内边距 */
-    border-radius: 12px; /* 圆角标签 */
-    font-size: 12px;
-    font-weight: 500;
-    margin-right: 6px; /* 右边距 */
-    vertical-align: middle;
-    backdrop-filter: blur(2px);
-    -webkit-backdrop-filter: blur(2px);
-}
-
-.chinese {
-    background-color: #E74C3C; /* 深红色 - 语文课本的红色 */
-    color: white;
-}
-
-.math {
-    background-color: #3498DB; /* 深蓝色 - 数学课本的蓝色 */
-    color: white;
-}
-
-.english {
-    background-color: #F39C12;
-    color: white;
-}
-
-.physics {
-    background-color: #2980B9;
-    color: white;
-}
-
-.chemistry {
-    background-color: #9B59B6;
-    color: white;
-}
-
-.biology {
-    background-color: #27AE60;
-    color: white;
-}
-
-.history {
-    background-color: #E67E22;
-    color: white;
-}
-
-.geography {
-    background-color: #27AE60;
-    color: white;
-}
-
-.politics {
-    background-color: #1ABC9C;
-    color: white;
-}
-
-.other {
-    background-color: #95A5A6;
-}
-
-.delete-btn {
-    background: rgba(255, 107, 107, 0.3);
-    backdrop-filter: blur(2px);
-    -webkit-backdrop-filter: blur(2px);
-    color: white;
-    border: 1px solid rgba(255, 107, 107, 0.5);
-    padding: 3px 6px;
-    border-radius: 3px;
-    cursor: pointer;
-    font-size: 12px;
-    transition: all 0.2s ease;
-}
-
-.delete-btn:hover {
-    background: rgba(255, 107, 107, 0.5);
-    border-color: rgba(255, 107, 107, 0.7);
-}
-
-/* 加载动画样式 */
-.loading-overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(135deg, rgba(30, 30, 40, 0.9), rgba(40, 40, 50, 0.9)); /* 渐变背景 */
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    z-index: 9999;
-    color: white;
-    font-size: 16px;
-    border-radius: 12px; /* 与主体保持一致 */
-    backdrop-filter: blur(10px);
-    -webkit-backdrop-filter: blur(10px);
-}
-
-.loading-spinner {
-    width: 44px;
-    height: 44px;
-    border: 4px solid rgba(255, 255, 255, 0.3);
-    border-top: 4px solid #0078d4; /* 使用主题色 */
-    border-radius: 50%;
-    animation: spin 1s linear infinite;
-    margin-bottom: 15px;
-}
-
-@keyframes spin {
-    0% {
-        transform: rotate(0deg);
-    }
-
-    100% {
-        transform: rotate(360deg);
-    }
-}
-
-/* 启动台样式 */
-.launchpad-card {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-    padding: 17px;
-    margin: 10px;
-    background: rgba(0, 0, 0, 0.15);
-    border-radius: 8px;
-    backdrop-filter: blur(8px);
-    -webkit-backdrop-filter: blur(8px);
-    border: 1px solid rgba(255, 255, 255, 0.2);
-}
-
-.launchpad-app {
-    width: 48px;
-    height: 48px;
-    background: rgba(0, 0, 0, 0.2);
-    backdrop-filter: blur(4px);
-    -webkit-backdrop-filter: blur(4px);
-    border: 1px solid rgba(255, 255, 255, 0.15);
-    border-radius: 8px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;    
-    cursor: pointer;
-    transition: all 0.2s ease;
-}
-
-.launchpad-app:hover {
-    background: rgba(0, 0, 0, 0.3);
-    border-color: rgba(255, 255, 255, 0.3);
-    transform: scale(1.1);
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-}
-
-.launchpad-icon {
-    font-size: 24px;
-    margin-bottom: 2px;
-}
-
-.launchpad-container {
-    display: flex; /* 启用 Flexbox 布局 */
-    justify-content: space-between; /* 水平分布 */
-    align-items: center; /* 垂直居中 */
-}
-
-.launchpad-name {
-    font-size: 10px;
-    text-align: center;
-    word-break: break-all;
-}
-
-/* 链接类型应用的特殊样式 */
-.launchpad-app.link-type {
-    background: rgba(0, 120, 212, 0.3);
-    /* 蓝色背景表示链接 */
-}
-
-.launchpad-app.link-type:hover {
-    background: rgba(0, 120, 212, 0.4);
-}
-
-fluent-button { 
-    height: 20px;
-}
\ No newline at end of file
+/* Loading animation */
+@import "./loading-dark.css";
\ No newline at end of file
diff --git a/assets/css/main.css b/assets/css/main.css
index 6a57047..030b9f8 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -1,39 +1,12 @@
-/* 加载动画样式 */
-.loading-overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(135deg, rgba(30, 30, 40, 0.9), rgba(40, 40, 50, 0.9)); /* 渐变背景 */
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    z-index: 9999;
-    color: white;
-    font-size: 16px;
-    border-radius: 12px; /* 与主体保持一致 */
-    backdrop-filter: blur(10px);
-    -webkit-backdrop-filter: blur(10px);
-}
+/* Import light theme components */
 
-.loading-spinner {
-    width: 44px;
-    height: 44px;
-    border: 4px solid rgba(255, 255, 255, 0.3);
-    border-top: 4px solid #0078d4; /* 使用主题色 */
-    border-radius: 50%;
-    animation: spin 1s linear infinite;
-    margin-bottom: 15px;
-}
+/* Base styles */
+@import "./card/shared.css";
 
-@keyframes spin {
-    0% {
-        transform: rotate(0deg);
-    }
+/* Card-specific styles */
+@import "./card/clock.css";
+@import "./card/homework.css";
+@import "./card/launchpad.css";
 
-    100% {
-        transform: rotate(360deg);
-    }
-}
\ No newline at end of file
+/* Loading animation */
+@import "./loading.css";
\ No newline at end of file
diff --git a/assets/css/settings.css b/assets/css/settings.css
index 2aa1852..2fa90be 100644
--- a/assets/css/settings.css
+++ b/assets/css/settings.css
@@ -8,39 +8,79 @@
 .settings-layout {
     display: flex;
     height: 100%;
-    gap: 24px;
+    gap: 0;
 }
 
 .sidebar {
-    width: 200px;
+    width: 220px;
     display: flex;
     flex-direction: column;
-    gap: 8px;
+    gap: 4px;
+    padding: 8px;
+    background-color: #f8f8f8;
+    border-right: 1px solid #edebe9;
+    height: calc(100% - 16px);
+    margin-top: 8px;
+    border-radius: 8px 0 0 8px;
 }
 
 .tab {
-    height: 50px;
-    padding: 10px 12px;
-    border-radius: 4px;
+    height: 46px;
+    padding: 12px 16px;
+    border-radius: 6px;
     cursor: pointer;
     font-size: 14px;
     color: #605e5c;
     transition: all 0.2s ease;
+    display: flex;
+    align-items: center;
+    position: relative;
+    margin: 2px 0;
+}
+
+.tab::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    width: 3px;
+    background-color: transparent;
+    border-radius: 3px 0 0 3px;
+    transition: all 0.2s ease;
 }
 
 .tab:hover {
-    background-color: #f3f2f1;
+    background-color: #eef1f5;
+    color: #323130;
 }
 
-.tab.active {
+.tab:hover::before {
     background-color: #0078d4;
-    color: #323130;
+}
+
+.tab.active {
+    background-color: #e6f0fa;
+    color: #0078d4;
     font-weight: 600;
+    border-left: 3px solid #0078d4;
+}
+
+.tab.active::before {
+    background-color: #0078d4;
+}
+
+.tab i {
+    margin-right: 10px;
+    font-size: 16px;
+    width: 20px;
+    text-align: center;
 }
 
 .content {
     flex: 1;
     overflow-y: auto;
+    padding: 16px;
 }
 
 .tab-content {
diff --git a/pages/clock.html b/pages/clock.html
index 9fc756d..8b2e01e 100644
--- a/pages/clock.html
+++ b/pages/clock.html
@@ -5,8 +5,7 @@
     <meta charset="UTF-8">
     <title>时钟</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/card/shared.css">
-    <link rel="stylesheet" href="../assets/css/card/clock.css">
+    <link rel="stylesheet" href="../assets/css/main.css">
     <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
     </link>
 </head>
diff --git a/pages/homework.html b/pages/homework.html
index 0994b8f..64965c3 100644
--- a/pages/homework.html
+++ b/pages/homework.html
@@ -5,8 +5,7 @@
     <meta charset="UTF-8">
     <title>作业</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/card/shared.css">
-    <link rel="stylesheet" href="../assets/css/card/homework.css">
+    <link rel="stylesheet" href="../assets/css/main.css">
     <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
     </link>
 </head>
diff --git a/pages/launchpad.html b/pages/launchpad.html
index 2da43cd..d252a02 100644
--- a/pages/launchpad.html
+++ b/pages/launchpad.html
@@ -5,8 +5,7 @@
     <meta charset="UTF-8">
     <title>启动台</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/card/shared.css">
-    <link rel="stylesheet" href="../assets/css/card/launchpad.css">
+    <link rel="stylesheet" href="../assets/css/main.css">
     <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
     </link>
 </head>
diff --git a/pages/settings.html b/pages/settings.html
index 1ac9e47..ff6e3d7 100644
--- a/pages/settings.html
+++ b/pages/settings.html
@@ -25,10 +25,10 @@
         <div class="settings-layout">
             <!-- 左侧选项卡 -->
             <div class="sidebar">
-                <fluent-card class="tab active" data-tab="general">常规</fluent-card>
-                <fluent-card class="tab" data-tab="appearance">外观</fluent-card>
-                <fluent-card class="tab" data-tab="launchpad">启动台</fluent-card>
-                <fluent-card class="tab" data-tab="advanced">高级</fluent-card>
+                <fluent-card class="tab active" data-tab="general"><i>⚙️</i>常规</fluent-card>
+                <fluent-card class="tab" data-tab="appearance"><i>🎨</i>外观</fluent-card>
+                <fluent-card class="tab" data-tab="launchpad"><i>🚀</i>启动台</fluent-card>
+                <fluent-card class="tab" data-tab="advanced"><i>🔧</i>高级</fluent-card>
             </div>
 
             <!-- 右侧内容区域 -->

From 6a1c815c6fe5ef1e5d19fb611e26879d913d31e1 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 20:29:10 +0800
Subject: [PATCH 14/20] =?UTF-8?q?refactor:=20:zap:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2UI=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/settings.css |  8 ++---
 pages/settings.html     | 70 +++++++++++++++++++++++++----------------
 2 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/assets/css/settings.css b/assets/css/settings.css
index 2fa90be..7c299d1 100644
--- a/assets/css/settings.css
+++ b/assets/css/settings.css
@@ -1,6 +1,6 @@
 .container {
     background: white;
-    padding-top: 40px;
+    padding-top: 30px;
     box-shadow: 0 2px 4px rgba(0,0,0,0.1);
     height: calc(100vh - 32px); /* 调整高度以适应标题栏 */
 }
@@ -20,7 +20,6 @@
     background-color: #f8f8f8;
     border-right: 1px solid #edebe9;
     height: calc(100% - 16px);
-    margin-top: 8px;
     border-radius: 8px 0 0 8px;
 }
 
@@ -166,14 +165,15 @@
 }
 
 .setting-group {
-    margin-bottom: 20px;
+    padding: 20px 20px 20px 20px;
 }
 
 .setting-item {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 12px 0;
+    padding-top: 15px;
+    padding-bottom: 15px;
     border-bottom: 1px solid #edebe9;
 }
 
diff --git a/pages/settings.html b/pages/settings.html
index ff6e3d7..230e465 100644
--- a/pages/settings.html
+++ b/pages/settings.html
@@ -17,7 +17,12 @@
     <div class="title-bar">
         <div class="title">设置</div>
         <div class="title-bar-buttons">
-            <div class="title-bar-button close-button" title="关闭" id="titleCloseBtn"></div>
+            <fluent-button id="titleCloseBtn" appearance="stealth" aria-label="关闭">
+                <svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                    <line x1="18" y1="6" x2="6" y2="18"></line>
+                    <line x1="6" y1="6" x2="18" y2="18"></line>
+                </svg>
+            </fluent-button>
         </div>
     </div>
 
@@ -25,17 +30,29 @@
         <div class="settings-layout">
             <!-- 左侧选项卡 -->
             <div class="sidebar">
-                <fluent-card class="tab active" data-tab="general"><i>⚙️</i>常规</fluent-card>
-                <fluent-card class="tab" data-tab="appearance"><i>🎨</i>外观</fluent-card>
-                <fluent-card class="tab" data-tab="launchpad"><i>🚀</i>启动台</fluent-card>
-                <fluent-card class="tab" data-tab="advanced"><i>🔧</i>高级</fluent-card>
+                <fluent-card class="tab active" data-tab="general">
+                    <fluent-badge appearance="accent">⚙️</fluent-badge>
+                    <span>常规</span>
+                </fluent-card>
+                <fluent-card class="tab" data-tab="appearance">
+                    <fluent-badge appearance="accent">🎨</fluent-badge>
+                    <span>外观</span>
+                </fluent-card>
+                <fluent-card class="tab" data-tab="launchpad">
+                    <fluent-badge appearance="accent">🚀</fluent-badge>
+                    <span>启动台</span>
+                </fluent-card>
+                <fluent-card class="tab" data-tab="advanced">
+                    <fluent-badge appearance="accent">🔧</fluent-badge>
+                    <span>高级</span>
+                </fluent-card>
             </div>
 
             <!-- 右侧内容区域 -->
             <div class="content">
                 <!-- 常规设置 -->
                 <div class="tab-content active" id="general-tab">
-                    <div class="setting-group">
+                    <fluent-card class="setting-group">
                         <div class="setting-item">
                             <div class="setting-info">
                                 <div class="setting-title">启用时钟</div>
@@ -55,12 +72,12 @@
                                 <fluent-switch id="homeworkToggle" label="作业"></fluent-switch>
                             </div>
                         </div>
-                    </div>
+                    </fluent-card>
                 </div>
 
                 <!-- 外观设置 -->
                 <div class="tab-content" id="appearance-tab">
-                    <div class="setting-group">
+                    <fluent-card class="setting-group">
                         <div class="setting-item">
                             <div class="setting-info">
                                 <div class="setting-title">使用暗色主题</div>
@@ -80,17 +97,16 @@
                                 <fluent-switch id="alwaysOnTopToggle" label="置顶"></fluent-switch>
                             </div>
                         </div>
-                    </div>
+                    </fluent-card>
                 </div>
 
                 <!-- 启动台设置 -->
                 <div class="tab-content" id="launchpad-tab">
-                    <!-- 启动台设置部分 -->
-                    <div class="launchpad-section">
+                    <fluent-card class="setting-group">
                         <div class="launchpad-header">
                             <div class="launchpad-title">启动台</div>
                         </div>
-                        <p style="color: #605e5c; margin-bottom: 16px;">管理快捷启动的应用程序和链接</p>
+                        <p class="launchpad-description">管理快捷启动的应用程序和链接</p>
 
                         <div class="launchpad-list" id="launchpadList">
                             <!-- 启动项将在这里显示 -->
@@ -98,22 +114,22 @@
 
                         <div class="add-form">
                             <div class="form-row">
-                                <input type="text" class="add-input" id="appNameInput" placeholder="名称">
-                                <select class="type-selector" id="appTypeInput">
-                                    <option value="app">应用程序</option>
-                                    <option value="link">链接</option>
-                                </select>
+                                <fluent-text-field id="appNameInput" placeholder="名称" class="add-input"></fluent-text-field>
+                                <fluent-select id="appTypeInput" class="type-selector">
+                                    <fluent-option value="app">应用程序</fluent-option>
+                                    <fluent-option value="link">链接</fluent-option>
+                                </fluent-select>
                             </div>
-                            <input type="text" class="add-input" id="appPathInput" placeholder="应用程序路径或链接地址">
-                            <input type="text" class="add-input" id="appIconInput" placeholder="图标路径（可选）">
+                            <fluent-text-field id="appPathInput" placeholder="应用程序路径或链接地址" class="add-input"></fluent-text-field>
+                            <fluent-text-field id="appIconInput" placeholder="图标路径（可选）" class="add-input"></fluent-text-field>
                             <fluent-button id="addAppBtn" appearance="accent" class="add-btn">添加</fluent-button>
                         </div>
-                    </div>
+                    </fluent-card>
                 </div>
 
                 <!-- 高级设置 -->
                 <div class="tab-content" id="advanced-tab">
-                    <div class="setting-group">
+                    <fluent-card class="setting-group">
                         <div class="setting-item">
                             <div class="setting-info">
                                 <div class="setting-title">开机自启</div>
@@ -123,7 +139,7 @@
                                 <fluent-switch id="startupToggle" label="开机自启"></fluent-switch>
                             </div>
                         </div>
-                    </div>
+                    </fluent-card>
                 </div>
             </div>
         </div>
@@ -142,9 +158,9 @@
         ipcRenderer.on('settings-updated', (event, settings) => {
             document.querySelector('#clockToggle').checked = settings.clockEnabled;
             document.querySelector('#homeworkToggle').checked = settings.homeworkEnabled;
-            document.querySelector('#alwaysOnTopToggle').checked = settings.alwaysOnTop; // 添加置顶状态
-            document.querySelector('#darkThemeToggle').checked = settings.darkThemeEnabled || false; // 添加暗色主题状态
-            document.querySelector('#startupToggle').checked = settings.startupEnabled || false; // 添加开机自启状态
+            document.querySelector('#alwaysOnTopToggle').checked = settings.alwaysOnTop; // 置顶状态
+            document.querySelector('#darkThemeToggle').checked = settings.darkThemeEnabled || false; // 暗色主题状态
+            document.querySelector('#startupToggle').checked = settings.startupEnabled || false; // 开机自启状态
 
             // 渲染启动台应用列表
             renderLaunchpadList(settings.launchpadApps || []);
@@ -249,12 +265,12 @@
                     <div class="launchpad-item-info">
                         <div class="launchpad-item-name">
                             ${app.name}
-                            <span class="launchpad-item-type" data-type="${typeClass}">${typeLabel}</span>
+                            <fluent-badge appearance="accent" size="small" class="launchpad-item-type" data-type="${typeClass}">${typeLabel}</fluent-badge>
                         </div>
                         <div class="launchpad-item-path">${app.path}</div>
                     </div>
                     <div class="launchpad-item-actions">
-                        <button class="remove-btn" onclick="removeLaunchpadApp(${index})">删除</button>
+                        <fluent-button appearance="lightweight" class="remove-btn" onclick="removeLaunchpadApp(${index})">删除</fluent-button>
                     </div>
                 `;
                 listContainer.appendChild(item);

From 1d6be44913921b08ece5e2178e65eada5192aac6 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Thu, 15 Jan 2026 22:28:22 +0800
Subject: [PATCH 15/20] =?UTF-8?q?ci:=20:construction=5Fworker:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=88=A0=E6=96=87=E4=BB=B6=E5=A4=B1=E8=B4=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 963675a..a2e211a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,19 +23,28 @@ jobs:
      - name: Delete Unnecessary Files on Windows
        if: matrix.os == 'windows-latest'
        run: |
-         del /f /q README.md
-         rmdir /S /Q .github
-         del /f /q .gitignore
-         del /f /q .gitattributes
-         rmdir /S /Q .vscode
-         rmdir /S /Q readme
-         rmdir /S /Q installer
-         rmdir /S /Q changelog
-         rmdir /S /Q node_modules/.cache
+         if exist README.md del /f /q README.md
+         if exist .github rmdir /S /Q .github
+         if exist .gitignore del /f /q .gitignore
+         if exist .gitattributes del /f /q .gitattributes
+         if exist .vscode rmdir /S /Q .vscode
+         if exist readme rmdir /S /Q readme
+         if exist installer rmdir /S /Q installer
+         if exist changelog rmdir /S /Q changelog
+         if exist node_modules/.cache rmdir /S /Q node_modules/.cache
        shell: cmd
      - name: Delete Unnecessary Files on Unix
        if: matrix.os != 'windows-latest'
-       run: rm -rf README.md && rm -rf .github && rm -rf .gitignore && rm -rf .gitattributes && rm -rf .vscode && rm -rf readme && rm -rf installer && rm -rf changelog && rm -rf node_modules/.cache
+       run: |
+         [ -f README.md ] && rm -rf README.md || true
+         [ -d .github ] && rm -rf .github || true
+         [ -f .gitignore ] && rm -rf .gitignore || true
+         [ -f .gitattributes ] && rm -rf .gitattributes || true
+         [ -d .vscode ] && rm -rf .vscode || true
+         [ -d readme ] && rm -rf readme || true
+         [ -d installer ] && rm -rf installer || true
+         [ -d changelog ] && rm -rf changelog || true
+         [ -d node_modules/.cache ] && rm -rf node_modules/.cache || true
        shell: bash
      - name: Build with electron-forge
        run: "yarn make"

From 081d63c77daf32036e0e16903af706e2b942b8c9 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Sat, 17 Jan 2026 12:24:30 +0800
Subject: [PATCH 16/20] =?UTF-8?q?refactor:=20:fire:=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E4=BE=9D=E8=B5=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/clock.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/clock.html b/pages/clock.html
index 8b2e01e..34a6b06 100644
--- a/pages/clock.html
+++ b/pages/clock.html
@@ -4,7 +4,6 @@
 <head>
     <meta charset="UTF-8">
     <title>时钟</title>
-    <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
     <link rel="stylesheet" href="../assets/css/main.css">
     <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
     </link>

From 7c276551cbf4843152600e52022cb5bfb39cc8fb Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Sat, 17 Jan 2026 12:39:20 +0800
Subject: [PATCH 17/20] =?UTF-8?q?fix:=20:bug:=20click=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E8=A2=AB=E6=8B=A6=E6=88=AA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/homework.html  | 15 +++++++++++++++
 pages/launchpad.html | 16 ++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/pages/homework.html b/pages/homework.html
index 64965c3..cca696b 100644
--- a/pages/homework.html
+++ b/pages/homework.html
@@ -35,6 +35,21 @@ <h3>作业</h3>
     // 导入 IPC 通信
     const { ipcRenderer } = require('electron');
 
+        // 防止click事件在空白区域时被拦截
+    const homeworkCard = document.getElementById('homeworkCard');
+    if (homeworkCard) {
+        homeworkCard.addEventListener('mouseenter', () =>
+            ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
+        );
+
+        homeworkCard.addEventListener('mouseleave', () =>
+            ipcRenderer.send('set-ignore-mouse-events', {
+                ignore: true,
+                forward: true
+            })
+        );
+    }
+
     // 添加作业显示状态变量
     let isHomeworkVisible = true;
     // 添加暗色主题状态变量
diff --git a/pages/launchpad.html b/pages/launchpad.html
index d252a02..5b98d1e 100644
--- a/pages/launchpad.html
+++ b/pages/launchpad.html
@@ -31,6 +31,22 @@ <h3>启动台</h3>
     // 导入 IPC 通信
     const { ipcRenderer } = require('electron');
 
+        // 防止click事件在空白区域时被拦截
+    const launchpadCard = document.getElementById('launchpadCard');
+    if (launchpadCard) {
+        launchpadCard.addEventListener('mouseenter', () =>
+            ipcRenderer.send('set-ignore-mouse-events', { ignore: false })
+        );
+
+        launchpadCard.addEventListener('mouseleave', () =>
+            ipcRenderer.send('set-ignore-mouse-events', {
+                ignore: true,
+                forward: true
+            })
+        );
+    }
+
+
     // 添加启动台显示状态变量
     let isLaunchpadVisible = true;
     // 添加暗色主题状态变量

From 8b4c087b592706b39605a5fc0596d2bd99647b58 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Sat, 17 Jan 2026 13:21:55 +0800
Subject: [PATCH 18/20] =?UTF-8?q?feat:=20:sparkles:=20=E4=BC=98=E5=8C=96UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/card/clock.css          | 29 +++++++++++++---
 assets/css/card/launchpad-dark.css | 23 ++++++++-----
 assets/css/card/launchpad.css      | 25 +++++++-------
 assets/css/card/shared-dark.css    | 53 +++++++++++++++++++++++++-----
 assets/css/card/shared.css         | 52 ++++++++++++++++++++++++-----
 5 files changed, 143 insertions(+), 39 deletions(-)

diff --git a/assets/css/card/clock.css b/assets/css/card/clock.css
index 82a105f..cb0e460 100644
--- a/assets/css/card/clock.css
+++ b/assets/css/card/clock.css
@@ -1,14 +1,35 @@
 .time {
-    font-size: 26px;
-    font-weight: bold;
+    font-size: 28px;
+    font-weight: 600;
     margin: 8px 0;
     letter-spacing: 1px;
     text-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+    font-family: 'Segoe UI', 'Roboto', 'Helvetica Neue', Arial, sans-serif;
+    background: linear-gradient(135deg, #ffffff, #e0e0e0);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    background-clip: text;
+    text-align: center;
+    position: relative;
+    z-index: 1;
 }
 
 .date {
-    font-size: 13px;
-    opacity: 0.85;
+    font-size: 14px;
+    opacity: 0.9;
     margin-top: 5px;
     text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+    font-family: 'Segoe UI', 'Roboto', 'Helvetica Neue', Arial, sans-serif;
+    text-align: center;
+    position: relative;
+    z-index: 1;
+}
+
+.period {
+    font-size: 14px;
+    opacity: 0.85;
+    margin-left: 8px;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+    position: relative;
+    z-index: 1;
 }
\ No newline at end of file
diff --git a/assets/css/card/launchpad-dark.css b/assets/css/card/launchpad-dark.css
index c94ff83..8e182ef 100644
--- a/assets/css/card/launchpad-dark.css
+++ b/assets/css/card/launchpad-dark.css
@@ -1,15 +1,22 @@
 /* 启动台样式 */
 .launchpad-card {
     display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-    padding: 17px;
+    flex-direction: column;
+    padding: 20px;
     margin: 10px;
-    background: rgba(0, 0, 0, 0.15);
-    border-radius: 8px;
-    backdrop-filter: blur(8px);
-    -webkit-backdrop-filter: blur(8px);
-    border: 1px solid rgba(255, 255, 255, 0.2);
+    background: rgba(0, 0, 0, 0.2);
+    backdrop-filter: blur(12px);
+    -webkit-backdrop-filter: blur(12px);
+    border-radius: 10px;
+    border: 1px solid rgba(255, 255, 255, 0.25);
+    box-shadow: 
+        0 4px 20px rgba(0, 0, 0, 0.15),
+        inset 0 0 15px rgba(255, 255, 255, 0.08),
+        0 0 10px rgba(255, 255, 255, 0.1);
+    min-width: 280px;
+    width: auto;
+    position: relative;
+    overflow: hidden;
 }
 
 .launchpad-app {
diff --git a/assets/css/card/launchpad.css b/assets/css/card/launchpad.css
index 7590126..e1df457 100644
--- a/assets/css/card/launchpad.css
+++ b/assets/css/card/launchpad.css
@@ -1,19 +1,22 @@
 /* 启动台样式 */
 .launchpad-card {
     display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-    padding: 17px;
-    /* 与其他卡片保持一致 */
+    flex-direction: column;
+    padding: 20px;
     margin: 10px;
-    /* 与其他卡片保持一致 */
     background: rgba(255, 255, 255, 0.15);
-    /* 与其他卡片保持一致 */
-    border-radius: 8px;
-    /* 与其他卡片保持一致 */
-    backdrop-filter: blur(8px);
-    -webkit-backdrop-filter: blur(8px);
-    border: 1px solid rgba(255, 255, 255, 0.2);
+    backdrop-filter: blur(12px);
+    -webkit-backdrop-filter: blur(12px);
+    border-radius: 10px;
+    border: 1px solid rgba(255, 255, 255, 0.3);
+    box-shadow: 
+        0 4px 20px rgba(0, 0, 0, 0.1),
+        inset 0 0 15px rgba(255, 255, 255, 0.1),
+        0 0 10px rgba(255, 255, 255, 0.15);
+    min-width: 280px;
+    width: auto;
+    position: relative;
+    overflow: hidden;
 }
 
 .launchpad-app {
diff --git a/assets/css/card/shared-dark.css b/assets/css/card/shared-dark.css
index 8aff0c2..8d7ed76 100644
--- a/assets/css/card/shared-dark.css
+++ b/assets/css/card/shared-dark.css
@@ -13,21 +13,58 @@ body {
 }
 
 .card {
-    background: rgba(0, 0, 0, 0.15);
-    backdrop-filter: blur(8px);
-    -webkit-backdrop-filter: blur(8px);
-    border: 1px solid rgba(255, 255, 255, 0.2);
+    background: rgba(0, 0, 0, 0.2);
+    backdrop-filter: blur(12px);
+    -webkit-backdrop-filter: blur(12px);
+    border: 1px solid rgba(255, 255, 255, 0.3);
     border-radius: 8px;
     padding: 17px;
     margin: 10px;
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+    box-shadow: 
+        0 4px 20px rgba(0, 0, 0, 0.15),
+        inset 0 0 15px rgba(255, 255, 255, 0.1),
+        0 0 10px rgba(255, 255, 255, 0.15);
     transition: all 0.3s ease;
+    position: relative;
+    overflow: hidden;
+}
+
+.card::before {
+    content: '';
+    position: absolute;
+    top: -2px;
+    left: -2px;
+    right: -2px;
+    bottom: -2px;
+    background: linear-gradient(45deg, 
+        rgba(255, 255, 255, 0.2), 
+        rgba(255, 255, 255, 0.05), 
+        rgba(255, 255, 255, 0.2),
+        rgba(255, 255, 255, 0.05),
+        rgba(255, 255, 255, 0.2));
+    z-index: -1;
+    border-radius: 10px;
+    opacity: 0.5;
+}
+
+.card:hover::before {
+    opacity: 0.7;
+    background: linear-gradient(45deg, 
+        rgba(255, 255, 255, 0.3), 
+        rgba(255, 255, 255, 0.1), 
+        rgba(255, 255, 255, 0.3),
+        rgba(255, 255, 255, 0.1),
+        rgba(255, 255, 255, 0.3));
 }
 
 .card:hover {
-    background: rgba(0, 0, 0, 0.2);
-    box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
-    transform: translateY(-2px);
+    background: rgba(0, 0, 0, 0.25);
+    box-shadow: 
+        0 8px 25px rgba(0, 0, 0, 0.2),
+        inset 0 0 20px rgba(255, 255, 255, 0.15),
+        0 0 15px rgba(255, 255, 255, 0.25);
+    transform: translateY(-3px);
+    border-color: rgba(255, 255, 255, 0.4);
 }
 
 .time-card h3,
diff --git a/assets/css/card/shared.css b/assets/css/card/shared.css
index 2c6f10e..4500760 100644
--- a/assets/css/card/shared.css
+++ b/assets/css/card/shared.css
@@ -14,21 +14,57 @@ body {
 
 .card {
     background: rgba(255, 255, 255, 0.15);
-    backdrop-filter: blur(8px);
-    -webkit-backdrop-filter: blur(8px);
-    border: 1px solid rgba(255, 255, 255, 0.2);
+    backdrop-filter: blur(12px);
+    -webkit-backdrop-filter: blur(12px);
+    border: 1px solid rgba(255, 255, 255, 0.3);
     border-radius: 8px;
-    /* 卡片圆角 */
     padding: 17px;
     margin: 10px;
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1);
+    box-shadow: 
+        0 4px 20px rgba(0, 0, 0, 0.1),
+        inset 0 0 15px rgba(255, 255, 255, 0.15),
+        0 0 10px rgba(255, 255, 255, 0.2);
     transition: all 0.3s ease;
+    position: relative;
+    overflow: hidden;
+}
+
+.card::before {
+    content: '';
+    position: absolute;
+    top: -2px;
+    left: -2px;
+    right: -2px;
+    bottom: -2px;
+    background: linear-gradient(45deg, 
+        rgba(255, 255, 255, 0.3), 
+        rgba(255, 255, 255, 0.1), 
+        rgba(255, 255, 255, 0.3),
+        rgba(255, 255, 255, 0.1),
+        rgba(255, 255, 255, 0.3));
+    z-index: -1;
+    border-radius: 10px;
+    opacity: 0.6;
+}
+
+.card:hover::before {
+    opacity: 0.8;
+    background: linear-gradient(45deg, 
+        rgba(255, 255, 255, 0.4), 
+        rgba(255, 255, 255, 0.2), 
+        rgba(255, 255, 255, 0.4),
+        rgba(255, 255, 255, 0.2),
+        rgba(255, 255, 255, 0.4));
 }
 
 .card:hover {
     background: rgba(255, 255, 255, 0.2);
-    box-shadow: 0 6px 20px rgba(0, 0, 0, 0.15);
-    transform: translateY(-2px);
+    box-shadow: 
+        0 8px 25px rgba(0, 0, 0, 0.15),
+        inset 0 0 20px rgba(255, 255, 255, 0.2),
+        0 0 15px rgba(255, 255, 255, 0.3);
+    transform: translateY(-3px);
+    border-color: rgba(255, 255, 255, 0.4);
 }
 
 
@@ -49,4 +85,4 @@ body {
 
 .content.loaded {
     opacity: 1;
-}
+}
\ No newline at end of file

From f7b247edab340764670a5f3ad6a2f775e1d57a67 Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Sat, 17 Jan 2026 21:46:51 +0800
Subject: [PATCH 19/20] =?UTF-8?q?fix:=20:bug:=20=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AA=97=E5=8F=A3=E5=A4=A7=E5=B0=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/homework-list.css     |   1 -
 main.js                          | 298 +++++++++++++++++++++---------
 pages/{ => cards}/clock.html     |   8 +-
 pages/{ => cards}/homework.html  |   8 +-
 pages/{ => cards}/launchpad.html |   8 +-
 pages/homework-bigscreen.html    | 304 +++++++++++++++++++++++++++++++
 6 files changed, 530 insertions(+), 97 deletions(-)
 rename pages/{ => cards}/clock.html (95%)
 rename pages/{ => cards}/homework.html (97%)
 rename pages/{ => cards}/launchpad.html (96%)
 create mode 100644 pages/homework-bigscreen.html

diff --git a/assets/css/homework-list.css b/assets/css/homework-list.css
index 6a56e7a..353e4dc 100644
--- a/assets/css/homework-list.css
+++ b/assets/css/homework-list.css
@@ -9,7 +9,6 @@ body {
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
     background: #ffffff;
     color: #333;
-    height: 100vh;
     overflow: hidden;
 }
 
diff --git a/main.js b/main.js
index b834769..e31b86b 100644
--- a/main.js
+++ b/main.js
@@ -56,28 +56,63 @@ if (app.isPackaged) {
 	iconPath = path.join(__dirname, "assets/logo.png");
 }
 
-// 获取默认位置（右上角）
-const getDefaultPosition = () => {
-	const {
-		width
-	} = screen.getPrimaryDisplay().workAreaSize;
-	return [width - 320, 20];
+// 读取/保存窗口位置和大小
+const loadWindowSize = (windowType) => {
+	const config = loadConfig();
+	
+	// 默认尺寸
+	const defaultSizes = {
+		clockWindow: { width: 300, height: 150 },
+		homeworkWindow: { width: 300, height: 300 },
+		launchpadWindow: { width: 300, height: 200 },
+		homeworkAddWindow: { width: 400, height: 300 },
+		homeworkListWindow: { width: 800, height: 600 },
+		settingsWindow: { width: 700, height: 600 },
+		aboutWindow: { width: 500, height: 400 },
+		welcomeWindow: { width: 600, height: 420 }
+	};
+	
+	const defaultSize = defaultSizes[windowType] || { width: 300, height: 300 };
+	
+	if (config[windowType]?.width !== undefined && config[windowType]?.height !== undefined) {
+		return {
+			width: config[windowType].width,
+			height: config[windowType].height
+		};
+	}
+	
+	return defaultSize;
 };
 
-// 读取/保存窗口位置
-const loadWindowPosition = () => {
+const loadWindowPosition = (windowType) => {
 	const config = loadConfig();
-	if (config.window?.x !== undefined && config.window?.y !== undefined) {
-		return [config.window.x, config.window.y];
+	const { width } = screen.getPrimaryDisplay().workAreaSize;
+	
+	// 如果配置中有该窗口的位置信息，则使用配置中的位置
+	if (config[windowType]?.x !== undefined && config[windowType]?.y !== undefined) {
+		return [config[windowType].x, config[windowType].y];
+	}
+	
+	// 否则返回默认位置
+	switch(windowType) {
+		case 'clockWindow':
+			return [width - 320, 20];
+		case 'homeworkWindow':
+			return [width - 320, 180]; // 在时钟窗口下方
+		case 'launchpadWindow':
+			return [width - 320, 480]; // 在作业窗口下方
+		default:
+			return [width - 320, 20];
 	}
-	return getDefaultPosition();
 };
 
-const saveWindowPosition = (x, y) => {
+const saveWindowBounds = (windowType, x, y, width, height) => {
 	const config = loadConfig();
-	config.window = {
+	config[windowType] = {
 		x,
-		y
+		y,
+		width,
+		height
 	};
 	saveConfig(config);
 };
@@ -86,7 +121,8 @@ const saveWindowPosition = (x, y) => {
 let clockWindow;
 
 const createClockWindow = () => {
-	const [defaultX, defaultY] = loadWindowPosition();
+	const size = loadWindowSize('clockWindow');
+	const [defaultX, defaultY] = loadWindowPosition('clockWindow');
 
 	// 读取置顶设置
 	const config = loadConfig();
@@ -94,8 +130,8 @@ const createClockWindow = () => {
 	const isDarkThemeEnabled = config.darkThemeEnabled !== undefined ? config.darkThemeEnabled : false; // 读取暗色主题设置
 
 	clockWindow = new BrowserWindow({
-		width: 300,
-		height: 150,
+		width: size.width,
+		height: size.height,
 		x: defaultX,
 		y: defaultY,
 		// 设置为无边框窗口
@@ -120,7 +156,7 @@ const createClockWindow = () => {
 	});
 
 	// 加载时钟页面内容
-	clockWindow.loadFile('pages/clock.html');
+	clockWindow.loadFile('pages/cards/clock.html');
 
 	// 当窗口 DOM 就绪时发送初始状态
 	clockWindow.webContents.once('dom-ready', () => {
@@ -129,22 +165,27 @@ const createClockWindow = () => {
 		clockWindow.webContents.send('dark-theme-toggle', isDarkThemeEnabled); // 发送暗色主题状态
 	});
 
-	// 监听窗口移动事件，保存位置
+	// 监听窗口移动和调整大小事件，保存位置和大小
 	clockWindow.on('moved', () => {
 		const [x, y] = clockWindow.getPosition();
-		// 保存时钟窗口位置
-		const config = loadConfig();
-		config.clockWindow = { x, y };
-		saveConfig(config);
+		const [width, height] = clockWindow.getSize();
+		// 保存时钟窗口位置和大小
+		saveWindowBounds('clockWindow', x, y, width, height);
+	});
+
+	clockWindow.on('resize', () => {
+		const [x, y] = clockWindow.getPosition();
+		const [width, height] = clockWindow.getSize();
+		// 保存时钟窗口位置和大小
+		saveWindowBounds('clockWindow', x, y, width, height);
 	});
 
-	// 监听窗口关闭事件，保存位置
+	// 监听窗口关闭事件，保存位置和大小
 	clockWindow.on('close', () => {
 		const [x, y] = clockWindow.getPosition();
-		// 保存时钟窗口位置
-		const config = loadConfig();
-		config.clockWindow = { x, y };
-		saveConfig(config);
+		const [width, height] = clockWindow.getSize();
+		// 保存时钟窗口位置和大小
+		saveWindowBounds('clockWindow', x, y, width, height);
 	});
 
 	return clockWindow;
@@ -155,24 +196,15 @@ let homeworkWindowSplit;
 
 const createHomeworkWindowSplit = () => {
 	const config = loadConfig();
-	let defaultX, defaultY;
-
-	// 尝试从配置中读取作业窗口位置，如果没有则使用默认位置
-	if (config.homeworkWindow?.x !== undefined && config.homeworkWindow?.y !== undefined) {
-		defaultX = config.homeworkWindow.x;
-		defaultY = config.homeworkWindow.y;
-	} else {
-		const [origX, origY] = loadWindowPosition(); // 使用原始默认位置作为基础
-		defaultX = origX;
-		defaultY = origY + 160; // 在时钟窗口下方
-	}
+	const size = loadWindowSize('homeworkWindow');
+	const [defaultX, defaultY] = loadWindowPosition('homeworkWindow');
 
 	const isAlwaysOnTop = config.alwaysOnTop !== undefined ? config.alwaysOnTop : false;
 	const isDarkThemeEnabled = config.darkThemeEnabled !== undefined ? config.darkThemeEnabled : false; // 读取暗色主题设置
 
 	homeworkWindowSplit = new BrowserWindow({
-		width: 300,
-		height: 300,
+		width: size.width,
+		height: size.height,
 		x: defaultX,
 		y: defaultY,
 		// 设置为无边框窗口
@@ -197,7 +229,7 @@ const createHomeworkWindowSplit = () => {
 	});
 
 	// 加载作业页面内容
-	homeworkWindowSplit.loadFile('pages/homework.html');
+	homeworkWindowSplit.loadFile('pages/cards/homework.html');
 
 	// 当窗口 DOM 就绪时发送初始状态
 	homeworkWindowSplit.webContents.once('dom-ready', () => {
@@ -207,22 +239,27 @@ const createHomeworkWindowSplit = () => {
 		homeworkWindowSplit.webContents.send('launchpad-apps-updated', getLaunchpadApps()); // 发送启动台应用数据
 	});
 
-	// 监听窗口移动事件，保存位置
+	// 监听窗口移动和调整大小事件，保存位置和大小
 	homeworkWindowSplit.on('moved', () => {
 		const [x, y] = homeworkWindowSplit.getPosition();
-		// 保存作业窗口位置
-		const config = loadConfig();
-		config.homeworkWindow = { x, y };
-		saveConfig(config);
+		const [width, height] = homeworkWindowSplit.getSize();
+		// 保存作业窗口位置和大小
+		saveWindowBounds('homeworkWindow', x, y, width, height);
+	});
+
+	homeworkWindowSplit.on('resize', () => {
+		const [x, y] = homeworkWindowSplit.getPosition();
+		const [width, height] = homeworkWindowSplit.getSize();
+		// 保存作业窗口位置和大小
+		saveWindowBounds('homeworkWindow', x, y, width, height);
 	});
 
-	// 监听窗口关闭事件，保存位置
+	// 监听窗口关闭事件，保存位置和大小
 	homeworkWindowSplit.on('close', () => {
 		const [x, y] = homeworkWindowSplit.getPosition();
-		// 保存作业窗口位置
-		const config = loadConfig();
-		config.homeworkWindow = { x, y };
-		saveConfig(config);
+		const [width, height] = homeworkWindowSplit.getSize();
+		// 保存作业窗口位置和大小
+		saveWindowBounds('homeworkWindow', x, y, width, height);
 	});
 
 	return homeworkWindowSplit;
@@ -233,24 +270,15 @@ let launchpadWindow;
 
 const createLaunchpadWindow = () => {
 	const config = loadConfig();
-	let defaultX, defaultY;
-
-	// 尝试从配置中读取启动台窗口位置，如果没有则使用默认位置
-	if (config.launchpadWindow?.x !== undefined && config.launchpadWindow?.y !== undefined) {
-		defaultX = config.launchpadWindow.x;
-		defaultY = config.launchpadWindow.y;
-	} else {
-		const [origX, origY] = loadWindowPosition(); // 使用原始默认位置作为基础
-		defaultX = origX;
-		defaultY = origY + 470; // 在作业窗口下方
-	}
+	const size = loadWindowSize('launchpadWindow');
+	const [defaultX, defaultY] = loadWindowPosition('launchpadWindow');
 
 	const isAlwaysOnTop = config.alwaysOnTop !== undefined ? config.alwaysOnTop : false;
 	const isDarkThemeEnabled = config.darkThemeEnabled !== undefined ? config.darkThemeEnabled : false; // 读取暗色主题设置
 
 	launchpadWindow = new BrowserWindow({
-		width: 300,
-		height: 200,
+		width: size.width,
+		height: size.height,
 		x: defaultX,
 		y: defaultY,
 		// 设置为无边框窗口
@@ -275,7 +303,7 @@ const createLaunchpadWindow = () => {
 	});
 
 	// 加载启动台页面内容
-	launchpadWindow.loadFile('pages/launchpad.html');
+	launchpadWindow.loadFile('pages/cards/launchpad.html');
 
 	// 当窗口 DOM 就绪时发送初始状态
 	launchpadWindow.webContents.once('dom-ready', () => {
@@ -284,22 +312,27 @@ const createLaunchpadWindow = () => {
 		launchpadWindow.webContents.send('launchpad-apps-updated', getLaunchpadApps()); // 发送启动台应用数据
 	});
 
-	// 监听窗口移动事件，保存位置
+	// 监听窗口移动和调整大小事件，保存位置和大小
 	launchpadWindow.on('moved', () => {
 		const [x, y] = launchpadWindow.getPosition();
-		// 保存启动台窗口位置
-		const config = loadConfig();
-		config.launchpadWindow = { x, y };
-		saveConfig(config);
+		const [width, height] = launchpadWindow.getSize();
+		// 保存启动台窗口位置和大小
+		saveWindowBounds('launchpadWindow', x, y, width, height);
 	});
 
-	// 监听窗口关闭事件，保存位置
+	launchpadWindow.on('resize', () => {
+		const [x, y] = launchpadWindow.getPosition();
+		const [width, height] = launchpadWindow.getSize();
+		// 保存启动台窗口位置和大小
+		saveWindowBounds('launchpadWindow', x, y, width, height);
+	});
+
+	// 监听窗口关闭事件，保存位置和大小
 	launchpadWindow.on('close', () => {
 		const [x, y] = launchpadWindow.getPosition();
-		// 保存启动台窗口位置
-		const config = loadConfig();
-		config.launchpadWindow = { x, y };
-		saveConfig(config);
+		const [width, height] = launchpadWindow.getSize();
+		// 保存启动台窗口位置和大小
+		saveWindowBounds('launchpadWindow', x, y, width, height);
 	});
 
 	return launchpadWindow;
@@ -327,9 +360,16 @@ const createHomeworkAddWindow = () => {
 		return;
 	}
 
+	const size = loadWindowSize('homeworkAddWindow');
+	const [defaultX, defaultY] = loadWindowPosition('homeworkAddWindow');
+
 	homeworkAddWindow = new BrowserWindow({
 		icon: iconPath,
 		frame: false,
+		width: size.width,
+		height: size.height,
+		x: defaultX,
+		y: defaultY,
 		alwaysOnTop: true,
 		resizable: true,
 		webPreferences: {
@@ -338,6 +378,21 @@ const createHomeworkAddWindow = () => {
 		}
 	});
 
+	// 监听窗口移动和调整大小事件，保存位置和大小
+	homeworkAddWindow.on('moved', () => {
+		const [x, y] = homeworkAddWindow.getPosition();
+		const [width, height] = homeworkAddWindow.getSize();
+		// 保存作业添加窗口位置和大小
+		saveWindowBounds('homeworkAddWindow', x, y, width, height);
+	});
+
+	homeworkAddWindow.on('resize', () => {
+		const [x, y] = homeworkAddWindow.getPosition();
+		const [width, height] = homeworkAddWindow.getSize();
+		// 保存作业添加窗口位置和大小
+		saveWindowBounds('homeworkAddWindow', x, y, width, height);
+	});
+
 	// 加载作业表单页面
 	homeworkAddWindow.loadFile('pages/homework-form.html');
 	homeworkAddWindow.setMenu(null);
@@ -357,11 +412,16 @@ const createHomeworkListWindow = () => {
 		return homeworkListWindow;
 	}
 
+	const size = loadWindowSize('homeworkListWindow');
+	const [defaultX, defaultY] = loadWindowPosition('homeworkListWindow');
+
 	homeworkListWindow = new BrowserWindow({
 		icon: iconPath,
 		frame: false,
-		width: 800,
-		height: 600,
+		width: size.width,
+		height: size.height,
+		x: defaultX,
+		y: defaultY,
 		resizable: true,
 		webPreferences: {
 			nodeIntegration: true,
@@ -369,6 +429,21 @@ const createHomeworkListWindow = () => {
 		}
 	});
 
+	// 监听窗口移动和调整大小事件，保存位置和大小
+	homeworkListWindow.on('moved', () => {
+		const [x, y] = homeworkListWindow.getPosition();
+		const [width, height] = homeworkListWindow.getSize();
+		// 保存作业列表窗口位置和大小
+		saveWindowBounds('homeworkListWindow', x, y, width, height);
+	});
+
+	homeworkListWindow.on('resize', () => {
+		const [x, y] = homeworkListWindow.getPosition();
+		const [width, height] = homeworkListWindow.getSize();
+		// 保存作业列表窗口位置和大小
+		saveWindowBounds('homeworkListWindow', x, y, width, height);
+	});
+
 	homeworkListWindow.loadFile('pages/homework-list.html');
 	homeworkListWindow.setMenu(null);
 
@@ -390,11 +465,16 @@ const createSettingsWindow = () => {
 		return;
 	}
 
+	const size = loadWindowSize('settingsWindow');
+	const [defaultX, defaultY] = loadWindowPosition('settingsWindow');
+
 	settingsWindow = new BrowserWindow({
 		icon: iconPath,
 		frame: false,
-		width: 700,
-		height: 600,
+		width: size.width,
+		height: size.height,
+		x: defaultX,
+		y: defaultY,
 		resizable: true,
 		webPreferences: {
 			nodeIntegration: true,
@@ -402,6 +482,21 @@ const createSettingsWindow = () => {
 		}
 	});
 
+	// 监听窗口移动和调整大小事件，保存位置和大小
+	settingsWindow.on('moved', () => {
+		const [x, y] = settingsWindow.getPosition();
+		const [width, height] = settingsWindow.getSize();
+		// 保存设置窗口位置和大小
+		saveWindowBounds('settingsWindow', x, y, width, height);
+	});
+
+	settingsWindow.on('resize', () => {
+		const [x, y] = settingsWindow.getPosition();
+		const [width, height] = settingsWindow.getSize();
+		// 保存设置窗口位置和大小
+		saveWindowBounds('settingsWindow', x, y, width, height);
+	});
+
 	settingsWindow.loadFile('pages/settings.html');
 	settingsWindow.setMenu(null);
 
@@ -419,9 +514,16 @@ const createAboutWindow = () => {
 		return;
 	}
 
+	const size = loadWindowSize('aboutWindow');
+	const [defaultX, defaultY] = loadWindowPosition('aboutWindow');
+
 	aboutWindow = new BrowserWindow({
 		icon: iconPath,
 		frame: false,
+		width: size.width,
+		height: size.height,
+		x: defaultX,
+		y: defaultY,
 		resizable: true,
 		webPreferences: {
 			nodeIntegration: true,
@@ -429,6 +531,21 @@ const createAboutWindow = () => {
 		}
 	});
 
+	// 监听窗口移动和调整大小事件，保存位置和大小
+	aboutWindow.on('moved', () => {
+		const [x, y] = aboutWindow.getPosition();
+		const [width, height] = aboutWindow.getSize();
+		// 保存关于窗口位置和大小
+		saveWindowBounds('aboutWindow', x, y, width, height);
+	});
+
+	aboutWindow.on('resize', () => {
+		const [x, y] = aboutWindow.getPosition();
+		const [width, height] = aboutWindow.getSize();
+		// 保存关于窗口位置和大小
+		saveWindowBounds('aboutWindow', x, y, width, height);
+	});
+
 	aboutWindow.loadFile('pages/about.html');
 
 	// 窗口关闭时清理引用
@@ -445,19 +562,32 @@ const createWelcomeWindow = () => {
 		return;
 	}
 
+	const size = loadWindowSize('welcomeWindow');
+	const [defaultX, defaultY] = loadWindowPosition('welcomeWindow');
+
 	welcomeWindow = new BrowserWindow({
 		icon: iconPath,
 		transparent: true,
 		frame: false,
-		width: 600,
-		height: 420,
-		resizable: false,
+		width: size.width,
+		height: size.height,
+		x: defaultX,
+		y: defaultY,
+		resizable: false, // 欢迎窗口保持不可调整大小
 		webPreferences: {
 			nodeIntegration: true,
 			contextIsolation: false
 		}
 	});
 
+	// 欢迎窗口不可调整大小，所以只监听移动事件
+	welcomeWindow.on('moved', () => {
+		const [x, y] = welcomeWindow.getPosition();
+		const [width, height] = welcomeWindow.getSize();
+		// 保存欢迎窗口位置和大小
+		saveWindowBounds('welcomeWindow', x, y, width, height);
+	});
+
 	welcomeWindow.loadFile('pages/welcome.html');
 	welcomeWindow.setMenu(null);
 
@@ -804,4 +934,4 @@ app.whenReady().then(() => {
 	});
 });
 
-app.on('window-all-closed', () => { });
+app.on('window-all-closed', () => { });
\ No newline at end of file
diff --git a/pages/clock.html b/pages/cards/clock.html
similarity index 95%
rename from pages/clock.html
rename to pages/cards/clock.html
index 34a6b06..5a009ca 100644
--- a/pages/clock.html
+++ b/pages/cards/clock.html
@@ -4,8 +4,8 @@
 <head>
     <meta charset="UTF-8">
     <title>时钟</title>
-    <link rel="stylesheet" href="../assets/css/main.css">
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+    <link rel="stylesheet" href="../../assets/css/main.css">
+    <link rel="stylesheet" href="../../assets/css/hide-scrollbar.css">
     </link>
 </head>
 
@@ -80,7 +80,7 @@ <h3>时间</h3>
             // 使用暗色主题CSS
             const darkThemeLink = document.createElement('link');
             darkThemeLink.rel = 'stylesheet';
-            darkThemeLink.href = '../assets/css/main-dark.css';
+            darkThemeLink.href = '../../assets/css/main-dark.css';
             darkThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
 
             // 移除现有的主题链接
@@ -95,7 +95,7 @@ <h3>时间</h3>
             // 使用默认主题CSS
             const lightThemeLink = document.createElement('link');
             lightThemeLink.rel = 'stylesheet';
-            lightThemeLink.href = '../assets/css/main.css';
+            lightThemeLink.href = '../../assets/css/main.css';
             lightThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
 
             // 移除现有的主题链接
diff --git a/pages/homework.html b/pages/cards/homework.html
similarity index 97%
rename from pages/homework.html
rename to pages/cards/homework.html
index cca696b..541e4ff 100644
--- a/pages/homework.html
+++ b/pages/cards/homework.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>作业</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/main.css">
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+    <link rel="stylesheet" href="../../assets/css/main.css">
+    <link rel="stylesheet" href="../../assets/css/hide-scrollbar.css">
     </link>
 </head>
 
@@ -96,7 +96,7 @@ <h3>作业</h3>
             // 使用暗色主题CSS
             const darkThemeLink = document.createElement('link');
             darkThemeLink.rel = 'stylesheet';
-            darkThemeLink.href = '../assets/css/main-dark.css';
+            darkThemeLink.href = '../../assets/css/main-dark.css';
             darkThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
 
             // 移除现有的主题链接
@@ -111,7 +111,7 @@ <h3>作业</h3>
             // 使用默认主题CSS
             const lightThemeLink = document.createElement('link');
             lightThemeLink.rel = 'stylesheet';
-            lightThemeLink.href = '../assets/css/main.css';
+            lightThemeLink.href = '../../assets/css/main.css';
             lightThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
 
             // 移除现有的主题链接
diff --git a/pages/launchpad.html b/pages/cards/launchpad.html
similarity index 96%
rename from pages/launchpad.html
rename to pages/cards/launchpad.html
index 5b98d1e..4221fae 100644
--- a/pages/launchpad.html
+++ b/pages/cards/launchpad.html
@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <title>启动台</title>
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/main.css">
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+    <link rel="stylesheet" href="../../assets/css/main.css">
+    <link rel="stylesheet" href="../../assets/css/hide-scrollbar.css">
     </link>
 </head>
 
@@ -77,7 +77,7 @@ <h3>启动台</h3>
             // 使用暗色主题CSS
             const darkThemeLink = document.createElement('link');
             darkThemeLink.rel = 'stylesheet';
-            darkThemeLink.href = '../assets/css/main-dark.css';
+            darkThemeLink.href = '../../assets/css/main-dark.css';
             darkThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
 
             // 移除现有的主题链接
@@ -92,7 +92,7 @@ <h3>启动台</h3>
             // 使用默认主题CSS
             const lightThemeLink = document.createElement('link');
             lightThemeLink.rel = 'stylesheet';
-            lightThemeLink.href = '../assets/css/main.css';
+            lightThemeLink.href = '../../assets/css/main.css';
             lightThemeLink.id = 'theme-stylesheet'; // 添加ID以便后续引用
 
             // 移除现有的主题链接
diff --git a/pages/homework-bigscreen.html b/pages/homework-bigscreen.html
new file mode 100644
index 0000000..ab8f7ac
--- /dev/null
+++ b/pages/homework-bigscreen.html
@@ -0,0 +1,304 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>全部作业</title>
+    <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
+    <link rel="stylesheet" href="../assets/css/homework-list.css">
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
+</head>
+
+<body>
+    <div class="container">
+        <div class="header">
+            <h2>作业列表</h2>
+            <fluent-button appearance="accent" id="addHomeworkBtn">添加作业</fluent-button>
+        </div>
+
+        <div class="search-bar">
+            <fluent-text-field id="searchInput" placeholder="搜索作业..." type="text"></fluent-text-field>
+        </div>
+
+        <div class="filter-controls">
+            <fluent-select id="subjectFilter">
+                <option value="">全部科目</option>
+                <option value="chinese">语文</option>
+                <option value="math">数学</option>
+                <option value="english">英语</option>
+                <option value="physics">物理</option>
+                <option value="chemistry">化学</option>
+                <option value="biology">生物</option>
+                <option value="history">历史</option>
+                <option value="geography">地理</option>
+                <option value="politics">道德与法治</option>
+                <option value="other">其他</option>
+            </fluent-select>
+
+            <fluent-select id="sortOrder">
+                <option value="newest">按最新添加</option>
+                <option value="oldest">按最早添加</option>
+                <option value="dueDateAsc">按截止日期（升序）</option>
+                <option value="dueDateDesc">按截止日期（降序）</option>
+            </fluent-select>
+        </div>
+
+        <div class="homework-list-container" id="homeworkListContainer">
+            <!-- 作业列表将在这里显示 -->
+        </div>
+
+        <div class="empty-state" id="emptyState" style="display: none;">
+            <p>暂无作业</p>
+            <fluent-button appearance="accent" id="emptyAddBtn">添加第一个作业</fluent-button>
+        </div>
+    </div>
+
+    <script>
+        const { ipcRenderer } = require('electron');
+        // 作业数据
+        let homeworkData = [];
+        let filteredHomework = [];
+
+        // DOM 元素
+        const homeworkListContainer = document.getElementById('homeworkListContainer');
+        const emptyState = document.getElementById('emptyState');
+        const searchInput = document.getElementById('searchInput');
+        const subjectFilter = document.getElementById('subjectFilter');
+        const sortOrder = document.getElementById('sortOrder');
+        const addHomeworkBtn = document.getElementById('addHomeworkBtn');
+        const emptyAddBtn = document.getElementById('emptyAddBtn');
+
+        // 获取所有作业数据
+        function getAllHomework() {
+            try {
+                // 请求作业列表
+                ipcRenderer.send('get-homework-list');
+
+                // 监听响应
+                ipcRenderer.on('homework-list-response', (event, homeworkList) => {
+                    homeworkData = homeworkList;
+                    filterAndSortHomework();
+                });
+            } catch (e) {
+                console.error('获取作业数据失败:', e);
+                return [];
+            }
+        }
+
+        // 删除作业
+        function deleteHomework(index) {
+            if (confirm('确定要删除这个作业吗？')) {
+                try {
+                    const { ipcRenderer } = require('electron');
+                    ipcRenderer.send('delete-homework', index);
+                } catch (e) {
+                    console.error('删除作业失败:', e);
+                }
+            }
+        }
+
+        // 渲染作业列表
+        function renderHomeworkList(homeworkList) {
+            if (homeworkList.length === 0) {
+                homeworkListContainer.innerHTML = '';
+                emptyState.style.display = 'flex';
+                return;
+            }
+
+            emptyState.style.display = 'none';
+            homeworkListContainer.innerHTML = '';
+
+            homeworkList.forEach((item, index) => {
+                const homeworkItem = document.createElement('div');
+                homeworkItem.className = 'homework-item';
+
+                // 格式化截止日期
+                let dueDateStr = '无截止日期';
+                let isOverdue = false;
+                if (item.dueDate) {
+                    const dueDate = new Date(item.dueDate);
+                    const now = new Date();
+                    // 检查是否过期
+                    if (dueDate < now) {
+                        isOverdue = true;
+                    }
+
+                    const formattedDate = `${dueDate.getFullYear()}-${String(dueDate.getMonth() + 1).padStart(2, '0')}-${String(dueDate.getDate()).padStart(2, '0')}`;
+                    dueDateStr = `截止: ${formattedDate}`;
+                }
+
+                // 格式化时间戳
+                const timestamp = item.timestamp ? new Date(item.timestamp) : new Date();
+                const timeStr = `${timestamp.getFullYear()}-${String(timestamp.getMonth() + 1).padStart(2, '0')}-${String(timestamp.getDate()).padStart(2, '0')}`;
+
+                // 将换行符替换为<br>标签
+                const contentWithLineBreaks = item.content.replace(/\n/g, '<br>');
+
+                homeworkItem.innerHTML = `
+                    <div class="item-header">
+                        <span class="subject-tag ${item.subject}">${getSubjectName(item.subject)}</span>
+                        <div class="item-meta">
+                            <span class="item-date">${timeStr}</span>
+                            <span class="due-date ${isOverdue ? 'overdue' : ''}">${dueDateStr}</span>
+                        </div>
+                    </div>
+                    <div class="item-content">${contentWithLineBreaks}</div>
+                    <div class="item-actions">
+                        <fluent-button appearance="neutral" class="detail-btn" data-index="${index}">详情</fluent-button>
+                        <fluent-button appearance="neutral" class="edit-btn" data-index="${index}">编辑</fluent-button>
+                        <fluent-button appearance="accent" class="delete-btn" data-index="${index}">删除</fluent-button>
+                    </div>
+                `;
+
+                homeworkListContainer.appendChild(homeworkItem);
+            });
+
+            // 添加事件监听器
+            addEventListeners();
+        }
+
+        // 获取科目名称
+        function getSubjectName(subjectValue) {
+            const subjects = {
+                'chinese': '语文',
+                'math': '数学',
+                'english': '英语',
+                'physics': '物理',
+                'chemistry': '化学',
+                'biology': '生物',
+                'history': '历史',
+                'geography': '地理',
+                'politics': '道法',
+                'other': '其他'
+            };
+            return subjects[subjectValue] || subjectValue;
+        }
+
+        // 过滤和排序作业
+        function filterAndSortHomework() {
+            let result = [...homeworkData];
+
+            // 搜索过滤
+            const searchTerm = searchInput.value.trim().toLowerCase();
+            if (searchTerm) {
+                result = result.filter(item =>
+                    item.content.toLowerCase().includes(searchTerm) ||
+                    getSubjectName(item.subject).toLowerCase().includes(searchTerm)
+                );
+            }
+
+            // 科目过滤
+            const selectedSubject = subjectFilter.value;
+            if (selectedSubject) {
+                result = result.filter(item => item.subject === selectedSubject);
+            }
+
+            // 排序
+            const order = sortOrder.value;
+            result.sort((a, b) => {
+                switch (order) {
+                    case 'newest':
+                        return new Date(b.timestamp || b.dateAdded || 0) - new Date(a.timestamp || a.dateAdded || 0);
+                    case 'oldest':
+                        return new Date(a.timestamp || a.dateAdded || 0) - new Date(b.timestamp || b.dateAdded || 0);
+                    case 'dueDateAsc':
+                        const dateA = a.dueDate ? new Date(a.dueDate) : new Date(8640000000000000); // 最大日期
+                        const dateB = b.dueDate ? new Date(b.dueDate) : new Date(8640000000000000);
+                        return dateA - dateB;
+                    case 'dueDateDesc':
+                        const dateA2 = a.dueDate ? new Date(a.dueDate) : new Date(-8640000000000000); // 最小日期
+                        const dateB2 = b.dueDate ? new Date(b.dueDate) : new Date(-8640000000000000);
+                        return dateB2 - dateA2;
+                    default:
+                        return 0;
+                }
+            });
+
+            filteredHomework = result;
+            renderHomeworkList(filteredHomework);
+        }
+
+        // 添加事件监听器
+        function addEventListeners() {
+            // 删除按钮
+            document.querySelectorAll('.delete-btn').forEach(button => {
+                button.addEventListener('click', function () {
+                    const index = parseInt(this.getAttribute('data-index'));
+                    deleteHomework(index);
+                });
+            });
+
+            // 详情按钮
+            document.querySelectorAll('.detail-btn').forEach(button => {
+                button.addEventListener('click', function () {
+                    const index = parseInt(this.getAttribute('data-index'));
+                    openHomeworkDetail(homeworkData[index]);
+                });
+            });
+
+            // 编辑按钮
+            document.querySelectorAll('.edit-btn').forEach(button => {
+                button.addEventListener('click', function () {
+                    const index = parseInt(this.getAttribute('data-index'));
+                    editHomework(index);
+                });
+            });
+        }
+
+        // 打开作业详情
+        function openHomeworkDetail(homework) {
+            ipcRenderer.send('open-homework-detail-window', homework);
+        }
+
+        // 编辑作业（目前先打开添加窗口并传入数据）
+        function editHomework(index) {
+            // 这里可以实现编辑功能，暂时先提示
+            alert('编辑功能正在开发中');
+            // 实际实现时，可以发送作业数据到编辑窗口
+            // ipcRenderer.send('edit-homework', homeworkData[index]);
+        }
+
+        // 初始化
+        function init() {
+            getAllHomework(); // 改为从主进程获取作业数据
+
+            // 其他初始化代码保持不变
+            searchInput.addEventListener('input', filterAndSortHomework);
+            subjectFilter.addEventListener('change', filterAndSortHomework);
+            sortOrder.addEventListener('change', filterAndSortHomework);
+
+            addHomeworkBtn.addEventListener('click', () => {
+                ipcRenderer.send('open-homework-window');
+            });
+
+            emptyAddBtn.addEventListener('click', () => {
+                ipcRenderer.send('open-homework-window');
+            });
+
+            // 监听来自主进程的新作业通知
+            ipcRenderer.on('new-homework', (event, homework) => {
+                getAllHomework(); // 重新获取作业列表
+            });
+
+            // 监听作业更新通知
+            ipcRenderer.on('refresh-homework-list', () => {
+                getAllHomework(); // 重新获取作业列表
+            });
+        }
+
+        // 标题栏按钮事件
+        document.getElementById('titleCloseBtn').addEventListener('click', () => {
+            window.close();
+        });
+
+        // 关闭窗口时清理引用
+        window.addEventListener('beforeunload', () => {
+            ipcRenderer.send('homework-list-window-closed');
+        });
+
+        // 页面加载完成后初始化
+        document.addEventListener('DOMContentLoaded', init);
+    </script>
+</body>
+
+</html>
\ No newline at end of file

From 2a3a4a394eb5715ab0fff2e6bc362eb81a412fbd Mon Sep 17 00:00:00 2001
From: Yeying-Xingchen <yeyingxingchen@yeah.net>
Date: Sun, 25 Jan 2026 02:13:29 +0800
Subject: [PATCH 20/20] =?UTF-8?q?feat:=20:lipstick:=20=E6=96=B0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AEUI=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/settings.css | 496 +++++++++++++++++++++++++++++--------
 pages/settings.html     | 525 ++++++++++++++++++++++------------------
 2 files changed, 678 insertions(+), 343 deletions(-)

diff --git a/assets/css/settings.css b/assets/css/settings.css
index 7c299d1..51b18c4 100644
--- a/assets/css/settings.css
+++ b/assets/css/settings.css
@@ -1,99 +1,215 @@
+/* 整体布局 */
+body {
+    margin: 0;
+    padding: 0;
+    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+    background: white;
+    overflow: hidden;
+}
+
 .container {
+    display: flex;
+    height: calc(100vh - 32px);
     background: white;
-    padding-top: 30px;
     box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-    height: calc(100vh - 32px); /* 调整高度以适应标题栏 */
+    margin-top: 32px; /* 为标题栏留出空间 */
 }
 
-.settings-layout {
-    display: flex;
-    height: 100%;
-    gap: 0;
+/* 暗色主题样式 */
+body.dark-theme {
+    background: #1e1e1e;
+    color: #ffffff;
 }
 
-.sidebar {
-    width: 220px;
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    padding: 8px;
-    background-color: #f8f8f8;
-    border-right: 1px solid #edebe9;
-    height: calc(100% - 16px);
-    border-radius: 8px 0 0 8px;
+body.dark-theme .container {
+    background: #1e1e1e;
+    color: #ffffff;
 }
 
-.tab {
-    height: 46px;
-    padding: 12px 16px;
-    border-radius: 6px;
-    cursor: pointer;
-    font-size: 14px;
-    color: #605e5c;
-    transition: all 0.2s ease;
-    display: flex;
-    align-items: center;
-    position: relative;
-    margin: 2px 0;
+body.dark-theme .sidebar {
+    background-color: #252526;
+    border-right: 1px solid #3e3e42;
 }
 
-.tab::before {
-    content: '';
-    position: absolute;
-    left: 0;
-    top: 0;
-    bottom: 0;
-    width: 3px;
-    background-color: transparent;
-    border-radius: 3px 0 0 3px;
-    transition: all 0.2s ease;
+body.dark-theme .nav-item {
+    color: #cccccc;
 }
 
-.tab:hover {
-    background-color: #eef1f5;
-    color: #323130;
+body.dark-theme .nav-item:hover {
+    background-color: #2a2d2e;
 }
 
-.tab:hover::before {
-    background-color: #0078d4;
+body.dark-theme .nav-item.active {
+    background-color: #0e639c;
+    border-left-color: #4ec9b0;
+    color: #ffffff;
 }
 
-.tab.active {
-    background-color: #e6f0fa;
-    color: #0078d4;
-    font-weight: 600;
-    border-left: 3px solid #0078d4;
+body.dark-theme .main-content {
+    background: #1e1e1e;
+    color: #cccccc;
 }
 
-.tab.active::before {
-    background-color: #0078d4;
+body.dark-theme .setting-section h2 {
+    color: #ffffff;
+    border-bottom-color: #3e3e42;
 }
 
-.tab i {
-    margin-right: 10px;
-    font-size: 16px;
-    width: 20px;
-    text-align: center;
+body.dark-theme .setting-group {
+    background: #252526;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.3);
 }
 
-.content {
-    flex: 1;
-    overflow-y: auto;
-    padding: 16px;
+body.dark-theme .setting-title {
+    color: #ffffff;
 }
 
-.tab-content {
-    display: none;
+body.dark-theme .setting-description {
+    color: #999999;
 }
 
-.tab-content.active {
-    display: block;
-    animation: fadeIn 0.3s ease;
+body.dark-theme .launchpad-section {
+    background-color: #252526;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.3);
+}
+
+body.dark-theme .launchpad-list {
+    background: #1e1e1e;
+    border-color: #3e3e42;
+}
+
+body.dark-theme .launchpad-item {
+    background: #252526;
+    border-color: #3e3e42;
+}
+
+body.dark-theme .launchpad-item-name {
+    color: #ffffff;
+}
+
+body.dark-theme .launchpad-item-path {
+    color: #999999;
+}
+body.dark-theme .add-input, body.dark-theme .type-selector {
+    background: #3c3c3c;
+    border-color: #3e3e42;
+    color: #ffffff;
+}
+
+body.dark-theme .add-input::placeholder {
+    color: #999999;
 }
 
-@keyframes fadeIn {
-    from { opacity: 0; }
-    to { opacity: 1; }
+body.dark-theme .info-card {
+    background: #252526;
+    color: #ffffff;
+    box-shadow: 0 2px 10px rgba(0,0,0,0.3);
+}
+
+body.dark-theme .about-text {
+    color: #cccccc;
+}
+
+/* 表单元素暗色主题 */
+body.dark-theme input, 
+body.dark-theme select, 
+body.dark-theme textarea {
+    background: #3c3c3c;
+    border: 1px solid #3e3e42;
+    color: #ffffff;
+    border-radius: 4px;
+}
+
+body.dark-theme input:focus, 
+body.dark-theme select:focus, 
+body.dark-theme textarea:focus {
+    outline: none;
+    border-color: #0e639c;
+    box-shadow: 0 0 0 2px rgba(14, 99, 156, 0.5);
+}
+
+body.dark-theme input::placeholder, 
+body.dark-theme textarea::placeholder {
+    color: #999999;
+}
+
+/* 按钮暗色主题 */
+body.dark-theme .remove-btn {
+    background-color: #d13438;
+    color: white;
+    border: none;
+}
+
+body.dark-theme .remove-btn:hover {
+    background-color: #a80000;
+}
+
+/* 标题栏完整暗色主题 */
+body.dark-theme .title-bar {
+    background: #252526;
+    border-bottom: 1px solid #3e3e42;
+}
+
+body.dark-theme .title {
+    color: white;
+}
+
+/* 启动台添加表单暗色主题 */
+body.dark-theme .add-form {
+    background: #252526;
+    border-color: #3e3e42;
+}
+
+/* 启动台列表暗色主题 */
+body.dark-theme .launchpad-list {
+    background: #1e1e1e;
+    border-color: #3e3e42;
+}
+
+body.dark-theme .launchpad-item {
+    background: #252526;
+    border-color: #3e3e42;
+}
+
+body.dark-theme .launchpad-item-name {
+    color: white;
+}
+
+body.dark-theme .launchpad-item-path {
+    color: #cccccc;
+}
+
+/* Fluent UI 组件暗色主题支持 */
+body.dark-theme fluent-switch::part(control) {
+    background: #3c3c3c;
+    border-color: #3e3e42;
+}
+
+body.dark-theme fluent-switch::part(checked-indicator) {
+    background: #0e639c;
+}
+
+body.dark-theme fluent-badge {
+    background: #252526;
+    color: white;
+    border-color: #3e3e42;
+}
+
+/* 卡片暗色主题 */
+body.dark-theme fluent-card {
+    background: #252526;
+    color: white;
+    border-color: #3e3e42;
+    box-shadow: 0 2px 10px rgba(0,0,0,0.3);
+}
+
+/* 链接暗色主题 */
+body.dark-theme fluent-anchor {
+    color: #4ec9b0;
+}
+
+body.dark-theme fluent-anchor:hover {
+    color: #56d3b8;
 }
 
 /* 标题栏样式 */
@@ -115,6 +231,7 @@
     left: 0;
     right: 0;
     box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+    z-index: 100;
 }
 
 .title {
@@ -149,31 +266,110 @@
     background-color: #28c840;
 }
 
+/* 侧边栏样式 */
+.sidebar {
+    width: 200px;
+    background-color: #f5f5f5;
+    border-right: 1px solid #e0e0e0;
+    padding: 20px 0;
+    height: 100%;
+    box-sizing: border-box;
+    overflow-y: auto;
+}
 
-.header {
-    text-align: center;
+.nav-menu {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+}
+
+.nav-item {
+    display: flex;
+    align-items: center;
+    padding: 12px 20px;
+    cursor: pointer;
+    transition: all 0.2s;
+    border-left: 3px solid transparent;
+    gap: 12px;
+    color: #333;
+}
+
+.nav-item:hover {
+    background-color: #e8e8e8;
+}
+
+.nav-item.active {
+    background-color: #e1f5fe;
+    border-left-color: #3498db;
+    color: #3498db;
+    font-weight: 600;
+}
+
+.nav-icon {
+    width: 20px;
+    height: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.nav-icon svg {
+    fill: currentColor;
+    stroke: currentColor;
+    width: 100%;
+    height: 100%;
+}
+
+.nav-text {
+    font-size: 14px;
+    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+}
+
+/* 主内容区域 */
+.main-content {
+    flex: 1;
+    padding: 20px;
+    height: 100%;
+    box-sizing: border-box;
+    overflow-y: auto;
+}
+
+/* 标签页内容 */
+.tab-content {
+    display: none;
+}
+
+.tab-content.active {
+    display: block;
+}
+
+/* 设置项样式 */
+.setting-section {
     margin-bottom: 30px;
-    padding-bottom: 16px;
-    border-bottom: 1px solid #edebe9;
 }
 
-.header h1 {
-    color: #323130;
-    font-size: 24px;
+.setting-section h2 {
+    font-size: 20px;
     font-weight: 600;
-    margin: 0;
+    color: #323130;
+    margin-bottom: 16px;
+    padding-bottom: 8px;
+    border-bottom: 2px solid #e0e0e0;
 }
 
 .setting-group {
-    padding: 20px 20px 20px 20px;
+    margin-bottom: 20px;
+    background: white;
+    border-radius: 8px;
+    padding: 16px;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.05);
 }
 
 .setting-item {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding-top: 15px;
-    padding-bottom: 15px;
+    padding: 12px 0;
     border-bottom: 1px solid #edebe9;
 }
 
@@ -205,40 +401,22 @@
     margin-left: 16px;
 }
 
-.footer {
-    margin-top: 24px;
-    text-align: right;
-}
-
-fluent-button {
-    margin-left: 8px;
-}
-
 /* 启动台设置样式 */
 .launchpad-section {
-    margin-top: 20px;
-    padding: 16px;
-    background-color: #faf9f8;
+    background-color: white;
     border-radius: 8px;
-}
-
-.launchpad-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 16px;
-}
-
-.launchpad-title {
-    font-size: 18px;
-    font-weight: 600;
-    color: #323130;
+    padding: 16px;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.05);
 }
 
 .launchpad-list {
-    max-height: 200px;
+    max-height: 300px;
     overflow-y: auto;
     margin-bottom: 16px;
+    border: 1px solid #edebe9;
+    border-radius: 6px;
+    background: #faf9f8;
+    padding: 8px;
 }
 
 .launchpad-item {
@@ -250,6 +428,11 @@ fluent-button {
     border: 1px solid #edebe9;
     border-radius: 4px;
     margin-bottom: 8px;
+    transition: all 0.2s;
+}
+
+.launchpad-item:hover {
+    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
 }
 
 .launchpad-item-info {
@@ -289,10 +472,12 @@ fluent-button {
     border-radius: 4px;
     cursor: pointer;
     font-size: 12px;
+    transition: all 0.2s;
 }
 
 .remove-btn:hover {
     background-color: #a80000;
+    transform: scale(1.05);
 }
 
 .add-form {
@@ -300,6 +485,10 @@ fluent-button {
     flex-direction: column;
     gap: 8px;
     margin-top: 16px;
+    padding: 16px;
+    background: #faf9f8;
+    border-radius: 8px;
+    border: 1px solid #edebe9;
 }
 
 .form-row {
@@ -312,11 +501,108 @@ fluent-button {
     padding: 8px;
     border: 1px solid #edebe9;
     border-radius: 4px;
+    font-size: 14px;
 }
 
 .type-selector {
-    width: 100px;
+    width: 120px;
     padding: 8px;
     border: 1px solid #edebe9;
     border-radius: 4px;
+    font-size: 14px;
+}
+
+.add-btn {
+    margin-top: 8px;
+}
+
+/* 关于页面样式 */
+.about-section {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    text-align: center;
+}
+
+.header-section {
+    margin-bottom: 30px;
+    text-align: center;
+}
+
+.promo-text {
+    font-size: 80px;
+    margin: 0;
+    line-height: 1;
+    color: #ffcc00;
+    text-shadow: 0 0 10px rgba(255, 204, 0, 0.5);
+}
+
+.slogan {
+    font-size: 24px;
+    font-weight: bold;
+    color: #333;
+    margin: 10px 0;
+}
+
+.app-name {
+    font-size: 28px;
+    font-weight: bold;
+    color: #3498db;
+    margin: 10px 0 20px 0;
+}
+
+.info-card {
+    margin: 20px 0;
+    padding: 20px 40px;
+    background: #f8f9fa;
+    border-radius: 10px;
+    box-shadow: 0 2px 10px rgba(0,0,0,0.05);
+    border: none;
+}
+
+.about-content {
+    max-width: 600px;
+    margin: 0 auto;
+    text-align: center;
+}
+
+.about-text {
+    margin: 15px 0;
+    color: #666;
+    font-size: 16px;
+    text-align: center;
+}
+
+.footer {
+    margin-top: 40px;
+    text-align: center;
+    font-size: 14px;
+    color: #999;
+}
+
+.adapt-info {
+    margin-bottom: 10px;
+    font-style: italic;
+}
+
+.original-info {
+    margin-bottom: 15px;
+    font-size: 13px;
+}
+
+.original-info fluent-anchor {
+    color: #3498db;
+    text-decoration: none;
+}
+
+.original-info fluent-anchor:hover {
+    text-decoration: underline;
+}
+
+.copyright {
+    margin-top: 20px;
+    font-size: 12px;
+    opacity: 0.8;
 }
\ No newline at end of file
diff --git a/pages/settings.html b/pages/settings.html
index 230e465..8c2c1c8 100644
--- a/pages/settings.html
+++ b/pages/settings.html
@@ -1,58 +1,59 @@
 <!DOCTYPE html>
 <html>
-
 <head>
     <meta charset="UTF-8">
     <title>设置 - 课堂窗</title>
     <!-- 引入 Fluent UI Web Components -->
     <script type="module" src="https://unpkg.com/@fluentui/web-components"></script>
-    <link rel="stylesheet" href="../assets/css/settings.css">
-    </link>
-    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css">
-    </link>
+    <link rel="stylesheet" href="../assets/css/settings.css"></link>
+    <link rel="stylesheet" href="../assets/css/hide-scrollbar.css"></link>
 </head>
-
 <body>
     <!-- 标题栏 -->
     <div class="title-bar">
         <div class="title">设置</div>
         <div class="title-bar-buttons">
-            <fluent-button id="titleCloseBtn" appearance="stealth" aria-label="关闭">
-                <svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                    <line x1="18" y1="6" x2="6" y2="18"></line>
-                    <line x1="6" y1="6" x2="18" y2="18"></line>
-                </svg>
-            </fluent-button>
+            <div class="title-bar-button close-button" title="关闭" id="titleCloseBtn"></div>
         </div>
     </div>
 
     <div class="container">
-        <div class="settings-layout">
-            <!-- 左侧选项卡 -->
-            <div class="sidebar">
-                <fluent-card class="tab active" data-tab="general">
-                    <fluent-badge appearance="accent">⚙️</fluent-badge>
-                    <span>常规</span>
-                </fluent-card>
-                <fluent-card class="tab" data-tab="appearance">
-                    <fluent-badge appearance="accent">🎨</fluent-badge>
-                    <span>外观</span>
-                </fluent-card>
-                <fluent-card class="tab" data-tab="launchpad">
-                    <fluent-badge appearance="accent">🚀</fluent-badge>
-                    <span>启动台</span>
-                </fluent-card>
-                <fluent-card class="tab" data-tab="advanced">
-                    <fluent-badge appearance="accent">🔧</fluent-badge>
-                    <span>高级</span>
-                </fluent-card>
-            </div>
-
-            <!-- 右侧内容区域 -->
-            <div class="content">
-                <!-- 常规设置 -->
-                <div class="tab-content active" id="general-tab">
-                    <fluent-card class="setting-group">
+        <!-- 侧边栏 -->
+        <div class="sidebar">
+            <nav class="nav-menu">
+                <div class="nav-item active" data-tab="general">
+                    <div class="nav-icon">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-sparkles-icon lucide-sparkles"><path d="M11.017 2.814a1 1 0 0 1 1.966 0l1.051 5.558a2 2 0 0 0 1.594 1.594l5.558 1.051a1 1 0 0 1 0 1.966l-5.558 1.051a2 2 0 0 0-1.594 1.594l-1.051 5.558a1 1 0 0 1-1.966 0l-1.051-5.558a2 2 0 0 0-1.594-1.594l-5.558-1.051a1 1 0 0 1 0-1.966l5.558-1.051a2 2 0 0 0 1.594-1.594z"/><path d="M20 2v4"/><path d="M22 4h-4"/><circle cx="4" cy="20" r="2"/></svg>
+                    </div>
+                    <div class="nav-text">功能</div>
+                </div>
+                <div class="nav-item" data-tab="appearance">
+                    <div class="nav-icon">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-sun-moon-icon lucide-sun-moon"><path d="M12 2v2"/><path d="M14.837 16.385a6 6 0 1 1-7.223-7.222c.624-.147.97.66.715 1.248a4 4 0 0 0 5.26 5.259c.589-.255 1.396.09 1.248.715"/><path d="M16 12a4 4 0 0 0-4-4"/><path d="m19 5-1.256 1.256"/><path d="M20 12h2"/></svg>
+                    <div class="nav-text">外观</div>
+                </div>
+                <div class="nav-item" data-tab="launchpad">
+                    <div class="nav-icon">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-zap-icon lucide-zap"><path d="M4 14a1 1 0 0 1-.78-1.63l9.9-10.2a.5.5 0 0 1 .86.46l-1.92 6.02A1 1 0 0 0 13 10h7a1 1 0 0 1 .78 1.63l-9.9 10.2a.5.5 0 0 1-.86-.46l1.92-6.02A1 1 0 0 0 11 14z"/></svg>
+                    </div>
+                    <div class="nav-text">启动台</div>
+                </div>
+                <div class="nav-item" data-tab="about">
+                    <div class="nav-icon">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-info-icon lucide-info"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg>
+                    </div>
+                    <div class="nav-text">关于</div>
+                </div>
+            </nav>
+        </div>
+        
+        <!-- 主内容区域 -->
+        <div class="main-content">
+            <!-- 通用设置标签 -->
+            <div class="tab-content active" id="general">
+                <div class="setting-section">
+                    <h2>功能</h2>
+                    <div class="setting-group">
                         <div class="setting-item">
                             <div class="setting-info">
                                 <div class="setting-title">启用时钟</div>
@@ -62,7 +63,7 @@
                                 <fluent-switch id="clockToggle" label="时钟"></fluent-switch>
                             </div>
                         </div>
-
+                        
                         <div class="setting-item">
                             <div class="setting-info">
                                 <div class="setting-title">启用作业</div>
@@ -72,22 +73,16 @@
                                 <fluent-switch id="homeworkToggle" label="作业"></fluent-switch>
                             </div>
                         </div>
-                    </fluent-card>
+                    </div>
                 </div>
+            </div>
 
-                <!-- 外观设置 -->
-                <div class="tab-content" id="appearance-tab">
-                    <fluent-card class="setting-group">
-                        <div class="setting-item">
-                            <div class="setting-info">
-                                <div class="setting-title">使用暗色主题</div>
-                                <div class="setting-description">启用深色模式，使用黑色背景</div>
-                            </div>
-                            <div class="actions">
-                                <fluent-switch id="darkThemeToggle" label="暗色主题"></fluent-switch>
-                            </div>
-                        </div>
-
+            <!-- 外观设置标签 -->
+            
+            <div class="tab-content" id="appearance"> 
+                <div class="setting-section">
+                    <h2>外观</h2>
+                    <div class="setting-group">
                         <div class="setting-item">
                             <div class="setting-info">
                                 <div class="setting-title">窗口置顶</div>
@@ -97,213 +92,267 @@
                                 <fluent-switch id="alwaysOnTopToggle" label="置顶"></fluent-switch>
                             </div>
                         </div>
-                    </fluent-card>
-                </div>
-
-                <!-- 启动台设置 -->
-                <div class="tab-content" id="launchpad-tab">
-                    <fluent-card class="setting-group">
-                        <div class="launchpad-header">
-                            <div class="launchpad-title">启动台</div>
-                        </div>
-                        <p class="launchpad-description">管理快捷启动的应用程序和链接</p>
-
-                        <div class="launchpad-list" id="launchpadList">
-                            <!-- 启动项将在这里显示 -->
-                        </div>
-
-                        <div class="add-form">
-                            <div class="form-row">
-                                <fluent-text-field id="appNameInput" placeholder="名称" class="add-input"></fluent-text-field>
-                                <fluent-select id="appTypeInput" class="type-selector">
-                                    <fluent-option value="app">应用程序</fluent-option>
-                                    <fluent-option value="link">链接</fluent-option>
-                                </fluent-select>
-                            </div>
-                            <fluent-text-field id="appPathInput" placeholder="应用程序路径或链接地址" class="add-input"></fluent-text-field>
-                            <fluent-text-field id="appIconInput" placeholder="图标路径（可选）" class="add-input"></fluent-text-field>
-                            <fluent-button id="addAppBtn" appearance="accent" class="add-btn">添加</fluent-button>
-                        </div>
-                    </fluent-card>
-                </div>
-
-                <!-- 高级设置 -->
-                <div class="tab-content" id="advanced-tab">
-                    <fluent-card class="setting-group">
+                        
                         <div class="setting-item">
                             <div class="setting-info">
-                                <div class="setting-title">开机自启</div>
-                                <div class="setting-description">系统启动时自动运行应用</div>
+                                <div class="setting-title">使用暗色主题</div>
+                                <div class="setting-description">启用深色模式，使用黑色背景</div>
                             </div>
                             <div class="actions">
-                                <fluent-switch id="startupToggle" label="开机自启"></fluent-switch>
+                                <fluent-switch id="darkThemeToggle" label="暗色主题"></fluent-switch>
                             </div>
                         </div>
-                    </fluent-card>
+                    </div>
+                </div>
+            </div>
+            <!-- 启动台标签 -->
+            <div class="tab-content" id="launchpad">
+                <div class="setting-section">
+                    <h2>启动台</h2>
+                    <p style="color: #605e5c; margin-bottom: 16px;">管理快捷启动的应用程序和链接</p>
+                    
+                    <div class="launchpad-list" id="launchpadList">
+                        <!-- 启动项将在这里显示 -->
+                    </div>
+                    
+                    <div class="add-form">
+                        <div class="form-row">
+                            <input type="text" class="add-input" id="appNameInput" placeholder="名称">
+                            <select class="type-selector" id="appTypeInput">
+                                <option value="app">应用程序</option>
+                                <option value="link">链接</option>
+                            </select>
+                        </div>
+                        <input type="text" class="add-input" id="appPathInput" placeholder="应用程序路径或链接地址">
+                        <input type="text" class="add-input" id="appIconInput" placeholder="图标路径（可选）">
+                        <fluent-button id="addAppBtn" appearance="accent" class="add-btn">添加</fluent-button>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
 
     <script>
-        const { ipcRenderer } = require('electron');
-
-        // 页面加载完成后获取当前设置状态
-        window.addEventListener('DOMContentLoaded', () => {
-            // 请求获取当前设置
-            ipcRenderer.send('get-settings');
-        });
-
-        // 监听设置状态更新
-        ipcRenderer.on('settings-updated', (event, settings) => {
-            document.querySelector('#clockToggle').checked = settings.clockEnabled;
-            document.querySelector('#homeworkToggle').checked = settings.homeworkEnabled;
-            document.querySelector('#alwaysOnTopToggle').checked = settings.alwaysOnTop; // 置顶状态
-            document.querySelector('#darkThemeToggle').checked = settings.darkThemeEnabled || false; // 暗色主题状态
-            document.querySelector('#startupToggle').checked = settings.startupEnabled || false; // 开机自启状态
-
-            // 渲染启动台应用列表
-            renderLaunchpadList(settings.launchpadApps || []);
-        });
-
-        // 监听时钟开关变化
-        document.querySelector('#clockToggle').addEventListener('change', function () {
-            ipcRenderer.send('toggle-clock', this.checked);
-        });
-
-        // 监听作业开关变化
-        document.querySelector('#homeworkToggle').addEventListener('change', function () {
-            ipcRenderer.send('toggle-homework', this.checked);
-        });
-
-        // 监听置顶开关变化
-        document.querySelector('#alwaysOnTopToggle').addEventListener('change', function () {
-            ipcRenderer.send('toggle-always-on-top', this.checked);
-        });
-
-        // 监听暗色主题开关变化
-        document.querySelector('#darkThemeToggle').addEventListener('change', function () {
-            ipcRenderer.send('toggle-dark-theme', this.checked);
-        });
-
-        // 监听开机自启开关变化
-        document.querySelector('#startupToggle').addEventListener('change', function () {
-            ipcRenderer.send('toggle-startup', this.checked);
-        });
-
-        // 添加启动台应用
-        document.querySelector('#addAppBtn').addEventListener('click', function () {
-            const nameInput = document.getElementById('appNameInput');
-            const pathInput = document.getElementById('appPathInput');
-            const typeInput = document.getElementById('appTypeInput');
-            const iconInput = document.getElementById('appIconInput'); // 新增图标输入
-
-            const name = nameInput.value.trim();
-            const path = pathInput.value.trim();
-            const type = typeInput.value;
-            const icon = iconInput.value.trim(); // 获取图标路径
-
-            if (!name || !path) {
-                alert('请输入名称和路径/链接');
-                return;
-            }
-
-            // 如果是链接类型，验证URL格式
-            if (type === 'link' && !isValidUrl(path)) {
-                alert('请输入有效的链接地址（以http://或https://开头）');
-                return;
-            }
-
-            // 发送包含图标信息的应用数据
-            ipcRenderer.send('add-launchpad-app', {
-                name,
-                path,
-                type,
-                icon: icon || null // 如果没有提供图标，则为null
+    const { ipcRenderer, shell } = require('electron');
+    
+    // 页面加载完成后获取当前设置状态
+    window.addEventListener('DOMContentLoaded', () => {
+        // 请求获取当前设置
+        ipcRenderer.send('get-settings');
+    });
+    
+    // 初始化标签页切换
+    function initTabSwitching() {
+        const navItems = document.querySelectorAll('.nav-item');
+        const tabContents = document.querySelectorAll('.tab-content');
+        
+        navItems.forEach(item => {
+            item.addEventListener('click', () => {
+                // 移除所有active类
+                navItems.forEach(nav => nav.classList.remove('active'));
+                tabContents.forEach(content => content.classList.remove('active'));
+                
+                // 添加active类到当前点击的标签
+                const tabId = item.dataset.tab;
+                item.classList.add('active');
+                document.getElementById(tabId).classList.add('active');
             });
-
-            // 清空输入框
-            nameInput.value = '';
-            pathInput.value = '';
-            iconInput.value = ''; // 清空图标输入框
         });
-
-        // 验证URL格式
-        function isValidUrl(string) {
-            try {
-                const url = new URL(string);
-                return url.protocol === 'http:' || url.protocol === 'https:';
-            } catch (_) {
-                return false;
+    }
+
+    
+    // 初始化外部链接处理
+    function initExternalLinks() {
+        // 处理所有外部链接点击，确保在外部浏览器打开
+        document.addEventListener('click', (event) => {
+            const anchor = event.target.closest('fluent-anchor');
+            if (anchor && anchor.href) {
+                event.preventDefault();
+                shell.openExternal(anchor.href);
             }
+        });
+    }
+    
+    // 监听设置状态更新
+    ipcRenderer.on('settings-updated', (event, settings) => {
+        document.querySelector('#clockToggle').checked = settings.clockEnabled;
+        document.querySelector('#homeworkToggle').checked = settings.homeworkEnabled;
+        document.querySelector('#alwaysOnTopToggle').checked = settings.alwaysOnTop; // 添加置顶状态
+        document.querySelector('#darkThemeToggle').checked = settings.darkThemeEnabled || false; // 添加暗色主题状态
+        
+        // 设置窗口背景模糊度
+        const windowBlurSlider = document.querySelector('#windowBlurSlider');
+        const windowBlurValue = document.querySelector('#windowBlurValue');
+        if (windowBlurSlider && windowBlurValue) {
+            windowBlurSlider.value = settings.windowBlur || 10;
+            windowBlurValue.textContent = settings.windowBlur || 10;
         }
-
-
-        // 删除启动台应用
-        function removeLaunchpadApp(index) {
-            ipcRenderer.send('remove-launchpad-app', index);
+        
+        // 设置窗口位置
+        const windowPositionSelect = document.querySelector('#windowPositionSelect');
+        if (windowPositionSelect) {
+            windowPositionSelect.value = settings.windowPosition || 'center';
         }
-
+        
+        // 应用暗色主题
+        applyDarkTheme(settings.darkThemeEnabled || false);
+        
         // 渲染启动台应用列表
-        function renderLaunchpadList(apps) {
-            const listContainer = document.getElementById('launchpadList');
-            listContainer.innerHTML = '';
-
-            if (apps.length === 0) {
-                listContainer.innerHTML = '<p style="text-align: center; color: #605e5c; padding: 10px;">暂无启动项</p>';
-                return;
-            }
-
-            apps.forEach((app, index) => {
-                const item = document.createElement('div');
-                item.className = 'launchpad-item';
-
-                const typeLabel = app.type === 'link' ? '链接' : '应用';
-                const typeClass = app.type === 'link' ? 'link' : 'app';
-
-                item.innerHTML = `
-                    <div class="launchpad-item-info">
-                        <div class="launchpad-item-name">
-                            ${app.name}
-                            <fluent-badge appearance="accent" size="small" class="launchpad-item-type" data-type="${typeClass}">${typeLabel}</fluent-badge>
-                        </div>
-                        <div class="launchpad-item-path">${app.path}</div>
-                    </div>
-                    <div class="launchpad-item-actions">
-                        <fluent-button appearance="lightweight" class="remove-btn" onclick="removeLaunchpadApp(${index})">删除</fluent-button>
-                    </div>
-                `;
-                listContainer.appendChild(item);
-            });
+        renderLaunchpadList(settings.launchpadApps || []);
+    });
+    
+    // 应用暗色主题
+    function applyDarkTheme(enabled) {
+        if (enabled) {
+            document.body.classList.add('dark-theme');
+        } else {
+            document.body.classList.remove('dark-theme');
         }
-
-        // 监听启动台应用更新
-        ipcRenderer.on('launchpad-apps-updated', (event, apps) => {
-            renderLaunchpadList(apps);
+    }
+    
+    // 监听时钟开关变化
+    document.querySelector('#clockToggle').addEventListener('change', function() {
+        ipcRenderer.send('toggle-clock', this.checked);
+    });
+    
+    // 监听作业开关变化
+    document.querySelector('#homeworkToggle').addEventListener('change', function() {
+        ipcRenderer.send('toggle-homework', this.checked);
+    });
+    
+    // 监听置顶开关变化
+    document.querySelector('#alwaysOnTopToggle').addEventListener('change', function() {
+        ipcRenderer.send('toggle-always-on-top', this.checked);
+    });
+    
+    // 监听暗色主题开关变化
+    document.querySelector('#darkThemeToggle').addEventListener('change', function() {
+        ipcRenderer.send('toggle-dark-theme', this.checked);
+        // 立即应用主题变化
+        applyDarkTheme(this.checked);
+    });
+    
+    // 监听窗口背景模糊滑块变化
+    const windowBlurSlider = document.querySelector('#windowBlurSlider');
+    const windowBlurValue = document.querySelector('#windowBlurValue');
+    if (windowBlurSlider && windowBlurValue) {
+        // 实时更新显示的数值
+        windowBlurSlider.addEventListener('input', function() {
+            windowBlurValue.textContent = this.value;
         });
-
-        // 选项卡切换功能
-        document.querySelectorAll('.tab').forEach(tab => {
-            tab.addEventListener('click', () => {
-                // 移除所有活动状态
-                document.querySelectorAll('.tab').forEach(t => t.classList.remove('active'));
-                document.querySelectorAll('.tab-content').forEach(c => c.classList.remove('active'));
-
-                // 添加当前活动状态
-                tab.classList.add('active');
-                const tabId = `${tab.dataset.tab}-tab`;
-                document.getElementById(tabId).classList.add('active');
-            });
+        
+        // 保存设置
+        windowBlurSlider.addEventListener('change', function() {
+            ipcRenderer.send('set-window-blur', parseInt(this.value));
         });
-
-        // 监听关闭按钮
-        document.querySelector('#titleCloseBtn').addEventListener('click', () => {
-            window.close();
+    }
+    
+    // 监听窗口位置选择变化
+    const windowPositionSelect = document.querySelector('#windowPositionSelect');
+    if (windowPositionSelect) {
+        windowPositionSelect.addEventListener('change', function() {
+            ipcRenderer.send('set-window-position', this.value);
         });
-
-        // 使 removeLaunchpadApp 函数全局可用
-        window.removeLaunchpadApp = removeLaunchpadApp;
+    }
+    
+    // 添加启动台应用
+    document.querySelector('#addAppBtn').addEventListener('click', function() {
+        const nameInput = document.getElementById('appNameInput');
+        const pathInput = document.getElementById('appPathInput');
+        const typeInput = document.getElementById('appTypeInput');
+        const iconInput = document.getElementById('appIconInput'); // 新增图标输入
+        
+        const name = nameInput.value.trim();
+        const path = pathInput.value.trim();
+        const type = typeInput.value;
+        const icon = iconInput.value.trim(); // 获取图标路径
+        
+        if (!name || !path) {
+            alert('请输入名称和路径/链接');
+            return;
+        }
+        
+        // 如果是链接类型，验证URL格式
+        if (type === 'link' && !isValidUrl(path)) {
+            alert('请输入有效的链接地址（以http://或https://开头）');
+            return;
+        }
+        
+        // 发送包含图标信息的应用数据
+        ipcRenderer.send('add-launchpad-app', { 
+            name, 
+            path, 
+            type,
+            icon: icon || null // 如果没有提供图标，则为null
+        });
+        
+        // 清空输入框
+        nameInput.value = '';
+        pathInput.value = '';
+        iconInput.value = ''; // 清空图标输入框
+    });
+    
+    // 验证URL格式
+    function isValidUrl(string) {
+        try {
+            const url = new URL(string);
+            return url.protocol === 'http:' || url.protocol === 'https:';
+        } catch (_) {
+            return false;
+        }
+    }
+    
+    
+    // 删除启动台应用
+    function removeLaunchpadApp(index) {
+        ipcRenderer.send('remove-launchpad-app', index);
+    }
+    
+    // 渲染启动台应用列表
+    function renderLaunchpadList(apps) {
+        const listContainer = document.getElementById('launchpadList');
+        listContainer.innerHTML = '';
+        
+        if (apps.length === 0) {
+            listContainer.innerHTML = '<p style="text-align: center; color: #605e5c; padding: 10px;">暂无启动项</p>';
+            return;
+        }
+        
+        apps.forEach((app, index) => {
+            const item = document.createElement('div');
+            item.className = 'launchpad-item';
+            
+            const typeLabel = app.type === 'link' ? '链接' : '应用';
+            const typeClass = app.type === 'link' ? 'link' : 'app';
+            
+            item.innerHTML = `
+                <div class="launchpad-item-info">
+                    <div class="launchpad-item-name">
+                        ${app.name}
+                        <span class="launchpad-item-type" data-type="${typeClass}">${typeLabel}</span>
+                    </div>
+                    <div class="launchpad-item-path">${app.path}</div>
+                </div>
+                <div class="launchpad-item-actions">
+                    <button class="remove-btn" onclick="removeLaunchpadApp(${index})">删除</button>
+                </div>
+            `;
+            listContainer.appendChild(item);
+        });
+    }
+    
+    // 监听启动台应用更新
+    ipcRenderer.on('launchpad-apps-updated', (event, apps) => {
+        renderLaunchpadList(apps);
+    });
+    
+    // 监听关闭按钮
+    document.querySelector('#titleCloseBtn').addEventListener('click', () => {
+        window.close();
+    });
+    
+    // 使 removeLaunchpadApp 函数全局可用
+    window.removeLaunchpadApp = removeLaunchpadApp;
     </script>
 </body>
-
 </html>
\ No newline at end of file