Skip to content

Commit 136ba15

Browse files
committed
fix: layout mix not support realDark
1 parent a1eb755 commit 136ba15

File tree

6 files changed

+6
-8
lines changed

6 files changed

+6
-8
lines changed

packages/pro-layout/examples/layouts/BasicLayout.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ const baseState = reactive<Omit<RouteContextProps, 'menuData'>>({
9090
9191
const state = reactive({
9292
menuData,
93-
splitMenus: false,
93+
splitMenus: true,
9494
// title: 'ProLayout',
9595
// logo: 'https://alicdn.antdv.com/v2/assets/logo.1ef800a8.svg',
96-
navTheme: 'light',
96+
navTheme: 'realDark',
9797
layout: 'mix',
9898
fixSiderbar: true,
9999
fixedHeader: true,

packages/pro-layout/examples/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import '@ant-design-vue/pro-layout/style.less';
2-
31
import { createApp } from 'vue';
42
import ProLayout, { PageContainer } from '@ant-design-vue/pro-layout';
53
import App from './App.vue';
@@ -10,6 +8,8 @@ import icons from './icons';
108
import 'ant-design-vue/es/result/style';
119
import 'ant-design-vue/es/button/style';
1210
import 'ant-design-vue/es/message/style';
11+
import 'ant-design-vue/dist/antd.dark.less';
12+
import '@ant-design-vue/pro-layout/style.less';
1313

1414
const app = createApp(App);
1515

packages/pro-layout/examples/views/Hello.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
status="404"
44
:style="{
55
height: '100%',
6-
background: '#fff',
76
}"
87
title="Hello World"
98
sub-title="Sorry, you are not authorized to access this page."

packages/pro-layout/examples/views/MyPage.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
status="404"
99
:style="{
1010
height: '100%',
11-
background: '#fff',
1211
}"
1312
title="Hello World"
1413
sub-title="Sorry, you are not authorized to access this page."

packages/pro-layout/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ant-design-vue/pro-layout",
3-
"version": "3.2.2",
3+
"version": "3.2.3",
44
"scripts": {
55
"dev": "vite",
66
"build": "vue-tsc --noEmit && vite build",

packages/pro-layout/src/components/SiderMenu/SiderMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ const SiderMenu: FunctionalComponent<SiderMenuProps> = (props: SiderMenuProps) =
157157
const { getPrefixCls } = context;
158158
const baseClassName = getPrefixCls('sider');
159159
const hasSplitMenu = computed(() => props.layout === 'mix' && props.splitMenus);
160-
const sTheme = computed(() => (props.layout === 'mix' && 'light') || props.navTheme);
160+
const sTheme = computed(() => ((props.layout === 'mix' && props.navTheme !== 'realDark') && 'light') || props.navTheme);
161161
const sSideWidth = computed(() => (props.collapsed ? props.collapsedWidth : props.siderWidth));
162162
const classNames = computed(() => {
163163
return {

0 commit comments

Comments
 (0)