mojiahui/dafuweng-buildadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

webman迁移-优化

Browse Source
This commit is contained in:
zhenhui
2026-03-18 15:10:40 +08:00
parent ea77c7b3a1
commit e2ae55319e
70 changed files with 1278 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dafuweng-webman/app/admin/controller/auth/Group.php
View File

@@ -41,8 +41,8 @@ class Group extends Backend
$this->tree = Tree::instance();
$isTree = $request->get('isTree') ?? $request->post('isTree') ?? true;
$this->initValue = $request->get('initValue') ?? [];
$this->initValue = is_array($this->initValue) ? array_filter($this->initValue) : [];
$initValue = $request->get('initValue') ?? $request->post('initValue') ?? [];
$this->initValue = is_array($initValue) ? array_filter($initValue) : [];
$this->keyword = $request->get('quickSearch') ?? $request->post('quickSearch') ?? '';
$this->assembleTree = $isTree && !$this->initValue;
@@ -185,9 +185,10 @@ class Group extends Backend
unset($rules[$ruKey]);
}
}
$row->rules = array_values($rules);
$rowData = $row->toArray();
$rowData['rules'] = array_values($rules);
return $this->success('', [
'row' => $row
'row' => $rowData
]);
}
@@ -323,7 +324,7 @@ class Group extends Backend
$rules = explode(',', $datum['rules']);
if ($rules) {
$rulesFirstTitle = AdminRule::where('id', $rules[0])->value('title');
$datum['rules'] = count($rules) == 1 ? $rulesFirstTitle : $rulesFirstTitle . '等 ' . count($rules) . ' 项';
$datum['rules'] = count($rules) == 1 ? $rulesFirstTitle : __('%first% etc. %count% items', ['%first%' => $rulesFirstTitle, '%count%' => count($rules)]);
}
}
} else {