xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/mzl_dev_curd

Browse Source
This commit is contained in:
mzl
2025-07-22 15:30:23 +08:00
parent e20ffa05c0 5e395eceae
commit c2b1f9b38b
3 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/logic/PermLogic.php
+7 -11
View File
@@ -52,7 +52,6 @@ class PermLogic
return $all->unique('id')->values()->sortBy('sort'); return $all->unique('id')->values()->sortBy('sort');
} }
/** /**
* 构建目录/菜单树 * 构建目录/菜单树
* *
@@ -66,13 +65,13 @@ class PermLogic
$tree = []; $tree = [];
foreach ($resources as $node) { foreach ($resources as $node) {
if ($node->parent_id !== $parentId) { // 只处理目录和菜单，不把 permission 当作菜单节点
if ($node->parent_id !== $parentId || $node->type === 'permission') {
continue; continue;
} }
// —— 拼接当前节点的完整路径 —— // —— 拼接当前节点的完整路径 ——
$currentPath = rtrim($parentPath, '/'); $currentPath = rtrim($parentPath, '/');
if (!empty($node->url)) { if (!empty($node->url)) {
$urlSegment = ltrim($node->url, '/'); $urlSegment = ltrim($node->url, '/');
$currentPath = $currentPath === '' $currentPath = $currentPath === ''
@@ -81,10 +80,8 @@ class PermLogic
} }
// —— 递归构建子节点 —— // —— 递归构建子节点 ——
$children = []; // 这里只会继续收目录和菜单，permission 永远不会进入此方法
if (in_array($node->type, ['directory', 'menu'])) {
$children = $this->buildTree($resources, $node->id, $currentPath); $children = $this->buildTree($resources, $node->id, $currentPath);
}
// —— 本级权限列表 —— // —— 本级权限列表 ——
$authList = $resources $authList = $resources
@@ -98,10 +95,7 @@ class PermLogic
->all(); ->all();
// —— 判断是否有子目录或子菜单 —— // —— 判断是否有子目录或子菜单 ——
$hasChildrenMenu = $resources $hasChildrenMenu = ! empty($children);
->where('parent_id', $node->id)
->whereIn('type', ['directory', 'menu'])
->isNotEmpty();
// —— 计算 component 字段 —— // —— 计算 component 字段 ——
if ($hasChildrenMenu) { if ($hasChildrenMenu) {
@@ -130,8 +124,10 @@ class PermLogic
'keepAlive' => true, 'keepAlive' => true,
'authList' => $authList, 'authList' => $authList,
'openType' => $node->open_type, 'openType' => $node->open_type,
'isHide' => $node->is_hide == 0 ? false : true,
'isHideTab' => $node->is_hide_tab == 0 ? false : true
], ],
'children' => $children, 'children' => $children
]; ];
} }
app/common/utils/scaffold/Generate.php
+22 -14
View File
@@ -26,11 +26,11 @@ class Generate
// 模板路径 // 模板路径
$templateDir = __DIR__ . '/templates/'; $templateDir = __DIR__ . '/templates/';
$controllerPath = __DIR__ . "/../../../{$this->options['controller']['module']}/controller/".ucfirst($this->options['controller']['name'])."Controller.php"; $controllerPath = __DIR__ . "/../../../{$this->options['controller']['module']}/controller/".$this->rName($this->options['controller']['name'])."Controller.php";
$servicePath = __DIR__ . "/../../../{$this->options['service']['module']}/service/".ucfirst($this->options['service']['name'])."Service.php"; $servicePath = __DIR__ . "/../../../{$this->options['service']['module']}/service/".$this->rName($this->options['service']['name'])."Service.php";
$logicPath = __DIR__ . "/../../../{$this->options['logic']['module']}/logic/".ucfirst($this->options['logic']['name'])."Logic.php"; $logicPath = __DIR__ . "/../../../{$this->options['logic']['module']}/logic/".$this->rName($this->options['logic']['name'])."Logic.php";
$modelPath = __DIR__ . "/../../../{$this->options['model']['module']}/model/".ucfirst($this->options['model']['name']).".php"; $modelPath = __DIR__ . "/../../../{$this->options['model']['module']}/model/".$this->rName($this->options['model']['name']).".php";
$validatePath = __DIR__ . "/../../../{$this->options['validate']['module']}/validate/".ucfirst($this->options['validate']['name'])."Validate.php"; $validatePath = __DIR__ . "/../../../{$this->options['validate']['module']}/validate/".$this->rName($this->options['validate']['name'])."Validate.php";
// 创建目录（如果不存在） // 创建目录（如果不存在）
$fs->mkdir(__DIR__ . "/../../../{$this->options['controller']['module']}/controller"); $fs->mkdir(__DIR__ . "/../../../{$this->options['controller']['module']}/controller");
@@ -86,32 +86,32 @@ class Generate
case 'controller': case 'controller':
$content = str_replace('{{controllerModule}}', $this->options['controller']['module'], $content); $content = str_replace('{{controllerModule}}', $this->options['controller']['module'], $content);
$content = str_replace('{{serviceModule}}', $this->options['service']['module'], $content); $content = str_replace('{{serviceModule}}', $this->options['service']['module'], $content);
$content = str_replace('{{serviceName}}', ucfirst($this->options['service']['name']), $content); $content = str_replace('{{serviceName}}', $this->rName($this->options['service']['name']), $content);
$content = str_replace('{{controllerName}}', ucfirst($this->options['controller']['name']), $content); $content = str_replace('{{controllerName}}', $this->rName($this->options['controller']['name']), $content);
break; break;
case 'service': case 'service':
$content = str_replace('{{serviceModule}}', $this->options['service']['module'], $content); $content = str_replace('{{serviceModule}}', $this->options['service']['module'], $content);
$content = str_replace('{{validateModule}}', $this->options['validate']['module'], $content); $content = str_replace('{{validateModule}}', $this->options['validate']['module'], $content);
$content = str_replace('{{validateName}}', ucfirst($this->options['validate']['name']), $content); $content = str_replace('{{validateName}}', $this->rName($this->options['validate']['name']), $content);
$content = str_replace('{{modelModule}}', $this->options['model']['module'], $content); $content = str_replace('{{modelModule}}', $this->options['model']['module'], $content);
$content = str_replace('{{modelName}}', ucfirst($this->options['model']['name']), $content); $content = str_replace('{{modelName}}', $this->rName($this->options['model']['name']), $content);
$content = str_replace('{{serviceName}}', ucfirst($this->options['service']['name']), $content); $content = str_replace('{{serviceName}}', $this->rName($this->options['service']['name']), $content);
break; break;
case 'logic': case 'logic':
$content = str_replace('{{logicModule}}', $this->options['logic']['module'], $content); $content = str_replace('{{logicModule}}', $this->options['logic']['module'], $content);
$content = str_replace('{{modelModule}}', $this->options['model']['module'], $content); $content = str_replace('{{modelModule}}', $this->options['model']['module'], $content);
$content = str_replace('{{modelName}}', ucfirst($this->options['model']['name']), $content); $content = str_replace('{{modelName}}', $this->rName($this->options['model']['name']), $content);
$content = str_replace('{{logicName}}', ucfirst($this->options['logic']['name']), $content); $content = str_replace('{{logicName}}', $this->rName($this->options['logic']['name']), $content);
break; break;
case 'model': case 'model':
$content = str_replace('{{modelModule}}', $this->options['model']['module'], $content); $content = str_replace('{{modelModule}}', $this->options['model']['module'], $content);
$content = str_replace('{{modelName}}', ucfirst($this->options['model']['name']), $content); $content = str_replace('{{modelName}}', $this->rName($this->options['model']['name']), $content);
$content = str_replace('{{table}}', $this->options['table'], $content); $content = str_replace('{{table}}', $this->options['table'], $content);
$content = str_replace('{{fillable}}', $this->fillableFields(), $content); $content = str_replace('{{fillable}}', $this->fillableFields(), $content);
break; break;
case 'validate': case 'validate':
$content = str_replace('{{validateModule}}', $this->options['validate']['module'], $content); $content = str_replace('{{validateModule}}', $this->options['validate']['module'], $content);
$content = str_replace('{{validateName}}', ucfirst($this->options['validate']['name']), $content); $content = str_replace('{{validateName}}', $this->rName($this->options['validate']['name']), $content);
break; break;
} }
@@ -153,6 +153,14 @@ class Generate
echo "删除已存在文件: <comment>{$path}</comment> \n"; echo "删除已存在文件: <comment>{$path}</comment> \n";
} }
} }
/**
* 设置名称
*/
public function rName($name = '')
{
return ucfirst(camelize($name));
}
} }
/** /**
app/controller/IndexController.php
+11 -11
View File
@@ -71,26 +71,26 @@ class IndexController
{ {
$options = [ $options = [
'controller' => [ 'controller' => [
'module' => 'admin', 'module' => 'inquiry',
'name' => 'systems' 'name' => 'inquiry_log'
], ],
'model' => [ 'model' => [
'module' => 'common', 'module' => 'inquiry',
'name' => 'systems' 'name' => 'inquiry_log'
], ],
'service' => [ 'service' => [
'module' => 'admin', 'module' => 'inquiry',
'name' => 'systems' 'name' => 'inquiry_log'
], ],
'logic' => [ 'logic' => [
'module' => 'common', 'module' => 'inquiry',
'name' => 'systems' 'name' => 'inquiry_log'
], ],
'validate' => [ 'validate' => [
'module' => 'common', 'module' => 'inquiry',
'name' => 'systems' 'name' => 'inquiry_log'
], ],
'table' => 'systems' 'table' => 'inquiry_log'
]; ];
$result = (new Generate($options))->doGenerate(); $result = (new Generate($options))->doGenerate();