From 067d0af5c4e43c5e96a386900d59db6c6a52fbfb Mon Sep 17 00:00:00 2001
From: MadCcc <1075746765@qq.com>
Date: Mon, 26 Dec 2022 11:30:33 +0800
Subject: [PATCH 1/2] fix: font-family for components

---
 components/style/index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/style/index.tsx b/components/style/index.tsx
index bcac9ee92a15..743ac86d504e 100644
--- a/components/style/index.tsx
+++ b/components/style/index.tsx
@@ -103,11 +103,15 @@ export const genLinkStyle = (token: DerivativeToken): CSSObject => ({
   },
 });
 
-export const genCommonStyle = (componentPrefixCls: string): CSSObject => {
+export const genCommonStyle = (token: DerivativeToken, componentPrefixCls: string): CSSObject => {
+  const { fontFamily, fontSize } = token;
+
   const rootPrefixSelector = `[class^="${componentPrefixCls}"], [class*=" ${componentPrefixCls}"]`;
 
   return {
     [rootPrefixSelector]: {
+      fontFamily,
+      fontSize,
       boxSizing: 'border-box',
 
       '&::before, &::after': {

From f34bc89375f60ff3cfeed1844e1a45c94f8cd291 Mon Sep 17 00:00:00 2001
From: MadCcc <1075746765@qq.com>
Date: Mon, 26 Dec 2022 11:38:09 +0800
Subject: [PATCH 2/2] chore: code clean

---
 components/theme/util/genComponentStyleHook.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/theme/util/genComponentStyleHook.ts b/components/theme/util/genComponentStyleHook.ts
index 7b5d172fbc47..db2bd218bbd9 100644
--- a/components/theme/util/genComponentStyleHook.ts
+++ b/components/theme/util/genComponentStyleHook.ts
@@ -87,7 +87,7 @@ export default function genComponentStyleHook<ComponentName extends OverrideComp
             overrideComponentToken: token[component],
           });
           flush(component, mergedComponentToken);
-          return [genCommonStyle(prefixCls), styleInterpolation];
+          return [genCommonStyle(token, prefixCls), styleInterpolation];
         },
       ),
       hashId,