From 1dcc97354efb8a6d29ba82db9ae038c711fd8b94 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Thu, 20 Apr 2023 11:27:24 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90service?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/crud/Service.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crmeb/crmeb/services/crud/Service.php b/crmeb/crmeb/services/crud/Service.php
index ce6e252e7..c8273d6a9 100644
--- a/crmeb/crmeb/services/crud/Service.php
+++ b/crmeb/crmeb/services/crud/Service.php
@@ -75,7 +75,7 @@ class Service extends Make
                         $from[] = $this->tab(2) . $this->getframeImagesPhpContent($item['field'], $item['name'], $item['required'] ?? false) . ';';
                         break;
                     default:
-                        $from[] = $this->tab(2) . '$rule[] = FormBuilder::' . $item['type'] . '("' . $item['field'] . '","' . $item['name'] . '",$info["' . $item['field'] . '"] ?? "")' . $this->getOptionContent($item['option'] ?? []) . (!empty($item['required']) ? '->required()' : '') . ';';
+                        $from[] = $this->tab(2) . '$rule[] = FormBuilder::' . $item['type'] . '("' . $item['field'] . '","' . $item['name'] . '",$info["' . $item['field'] . '"] ?? "")' . $this->getOptionContent(in_array($item['type'], ['radio']), $item['option'] ?? []) . (!empty($item['required']) ? '->required()' : '') . ';';
                         break;
                 }
 
@@ -117,9 +117,9 @@ class Service extends Make
      * @email 136327134@qq.com
      * @date 2023/3/23
      */
-    protected function getOptionContent(array $option = [])
+    protected function getOptionContent(bool $isOption, array $option = [])
     {
-        if (!$option) {
+        if (!$option && $isOption) {
             $option = [
                 ['value' => 1, 'label' => '开启'],
                 ['value' => 0, 'label' => '关闭']

From 2402d0f796e912411b06a99e176d927c0647db56 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Thu, 20 Apr 2023 11:56:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9crudBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/crud/Controller.php                   | 2 +-
 crmeb/crmeb/services/crud/Make.php                         | 2 +-
 crmeb/crmeb/services/crud/ViewPages.php                    | 3 ++-
 crmeb/crmeb/services/crud/stubs/view/pages/crud/index.stub | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/crmeb/crmeb/services/crud/Controller.php b/crmeb/crmeb/services/crud/Controller.php
index 1289f8a92..616ebd4dd 100644
--- a/crmeb/crmeb/services/crud/Controller.php
+++ b/crmeb/crmeb/services/crud/Controller.php
@@ -94,7 +94,7 @@ class Controller extends Make
         $this->value['name'] = $className;
         $this->value['path'] = $this->getfolderPath($path);
         $this->value['content-php'] = $contentPhp;
-        $this->value['use-php'] = "use " . $options['usePath'] . "Services;\n";
+        $this->value['use-php'] = "use " . str_replace('/', '\\', $options['usePath']) . "Services;\n";
 
         $contentStr = str_replace($this->var, $this->value, $contentController);
 
diff --git a/crmeb/crmeb/services/crud/Make.php b/crmeb/crmeb/services/crud/Make.php
index e9f5a1ebb..d1380fe76 100644
--- a/crmeb/crmeb/services/crud/Make.php
+++ b/crmeb/crmeb/services/crud/Make.php
@@ -236,7 +236,7 @@ abstract class Make
             $this->value['path'] = $this->getfolderPath($path);
         }
         if (isset($this->value['use-php']) && !empty($options['usePath'])) {
-            $this->value['use-php'] = "use " . $options['usePath'] . ";\n";
+            $this->value['use-php'] = "use " . str_replace('/', '\\', $options['usePath']) . ";\n";
         }
 
         $contentStr = str_replace($this->var, $this->value, $content);
diff --git a/crmeb/crmeb/services/crud/ViewPages.php b/crmeb/crmeb/services/crud/ViewPages.php
index 034aa65a2..e04d2b957 100644
--- a/crmeb/crmeb/services/crud/ViewPages.php
+++ b/crmeb/crmeb/services/crud/ViewPages.php
@@ -88,8 +88,9 @@ class ViewPages extends Make
             }
             $columnStr[] = ($key == 0 ? $this->tab(2) : '') . "{\n" . $this->tab(3) . "title:\"{$item['name']}\"," . $this->tab(2) . "\n" . $this->tab(3) . "key:\"{$item['field']}\"\n" . $this->tab(2) . "}\n";
         }
-        $this->value['route'] = $route;
         $this->value['auth'] = Str::snake($name);
+        $this->value['componentName'] = $this->value['auth'];
+        $this->value['route'] = $route;
         $this->value['content-vue'] = $columnStr ? "\n" . implode($this->tab(2) . ',', $columnStr) . $this->tab(2) . ',' : '';
         $this->value['pathApiJs'] = $options['pathApiJs'] ?? '';
         $this->value['nameStudly'] = Str::studly($name);
diff --git a/crmeb/crmeb/services/crud/stubs/view/pages/crud/index.stub b/crmeb/crmeb/services/crud/stubs/view/pages/crud/index.stub
index f11b09c97..9a22311bb 100644
--- a/crmeb/crmeb/services/crud/stubs/view/pages/crud/index.stub
+++ b/crmeb/crmeb/services/crud/stubs/view/pages/crud/index.stub
@@ -34,7 +34,7 @@
 import { mapState } from 'vuex';
 import { {%nameCamel%}SaveApi, {%nameCamel%}DeleteApi, {%nameCamel%}UpdateApi, get{%nameStudly%}CreateApi, get{%nameStudly%}EditApi, get{%nameStudly%}ListApi} from '{%pathApiJs%}';
 export default {
-  name: 'user_group',
+  name: '{%componentName%}',
   data() {
     return {
       grid: {

From 95f361def9554dde9ee5b749b99f2b85c6427615 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Thu, 20 Apr 2023 12:18:33 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=94=9F=E6=88=90crud=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/system/SystemCrudServices.php       | 1 +
 crmeb/crmeb/services/crud/Controller.php               | 4 ++--
 crmeb/crmeb/services/crud/stubs/controller/save.stub   | 2 ++
 crmeb/crmeb/services/crud/stubs/controller/update.stub | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php
index 2fc768dba..6e9181e71 100644
--- a/crmeb/app/services/system/SystemCrudServices.php
+++ b/crmeb/app/services/system/SystemCrudServices.php
@@ -536,6 +536,7 @@ class SystemCrudServices extends BaseServices
         $controller = app()->make(Controller::class);
         $controller->setFilePathName($filePath['controller'] ?? '')->setbasePath($basePath)->handle($tableName, [
             'usePath' => $service->getUsePath(),
+            'validateName' => '\\' . $validate->getUsePath() . '::class',
             'field' => array_column($options['fromField'], 'field'),
         ]);
         //生成路由
diff --git a/crmeb/crmeb/services/crud/Controller.php b/crmeb/crmeb/services/crud/Controller.php
index 616ebd4dd..bf4098d4f 100644
--- a/crmeb/crmeb/services/crud/Controller.php
+++ b/crmeb/crmeb/services/crud/Controller.php
@@ -53,8 +53,8 @@ class Controller extends Make
     {
         $path = $options['path'] ?? '';
         $contentPhp = '';
-        $var = ["{%date%}"];
-        $fieldPhp = [$this->value['date']];
+        $var = ["{%date%}", '{%validateName%}'];
+        $fieldPhp = [$this->value['date'], $options['validateName'] ?? ''];
 
         $action = $options['action'] ?? [];
         $field = $options['field'] ?? [];
diff --git a/crmeb/crmeb/services/crud/stubs/controller/save.stub b/crmeb/crmeb/services/crud/stubs/controller/save.stub
index 6f73baf66..e7c029656 100644
--- a/crmeb/crmeb/services/crud/stubs/controller/save.stub
+++ b/crmeb/crmeb/services/crud/stubs/controller/save.stub
@@ -9,6 +9,8 @@
 {%field-php%}
         ]);
 
+        validate({%validateName%})->check($data);
+
         $this->service->crudSave($data);
 
         return app('json')->success(100021);
diff --git a/crmeb/crmeb/services/crud/stubs/controller/update.stub b/crmeb/crmeb/services/crud/stubs/controller/update.stub
index 7de81ed82..e2897f512 100644
--- a/crmeb/crmeb/services/crud/stubs/controller/update.stub
+++ b/crmeb/crmeb/services/crud/stubs/controller/update.stub
@@ -14,6 +14,8 @@
 {%field-php%}
         ]);
 
+        validate({%validateName%})->check($data);
+
         $this->service->crudUpdate((int)$id, $data);
 
         return app('json')->success(100001);

From d02cbd6d9904d3b7a2d181f49665fdc8f49942d3 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Thu, 20 Apr 2023 12:19:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/system/SystemCrudServices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php
index 6e9181e71..cafc3f743 100644
--- a/crmeb/app/services/system/SystemCrudServices.php
+++ b/crmeb/app/services/system/SystemCrudServices.php
@@ -536,7 +536,7 @@ class SystemCrudServices extends BaseServices
         $controller = app()->make(Controller::class);
         $controller->setFilePathName($filePath['controller'] ?? '')->setbasePath($basePath)->handle($tableName, [
             'usePath' => $service->getUsePath(),
-            'validateName' => '\\' . $validate->getUsePath() . '::class',
+            'validateName' => '\\' . str_replace('/', '\\', $validate->getUsePath()) . '::class',
             'field' => array_column($options['fromField'], 'field'),
         ]);
         //生成路由