Jelajahi Sumber

更新Echarts
优化表格content格式化方法

Karson 4 tahun lalu
induk
melakukan
98b813aff1

File diff ditekan karena terlalu besar
+ 1 - 1
public/assets/js/echarts.min.js


File diff ditekan karena terlalu besar
+ 3 - 3
public/assets/js/require-backend.min.js


File diff ditekan karena terlalu besar
+ 2 - 2
public/assets/js/require-frontend.min.js


+ 2 - 2
public/assets/js/require-table.js

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