improve(ui): ProTable should inherit style from Table

oceanbase · Apr 8, 2024 · b370188 · b370188
1 parent 0dba270
commit b370188
Show file tree

Hide file tree

Showing 19 changed files with 1,225 additions and 20 deletions.
diff --git a/.dumirc.ts b/.dumirc.ts
@@ -189,6 +189,10 @@ export default defineConfig({
             { title: 'Welcome 欢迎页', link: '/biz-components/welcome' },
           ],
         },
+        {
+          title: 'ProComponents 组件',
+          children: [{ title: 'ProTable 高级表格', link: '/biz-components/pro-table' }],
+        },
         {
           title: '可视化',
           children: [

diff --git a/packages/design/src/config-provider/index.tsx b/packages/design/src/config-provider/index.tsx
@@ -6,6 +6,7 @@ import type {
   ThemeConfig as AntThemeConfig,
 } from 'antd/es/config-provider';
 import type { ComponentStyleConfig } from 'antd/es/config-provider/context';
+import type { PaginationConfig } from 'antd/es/pagination';
 import type { SpinIndicator } from 'antd/es/spin';
 import { StyleProvider } from '@ant-design/cssinjs';
 import type { StyleProviderProps } from '@ant-design/cssinjs';
@@ -58,6 +59,7 @@ export interface ConfigProviderProps extends AntConfigProviderProps {
   // for react-router-dom v6: navigate
   navigate?: NavigateFunction;
   hideOnSinglePage?: boolean;
+  pagination?: PaginationConfig;
   spin?: SpinConfig;
   table?: TableConfig;
   // inject static function to consume ConfigProvider

diff --git a/packages/design/src/form/index.tsx b/packages/design/src/form/index.tsx
@@ -20,22 +20,16 @@ type CompoundedComponent = React.FC<FormProps> & {
   create: typeof AntForm.create;
 };
 
-const Form: CompoundedComponent = ({ hideRequiredMark, ...restProps }) => {
+const Form: CompoundedComponent = props => {
   const { form: contextForm } = useContext(ConfigProvider.ConfigContext);
   return (
     // @ts-ignore to ignore children type error
     <AntForm
       requiredMark={
-        // could remove hideRequiredMark logic after https://github.com/ant-design/ant-design/pull/46299 is published
-        hideRequiredMark
-          ? false
-          : contextForm?.requiredMark !== undefined
-            ? contextForm?.requiredMark
-            : 'optional'
+        contextForm?.requiredMark !== undefined ? contextForm?.requiredMark : 'optional'
       }
-      hideRequiredMark={hideRequiredMark}
       preserve={false}
-      {...restProps}
+      {...props}
     />
   );
 };

diff --git a/packages/design/src/locale/en-US.ts b/packages/design/src/locale/en-US.ts
@@ -7,6 +7,10 @@ export default {
     ...enUS.global,
     inputPlaceholder: 'Please enter',
   },
+  Pagination: {
+    ...enUS.Pagination,
+    total: '${total} in Total',
+  },
   Drawer: {
     okText: 'OK',
     cancelText: 'Cancel',

diff --git a/packages/design/src/locale/index.ts b/packages/design/src/locale/index.ts
@@ -1,4 +1,5 @@
 import type { Locale as AntLocale } from 'antd/es/locale';
+import type { PaginationLocale as AntPaginationLocale } from 'antd/es/pagination/Pagination';
 import type { DrawerLocale } from '../drawer';
 import type { InputLocale } from '../input';
 import type { InputNumberLocale } from '../input-number';
@@ -12,8 +13,13 @@ export type GlobalLocale = AntLocale['global'] & {
   inputPlaceholder?: string;
 };
 
+export interface PaginationLocale extends AntPaginationLocale {
+  total?: string;
+}
+
 export interface Locale extends AntLocale {
   global?: GlobalLocale;
+  Pagination?: PaginationLocale;
   Drawer?: DrawerLocale;
   Input?: InputLocale;
   InputNumber?: InputNumberLocale;

diff --git a/packages/design/src/locale/zh-CN.ts b/packages/design/src/locale/zh-CN.ts
@@ -7,6 +7,10 @@ export default {
     ...zhCN.global,
     inputPlaceholder: '请输入',
   },
+  Pagination: {
+    ...zhCN.Pagination,
+    total: '共 ${total} 条',
+  },
   Drawer: {
     okText: '确定',
     cancelText: '取消',

diff --git a/packages/design/src/locale/zh-TW.ts b/packages/design/src/locale/zh-TW.ts
@@ -7,6 +7,10 @@ export default {
     ...zhTW.global,
     inputPlaceholder: '請輸入',
   },
+  Pagination: {
+    ...zhTW.Pagination,
+    total: '共 ${total} 條',
+  },
   Drawer: {
     okText: '确定',
     cancelText: '取消',