Merge pull request #190 from oceanbase/dengfuping-dev

fix(ui): PageContainer min-height should be calc(100vh - 48px) in BasicLayout
oceanbase · Oct 18, 2023 · 45db855 · 45db855
2 parents 265c33e + 1d58942
commit 45db855
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/packages/ui/src/BasicLayout/index.tsx b/packages/ui/src/BasicLayout/index.tsx
@@ -96,9 +96,9 @@ const BasicLayout: React.FC<BasicLayoutProps> = ({
   ...restProps
 }) => {
   const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);
-  const prefixCls = getPrefixCls('basic-layout', customizePrefixCls);
+  const prefixCls = getPrefixCls('pro-basic-layout', customizePrefixCls);
   const { wrapSSR } = useStyle(prefixCls);
-  const basicLayoutCls = classNames(className);
+  const basicLayoutCls = classNames(prefixCls, className);
 
   const navigate = useNavigate();
   // 侧边栏导航是否收起

diff --git a/packages/ui/src/BasicLayout/style/index.ts b/packages/ui/src/BasicLayout/style/index.ts
@@ -7,13 +7,15 @@ export type BasicLayoutToken = FullToken<any>;
 export const genBasicLayoutStyle: GenerateStyle<BasicLayoutToken> = (
   token: BasicLayoutToken
 ): CSSObject => {
-  const { proComponentsCls } = token;
+  const { componentCls, proComponentsCls } = token;
 
   return {
-    // Set style of PageContainer in BasicLayout
-    [`${proComponentsCls}-page-container`]: {
-      // 48px is the height of BasicLayout header
-      minHeight: 'calc(100vh - 48px)',
+    [`${componentCls}`]: {
+      // Set style of PageContainer in BasicLayout
+      [`${proComponentsCls}-page-container`]: {
+        // 48px is the height of BasicLayout header
+        minHeight: 'calc(100vh - 48px)',
+      },
     },
     [`${proComponentsCls}-footer-bar`]: {
       width: `calc(100% - 192px - 24px)`,