Merge branch 'feature' of github.com:oceanbase/oceanbase-design into …

…hjg-style
oceanbase · Feb 4, 2024 · 8604e44 · 8604e44
2 parents 973e3fc + 58b8c0f
commit 8604e44
Show file tree

Hide file tree

Showing 4 changed files with 4,627 additions and 13,811 deletions.
diff --git a/package.json b/package.json
@@ -105,7 +105,7 @@
     "rc-footer": "^0.6.8",
     "rc-resize-observer": "^1.4.0",
     "rc-segmented": "^2.2.2",
-    "rc-tabs": "^12.13.1",
+    "rc-tabs": "^14.0.0",
     "rc-util": "^5.38.1",
     "react": "^18.2.0",
     "react-color": "^2.19.3",

diff --git a/packages/design/package.json b/packages/design/package.json
@@ -52,7 +52,7 @@
     "@babel/preset-env": "^7.23.6",
     "antd-token-previewer": "^2.0.5",
     "rc-select": "^14.10.0",
-    "rc-table": "^7.35.2"
+    "rc-table": "^7.38.1"
   },
   "peerDependencies": {
     "react": ">=16.9.0",

diff --git a/packages/design/src/_util/genComponentStyleHook.ts b/packages/design/src/_util/genComponentStyleHook.ts
@@ -22,7 +22,10 @@ export function genComponentStyleHook(
       token => {
         return [styleFn(token)];
       },
-      getDefaultToken
+      getDefaultToken,
+      {
+        resetStyle: false,
+      }
     );
     const [wrapSSR] = useStyle(prefixCls);
     // use hashId from useToken, as hashId is '' when hashed is false