github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-15 14:24:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1904 from jumpserver/pr@dev@perf_colors

Browse Source 
fix: theme colors default
This commit is contained in:
feng626
2022-07-12 14:56:21 +08:00
committed by GitHub
parent b6be60c584 39766553fa
commit 5dfcfd7b71
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/theme/color.js
View File

@@ -4,7 +4,7 @@ import defaultThemeConfig from './default.js'
export function generateColors(themeColors) {
const colors = {}
if (!themeColors) {
if (!themeColors || Object.keys(themeColors).length === 0) {
themeColors = defaultThemeConfig
}
let primaryColor = themeColors
@@ -31,7 +31,7 @@ export function generateColors(themeColors) {
if (value.includes('danger')) {
replaceColor = value.replace(/danger/g, subColor['--color-danger'])
}
if (replaceColor) {
if (replaceColor && !replaceColor.includes('undefined')) {
const convertColor = color.convert(replaceColor)
colors[key] = convertColor.indexOf('rgba') > -1 ? convertColor : colorRgbToHex(convertColor)
}