chore: 解决冲突

This commit is contained in:
pany 2022-10-21 18:05:23 +08:00
commit bbbcc44a0e

@ -9,8 +9,6 @@ interface IThemeList {
/** 注册的主题名称, 其中 normal 是必填的 */ /** 注册的主题名称, 其中 normal 是必填的 */
export type ThemeName = "normal" | "dark" | "dark-blue" export type ThemeName = "normal" | "dark" | "dark-blue"
/** 主题 hook */
export function useTheme() {
/** 主题列表 */ /** 主题列表 */
const themeList: IThemeList[] = [ const themeList: IThemeList[] = [
{ {
@ -20,12 +18,9 @@ export function useTheme() {
{ {
title: "黑暗", title: "黑暗",
name: "dark" name: "dark"
},
{
title: "深蓝",
name: "dark-blue"
} }
] ]
/** 正在应用的主题名称 */ /** 正在应用的主题名称 */
const activeThemeName = ref<ThemeName>(getActiveThemeName() || "normal") const activeThemeName = ref<ThemeName>(getActiveThemeName() || "normal")
@ -44,5 +39,7 @@ export function useTheme() {
document.documentElement.className = value document.documentElement.className = value
} }
/** 主题 hook */
export function useTheme() {
return { themeList, activeThemeName, initTheme, setTheme } return { themeList, activeThemeName, initTheme, setTheme }
} }