From 7c2f85169248b369f95c5866ef7e90d4fb1739ef Mon Sep 17 00:00:00 2001
From: Vben <anncwb@126.com>
Date: 星期五, 26 二月 2021 20:36:54 +0800
Subject: [PATCH] fix(table): ensure the table setting button dividing line is hidden
---
src/components/Table/src/components/settings/index.vue | 2 --
CHANGELOG.zh_CN.md | 2 ++
src/components/Table/src/components/TableHeader.vue | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 6144914..4cf6dc7 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 ffa3d8b..deabb8e 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 cd1ba1d..25149e6 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>
--
Gitblit v1.8.0