diff --git a/components/apolloTable/component/index.less b/components/apolloTable/component/index.less index 161ec31ba98ab414f6fdea2bebf95e63aff81f3b..c7cc7a1c131b04af6e70c840159741bfcc24eaf1 100644 --- a/components/apolloTable/component/index.less +++ b/components/apolloTable/component/index.less @@ -18,10 +18,16 @@ //min-height: 600px; &.scroll { flex: 1; + display: flex; + flex-direction: column; + } + .tableOperateContainer { + height: 58px; + overflow: hidden; } .tableC { - padding: 0 16px; + flex: 1; } .rowClassName { border: 1px solid black; diff --git a/components/apolloTable/component/index.tsx b/components/apolloTable/component/index.tsx index 559db752de45c9b9839a346585ceb0e4dc7b0c6f..5ee03419d4c10869a4e8b8e7ba95cdfdd948b4cc 100644 --- a/components/apolloTable/component/index.tsx +++ b/components/apolloTable/component/index.tsx @@ -57,6 +57,7 @@ class AirTable extends React.Component { render() { const { columns, dataSource } = this.state; const { + className, rowStyle, rowClassName, distanceToLoad, @@ -89,38 +90,50 @@ class AirTable extends React.Component { }); return ( -
+
{operateConfig && }
- {tableOperateConfig && } - + {tableOperateConfig && ( +
+ +
+ )} +
+
+ {paginationConfig && } diff --git a/components/apolloTable/component/interface.tsx b/components/apolloTable/component/interface.tsx index 1b10d4a008895cd7054852efd8bcfb3ad5744816..467c19522bc8ce7dac5291ebad482d65001b4377 100644 --- a/components/apolloTable/component/interface.tsx +++ b/components/apolloTable/component/interface.tsx @@ -86,6 +86,7 @@ export interface CommonProps extends TableProps { tableOperateConfig?: OperateConfigProps; paginationConfig?: any; locale?: any; + className?: string; } export interface CommonState extends TableState {}