Commit 7c2f85169248b369f95c5866ef7e90d4fb1739ef
1 parent
37508ca4
fix(table): ensure the table setting button dividing line is hidden
Showing
3 changed files
with
3 additions
and
3 deletions
CHANGELOG.zh_CN.md
src/components/Table/src/components/TableHeader.vue
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | 4 | ||
5 | <div :class="`${prefixCls}__toolbar`"> | 5 | <div :class="`${prefixCls}__toolbar`"> |
6 | <slot name="toolbar"></slot> | 6 | <slot name="toolbar"></slot> |
7 | - <Divider type="vertical" v-if="$slots.toolbar" /> | 7 | + <Divider type="vertical" v-if="$slots.toolbar && showTableSetting" /> |
8 | <TableSetting :setting="tableSetting" v-if="showTableSetting" /> | 8 | <TableSetting :setting="tableSetting" v-if="showTableSetting" /> |
9 | </div> | 9 | </div> |
10 | </template> | 10 | </template> |
src/components/Table/src/components/settings/index.vue
@@ -2,9 +2,7 @@ | @@ -2,9 +2,7 @@ | ||
2 | <div class="table-settings"> | 2 | <div class="table-settings"> |
3 | <RedoSetting v-if="getSetting.size" /> | 3 | <RedoSetting v-if="getSetting.size" /> |
4 | <SizeSetting v-if="getSetting.redo" /> | 4 | <SizeSetting v-if="getSetting.redo" /> |
5 | - | ||
6 | <ColumnSetting v-if="getSetting.setting" /> | 5 | <ColumnSetting v-if="getSetting.setting" /> |
7 | - | ||
8 | <FullScreenSetting v-if="getSetting.fullScreen" /> | 6 | <FullScreenSetting v-if="getSetting.fullScreen" /> |
9 | </div> | 7 | </div> |
10 | </template> | 8 | </template> |