Skip to content

S
submodule
Commit 8972d499 authored by zhangwenshuai's avatar zhangwenshuai
Browse files
Options

Merge branch 'patch1.0.1' into dev

parents c916848b 284a8e70
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
components/apolloTable/component/Table.tsx
View file @ 8972d499
...@@ -423,7 +423,7 @@ export default class AirTable extends Component<TableProps, TableState> { ...@@ -423,7 +423,7 @@ export default class AirTable extends Component<TableProps, TableState> {
{ columnIndex, key, rowIndex, style }: any, { columnIndex, key, rowIndex, style }: any,
) => { ) => {
const { columns, dataSource, tableHeight = 0 } = this.state; const { columns, dataSource, tableHeight = 0 } = this.state;
const { headerHeight } = this.config; const { headerHeight, rowHeight } = this.config;
const { const {
emitChangeCell, emitChangeCell,
paginationConfig, paginationConfig,
...@@ -481,7 +481,7 @@ export default class AirTable extends Component<TableProps, TableState> { ...@@ -481,7 +481,7 @@ export default class AirTable extends Component<TableProps, TableState> {
cellData, cellData,
}); });
let maxPopHeight = (tableHeight - headerHeight) / 2; let maxPopHeight = (tableHeight - headerHeight - rowHeight - 10) / 2;
if (maxPopHeight > 250) { if (maxPopHeight > 250) {
maxPopHeight = 250; maxPopHeight = 250;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment