diff --git a/app/admin/route/demo.php b/app/admin/route/demo.php index 6d4e300e7..3ccca9e20 100644 --- a/app/admin/route/demo.php +++ b/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 ($app->request->isGet() && !SystemService::checkRunMode()) { - @unlink("{$app->getBasePath()}admin/controller/api/Update.php"); - @unlink("{$app->getBasePath()}admin/route/demo.php"); - @rmdir("{$app->getBasePath()}admin/route"); - return; - } - /*! 演示环境禁止操作路由绑定 */ - if (SystemService::checkRunMode('demo')) { - $app->route->post('index/pass', function () { - return json(['code' => 0, 'info' => '演示环境禁止修改用户密码！']); - }); - $app->route->post('config/system', function () { - return json(['code' => 0, 'info' => '演示环境禁止修改系统配置！']); - }); - $app->route->post('config/storage', function () { - return json(['code' => 0, 'info' => '演示环境禁止修改系统配置！']); - }); - $app->route->post('menu', function () { - return json(['code' => 0, 'info' => '演示环境禁止给菜单排序！']); - }); - $app->route->post('menu/index', function () { - return json(['code' => 0, 'info' => '演示环境禁止给菜单排序！']); - }); - $app->route->post('menu/add', function () { - return json(['code' => 0, 'info' => '演示环境禁止添加菜单！']); - }); - $app->route->post('menu/edit', function () { - return json(['code' => 0, 'info' => '演示环境禁止编辑菜单！']); - }); - $app->route->post('menu/state', function () { - return json(['code' => 0, 'info' => '演示环境禁止禁用菜单！']); - }); - $app->route->post('menu/remove', function () { - return json(['code' => 0, 'info' => '演示环境禁止删除菜单！']); - }); - $app->route->post('user/pass', function () { - return json(['code' => 0, 'info' => '演示环境禁止修改用户密码！']); - }); - } -}); \ No newline at end of file +/*! 非开发环境，清理限制文件 */ +if (Library::$sapp->request->isGet() && !SystemService::checkRunMode()) { + @unlink(Library::$sapp->getBasePath() . 'admin/controller/api/Update.php'); + @unlink(Library::$sapp->getBasePath() . 'admin/route/demo.php'); + @rmdir(Library::$sapp->getBasePath() . 'admin/route'); +} + +/*! 演示环境禁止操作路由绑定 */ +if (SystemService::checkRunMode('demo')) { + Library::$sapp->route->post('index/pass', function () { + return json(['code' => 0, 'info' => '演示环境禁止修改用户密码！']); + }); + Library::$sapp->route->post('config/system', function () { + return json(['code' => 0, 'info' => '演示环境禁止修改系统配置！']); + }); + Library::$sapp->route->post('config/storage', function () { + return json(['code' => 0, 'info' => '演示环境禁止修改系统配置！']); + }); + Library::$sapp->route->post('menu', function () { + return json(['code' => 0, 'info' => '演示环境禁止给菜单排序！']); + }); + Library::$sapp->route->post('menu/index', function () { + return json(['code' => 0, 'info' => '演示环境禁止给菜单排序！']); + }); + Library::$sapp->route->post('menu/add', function () { + return json(['code' => 0, 'info' => '演示环境禁止添加菜单！']); + }); + Library::$sapp->route->post('menu/edit', function () { + return json(['code' => 0, 'info' => '演示环境禁止编辑菜单！']); + }); + Library::$sapp->route->post('menu/state', function () { + return json(['code' => 0, 'info' => '演示环境禁止禁用菜单！']); + }); + Library::$sapp->route->post('menu/remove', function () { + return json(['code' => 0, 'info' => '演示环境禁止删除菜单！']); + }); + Library::$sapp->route->post('user/pass', function () { + return json(['code' => 0, 'info' => '演示环境禁止修改用户密码！']); + }); +} \ No newline at end of file diff --git a/app/admin/view/api/upload/image.html b/app/admin/view/api/upload/image.html index e35bf8fff..1d40b6caf 100644 --- a/app/admin/view/api/upload/image.html +++ b/app/admin/view/api/upload/image.html @@ -12,6 +12,7 @@
@@ -49,6 +50,10 @@ app.setValue(file.xurl); }), this.setInput(); }, + // 格式文件大小 + formatSize: function (size) { + return $.formatFileSize(size); + }, // 设置单项数据 setItem: function (item) { if (!this.mult) { diff --git a/app/admin/view/file/index.html b/app/admin/view/file/index.html index 0c0f4b366..3e1584d7f 100644 --- a/app/admin/view/file/index.html +++ b/app/admin/view/file/index.html @@ -23,7 +23,7 @@ {field: 'hash', title: '文件哈希', width: '15%', align: 'center', templet: '
{{d.hash}}
'}, { 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; - }