diff --git a/src/assets/styles/menu.less b/src/assets/styles/menu.less index c86484d9..cc7ed8e6 100644 --- a/src/assets/styles/menu.less +++ b/src/assets/styles/menu.less @@ -6,7 +6,7 @@ .ant-layout-sider-children { background-color: var(--color-fill-1); border-inline: none; - border-radius: var(--menu-border-radius-base); + border-radius: 0; padding-inline: 16px; padding-block-end: 12px; } diff --git a/src/global.less b/src/global.less index f34f423c..8278a090 100644 --- a/src/global.less +++ b/src/global.less @@ -9,6 +9,8 @@ html { --color-fill-3: #f3f6fa; --color-logs-bg: #1e1e1e; --color-logs-text: #d4d4d4; + --layout-content-blockpadding: 32px; + --layout-content-inlinepadding: 32px; --menu-border-radius-base: 8px; --border-radius-base: 8px; --border-radius-middle: 20px; @@ -40,7 +42,7 @@ html { --ant-input-active-shadow: 0 0 0 2px rgba(5, 255, 105, 6%); --ant-input-active-border-color: #2fbf85; --ant-input-hover-border-color: #54cc98; - --box-shadow-base: 0 4px 12px rgb(227, 232, 240); + --box-shadow-base: 0 4px 12px rgba(227, 232, 240, 70%); .css-var-rf { --ant-font-size: var(--font-size-base); @@ -272,6 +274,14 @@ body { .ant-pro-layout { height: 100vh; + // .ant-pro-layout-content { + // padding-block: var(--layout-content-blockpadding); + // padding-inline: var(--layout-content-inlinepadding); + // } + .ant-pro-page-container-children-container { + padding-block: var(--layout-content-blockpadding); + padding-inline: var(--layout-content-inlinepadding); + } .ant-pro-sider-logo { padding-left: 22px; diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index a19ebd32..f096a5ef 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -186,7 +186,6 @@ export default (props: any) => { } if (menuItemProps.path && location.pathname !== menuItemProps.path) { return ( - // handle wildcard route path, for example /slave/* from qiankun { + return ( +
+ ); + }; const langMenu = { className: 'umi-plugin-layout-menu', selectedKeys: [], @@ -123,7 +143,7 @@ export function getRightRenderContent(opts: { let dropdownProps; if (version.startsWith('5.') || version.startsWith('4.24.')) { - dropdownProps = { menu: langMenu }; + dropdownProps = { menu: langMenu, mode: 'vertical' }; } else if (version.startsWith('3.')) { dropdownProps = { overlay: ( @@ -138,7 +158,7 @@ export function getRightRenderContent(opts: { }; } else { // 需要 antd 4.20.0 以上版本 - dropdownProps = { overlay: }; + dropdownProps = { overlay: }; } return ( @@ -153,7 +173,6 @@ export function getRightRenderContent(opts: { > {avatar} - > ) : ( avatar diff --git a/src/pages/dashboard/components/resource-utilization.tsx b/src/pages/dashboard/components/resource-utilization.tsx index 5295e5f1..fcd06b82 100644 --- a/src/pages/dashboard/components/resource-utilization.tsx +++ b/src/pages/dashboard/components/resource-utilization.tsx @@ -95,6 +95,7 @@ const UtilizationOvertime: React.FC = () => {