molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复文档模型栏目无法选择的bug，记录用户操作行为

Browse Source
This commit is contained in:
tensent
2020-04-27 18:57:43 +08:00
parent 484f2f0e13
commit 2482e6f304
3 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/http/middleware/Admin.php
View File

@@ -8,6 +8,7 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\http\middleware; namespace app\http\middleware;
use app\model\MemberLog;
use think\facade\Session; use think\facade\Session;
/** /**
@@ -17,14 +18,15 @@ class Admin {
public function handle($request, \Closure $next) { public function handle($request, \Closure $next) {
$request->rootUid = env('rootuid'); $request->rootUid = env('rootuid');
$request->user = Session::get('userInfo'); $request->user = Session::get('adminInfo');
$request->url = str_replace(".", "/", strtolower($request->controller())) . '/' . $request->action(); $request->url = str_replace(".", "/", strtolower($request->controller())) . '/' . $request->action();
$request->pageConfig = array( $request->pageConfig = array(
'list_rows' => $request->param('limit', 20), 'list_rows' => $request->param('limit', 20),
'page' => $request->param('page', 1), 'page' => $request->param('page', 1),
'query' => $request->param() 'query' => $request->param(),
); );
MemberLog::record($request);
$response = $next($request); $response = $next($request);
return $response; return $response;

66
app/model/Attribute.php
View File

@@ -8,10 +8,10 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\model; namespace app\model;
use app\model\Model as Models;
use sent\tree\Tree;
use think\facade\Config; use think\facade\Config;
use think\facade\Db; use think\facade\Db;
use sent\tree\Tree;
use app\model\Model as Models;
/** /**
* 设置模型 * 设置模型
@@ -25,7 +25,7 @@ class Attribute extends \think\Model {
/** /**
* @title 新增后事件 * @title 新增后事件
*/ */
protected static function onAfterInsert($data){ protected static function onAfterInsert($data) {
$data = $data->toArray(); $data = $data->toArray();
if ($data['model_id']) { if ($data['model_id']) {
$db = new \com\Datatable(); $db = new \com\Datatable();
@@ -38,7 +38,7 @@ class Attribute extends \think\Model {
/** /**
* @title 更新后事件 * @title 更新后事件
*/ */
protected static function onAfterUpdate($data){ protected static function onAfterUpdate($data) {
$data = $data->toArray(); $data = $data->toArray();
if (isset($data['model_id']) && isset($data['name'])) { if (isset($data['model_id']) && isset($data['name'])) {
$tablename = Models::where('id', $data['model_id'])->value('name'); $tablename = Models::where('id', $data['model_id'])->value('name');
@@ -50,7 +50,7 @@ class Attribute extends \think\Model {
$data['after'] = self::where('name', '<>', $data['name'])->where('model_id', $data['model_id'])->order('sort asc, id asc')->value('name'); $data['after'] = self::where('name', '<>', $data['name'])->where('model_id', $data['model_id'])->order('sort asc, id asc')->value('name');
$result = $db->columField(strtolower($tablename), $data)->query(); $result = $db->columField(strtolower($tablename), $data)->query();
return $result; return $result;
}else{ } else {
return false; return false;
} }
} }
@@ -58,7 +58,7 @@ class Attribute extends \think\Model {
/** /**
* @title 删除后事件 * @title 删除后事件
*/ */
protected static function onAfterDelete($data){ protected static function onAfterDelete($data) {
$data = $data->toArray(); $data = $data->toArray();
if ($data['model_id']) { if ($data['model_id']) {
$tablename = Models::where('id', $data['model_id'])->value('name'); $tablename = Models::where('id', $data['model_id'])->value('name');
@@ -67,11 +67,11 @@ class Attribute extends \think\Model {
$db = new \com\Datatable(); $db = new \com\Datatable();
if (!$db->CheckField($tablename, $data['name'])) { if (!$db->CheckField($tablename, $data['name'])) {
$result = true; $result = true;
}else{ } else {
$result = $db->delField($tablename, $data['name'])->query(); $result = $db->delField($tablename, $data['name'])->query();
} }
return $result; return $result;
}else{ } else {
return false; return false;
} }
} }
@@ -85,7 +85,7 @@ class Attribute extends \think\Model {
return isset($type[$data['type']]) ? $type[$data['type']] : ''; return isset($type[$data['type']]) ? $type[$data['type']] : '';
} }
protected function getOptionAttr($value, $data){ protected function getOptionAttr($value, $data) {
$list = []; $list = [];
if ($data == '') { if ($data == '') {
return $list; return $list;
@@ -96,13 +96,13 @@ class Attribute extends \think\Model {
if (strrpos($val, ":")) { if (strrpos($val, ":")) {
list($key, $label) = explode(":", $val); list($key, $label) = explode(":", $val);
$list[] = ['key' => $key, 'label' => $label]; $list[] = ['key' => $key, 'label' => $label];
}else{ } else {
$list[] = ['key' => $k, 'label' => $val]; $list[] = ['key' => $k, 'label' => $val];
} }
} }
}elseif($data['type'] == 'bool'){ } elseif ($data['type'] == 'bool') {
$list = [['key'=>0,'label'=>'禁用'],['key'=>1,'label'=>'启用']]; $list = [['key' => 0, 'label' => '禁用'], ['key' => 1, 'label' => '启用']];
}elseif($data['type'] == 'bind'){ } elseif ($data['type'] == 'bind') {
$map = []; $map = [];
$db = new \com\Datatable(); $db = new \com\Datatable();
if (strrpos($data['extra'], ":")) { if (strrpos($data['extra'], ":")) {
@@ -110,34 +110,34 @@ class Attribute extends \think\Model {
if ($db->CheckField($extra[0], 'model_id')) { if ($db->CheckField($extra[0], 'model_id')) {
$map[] = ['model_id', '=', $data['model_id']]; $map[] = ['model_id', '=', $data['model_id']];
} }
$row = Db::name($extra[0])->where($map)->select()->toArray(); $row = Db::name($extra[0])->where($map)->select()->toArray();
if(empty($row)){ if (empty($row)) {
return []; return [];
} }
if ($extra[1] == 'tree') { if ($extra[1] == 'tree') {
$row = (new Tree())->toFormatTree($row); $row = (new Tree())->toFormatTree($row);
foreach ($row as $val) { foreach ($row as $val) {
$list[] = ['key'=>$val['id'], 'label'=>$val['title_show']]; $list[] = ['key' => $val['id'], 'label' => $val['title_show']];
} }
}else{ } else {
foreach ($row as $val) { foreach ($row as $val) {
$list[] = ['key'=>$val['id'], 'label'=>$val['title']]; $list[] = ['key' => $val['id'], 'label' => $val['title']];
} }
} }
}else{ } else {
if ($db->CheckField($data['extra'], 'model_id')) { if ($db->CheckField($data['extra'], 'model_id')) {
$map[] = ['model_id', '=', $data['model_id']]; $map[] = ['model_id', '=', $data['model_id']];
} }
$row = Db::name($data['extra'])->select($map)->toArray(); $row = Db::name($data['extra'])->where($map)->select()->toArray();
foreach ($row as $val) { foreach ($row as $val) {
$list[] = ['key'=>$val['id'], 'label'=>$val['title']]; $list[] = ['key' => $val['id'], 'label' => $val['title']];
} }
} }
} }
return $list; return $list;
} }
public static function getField($model, $ac = "add"){ public static function getField($model, $ac = "add") {
$list = []; $list = [];
$group = $model['attr_group']; $group = $model['attr_group'];
@@ -145,7 +145,7 @@ class Attribute extends \think\Model {
$map[] = ['model_id', '=', $model['id']]; $map[] = ['model_id', '=', $model['id']];
if ($ac == 'add') { if ($ac == 'add') {
$map[] = ['is_show', 'IN', [1, 2]]; $map[] = ['is_show', 'IN', [1, 2]];
}else if ($ac == 'edit') { } else if ($ac == 'edit') {
$map[] = ['is_show', 'IN', [1, 3]]; $map[] = ['is_show', 'IN', [1, 3]];
} }
@@ -156,7 +156,7 @@ class Attribute extends \think\Model {
foreach ($row as $key => $value) { foreach ($row as $key => $value) {
if (isset($group[$value['group_id']])) { if (isset($group[$value['group_id']])) {
$list[$group[$value['group_id']]['label']][] = $value; $list[$group[$value['group_id']]['label']][] = $value;
}else{ } else {
$list[$value['group_id']][] = $value; $list[$value['group_id']][] = $value;
} }
} }
@@ -164,26 +164,26 @@ class Attribute extends \think\Model {
return $list; return $list;
} }
public static function getfieldList(){ public static function getfieldList() {
$config = \think\facade\Cache::get('system_config_data'); $config = \think\facade\Cache::get('system_config_data');
$time = [['key'=>1, 'label'=>'新增'],['key'=>2, 'label'=>'编辑'],['key'=>3, 'label'=>'始终']]; $time = [['key' => 1, 'label' => '新增'], ['key' => 2, 'label' => '编辑'], ['key' => 3, 'label' => '始终']];
$auto_type = [['key'=>'function', 'label'=>'函数'],['key'=>'field', 'label'=>'字段'],['key'=>'string', 'label'=>'字符串']]; $auto_type = [['key' => 'function', 'label' => '函数'], ['key' => 'field', 'label' => '字段'], ['key' => 'string', 'label' => '字符串']];
$validate_type = [['key'=>'thinkphp', 'label'=>'thinkphp内置'],['key'=>'regex', 'label'=>'正则验证']]; $validate_type = [['key' => 'thinkphp', 'label' => 'thinkphp内置'], ['key' => 'regex', 'label' => '正则验证']];
return [ return [
'基础' => [ '基础' => [
['name' => 'id', 'title' => 'id', 'help' => '', 'type' => 'hidden'], ['name' => 'id', 'title' => 'id', 'help' => '', 'type' => 'hidden'],
['name' => 'model_id', 'title' => 'model_id', 'help' => '', 'type' => 'hidden'], ['name' => 'model_id', 'title' => 'model_id', 'help' => '', 'type' => 'hidden'],
['name' => 'name', 'title' => '字段名', 'help' => '英文字母开头，长度不超过30', 'is_must'=> true, 'type' => 'text'], ['name' => 'name', 'title' => '字段名', 'help' => '英文字母开头，长度不超过30', 'is_must' => true, 'type' => 'text'],
['name' => 'title', 'title' => '字段标题', 'help' => '请输入字段标题，用于表单显示', 'is_must'=> true, 'type' => 'text'], ['name' => 'title', 'title' => '字段标题', 'help' => '请输入字段标题，用于表单显示', 'is_must' => true, 'type' => 'text'],
['name' => 'type', 'title' => '字段类型', 'help' => '用于表单中的展示方式', 'type' => 'select', 'option' => $config['config_type_list'], 'help' => ''], ['name' => 'type', 'title' => '字段类型', 'help' => '用于表单中的展示方式', 'type' => 'select', 'option' => $config['config_type_list'], 'help' => ''],
['name' => 'length', 'title' => '字段长度', 'help' => '字段的长度值', 'type' => 'text'], ['name' => 'length', 'title' => '字段长度', 'help' => '字段的长度值', 'type' => 'text'],
['name' => 'extra', 'title' => '参数', 'help' => '布尔、枚举、多选字段类型的定义数据', 'type' => 'textarea'], ['name' => 'extra', 'title' => '参数', 'help' => '布尔、枚举、多选字段类型的定义数据', 'type' => 'textarea'],
['name' => 'value', 'title' => '默认值', 'help' => '字段的默认值', 'type' => 'text'], ['name' => 'value', 'title' => '默认值', 'help' => '字段的默认值', 'type' => 'text'],
['name' => 'remark', 'title' => '字段备注', 'help' => '用于表单中的提示', 'type' => 'text'], ['name' => 'remark', 'title' => '字段备注', 'help' => '用于表单中的提示', 'type' => 'text'],
['name' => 'is_show', 'title' => '是否显示', 'help' => '是否显示在表单中', 'type' => 'select', 'option' => [ ['name' => 'is_show', 'title' => '是否显示', 'help' => '是否显示在表单中', 'type' => 'select', 'option' => [
['key'=>'1', 'label' => '始终显示'], ['key'=>'2', 'label' => '新增显示'], ['key'=>'3', 'label' => '编辑显示'], ['key'=>'0', 'label' => '不显示'] ['key' => '1', 'label' => '始终显示'], ['key' => '2', 'label' => '新增显示'], ['key' => '3', 'label' => '编辑显示'], ['key' => '0', 'label' => '不显示'],
], 'value' => 1], ], 'value' => 1],
['name' => 'is_must', 'title' => '是否必填', 'help' => '用于自动验证', 'type' => 'select', 'option' => [['key'=>'0', 'label' => '否'], ['key'=>'1', 'label' => '是']]], ['name' => 'is_must', 'title' => '是否必填', 'help' => '用于自动验证', 'type' => 'select', 'option' => [['key' => '0', 'label' => '否'], ['key' => '1', 'label' => '是']]],
], ],
'高级' => [ '高级' => [
// ['name' => 'validate_type', 'title' => '验证方式', 'type' => 'select', 'option' => $validate_type, 'help' => ''], // ['name' => 'validate_type', 'title' => '验证方式', 'type' => 'select', 'option' => $validate_type, 'help' => ''],

44
app/model/MemberLog.php
View File

@@ -18,18 +18,19 @@ use xin\helper\Server;
class MemberLog extends Model { class MemberLog extends Model {
protected $type = [ protected $type = [
'param' => 'json', 'param' => 'json',
'visite_time' => 'timestamp', 'visite_time' => 'timestamp',
]; ];
public static function record($request) { public static function record($request) {
$data = [ $data = [
'uid' => $request->user['uid'], 'uid' => $request->user['uid'],
'url' => $request->baseUrl(), 'title' => self::getCurrentTitle($request),
'param' => $request->param(), 'url' => $request->baseUrl(),
'method' => $request->method(), 'param' => $request->param(),
'method' => $request->method(),
'visite_time' => $request->time(), 'visite_time' => $request->time(),
'client_ip' => Server::getRemoteIp(), 'client_ip' => Server::getRemoteIp(),
'create_time' => time(), 'create_time' => time(),
]; ];
self::create($data); self::create($data);
@@ -37,7 +38,7 @@ class MemberLog extends Model {
public function getMemberLogList($request) { public function getMemberLogList($request) {
$param = $request->param(); $param = $request->param();
$map = []; $map = [];
$order = "id desc"; $order = "id desc";
return self::with(['user'])->where($map)->order($order)->paginate($request->pageConfig); return self::with(['user'])->where($map)->order($order)->paginate($request->pageConfig);
@@ -46,4 +47,33 @@ class MemberLog extends Model {
public function user() { public function user() {
return $this->hasOne('Member', 'uid', 'uid')->field('uid,nickname,username'); return $this->hasOne('Member', 'uid', 'uid')->field('uid,nickname,username');
} }
protected static function getCurrentTitle($request) {
$mate = '';
$controller = strtr(strtolower($request->controller()), '.', '\\');
$action = $request->action();
$class = "\\app\\controller\\" . $controller;
if (class_exists($class)) {
$reflection = new \ReflectionClass($class);
$group_doc = self::Parser($reflection->getDocComment());
if (isset($group_doc['title'])) {
$mate = $group_doc['title'];
}
$method = $reflection->getMethods(\ReflectionMethod::IS_FINAL | \ReflectionMethod::IS_PUBLIC);
foreach ($method as $key => $v) {
if ($action == $v->name) {
$title_doc = self::Parser($v->getDocComment());
if (isset($title_doc['title'])) {
$mate = $title_doc['title'];
}
}
}
}
return $mate;
}
protected static function Parser($text) {
$doc = new \doc\Doc();
return $doc->parse($text);
}
} }