diff --git a/packages/message-box/src/main.vue b/packages/message-box/src/main.vue index 60bdccf46..a146d122f 100644 --- a/packages/message-box/src/main.vue +++ b/packages/message-box/src/main.vue @@ -232,10 +232,10 @@ removeClass(this.getInputElement(), 'invalid'); return true; }, - getFistFocus() { - const $btns = this.$el.querySelector('.el-message-box__btns .el-button'); - const $title = this.$el.querySelector('.el-message-box__btns .el-message-box__title'); - return $btns && $btns[0] || $title; + getFirstFocus() { + const btn = this.$el.querySelector('.el-message-box__btns .el-button'); + const title = this.$el.querySelector('.el-message-box__btns .el-message-box__title'); + return btn || title; }, getInputElement() { const inputRefs = this.$refs.input.$refs; @@ -264,7 +264,7 @@ }); } this.focusAfterClosed = document.activeElement; - messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFistFocus()); + messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFirstFocus()); } // prompt diff --git a/packages/table/src/table-layout.js b/packages/table/src/table-layout.js index 5e98dcf9d..a7a14a1c6 100644 --- a/packages/table/src/table-layout.js +++ b/packages/table/src/table-layout.js @@ -112,6 +112,7 @@ class TableLayout { } updateColumnsWidth() { + if (Vue.prototype.$isServer) return; const fit = this.fit; const bodyWidth = this.table.$el.clientWidth; let bodyMinWidth = 0;