修改文件管理

app/admin/route/demo.php

@@ -14,48 +14,46 @@
 // | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
 // +----------------------------------------------------------------------
 
+use think\admin\Library;
 use think\admin\service\SystemService;
-use think\App;
 
-invoke(function (App $app) {
+/*! 非开发环境，清理限制文件 */
-    /*! 非开发环境，清理限制文件 */
+if (Library::$sapp->request->isGet() && !SystemService::checkRunMode()) {
-    if ($app->request->isGet() && !SystemService::checkRunMode()) {
+    @unlink(Library::$sapp->getBasePath() . 'admin/controller/api/Update.php');
-        @unlink("{$app->getBasePath()}admin/controller/api/Update.php");
+    @unlink(Library::$sapp->getBasePath() . 'admin/route/demo.php');
-        @unlink("{$app->getBasePath()}admin/route/demo.php");
+    @rmdir(Library::$sapp->getBasePath() . 'admin/route');
-        @rmdir("{$app->getBasePath()}admin/route");
+}
-        return;
+
-    }
+/*! 演示环境禁止操作路由绑定 */
-    /*! 演示环境禁止操作路由绑定 */
+if (SystemService::checkRunMode('demo')) {
-    if (SystemService::checkRunMode('demo')) {
+    Library::$sapp->route->post('index/pass', function () {
-        $app->route->post('index/pass', function () {
+        return json(['code' => 0, 'info' => '演示环境禁止修改用户密码！']);
-            return json(['code' => 0, 'info' => '演示环境禁止修改用户密码！']);
+    });
-        });
+    Library::$sapp->route->post('config/system', function () {
-        $app->route->post('config/system', function () {
+        return json(['code' => 0, 'info' => '演示环境禁止修改系统配置！']);
-            return json(['code' => 0, 'info' => '演示环境禁止修改系统配置！']);
+    });
-        });
+    Library::$sapp->route->post('config/storage', function () {
-        $app->route->post('config/storage', function () {
+        return json(['code' => 0, 'info' => '演示环境禁止修改系统配置！']);
-            return json(['code' => 0, 'info' => '演示环境禁止修改系统配置！']);
+    });
-        });
+    Library::$sapp->route->post('menu', function () {
-        $app->route->post('menu', function () {
+        return json(['code' => 0, 'info' => '演示环境禁止给菜单排序！']);
-            return json(['code' => 0, 'info' => '演示环境禁止给菜单排序！']);
+    });
-        });
+    Library::$sapp->route->post('menu/index', function () {
-        $app->route->post('menu/index', function () {
+        return json(['code' => 0, 'info' => '演示环境禁止给菜单排序！']);
-            return json(['code' => 0, 'info' => '演示环境禁止给菜单排序！']);
+    });
-        });
+    Library::$sapp->route->post('menu/add', function () {
-        $app->route->post('menu/add', function () {
+        return json(['code' => 0, 'info' => '演示环境禁止添加菜单！']);
-            return json(['code' => 0, 'info' => '演示环境禁止添加菜单！']);
+    });
-        });
+    Library::$sapp->route->post('menu/edit', function () {
-        $app->route->post('menu/edit', function () {
+        return json(['code' => 0, 'info' => '演示环境禁止编辑菜单！']);
-            return json(['code' => 0, 'info' => '演示环境禁止编辑菜单！']);
+    });
-        });
+    Library::$sapp->route->post('menu/state', function () {
-        $app->route->post('menu/state', function () {
+        return json(['code' => 0, 'info' => '演示环境禁止禁用菜单！']);
-            return json(['code' => 0, 'info' => '演示环境禁止禁用菜单！']);
+    });
-        });
+    Library::$sapp->route->post('menu/remove', function () {
-        $app->route->post('menu/remove', function () {
+        return json(['code' => 0, 'info' => '演示环境禁止删除菜单！']);
-            return json(['code' => 0, 'info' => '演示环境禁止删除菜单！']);
+    });
-        });
+    Library::$sapp->route->post('user/pass', function () {
-        $app->route->post('user/pass', function () {
+        return json(['code' => 0, 'info' => '演示环境禁止修改用户密码！']);
-            return json(['code' => 0, 'info' => '演示环境禁止修改用户密码！']);
+    });
-        });
+}
-    }
-});

app/admin/view/api/upload/image.html

@@ -12,6 +12,7 @@
         <div class="image-dialog-item" v-for="x in list" @click="setItem(x)" style="display:none" v-show="show" :class="{'image-dialog-checked':x.checked}">
             <div class="uploadimage" :style="x.style"></div>
             <p class="image-dialog-item-name layui-elip" v-text="x.name"></p>
+            <span class="image-dialog-item-size">{{formatSize(x.size)}}</span>
         </div>
     </div>
     <div class="image-dialog-foot">
@@ -49,6 +50,10 @@
                         app.setValue(file.xurl);
                     }), this.setInput();
                 },
+                // 格式文件大小
+                formatSize: function (size) {
+                    return $.formatFileSize(size);
+                },
                 // 设置单项数据
                 setItem: function (item) {
                     if (!this.mult) {

app/admin/view/file/index.html

@@ -23,7 +23,7 @@
                 {field: 'hash', title: '文件哈希', width: '15%', align: 'center', templet: '<div><code>{{d.hash}}</code></div>'},
                 {
                     field: 'size', title: '文件大小', align: 'center', width: '8%', sort: true, templet: function (d) {
-                        return formatSize(d.size)
+                        return $.formatFileSize(d.size)
                     }
                 },
                 {field: 'xext', title: '文件后缀', align: 'center', width: '8%', sort: true},
@@ -47,13 +47,6 @@
             ]]
         });
     });
-
-    function formatSize(size, fixed, units) {
-        var unit;
-        units = units || ['B', 'K', 'M', 'G', 'TB'];
-        while ((unit = units.shift()) && size > 1024) size = size / 1024;
-        return (unit === 'B' ? size : size.toFixed(fixed === undefined ? 2 : fixed)) + unit;
-    }
 </script>
 
 <script type="text/html" id="toolbar">

public/static/admin.js

@@ -785,6 +785,14 @@ $(function () {
         };
     };
 
+    /*！格式化文件大小 */
+    $.formatFileSize = function (size, fixed, units) {
+        var unit;
+        units = units || ['B', 'K', 'M', 'G', 'TB'];
+        while ((unit = units.shift()) && size > 1024) size = size / 1024;
+        return (unit === 'B' ? size : size.toFixed(fixed === undefined ? 2 : fixed)) + unit;
+    }
+
     /*! 弹出图片层 */
     $.previewImage = function (src, area) {
         var img = new Image(), defer = $.Deferred(), loaded = $.msg.loading();

public/static/theme/css/_custom.less

@@ -983,9 +983,22 @@ input:not(.layui-hide,[type=hidden]) {
     border-radius: @BoxBorderRadius;
 
     .uploadimage {
-      margin: 0;
       width: 145px;
       height: 145px;
+      margin: 0;
+    }
+
+    &-size {
+      top: 2px;
+      right: 1px;
+      color: #FFF;
+      padding: 0 6px;
+      position: absolute;
+      font-size: 12px;
+      transform: scale(0.9);
+      background: rgba(0, 0, 0, 0.6);
+      line-height: 20px;
+      border-radius: 20px;
     }
 
     &-name {