mirror of
https://github.com/pure-admin/vue-pure-admin.git
synced 2025-11-09 13:53:38 +08:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
185d779c8d | ||
|
|
241fc618b8 |
@@ -1,3 +1,9 @@
|
|||||||
|
# 3.4.5 (2022-8-22)
|
||||||
|
|
||||||
|
### 🐞 Bug fixes
|
||||||
|
|
||||||
|
- Fix local responsive storage object setting issue
|
||||||
|
|
||||||
# 3.4.0 (2022-8-22)
|
# 3.4.0 (2022-8-22)
|
||||||
|
|
||||||
### 🍏 Perf
|
### 🍏 Perf
|
||||||
|
|||||||
@@ -1,3 +1,9 @@
|
|||||||
|
# 3.4.5 (2022-8-22)
|
||||||
|
|
||||||
|
### 🐞 Bug fixes
|
||||||
|
|
||||||
|
- Fix local responsive storage object setting issue
|
||||||
|
|
||||||
# 3.4.0 (2022-8-22)
|
# 3.4.0 (2022-8-22)
|
||||||
|
|
||||||
### 🍏 Perf
|
### 🍏 Perf
|
||||||
|
|||||||
@@ -1,3 +1,9 @@
|
|||||||
|
# 3.4.5 (2022-8-22)
|
||||||
|
|
||||||
|
### 🐞 Bug fixes
|
||||||
|
|
||||||
|
- 修复本地响应式存储对象设置问题
|
||||||
|
|
||||||
# 3.4.0 (2022-8-22)
|
# 3.4.0 (2022-8-22)
|
||||||
|
|
||||||
### 🍏 Perf
|
### 🍏 Perf
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vue-pure-admin",
|
"name": "vue-pure-admin",
|
||||||
"version": "3.4.0",
|
"version": "3.4.5",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "cross-env --max_old_space_size=4096 vite",
|
"dev": "cross-env --max_old_space_size=4096 vite",
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"Version": "3.4.0",
|
"Version": "3.4.5",
|
||||||
"Title": "PureAdmin",
|
"Title": "PureAdmin",
|
||||||
"FixedHeader": true,
|
"FixedHeader": true,
|
||||||
"HiddenSideBar": false,
|
"HiddenSideBar": false,
|
||||||
|
|||||||
@@ -211,8 +211,9 @@ function setLayoutModel(layout: string) {
|
|||||||
$storage.layout = {
|
$storage.layout = {
|
||||||
layout,
|
layout,
|
||||||
theme: layoutTheme.value.theme,
|
theme: layoutTheme.value.theme,
|
||||||
darkMode: $storage.layout.darkMode,
|
darkMode: $storage.layout?.darkMode,
|
||||||
sidebarStatus: $storage.layout.sidebarStatus
|
sidebarStatus: $storage.layout?.sidebarStatus,
|
||||||
|
epThemeColor: $storage.layout?.epThemeColor
|
||||||
};
|
};
|
||||||
useAppStoreHook().setLayout(layout);
|
useAppStoreHook().setLayout(layout);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import {
|
|||||||
} from "@pureadmin/theme/dist/browser-utils";
|
} from "@pureadmin/theme/dist/browser-utils";
|
||||||
|
|
||||||
export function useDataThemeChange() {
|
export function useDataThemeChange() {
|
||||||
const { layoutTheme } = useLayout();
|
const { layoutTheme, layout } = useLayout();
|
||||||
const themeColors = ref<Array<themeColorsType>>([
|
const themeColors = ref<Array<themeColorsType>>([
|
||||||
/* 道奇蓝(默认) */
|
/* 道奇蓝(默认) */
|
||||||
{ color: "#1b2a47", themeColor: "default" },
|
{ color: "#1b2a47", themeColor: "default" },
|
||||||
@@ -36,7 +36,7 @@ export function useDataThemeChange() {
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
const { $storage } = useGlobal<GlobalPropertiesApi>();
|
const { $storage } = useGlobal<GlobalPropertiesApi>();
|
||||||
|
const dataTheme = ref<boolean>($storage?.layout?.darkMode);
|
||||||
const body = document.documentElement as HTMLElement;
|
const body = document.documentElement as HTMLElement;
|
||||||
|
|
||||||
/** 设置导航主题色 */
|
/** 设置导航主题色 */
|
||||||
@@ -45,8 +45,13 @@ export function useDataThemeChange() {
|
|||||||
toggleTheme({
|
toggleTheme({
|
||||||
scopeName: `layout-theme-${theme}`
|
scopeName: `layout-theme-${theme}`
|
||||||
});
|
});
|
||||||
$storage.layout.theme = theme;
|
$storage.layout = {
|
||||||
$storage.layout.darkMode = dataTheme.value;
|
layout: layout.value,
|
||||||
|
theme,
|
||||||
|
darkMode: dataTheme.value,
|
||||||
|
sidebarStatus: $storage.layout?.sidebarStatus,
|
||||||
|
epThemeColor: $storage.layout?.epThemeColor
|
||||||
|
};
|
||||||
|
|
||||||
if (theme === "default" || theme === "light") {
|
if (theme === "default" || theme === "light") {
|
||||||
setEpThemeColor(getConfig().EpThemeColor);
|
setEpThemeColor(getConfig().EpThemeColor);
|
||||||
@@ -82,7 +87,6 @@ export function useDataThemeChange() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const dataTheme = ref<boolean>($storage?.layout?.darkMode);
|
|
||||||
|
|
||||||
/** 日间、夜间主题切换 */
|
/** 日间、夜间主题切换 */
|
||||||
function dataThemeChange() {
|
function dataThemeChange() {
|
||||||
@@ -94,10 +98,8 @@ export function useDataThemeChange() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (dataTheme.value) {
|
if (dataTheme.value) {
|
||||||
$storage.layout.darkMode = true;
|
|
||||||
document.documentElement.classList.add("dark");
|
document.documentElement.classList.add("dark");
|
||||||
} else {
|
} else {
|
||||||
$storage.layout.darkMode = false;
|
|
||||||
document.documentElement.classList.remove("dark");
|
document.documentElement.classList.remove("dark");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user