github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Table: fix an undefined issue in ssr (#11109)

pull/11111/head
杨奕 2018-05-10 17:03:03 +08:00 committed by GitHub
parent 3d5f9ef080
commit 1ff01a77f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/message-box/src/main.vue
View File

@ -232,10 +232,10 @@
removeClass(this.getInputElement(), 'invalid'); removeClass(this.getInputElement(), 'invalid');
return true; return true;
}, },
getFistFocus() { getFirstFocus() {
const $btns = this.$el.querySelector('.el-message-box__btns .el-button'); const btn = this.$el.querySelector('.el-message-box__btns .el-button');
const $title = this.$el.querySelector('.el-message-box__btns .el-message-box__title'); const title = this.$el.querySelector('.el-message-box__btns .el-message-box__title');
return $btns && $btns[0] || $title; return btn || title;
}, },
getInputElement() { getInputElement() {
const inputRefs = this.$refs.input.$refs; const inputRefs = this.$refs.input.$refs;
@ -264,7 +264,7 @@
}); });
} }
this.focusAfterClosed = document.activeElement; this.focusAfterClosed = document.activeElement;
messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFistFocus()); messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFirstFocus());
} }
// prompt // prompt

1
packages/table/src/table-layout.js
View File

@ -112,6 +112,7 @@ class TableLayout {
} }
updateColumnsWidth() { updateColumnsWidth() {
if (Vue.prototype.$isServer) return;
const fit = this.fit; const fit = this.fit;
const bodyWidth = this.table.$el.clientWidth; const bodyWidth = this.table.$el.clientWidth;
let bodyMinWidth = 0; let bodyMinWidth = 0;