Skip to content

Commit

Permalink
style: 优化样式
Browse files Browse the repository at this point in the history
  • Loading branch information
JackySoft authored and jianbing.chen committed Dec 18, 2024
1 parent 0fd64b5 commit d96ef47
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 12 deletions.
35 changes: 24 additions & 11 deletions packages/admin/src/components/Menu/Menu.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
import { useLocation, useNavigate, useParams } from 'react-router-dom';
import { Menu } from 'antd';
import { ConfigProvider, Menu } from 'antd';
import type { MenuProps, MenuTheme } from 'antd';
import * as Icons from '@ant-design/icons';
import { useProjectStore } from '@/stores/projectStore';
Expand Down Expand Up @@ -69,20 +69,33 @@ const MenuComponent: React.FC = () => {
return (
<div
style={{
width: collapsed ? 80 : 255,
width: collapsed ? 79 : 255,
background: projectInfo.menu_theme_color === 'light' ? '#fff' : '#001529',
borderRight: projectInfo.layout === 2 ? '1px solid #e8e9eb' : 'none',
overflowX: 'hidden',
}}
>
<Menu
onClick={onClick}
theme={projectInfo.menu_theme_color as MenuTheme}
selectedKeys={selectedKeys}
style={{ height: 'calc(100vh - 64px)', border: 'none', overflowY: 'auto' }}
mode={projectInfo.menu_mode}
inlineCollapsed={collapsed}
items={menuList}
/>
<ConfigProvider
theme={{
components: {
Menu: {
darkItemColor: '#fff',
darkItemHoverColor: projectInfo.system_theme_color,
iconSize: 16,
},
},
}}
>
<Menu
onClick={onClick}
theme={projectInfo.menu_theme_color as MenuTheme}
selectedKeys={selectedKeys}
style={{ height: 'calc(100vh - 64px)', border: 'none', overflowY: 'auto' }}
mode={projectInfo.menu_mode}
inlineCollapsed={collapsed}
items={menuList}
/>
</ConfigProvider>
</div>
);
};
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/src/pages/welcome/welcome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function Welcome() {
return (
<div className={style.welcome}>
<img src="/imgs/welcome.svg" alt="" />
<div className={style.title}>欢迎使用 Marsview 访问端系统</div>
<div className={style.title}>欢迎使用 Marsview 低代码管理系统</div>
{location.pathname === '/' && (
<div className={style.content}>
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
}
.table-wrapper {
padding-inline: 15px;
padding-bottom: 15px;
}
}

0 comments on commit d96ef47

Please sign in to comment.