From 3c38e834014596e642993adb6648e9ae1b39a567 Mon Sep 17 00:00:00 2001 From: PPPSCN <35696959@qq.com> Date: Fri, 20 Apr 2018 17:33:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E6=B8=85=E9=99=A4Log?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E3=80=81=E4=BC=98=E5=8C=96Crud=E3=80=81?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8F=92=E5=85=A5admin=5Fid=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/command/Crud.php | 2 +- application/admin/command/Crud/stubs/add.stub | 2 +- application/admin/controller/Ajax.php | 14 ++++++-- .../admin/lang/zh-cn/general/attachment.php | 33 ++++++++++--------- application/admin/library/traits/Backend.php | 3 ++ 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index bcd63f5f..05aa2051 100755 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -763,7 +763,7 @@ class Crud extends Command 'relationMethodList' => '', 'controllerIndex' => '', 'visibleFieldList' => $fields ? "\$row->visible(['" . implode("','", array_filter(explode(',', $fields))) . "']);" : '', - 'appendAttrList' => implode(",\n", $appendAttrList) . ',', + 'appendAttrList' => implode(",\n", $appendAttrList), 'getEnumList' => implode("\n\n", $getEnumArr), 'getAttrList' => implode("\n\n", $getAttrArr), 'setAttrList' => implode("\n\n", $setAttrArr), diff --git a/application/admin/command/Crud/stubs/add.stub b/application/admin/command/Crud/stubs/add.stub index 6d4c3f07..33676516 100644 --- a/application/admin/command/Crud/stubs/add.stub +++ b/application/admin/command/Crud/stubs/add.stub @@ -1,6 +1,6 @@
{%addList%} -
+
diff --git a/application/admin/controller/Ajax.php b/application/admin/controller/Ajax.php index 61455060..24806a2e 100644 --- a/application/admin/controller/Ajax.php +++ b/application/admin/controller/Ajax.php @@ -215,16 +215,24 @@ class Ajax extends Backend case 'content' || 'all': rmdirs(CACHE_PATH, false); Cache::clear(); - if ($type == 'content') + if ($type == 'content') { break; + } case 'template' || 'all': rmdirs(TEMP_PATH, false); - if ($type == 'template') + if ($type == 'template') { break; + } + case 'log' || 'all': + rmdirs(LOG_PATH, false); + if ($type == 'log') { + break; + } case 'addons' || 'all': Service::refresh(); - if ($type == 'addons') + if ($type == 'addons') { break; + } } \think\Hook::listen("wipecache_after"); diff --git a/application/admin/lang/zh-cn/general/attachment.php b/application/admin/lang/zh-cn/general/attachment.php index 3d0899fc..962c7e29 100644 --- a/application/admin/lang/zh-cn/general/attachment.php +++ b/application/admin/lang/zh-cn/general/attachment.php @@ -1,19 +1,22 @@ '物理路径', - 'Imagewidth' => '宽度', - 'Imageheight' => '宽度', - 'Imagetype' => '图片类型', - 'Imageframes' => '图片帧数', - 'Preview' => '预览', - 'Filesize' => '文件大小', - 'Mimetype' => 'Mime类型', - 'Extparam' => '透传数据', - 'Createtime' => '创建日期', - 'Uploadtime' => '上传时间', - 'Storage' => '存储引擎', - 'Upload to third' => '上传到第三方', - 'Upload to local' => '上传到本地', - 'Upload from editor' => '从编辑器上传' + 'Url' => '物理路径', + 'Imagewidth' => '宽度', + 'Imageheight' => '宽度', + 'Imagetype' => '图片类型', + 'Imageframes' => '图片帧数', + 'Preview' => '预览', + 'Filesize' => '文件大小', + 'Mimetype' => 'Mime类型', + 'Extparam' => '透传数据', + 'Createtime' => '创建日期', + 'Uploadtime' => '上传时间', + 'Storage' => '存储引擎', + 'Upload to third' => '上传到第三方', + 'Upload to local' => '上传到本地', + 'Upload from editor' => '从编辑器上传', + 'No file upload or server upload limit exceeded' => '未上传文件或超出服务器上传限制', + 'Uploaded file format is limited' => '上传文件格式受限制', + 'Upload successful' => '上传成功', ]; diff --git a/application/admin/library/traits/Backend.php b/application/admin/library/traits/Backend.php index 8ba837cc..45c04b20 100755 --- a/application/admin/library/traits/Backend.php +++ b/application/admin/library/traits/Backend.php @@ -2,6 +2,7 @@ namespace app\admin\library\traits; +use app\admin\library\Auth; use PhpOffice\PhpSpreadsheet\Cell\Coordinate; use PhpOffice\PhpSpreadsheet\Reader\Xlsx; use PhpOffice\PhpSpreadsheet\Reader\Xls; @@ -84,6 +85,8 @@ trait Backend $params = $this->request->post("row/a"); if ($params) { + $auth = Auth::instance(); + $params['admin_id'] = $auth->isLogin() ? $auth->id : 0; if ($this->dataLimit && $this->dataLimitFieldAutoFill) { $params[$this->dataLimitField] = $this->auth->id;