From 8c3e787a289d8848cc0cca60f5d60c9d6e908313 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 27 Jun 2022 15:06:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/File.php  |  2 +-
 app/admin/view/file/index.html | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/admin/controller/File.php b/app/admin/controller/File.php
index 326af5fc1..bd8a939c6 100644
--- a/app/admin/controller/File.php
+++ b/app/admin/controller/File.php
@@ -52,8 +52,8 @@ class File extends Controller
         SystemFile::mQuery()->layTable(function () {
             $this->title = '系统文件管理';
         }, function (QueryHelper $query) {
-            $query->where(['issafe' => 0, 'status' => 2]);
             $query->like('name,hash,xext')->dateBetween('create_at');
+            $query->where(['issafe' => 0, 'status' => 2])->equal('type');
         });
     }
 
diff --git a/app/admin/view/file/index.html b/app/admin/view/file/index.html
index 1aafc67be..e4ef76ef4 100644
--- a/app/admin/view/file/index.html
+++ b/app/admin/view/file/index.html
@@ -20,24 +20,21 @@
             cols: [[
                 {checkbox: true, fixed: true},
                 {field: 'id', title: 'ID', width: 80, align: 'center', sort: true},
+                {field: 'name', title: '名 称', width: '15%', align: 'center'},
+                {field: 'hash', title: '哈 希', width: '15%', align: 'center', templet: '<div><code>{{d.hash}}</code></div>'},
                 {
-                    field: 'name', title: '文件名称', minWidth: 200, align: 'center', templet: function (d) {
-                        return d.name + '<a class="pull-right font-s10" target="_blank" href="' + d.xurl + '">查看</a>'
-                    }
-                },
-                {field: 'hash', title: '文件哈希', minWidth: 200, align: 'center', templet: '<div><code>{{d.hash}}</code></div>'},
-                {
-                    field: 'size', title: '文件大小', align: 'center', minWidth: 100, sort: true, templet: function (d) {
+                    field: 'size', title: '大 小', align: 'center', width: '8%', sort: true, templet: function (d) {
                         return formatSize(d.size)
                     }
                 },
-                {field: 'xext', title: '文件后缀', align: 'center', minWidth: 100, sort: true},
+                {field: 'xext', title: '后 缀', align: 'center', width: '8%', sort: true},
+                {field: 'xurl', title: '链 接', width: '5%', align: 'center', templet: '<div><a target="_blank" href="{{d.xurl}}">查看</a></div>'},
                 {
-                    field: 'isfast', title: '上传方式', align: 'center', minWidth: 100, templet: function (d) {
+                    field: 'isfast', title: '上传方式', align: 'center', width: '8%', templet: function (d) {
                         return d.isfast ? '<b class="color-green">秒传</b>' : '<b class="color-blue">普通</b>';
                     }
                 },
-                {field: 'ctype', title: '存储方式', align: 'center', minWidth: 80},
+                {field: 'ctype', title: '存储方式', align: 'center', width: '10%'},
                 {field: 'create_at', title: '上传时间', align: 'center', minWidth: 170, sort: true},
                 {toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 80, fixed: 'right'}
             ]]