Commit 8de485ad authored by Leopoldthecoder's avatar Leopoldthecoder

cancel inline-style for table <td> white-space

parent 26037506
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
export default { export default {
methods: { methods: {
open() { open() {
this.$alert('操作失败, 请稍后重试', '提示', { this.$alert('这是一段内容', '标题名称');
type: 'error'
});
}, },
open2() { open2() {
...@@ -74,7 +72,7 @@ ...@@ -74,7 +72,7 @@
export default { export default {
methods: { methods: {
open() { open() {
this.$alert('操作失败, 请稍后重试', '提示'); this.$alert('这是一段内容', '标题名称');
} }
} }
} }
......
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
{ {
this._l(this.columns, (column) => this._l(this.columns, (column) =>
<td <td
style={{ 'white-space': column.showTooltipWhenOverflow ? 'nowrap' : 'normal' }} style={ this.getColumnWhiteSpaceStyle(column) }
class={ column.id } class={ column.id }
on-mouseenter={ ($event) => this.handleCellMouseEnter($event, row) } on-mouseenter={ ($event) => this.handleCellMouseEnter($event, row) }
on-mouseleave={ this.handleCellMouseLeave }> on-mouseleave={ this.handleCellMouseLeave }>
...@@ -84,6 +84,10 @@ export default { ...@@ -84,6 +84,10 @@ export default {
}, },
methods: { methods: {
getColumnWhiteSpaceStyle(column) {
return column.showTooltipWhenOverflow ? { 'white-space': 'nowrap' } : {};
},
checkProperty(row) { checkProperty(row) {
if (this.criteria && this.criteria.length > 0) { if (this.criteria && this.criteria.length > 0) {
for (let i = 0, len = this.criteria.length; i < len; i++) { for (let i = 0, len = this.criteria.length; i < len; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment