diff --git a/packages/sula/src/template-query-table/QueryTable.tsx b/packages/sula/src/template-query-table/QueryTable.tsx index 3812d35..b78501a 100644 --- a/packages/sula/src/template-query-table/QueryTable.tsx +++ b/packages/sula/src/template-query-table/QueryTable.tsx @@ -117,10 +117,11 @@ export default class QueryTable extends React.Component { const clientHeight = document.documentElement.clientHeight; const outerHeight = window.screen.height; let newHeight = 500; + let cancelHeight = window.top == window ? 142 : 62; if (isFullScreen) { - newHeight = outerHeight - 142; + newHeight = outerHeight - cancelHeight; } else { - newHeight = clientHeight - 142; + newHeight = clientHeight - cancelHeight; } this.setState({ sliderFormHeight: newHeight @@ -513,7 +514,7 @@ export default class QueryTable extends React.Component { } //当筛选条件项存在 if (source) { - if (typeof(value) === 'number' || typeof(value) === 'string') { + if (typeof(value) === 'number' || typeof(value) === 'string' || typeof(value) === 'boolean') { return this.getSourceName(source, value); } if (Array.isArray(value)) {