diff --git a/package.json b/package.json index 66b38e0..ae8b440 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iview", - "version": "0.9.9-rc-6", + "version": "0.9.9", "title": "iView", "description": "A high quality UI components Library with Vue.js", "homepage": "http://www.iviewui.com", diff --git a/src/components/table/table.vue b/src/components/table/table.vue index 2897666..f5dc220 100644 --- a/src/components/table/table.vue +++ b/src/components/table/table.vue @@ -147,7 +147,9 @@ return [ `${prefixCls}-wrapper`, { - [`${prefixCls}-hide`]: !this.ready + [`${prefixCls}-hide`]: !this.ready, + [`${prefixCls}-with-header`]: this.showSlotHeader, + [`${prefixCls}-with-footer`]: this.showSlotFooter } ] }, @@ -158,8 +160,6 @@ [`${prefixCls}-${this.size}`]: !!this.size, [`${prefixCls}-border`]: this.border, [`${prefixCls}-stripe`]: this.stripe, - [`${prefixCls}-with-header`]: this.showSlotHeader, - [`${prefixCls}-with-footer`]: this.showSlotFooter, [`${prefixCls}-with-fixed-top`]: !!this.height } ] diff --git a/src/styles/components/table.less b/src/styles/components/table.less index bde0fa9..6e28231 100644 --- a/src/styles/components/table.less +++ b/src/styles/components/table.less @@ -46,16 +46,16 @@ } &-with-header{ - border-radius: @border-radius-base @border-radius-base 0 0; + //border-radius: @border-radius-base @border-radius-base 0 0; } &-with-footer{ - border: 1px solid @border-color-base; - border-radius: 0 0 @border-radius-base @border-radius-base; + //border: 1px solid @border-color-base; + //border-radius: 0 0 @border-radius-base @border-radius-base; } &-with-header&-with-footer{ - border-radius: @border-radius-base; + //border-radius: @border-radius-base; } &-title, &-footer{ diff --git a/test/routers/select.vue b/test/routers/select.vue index 8c448b0..eb50e9e 100644 --- a/test/routers/select.vue +++ b/test/routers/select.vue @@ -1,44 +1,19 @@ -- libgit2 0.21.4