Merge pull request #140 from Leopoldthecoder/next

cancel inline-style for table <td> white-space
pull/2/head
cinwell.li 2016-09-02 15:47:38 +08:00 committed by GitHub
commit a8f6ae8db9
2 changed files with 7 additions and 5 deletions

View File

@ -2,9 +2,7 @@
export default {
methods: {
open() {
this.$alert('操作失败, 请稍后重试', '提示', {
type: 'error'
});
this.$alert('这是一段内容', '标题名称');
},
open2() {
@ -74,7 +72,7 @@
export default {
methods: {
open() {
this.$alert('操作失败, 请稍后重试', '提示');
this.$alert('这是一段内容', '标题名称');
}
}
}

View File

@ -51,7 +51,7 @@ export default {
{
this._l(this.columns, (column) =>
<td
style={{ 'white-space': column.showTooltipWhenOverflow ? 'nowrap' : 'normal' }}
style={ this.getColumnWhiteSpaceStyle(column) }
class={ column.id }
on-mouseenter={ ($event) => this.handleCellMouseEnter($event, row) }
on-mouseleave={ this.handleCellMouseLeave }>
@ -84,6 +84,10 @@ export default {
},
methods: {
getColumnWhiteSpaceStyle(column) {
return column.showTooltipWhenOverflow ? { 'white-space': 'nowrap' } : {};
},
checkProperty(row) {
if (this.criteria && this.criteria.length > 0) {
for (let i = 0, len = this.criteria.length; i < len; i++) {