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

移除拼音转换，代码优化

pull/319/head
Henry 2021-06-09 14:03:25 +08:00
parent a5eb7ef3b7
commit 4f28da05fe
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,7 +407,6 @@ class Auth extends \fast\Auth
$userRule = $this->getRuleList(); $userRule = $this->getRuleList();
$selected = $referer = []; $selected = $referer = [];
$refererUrl = Session::get('referer'); $refererUrl = Session::get('referer');
$pinyin = new \Overtrue\Pinyin\Pinyin('Overtrue\Pinyin\MemoryFileDictLoader');
// 必须将结果集转换为数组 // 必须将结果集转换为数组
$ruleList = collection(\app\admin\model\AuthRule::where('status', 'normal') $ruleList = collection(\app\admin\model\AuthRule::where('status', 'normal')
->where('ismenu', 1) ->where('ismenu', 1)
@ -418,9 +417,8 @@ class Auth extends \fast\Auth
->where('ismenu', 0) ->where('ismenu', 0)
->where('name', 'like', '%/index') ->where('name', 'like', '%/index')
->column('name,pid'); ->column('name,pid');
$pidArr = array_filter(array_unique(array_map(function ($item) { $pidArr = array_unique(array_column($ruleList, 'pid'));
return $item['pid']; unset($pidArr[0]);
}, $ruleList)));
foreach ($ruleList as $k => &$v) { foreach ($ruleList as $k => &$v) {
if (!in_array($v['name'], $userRule)) { if (!in_array($v['name'], $userRule)) {
unset($ruleList[$k]); unset($ruleList[$k]);
@ -434,8 +432,6 @@ 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'] = isset($badgeList[$v['name']]) ? $badgeList[$v['name']] : '';
$v['py'] = $pinyin->abbr($v['title'], '');
$v['pinyin'] = $pinyin->permalink($v['title'], '');
$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'] : '';
@ -443,11 +439,11 @@ class Auth extends \fast\Auth
$selected = $v['name'] == $fixedPage ? $v : $selected; $selected = $v['name'] == $fixedPage ? $v : $selected;
$referer = $v['url'] == $refererUrl ? $v : $referer; $referer = $v['url'] == $refererUrl ? $v : $referer;
} }
$lastArr = array_diff($pidArr, array_filter(array_unique(array_map(function ($item) { $lastArr = array_unique(array_column($ruleList, 'pid'));
return $item['pid']; unset($lastArr[0]);
}, $ruleList)))); $pidDiffArr = array_diff($pidArr, $lastArr);
foreach ($ruleList as $index => $item) { foreach ($ruleList as $index => $item) {
if (in_array($item['id'], $lastArr)) { if (in_array($item['id'], $pidDiffArr)) {
unset($ruleList[$index]); unset($ruleList[$index]);
} }
} }