From 7c2f85169248b369f95c5866ef7e90d4fb1739ef Mon Sep 17 00:00:00 2001
From: Vben <anncwb@126.com>
Date: Fri, 26 Feb 2021 20:36:54 +0800
Subject: [PATCH] fix(table): ensure the table setting button dividing line is
 hidden

---
 CHANGELOG.zh_CN.md                                     | 2 ++
 src/components/Table/src/components/TableHeader.vue    | 2 +-
 src/components/Table/src/components/settings/index.vue | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 61449145395..4cf6dc7acaf 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -16,6 +16,8 @@
 
 - 修复验证码组件警告问题
 - 修复表格不能正确的获取选中行
+- 修复全屏状态下 modal 高度计算错误
+- 修复部分表格样式问题
 
 ## 2.0.1 (2021-02-21)
 
diff --git a/src/components/Table/src/components/TableHeader.vue b/src/components/Table/src/components/TableHeader.vue
index ffa3d8b5c69..deabb8e1a44 100644
--- a/src/components/Table/src/components/TableHeader.vue
+++ b/src/components/Table/src/components/TableHeader.vue
@@ -4,7 +4,7 @@
 
   <div :class="`${prefixCls}__toolbar`">
     <slot name="toolbar"></slot>
-    <Divider type="vertical" v-if="$slots.toolbar" />
+    <Divider type="vertical" v-if="$slots.toolbar && showTableSetting" />
     <TableSetting :setting="tableSetting" v-if="showTableSetting" />
   </div>
 </template>
diff --git a/src/components/Table/src/components/settings/index.vue b/src/components/Table/src/components/settings/index.vue
index cd1ba1d0ec7..25149e67601 100644
--- a/src/components/Table/src/components/settings/index.vue
+++ b/src/components/Table/src/components/settings/index.vue
@@ -2,9 +2,7 @@
   <div class="table-settings">
     <RedoSetting v-if="getSetting.size" />
     <SizeSetting v-if="getSetting.redo" />
-
     <ColumnSetting v-if="getSetting.setting" />
-
     <FullScreenSetting v-if="getSetting.fullScreen" />
   </div>
 </template>