From 5470429a79313630a7ddef601de1d89e7dada754 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 22 五月 2026 09:14:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev-new_pro_OA
---
src/utils/theme.js | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/utils/theme.js b/src/utils/theme.js
index f4badc6..90a511e 100644
--- a/src/utils/theme.js
+++ b/src/utils/theme.js
@@ -1,29 +1,44 @@
// 澶勭悊涓婚鏍峰紡
export function handleThemeStyle(theme) {
- document.documentElement.style.setProperty('--el-color-primary', theme)
+ const primary = normalizeHex(theme)
+ const [r, g, b] = hexToRgb(primary)
+ const light2 = getLightColor(primary, 0.2)
+ const light3 = getLightColor(primary, 0.3)
+ const light5 = getLightColor(primary, 0.5)
+
+ document.documentElement.style.setProperty('--el-color-primary', primary)
+ document.documentElement.style.setProperty('--el-color-primary-rgb', `${r}, ${g}, ${b}`)
for (let i = 1; i <= 9; i++) {
- document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, `${getLightColor(theme, i / 10)}`)
+ document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, `${getLightColor(primary, i / 10)}`)
}
for (let i = 1; i <= 9; i++) {
- document.documentElement.style.setProperty(`--el-color-primary-dark-${i}`, `${getDarkColor(theme, i / 10)}`)
+ document.documentElement.style.setProperty(`--el-color-primary-dark-${i}`, `${getDarkColor(primary, i / 10)}`)
}
+
+ // 绯荤粺涓婚鑱斿姩鍒颁晶杈规爮閫変腑鎬佷笌楂樹寒
+ document.documentElement.style.setProperty('--menu-active-bg', `linear-gradient(135deg, ${primary} 0%, ${light3} 100%)`)
+ document.documentElement.style.setProperty('--menu-active-glow', `0 10px 24px rgba(${r}, ${g}, ${b}, 0.32)`)
+ document.documentElement.style.setProperty('--menu-hover', `rgba(${r}, ${g}, ${b}, 0.2)`)
+ document.documentElement.style.setProperty('--accent-primary', primary)
+ document.documentElement.style.setProperty('--accent-light', light2)
+ document.documentElement.style.setProperty('--accent-lighter', light5)
}
// hex棰滆壊杞瑀gb棰滆壊
export function hexToRgb(str) {
- str = str.replace('#', '')
- let hexs = str.match(/../g)
+ str = normalizeHex(str).replace('#', '')
+ const hexs = str.match(/../g) || ['40', '9e', 'ff']
for (let i = 0; i < 3; i++) {
hexs[i] = parseInt(hexs[i], 16)
}
return hexs
}
-// rgb棰滆壊杞琀ex棰滆壊
+// rgb棰滆壊杞琱ex棰滆壊
export function rgbToHex(r, g, b) {
- let hexs = [r.toString(16), g.toString(16), b.toString(16)]
+ const hexs = [r.toString(16), g.toString(16), b.toString(16)]
for (let i = 0; i < 3; i++) {
- if (hexs[i].length == 1) {
+ if (hexs[i].length === 1) {
hexs[i] = `0${hexs[i]}`
}
}
@@ -32,7 +47,7 @@
// 鍙樻祬棰滆壊鍊�
export function getLightColor(color, level) {
- let rgb = hexToRgb(color)
+ const rgb = hexToRgb(color)
for (let i = 0; i < 3; i++) {
rgb[i] = Math.floor((255 - rgb[i]) * level + rgb[i])
}
@@ -41,9 +56,19 @@
// 鍙樻繁棰滆壊鍊�
export function getDarkColor(color, level) {
- let rgb = hexToRgb(color)
+ const rgb = hexToRgb(color)
for (let i = 0; i < 3; i++) {
rgb[i] = Math.floor(rgb[i] * (1 - level))
}
return rgbToHex(rgb[0], rgb[1], rgb[2])
}
+
+function normalizeHex(color) {
+ if (!color || typeof color !== 'string') return '#409eff'
+ let value = color.trim().replace('#', '')
+ if (value.length === 3) {
+ value = value.split('').map((s) => s + s).join('')
+ }
+ if (!/^[0-9a-fA-F]{6}$/.test(value)) return '#409eff'
+ return `#${value.toLowerCase()}`
+}
--
Gitblit v1.9.3