From cb77b7c9858a9c859f2d60069a83267931d7f0f6 Mon Sep 17 00:00:00 2001
From: "zhangqingtian@pxjy.com" <zhangqingtian@pxjy.com>
Date: Wed, 16 May 2018 11:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9ETable.api.formatter.toggle?=
 =?UTF-8?q?=EF=BC=8C=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=90=8E=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E6=89=93=E5=8C=85=E5=90=8E=E5=8F=B0=E7=9A=84?=
 =?UTF-8?q?JS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/js/backend/general/attachment.js |  2 +-
 public/assets/js/require-table.js              | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/public/assets/js/backend/general/attachment.js b/public/assets/js/backend/general/attachment.js
index 7118da62..a4c0b6cc 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 55042656..74a8cac9 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;