From e40d497515b42571bb5563bae7a8b311bfa8ebd6 Mon Sep 17 00:00:00 2001 From: augushong Date: Sun, 19 Jul 2026 09:07:49 +0800 Subject: [PATCH] =?UTF-8?q?fix(curd):=20=E4=BF=AE=E6=AD=A3=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=A1=A8=20onlyFields=20=E9=94=AE=E5=90=8D=E6=8B=BC?= =?UTF-8?q?=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - CurdBase 注释解析只识别 onlyFields(正确拼写),不再支持历史错误拼写 onlyFileds - BuildCurdServiceBase 内部局部变量 onlyShowFileds 改为 onlyShowFields(按位置传参,外部 API 不变) - 同步文档(ulthon-database-design 已删除,ulthon-scheme-definition 技能已使用正确拼写) --- extend/base/admin/service/curd/BuildCurdServiceBase.php | 6 +++--- extend/base/common/command/CurdBase.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extend/base/admin/service/curd/BuildCurdServiceBase.php b/extend/base/admin/service/curd/BuildCurdServiceBase.php index 660b86f..d9296cd 100644 --- a/extend/base/admin/service/curd/BuildCurdServiceBase.php +++ b/extend/base/admin/service/curd/BuildCurdServiceBase.php @@ -385,12 +385,12 @@ class BuildCurdServiceBase * @param $foreignKey * @param null $primaryKey * @param null $modelFilename - * @param array $onlyShowFileds + * @param array $onlyShowFields * @param null $bindSelectField * @return $this * @throws TableException */ - public function setRelation($relationTable, $foreignKey, $primaryKey = null, $modelFilename = null, $onlyShowFileds = [], $bindSelectField = null) + public function setRelation($relationTable, $foreignKey, $primaryKey = null, $modelFilename = null, $onlyShowFields = [], $bindSelectField = null) { // 自动检测并处理关联表前缀(与 setTable 保持一致) $relationTable = $this->stripTablePrefix($relationTable); @@ -455,7 +455,7 @@ class BuildCurdServiceBase throw new TableException("关联表{$relationTable}未找到主键字段"); } - $formatColums = $schemeService->getColumnsForCurd($schemeClass, $onlyShowFileds); + $formatColums = $schemeService->getColumnsForCurd($schemeClass, $onlyShowFields); $delete = isset($allColumns['delete_time']); foreach ($formatColums as $field => $colum) { diff --git a/extend/base/common/command/CurdBase.php b/extend/base/common/command/CurdBase.php index 404e3dc..192b07f 100644 --- a/extend/base/common/command/CurdBase.php +++ b/extend/base/common/command/CurdBase.php @@ -130,7 +130,7 @@ EXAMPLES; 'foreignKey' => $field, 'primaryKey' => $define['primaryKey'] ?? null, 'modelFilename' => $define['modelFilename'] ?? null, - 'onlyFileds' => isset($define['onlyFileds']) ? explode('|', $define['onlyFileds']) : [], + 'onlyFields' => isset($define['onlyFields']) ? explode('|', $define['onlyFields']) : [], 'relationBindSelect' => $define['relationBindSelect'] ?? null, ]; } @@ -140,7 +140,7 @@ EXAMPLES; !empty($modelFilename) && $build = $build->setModelFilename($modelFilename); foreach ($relations as $relation) { - $build = $build->setRelation($relation['table'], $relation['foreignKey'], $relation['primaryKey'], $relation['modelFilename'], $relation['onlyFileds'], $relation['relationBindSelect']); + $build = $build->setRelation($relation['table'], $relation['foreignKey'], $relation['primaryKey'], $relation['modelFilename'], $relation['onlyFields'], $relation['relationBindSelect']); } $build = $build->render();