diff --git a/components/dropdown/src/Dropdown.vue b/components/dropdown/src/Dropdown.vue
index 4c3bddd86..61f99503b 100644
--- a/components/dropdown/src/Dropdown.vue
+++ b/components/dropdown/src/Dropdown.vue
@@ -89,7 +89,7 @@ export default {
const overlayNode = this.getPopupDomNode()
const rootNode = this.$el
if (rootNode && overlayNode && rootNode.offsetWidth > overlayNode.offsetWidth) {
- overlayNode.style.width = `${rootNode.offsetWidth}px`
+ overlayNode.style.minWidth = `${rootNode.offsetWidth}px`
if (this.$refs.trigger &&
this.$refs.trigger._component &&
this.$refs.trigger._component.alignInstance) {
diff --git a/components/modal/demo/index.vue b/components/modal/demo/index.vue
index 5dafd70f2..a7895bdaa 100644
--- a/components/modal/demo/index.vue
+++ b/components/modal/demo/index.vue
@@ -35,7 +35,7 @@ export default {
title: 'Modal',
render () {
return (
-
+
@@ -57,7 +57,7 @@ export default {
diff --git a/components/time-picker/demo/index.vue b/components/time-picker/demo/index.vue
index 3165dbc92..9298d36e9 100644
--- a/components/time-picker/demo/index.vue
+++ b/components/time-picker/demo/index.vue
@@ -28,7 +28,7 @@ export default {
title: 'TimePicker',
render () {
return (
-
+
@@ -48,5 +48,5 @@ export default {
}
diff --git a/components/vc-pagination/Pagination.vue b/components/vc-pagination/Pagination.vue
index 9e37ec597..5e4d6a031 100644
--- a/components/vc-pagination/Pagination.vue
+++ b/components/vc-pagination/Pagination.vue
@@ -276,14 +276,16 @@ export default {
)
}
+ const hasPrev = this.hasPrev()
+ const hasNext = this.hasNext()
return (
-
{this.itemRender(prevPage, 'prev', )}
@@ -308,7 +310,7 @@ export default {
onClick={this.next}
tabIndex='0'
onKeypress={this.runIfEnterNext}
- class={`${this.hasNext() ? '' : `${prefixCls}-disabled`} ${prefixCls}-next`}
+ class={`${hasNext ? '' : `${prefixCls}-disabled`} ${prefixCls}-next`}
aria-disabled={!this.hasNext()}
>
{this.itemRender(nextPage, 'next', )}
@@ -492,7 +494,7 @@ export default {