From d5befae3a383c7514b9ca471ca8631c9ca4415a3 Mon Sep 17 00:00:00 2001 From: JiwenBai Date: Thu, 25 Jul 2019 11:30:16 +0800 Subject: [PATCH] feat(advance-table): add minHeight props --- package.json | 2 +- packages/common/AdvanceTable/src/main.vue | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c860a52fc..1cb298c39 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "naive-ui", - "version": "0.2.33", + "version": "0.2.34", "description": "", "main": "index.js", "scripts": { diff --git a/packages/common/AdvanceTable/src/main.vue b/packages/common/AdvanceTable/src/main.vue index 3ec6fcac9..4a5d9a81c 100644 --- a/packages/common/AdvanceTable/src/main.vue +++ b/packages/common/AdvanceTable/src/main.vue @@ -166,6 +166,10 @@ export default { type: Function, default: null }, + minHeight: { + type: [Number, String], + default: 'unset' + }, maxHeight: { type: [Number, String], default: 'auto' @@ -261,6 +265,12 @@ export default { ? this.maxWidth + 'px' : this.maxWidth } + if (this.minHeight !== 'unset') { + stl.minHeight = + typeof this.minHeight === 'number' + ? this.minHeight + 'px' + : this.minHeight + } return stl }, colGroup () {