一键清除Log日志、优化Crud、自动插入admin_id字段

pull/71/head
PPPSCN 2018-04-20 17:33:39 +08:00
parent 1731cdd4bf
commit 3c38e83401
5 changed files with 34 additions and 20 deletions

View File

@ -763,7 +763,7 @@ class Crud extends Command
'relationMethodList' => '', 'relationMethodList' => '',
'controllerIndex' => '', 'controllerIndex' => '',
'visibleFieldList' => $fields ? "\$row->visible(['" . implode("','", array_filter(explode(',', $fields))) . "']);" : '', 'visibleFieldList' => $fields ? "\$row->visible(['" . implode("','", array_filter(explode(',', $fields))) . "']);" : '',
'appendAttrList' => implode(",\n", $appendAttrList) . ',', 'appendAttrList' => implode(",\n", $appendAttrList),
'getEnumList' => implode("\n\n", $getEnumArr), 'getEnumList' => implode("\n\n", $getEnumArr),
'getAttrList' => implode("\n\n", $getAttrArr), 'getAttrList' => implode("\n\n", $getAttrArr),
'setAttrList' => implode("\n\n", $setAttrArr), 'setAttrList' => implode("\n\n", $setAttrArr),

View File

@ -1,6 +1,6 @@
<form id="add-form" role="form" data-toggle="validator" method="POST" action=""> <form id="add-form" role="form" data-toggle="validator" method="POST" action="">
{%addList%} {%addList%}
<div class="form-group layer-footer text-center"> <div class="form-group layer-footer">
<div class="pp_container text-center"> <div class="pp_container text-center">
<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button> <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button> <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>

View File

@ -215,17 +215,25 @@ class Ajax extends Backend
case 'content' || 'all': case 'content' || 'all':
rmdirs(CACHE_PATH, false); rmdirs(CACHE_PATH, false);
Cache::clear(); Cache::clear();
if ($type == 'content') if ($type == 'content') {
break; break;
}
case 'template' || 'all': case 'template' || 'all':
rmdirs(TEMP_PATH, false); rmdirs(TEMP_PATH, false);
if ($type == 'template') if ($type == 'template') {
break; break;
}
case 'log' || 'all':
rmdirs(LOG_PATH, false);
if ($type == 'log') {
break;
}
case 'addons' || 'all': case 'addons' || 'all':
Service::refresh(); Service::refresh();
if ($type == 'addons') if ($type == 'addons') {
break; break;
} }
}
\think\Hook::listen("wipecache_after"); \think\Hook::listen("wipecache_after");
$this->success(); $this->success();

View File

@ -15,5 +15,8 @@ return [
'Storage' => '存储引擎', 'Storage' => '存储引擎',
'Upload to third' => '上传到第三方', 'Upload to third' => '上传到第三方',
'Upload to local' => '上传到本地', 'Upload to local' => '上传到本地',
'Upload from editor' => '从编辑器上传' 'Upload from editor' => '从编辑器上传',
'No file upload or server upload limit exceeded' => '未上传文件或超出服务器上传限制',
'Uploaded file format is limited' => '上传文件格式受限制',
'Upload successful' => '上传成功',
]; ];

View File

@ -2,6 +2,7 @@
namespace app\admin\library\traits; namespace app\admin\library\traits;
use app\admin\library\Auth;
use PhpOffice\PhpSpreadsheet\Cell\Coordinate; use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
use PhpOffice\PhpSpreadsheet\Reader\Xlsx; use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
use PhpOffice\PhpSpreadsheet\Reader\Xls; use PhpOffice\PhpSpreadsheet\Reader\Xls;
@ -84,6 +85,8 @@ trait Backend
$params = $this->request->post("row/a"); $params = $this->request->post("row/a");
if ($params) if ($params)
{ {
$auth = Auth::instance();
$params['admin_id'] = $auth->isLogin() ? $auth->id : 0;
if ($this->dataLimit && $this->dataLimitFieldAutoFill) if ($this->dataLimit && $this->dataLimitFieldAutoFill)
{ {
$params[$this->dataLimitField] = $this->auth->id; $params[$this->dataLimitField] = $this->auth->id;