作者 Karson

更新Echarts

优化表格content格式化方法
@@ -583,8 +583,8 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table @@ -583,8 +583,8 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
583 return html.join(' '); 583 return html.join(' ');
584 }, 584 },
585 content: function (value, row, index) { 585 content: function (value, row, index) {
586 - var width = this.width != undefined ? this.width : 250;  
587 - return "<div style='white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:" + width + "px;'>" + value + "</div>"; 586 + var width = this.width != undefined ? (this.width.match(/^\d+$/) ? this.width + "px" : this.width) : "250px";
  587 + return "<div style='white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:" + width + ";'>" + value + "</div>";
588 }, 588 },
589 status: function (value, row, index) { 589 status: function (value, row, index) {
590 var custom = {normal: 'success', hidden: 'gray', deleted: 'danger', locked: 'info'}; 590 var custom = {normal: 'success', hidden: 'gray', deleted: 'danger', locked: 'info'};