feat: 🎸 (pro-table) header flex custome

charlzyx · Aug 14, 2024 · 8056fe2 · 8056fe2
1 parent 9d2be09
commit 8056fe2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/pro-array-table/pro.tsx b/src/pro-array-table/pro.tsx
@@ -185,8 +185,7 @@ const ArrayTableProInside: ReactFC<ProArrayTableProps> = observer(
       props.settings !== false;
 
     const _header = !showHeader ? null : (
-      <Flex between marginBottom={"6px"} marginTop={"6px"}>
-        <Flex start>
+      <Flex {...props.headerFlex} marginBottom={"8px"} marginTop={"8px"}>
           {props.title ? (
             typeof props.title === "function" ? (
               props.title(dataSource)
@@ -199,8 +198,6 @@ const ArrayTableProInside: ReactFC<ProArrayTableProps> = observer(
           {rowSelection?.showPro === "top" ? (
             <RowSelectionPro ds={dataSlice} rowKey={rowKey}></RowSelectionPro>
           ) : null}
-        </Flex>
-        <Flex end>
           {toolbar}
           {addition}
           {!props.extra && props.settings === false ? null : (
@@ -211,7 +208,6 @@ const ArrayTableProInside: ReactFC<ProArrayTableProps> = observer(
               ) : null}
             </Space>
           )}
-        </Flex>
       </Flex>
     );
 
@@ -354,7 +350,6 @@ const ArrayTableProInside: ReactFC<ProArrayTableProps> = observer(
 );
 
 const useTableExpandable = () => {
-  return useContext(TableExpandableContext);
 };
 
 const useTableRowSelection = () => {

diff --git a/src/pro-array-table/types.tsx b/src/pro-array-table/types.tsx
@@ -4,6 +4,7 @@ import type { Table } from "../adaptor";
 
 type TableProps<T> = React.ComponentProps<typeof Table>;
 
+import { Flex } from './mixin.pro'
 export type TableChangeParams = Parameters<
   Required<TableProps<any>>["onChange"]
 >;
@@ -57,6 +58,7 @@ export interface IProArrayTableBaseMixins {
 
 export type ProArrayTableProps = Omit<TableProps<any>, "title"> &
   IProArrayTableBaseMixins & {
+    headerFlex?: React.ComponentProps<typeof Flex>,
     title: string | TableProps<any>["title"];
     footer: string | TableProps<any>["footer"];
     rowSelection?: