diff --git a/public/assets/css/backend.css b/public/assets/css/backend.css index 3152184a70c7dafc410aa31aa5284e0a2fe43aea..398f40db26fe79a1e49e17286990e646d5adf940 100644 --- a/public/assets/css/backend.css +++ b/public/assets/css/backend.css @@ -560,14 +560,14 @@ form.form-horizontal .control-label { float: left; background: none; margin-left: 0; - width: 80px; + /*width: 80px;*/ clear: none; } #treeview .jstree-leaf { float: left; margin-left: 0; padding-left: 24px; - width: 80px; + /*width: 80px;*/ clear: none; color: #777; } diff --git a/public/assets/js/backend/general/attachment.js b/public/assets/js/backend/general/attachment.js index 7118da62a42e541225d3675dd3cb5c20eb4a8ee2..a4c0b6cc3b0695a738f737e8204bb08e42c5b8dc 100644 --- a/public/assets/js/backend/general/attachment.js +++ b/public/assets/js/backend/general/attachment.js @@ -30,7 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin {field: 'imageheight', title: __('Imageheight'), sortable: true}, {field: 'imagetype', title: __('Imagetype'), formatter:Table.api.formatter.search}, {field: 'storage', title: __('Storage'), formatter: Table.api.formatter.search}, - {field: 'filesize', title: __('Filesize'), operate: 'BETWEEN', sortable: true}, + {field: 'filesize', title: __('Filesize'), operate: 'BETWEEN', sortable: true, formatter: Table.api.formatter.filesize}, {field: 'mimetype', title: __('Mimetype'), formatter:Table.api.formatter.search}, { field: 'createtime', diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index 55042656ccd868a58e051b70ae0ba72248366ad2..74a8cac989087f4ac5a8d5a997d7d8737a8232d5 100644 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -458,6 +458,19 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table } else { return value ? Moment(parseInt(value) * 1000).format(datetimeFormat) : __('None'); } + }, + filesize: function (value, row, index) { + if(value == null || value == ''){ + return "0 Bytes"; + } + var unitArr = new Array("Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"); + var i = 0; + var srcsize = parseFloat(value); + i = Math.floor(Math.log(srcsize) / Math.log(1024)); + var size = srcsize / Math.pow(1024,i); + //保留的小数位数 + size = size.toFixed(2); + return size + unitArr[i]; }, operate: function (value, row, index) { var table = this.table;