hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

优化代码

pull/462/MERGE
Karson 2024-02-28 11:59:00 +08:00
parent 42e91e10e6
commit 8a0e8b1d3b
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/admin/library/Auth.php
View File

@ -371,8 +371,7 @@ class Auth extends \fast\Auth
$childrenAdminIds = []; $childrenAdminIds = [];
if (!$this->isSuperAdmin()) { if (!$this->isSuperAdmin()) {
$groupIds = $this->getChildrenGroupIds(false); $groupIds = $this->getChildrenGroupIds(false);
$authGroupList = \app\admin\model\AuthGroupAccess:: $authGroupList = \app\admin\model\AuthGroupAccess::field('uid,group_id')
field('uid,group_id')
->where('group_id', 'in', $groupIds) ->where('group_id', 'in', $groupIds)
->select(); ->select();
foreach ($authGroupList as $k => $v) { foreach ($authGroupList as $k => $v) {
@ -418,7 +417,6 @@ class Auth extends \fast\Auth
$titleArr[$pathArr[$rule['name']]] = $rule['title']; $titleArr[$pathArr[$rule['name']]] = $rule['title'];
$menuArr[$pathArr[$rule['name']]] = $rule; $menuArr[$pathArr[$rule['name']]] = $rule;
} }
} }
ksort($menuArr); ksort($menuArr);
$this->breadcrumb = $menuArr; $this->breadcrumb = $menuArr;
@ -444,9 +442,9 @@ class Auth extends \fast\Auth
foreach ($params as $k => $v) { foreach ($params as $k => $v) {
$url = $k; $url = $k;
if (is_array($v)) { if (is_array($v)) {
$nums = isset($v[0]) ? $v[0] : 0; $nums = $v[0] ?? 0;
$color = isset($v[1]) ? $v[1] : $colorArr[(is_numeric($nums) ? $nums : strlen($nums)) % $colorNums]; $color = $v[1] ?? $colorArr[(is_numeric($nums) ? $nums : strlen($nums)) % $colorNums];
$class = isset($v[2]) ? $v[2] : 'label'; $class = $v[2] ?? 'label';
} else { } else {
$nums = $v; $nums = $v;
$color = $colorArr[(is_numeric($nums) ? $nums : strlen($nums)) % $colorNums]; $color = $colorArr[(is_numeric($nums) ? $nums : strlen($nums)) % $colorNums];
@ -485,7 +483,7 @@ class Auth extends \fast\Auth
} }
$v['icon'] = $v['icon'] . ' fa-fw'; $v['icon'] = $v['icon'] . ' fa-fw';
$v['url'] = isset($v['url']) && $v['url'] ? $v['url'] : '/' . $module . '/' . $v['name']; $v['url'] = isset($v['url']) && $v['url'] ? $v['url'] : '/' . $module . '/' . $v['name'];
$v['badge'] = isset($badgeList[$v['name']]) ? $badgeList[$v['name']] : ''; $v['badge'] = $badgeList[$v['name']] ?? '';
$v['title'] = __($v['title']); $v['title'] = __($v['title']);
$v['url'] = preg_match("/^((?:[a-z]+:)?\/\/|data:image\/)(.*)/i", $v['url']) ? $v['url'] : url($v['url']); $v['url'] = preg_match("/^((?:[a-z]+:)?\/\/|data:image\/)(.*)/i", $v['url']) ? $v['url'] : url($v['url']);
$v['menuclass'] = in_array($v['menutype'], ['dialog', 'ajax']) ? 'btn-' . $v['menutype'] : ''; $v['menuclass'] = in_array($v['menutype'], ['dialog', 'ajax']) ? 'btn-' . $v['menutype'] : '';

4
application/admin/library/traits/Backend.php
View File

@ -391,7 +391,7 @@ trait Backend
} }
//导入文件首行类型,默认是注释,如果需要使用字段名称请使用name //导入文件首行类型,默认是注释,如果需要使用字段名称请使用name
$importHeadType = isset($this->importHeadType) ? $this->importHeadType : 'comment'; $importHeadType = $this->importHeadType ?? 'comment';
$table = $this->model->getQuery()->getTable(); $table = $this->model->getQuery()->getTable();
$database = \think\Config::get('database.database'); $database = \think\Config::get('database.database');
@ -460,7 +460,7 @@ trait Backend
if ($has_admin_id) { if ($has_admin_id) {
$auth = Auth::instance(); $auth = Auth::instance();
foreach ($insert as &$val) { foreach ($insert as &$val) {
if (!isset($val['admin_id']) || empty($val['admin_id'])) { if (empty($val['admin_id'])) {
$val['admin_id'] = $auth->isLogin() ? $auth->id : 0; $val['admin_id'] = $auth->isLogin() ? $auth->id : 0;
} }
} }