diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 614491453..4cf6dc7ac 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 ffa3d8b5c..deabb8e1a 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 cd1ba1d0e..25149e676 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>