From e45741f7298204904c72b3844a46f2473435e959 Mon Sep 17 00:00:00 2001 From: monkey Date: Wed, 31 Aug 2022 11:37:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2form?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86value=E5=80=BC=E4=B8=BA=E5=B8=83?= =?UTF-8?q?=E5=B0=94=E7=B1=BB=E5=9E=8B=E6=97=B6=E6=A0=87=E7=AD=BE=E5=80=BC?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/sula/src/template-query-table/QueryTable.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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)) {