|
103 | 103 | <div v-if="isCellMergeRender(rowIndex,col.field,item)" |
104 | 104 | :class="['v-table-body-cell',showVerticalBorder ? 'vertical-border':'',showHorizontalBorder?'horizontal-border':'']" |
105 | 105 | :style="{'width':getRowWidthByColSpan(rowIndex,col.field,item)+'px','height': getRowHeightByRowSpan(rowIndex,col.field,item)+'px','line-height':getRowHeightByRowSpan(rowIndex,col.field,item)+'px','text-align':col.columnAlign}" |
106 | | - :title="col.overflowTitle ? overflowTitle(item,col) :''" |
| 106 | + :title="col.overflowTitle ? overflowTitle(item,rowIndex,col) :''" |
107 | 107 | @click.stop="rowCellClick(rowIndex,item,col);cellEditClick($event,col.isEdit,item,col.field,rowIndex)" |
108 | 108 | @dblclick.stop="rowCellDbClick(rowIndex,item,col)" |
109 | 109 | > |
|
119 | 119 | <div v-else |
120 | 120 | :class="['v-table-body-cell',showVerticalBorder ? 'vertical-border':'',showHorizontalBorder?'horizontal-border':'']" |
121 | 121 | :style="{'width':col.width+'px','height': rowHeight+'px','line-height':rowHeight+'px','text-align':col.columnAlign}" |
122 | | - :title="col.overflowTitle ? overflowTitle(item,col) :''" |
| 122 | + :title="col.overflowTitle ? overflowTitle(item,rowIndex,col) :''" |
123 | 123 | @click.stop="rowCellClick(rowIndex,item,col);cellEditClick($event,col.isEdit,item,col.field,rowIndex)" |
124 | 124 | @dblclick.stop="rowCellDbClick(rowIndex,item,col)" |
125 | 125 | > |
|
257 | 257 | <div v-if="isCellMergeRender(rowIndex,col.field,item)" |
258 | 258 | :class="['v-table-body-cell',showVerticalBorder ? 'vertical-border':'',showHorizontalBorder?'horizontal-border':'']" |
259 | 259 | :style="{'width':getRowWidthByColSpan(rowIndex,col.field,item)+'px','height': getRowHeightByRowSpan(rowIndex,col.field,item)+'px','line-height':getRowHeightByRowSpan(rowIndex,col.field,item)+'px','text-align':col.columnAlign}" |
260 | | - :title="col.overflowTitle ? overflowTitle(item,col) :''" |
| 260 | + :title="col.overflowTitle ? overflowTitle(item,rowIndex,col) :''" |
261 | 261 | @click.stop="rowCellClick(rowIndex,item,col);cellEditClick($event,col.isEdit,item,col.field,rowIndex)" |
262 | 262 | @dblclick.stop="rowCellDbClick(rowIndex,item,col)" |
263 | 263 | > |
|
273 | 273 | <div v-else |
274 | 274 | :class="['v-table-body-cell',showVerticalBorder ? 'vertical-border':'',showHorizontalBorder?'horizontal-border':'']" |
275 | 275 | :style="{'width':col.width+'px','height': rowHeight+'px','line-height':rowHeight+'px','text-align':col.columnAlign}" |
276 | | - :title="col.overflowTitle ? overflowTitle(item,col) :''" |
| 276 | + :title="col.overflowTitle ? overflowTitle(item,rowIndex,col) :''" |
277 | 277 | @click.stop="rowCellClick(rowIndex,item,col);cellEditClick($event,col.isEdit,item,col.field,rowIndex)" |
278 | 278 | @dblclick.stop="rowCellDbClick(rowIndex,item,col)" |
279 | 279 | > |
|
679 | 679 | }, |
680 | 680 |
|
681 | 681 | // 超出的title提示 |
682 | | - overflowTitle(row, col){ |
| 682 | + overflowTitle(row, rowIndex,col){ |
| 683 | +
|
683 | 684 | var result = ''; |
684 | 685 | if (typeof col.formatter === 'function') { |
685 | | - var val = col.formatter(row, -1); |
| 686 | + var val = col.formatter(row, rowIndex,this.pagingIndex,col.field); |
686 | 687 | // 如果是html 不处理 |
687 | 688 | if (utils.isHtml(val)) { |
688 | 689 | result = ''; |
|
0 commit comments