diff --git a/.gitignore b/.gitignore index 41d080fe..afe68414 100644 --- a/.gitignore +++ b/.gitignore @@ -65,4 +65,4 @@ mvnw /react-ui/types/tsconfig.tsbuildinfo /react-ui/storybook-static /react-ui/.storybook/scripts -/react-ui/dist.zip +/react-ui/@alita/* diff --git a/react-ui/src/app.tsx b/react-ui/src/app.tsx index 6de3d781..8069d4af 100644 --- a/react-ui/src/app.tsx +++ b/react-ui/src/app.tsx @@ -23,6 +23,7 @@ import { } from './services/session'; import './styles/menu.less'; import { isLoginPage, needAuth } from './utils'; +import { addAlpha } from './utils/color'; import { HomeUrl } from './utils/constant'; import { closeAllModals } from './utils/modal'; import { gotoHomePage } from './utils/ui'; @@ -208,14 +209,14 @@ export const antd: RuntimeAntdConfig = (memo) => { memo.theme.components ??= {}; memo.theme.components.Tabs = {}; memo.theme.components.Button = { - defaultBg: 'rgba(22, 100, 255, 0.06)', - defaultBorderColor: 'rgba(22, 100, 255, 0.11)', + defaultBg: addAlpha(themes['primaryColor'], 0.06), + defaultBorderColor: addAlpha(themes['primaryColor'], 0.11), defaultColor: themes['textColor'], - defaultHoverBg: 'rgba(22, 100, 255, 0.06)', - defaultHoverBorderColor: 'rgba(22, 100, 255, 0.5)', - defaultHoverColor: '#3F7FFF', - defaultActiveBg: 'rgba(22, 100, 255, 0.12)', - defaultActiveBorderColor: 'rgba(22, 100, 255, 0.75)', + defaultHoverBg: addAlpha(themes['primaryColor'], 0.06), + defaultHoverBorderColor: addAlpha(themes['primaryColor'], 0.5), + defaultHoverColor: themes['primaryHoverColor'], + defaultActiveBg: addAlpha(themes['primaryColor'], 0.12), + defaultActiveBorderColor: addAlpha(themes['primaryColor'], 0.75), defaultActiveColor: themes['primaryColor'], contentFontSize: parseInt(themes['fontSize']), }; @@ -245,7 +246,12 @@ export const antd: RuntimeAntdConfig = (memo) => { separatorColor: 'rgba(29, 29, 32, 0.7)', }; memo.theme.components.Tree = { - directoryNodeSelectedBg: 'rgba(22, 100, 255, 0.7)', + directoryNodeSelectedBg: addAlpha(themes['primaryColor'], 0.7), + }; + memo.theme.components.Breadcrumb = { + itemColor: themes['textColorSecondary'], + separatorColor: themes['textColorSecondary'], + linkColor: themes['textColorSecondary'], }; memo.theme.cssVar = true; diff --git a/react-ui/src/components/PageContainer/index.less b/react-ui/src/components/PageContainer/index.less index 5fc3b48a..8ab2cdd2 100644 --- a/react-ui/src/components/PageContainer/index.less +++ b/react-ui/src/components/PageContainer/index.less @@ -16,5 +16,6 @@ &__content { flex: 1; width: 100%; + min-height: 0; } } diff --git a/react-ui/src/components/PageContainer/index.tsx b/react-ui/src/components/PageContainer/index.tsx index 878294ac..2e56582c 100644 --- a/react-ui/src/components/PageContainer/index.tsx +++ b/react-ui/src/components/PageContainer/index.tsx @@ -1,3 +1,4 @@ +import { RightOutlined } from '@ant-design/icons'; import { ProBreadcrumb } from '@ant-design/pro-components'; import React from 'react'; import './index.less'; @@ -5,13 +6,12 @@ import './index.less'; function PageContainer({ children }: { children: React.ReactNode }) { const { pathname } = location; const showBreadcrumb = pathname.split('/').filter((v) => v !== '').length >= 2; - console.log('111', pathname); return (