liaofei 2 лет назад
Родитель
Сommit
c2e3962d32

+ 2 - 0
crmeb/app/services/system/SystemCrudServices.php

@@ -855,11 +855,13 @@ class SystemCrudServices extends BaseServices
         $validate = app()->make(Validate::class);
         $validate->setFilePathName($filePath['validate'] ?? '')->setbasePath($basePath)->handle($tableName, [
             'field' => $options['fromField'],
+            'modelName' => $options['modelName'] ?? '',
         ]);
         //生成控制器
         $controller = app()->make(Controller::class);
         $controller->setFilePathName($filePath['controller'] ?? '')->setbasePath($basePath)->handle($tableName, [
             'usePath' => $service->getUsePath(),
+            'modelName' => $options['modelName'] ?? '',
             'validateName' => '\\' . str_replace('/', '\\', $validate->getUsePath()) . 'Validate::class',
             'field' => array_column($options['fromField'], 'field'),
         ]);

+ 1 - 0
crmeb/crmeb/services/crud/Controller.php

@@ -90,6 +90,7 @@ class Controller extends Make
 
         [$className, $contentController] = $this->getStubContent($name, 'controller');
 
+        $this->value['modelName'] = $options['modelName'] ?? $name;
         $this->value['nameCamel'] = Str::studly($name);
         $this->value['name'] = $className;
         $this->value['path'] = $this->getfolderPath($path);

+ 1 - 0
crmeb/crmeb/services/crud/Model.php

@@ -56,6 +56,7 @@ class Model extends Make
             $this->value['use-php'] = "use think\model\concern\SoftDelete;\n";
             $this->value['content-php'] = $this->tab() . "use SoftDelete;\n";
         }
+        $this->value['modelName'] = $options['modelName'] ?? $name;
         return parent::handle($name, $options);
     }
 

+ 1 - 0
crmeb/crmeb/services/crud/Validate.php

@@ -51,6 +51,7 @@ class Validate extends Make
         [$rule, $message] = $this->getRuleContent($options['field']);
         $this->value['rule-php'] = $rule;
         $this->value['message-php'] = $message;
+        $this->value['modelName'] = $options['modelName'] ?? $name;
         return parent::handle($name, $options); // TODO: Change the autogenerated stub
     }
 

+ 1 - 0
crmeb/crmeb/services/crud/stubs/controller/crudController.stub

@@ -12,6 +12,7 @@
  */
 
 /**
+ * {%modelName%}
  * @author crud自动生成代码
  * @date {%time%}
  */

+ 1 - 0
crmeb/crmeb/services/crud/stubs/dao/crudDao.stub

@@ -12,6 +12,7 @@
  */
 
 /**
+ * {%modelName%}
  * @author crud自动生成代码
  * @date {%time%}
  */

+ 1 - 0
crmeb/crmeb/services/crud/stubs/model/crudModel.stub

@@ -12,6 +12,7 @@
  */
 
 /**
+ * {%modelName%}
  * @author crud自动生成代码
  * @date {%time%}
  */

+ 4 - 0
crmeb/crmeb/services/crud/stubs/model/getattr.stub

@@ -0,0 +1,4 @@
+    public function get{%field%}Attr($value)
+    {
+{%content-php%}
+    }

+ 1 - 1
crmeb/crmeb/services/crud/stubs/service/crudService.stub

@@ -12,6 +12,7 @@
  */
 
 /**
+ * {%modelName%}
  * @author crud自动生成代码
  * @date {%time%}
  */
@@ -23,7 +24,6 @@ use think\exception\ValidateException;
 {%use-php%}
 
 /**
- * {%modelName%}
  * Class CrudService
  * @date {%date%}
  * @package app\services\crud{%path%}

+ 1 - 0
crmeb/crmeb/services/crud/stubs/validate/crudValidate.stub

@@ -12,6 +12,7 @@
  */
 
 /**
+ * {%modelName%}
  * @author crud自动生成代码
  * @date {%time%}
  */