From 52c7858a4faefafc5cf7682ebbc01f2ee58f22db Mon Sep 17 00:00:00 2001
From: zhangwenshuai <zhangwenshuai@mttop.cn>
Date: Thu, 25 Jun 2020 09:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/apolloTable/component/index.less              | 2 +-
 components/apolloTable/component/operate/index.less      | 2 +-
 components/apolloTable/component/operate/index.tsx       | 2 +-
 components/apolloTable/component/tableOperate/index.less | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/apolloTable/component/index.less b/components/apolloTable/component/index.less
index c7cc7a1..2da4616 100644
--- a/components/apolloTable/component/index.less
+++ b/components/apolloTable/component/index.less
@@ -22,7 +22,7 @@
             flex-direction: column;
         }
         .tableOperateContainer {
-            height: 58px;
+            height: 38px;
             overflow: hidden;
         }
 
diff --git a/components/apolloTable/component/operate/index.less b/components/apolloTable/component/operate/index.less
index 36dc5cd..5a53115 100644
--- a/components/apolloTable/component/operate/index.less
+++ b/components/apolloTable/component/operate/index.less
@@ -4,7 +4,7 @@
     background: white;
     position: relative;
     box-shadow: @boxShadow;
-    margin-bottom: @marginLg;
+    margin-bottom: @marginGen;
     .headerContainer {
         display: flex;
         height: 62px;
diff --git a/components/apolloTable/component/operate/index.tsx b/components/apolloTable/component/operate/index.tsx
index 08e493e..81608c8 100644
--- a/components/apolloTable/component/operate/index.tsx
+++ b/components/apolloTable/component/operate/index.tsx
@@ -84,7 +84,7 @@ export default class Operate extends Component<Props> {
                         </div>
                     )}
                 </div>
-                {filter && (
+                {filter && filter.value && filter.value.length > 0 && (
                     <FilterCondition
                         columns={columns}
                         value={filter.value}
diff --git a/components/apolloTable/component/tableOperate/index.less b/components/apolloTable/component/tableOperate/index.less
index 353925e..15d88ea 100644
--- a/components/apolloTable/component/tableOperate/index.less
+++ b/components/apolloTable/component/tableOperate/index.less
@@ -3,7 +3,7 @@
 .container {
     background: white;
     position: relative;
-    height: 58px;
+    height: 38px;
     display: flex;
     align-items: center;
     padding: 0 @paddingLg;
-- 
2.21.0