diff --git a/extend/catcher/generate/factory/Model.php b/extend/catcher/generate/factory/Model.php index 3bf4116..f66036e 100644 --- a/extend/catcher/generate/factory/Model.php +++ b/extend/catcher/generate/factory/Model.php @@ -4,6 +4,7 @@ namespace catcher\generate\factory; use catcher\exceptions\FailedException; use catcher\generate\template\Model as Template; use think\facade\Db; +use think\helper\Str; class Model extends Factory { @@ -38,6 +39,11 @@ class Model extends Factory [$modelName, $namespace] = $this->parseFilename($params['model']); + // 如果填写了表名并且没有填写模型名称 使用表名作为模型名称 + if (!$modelName && $table) { + $modelName = Str::camel($table); + } + if (!$modelName) { throw new FailedException('model name not set'); } diff --git a/extend/catcher/generate/factory/SQL.php b/extend/catcher/generate/factory/SQL.php index f270abd..1666f79 100644 --- a/extend/catcher/generate/factory/SQL.php +++ b/extend/catcher/generate/factory/SQL.php @@ -5,7 +5,7 @@ namespace catcher\generate\factory; use catcher\exceptions\FailedException; use think\facade\Db; -class SQL +class SQL extends Factory { protected $index = '';