x

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Aside;
 use App\Enums\Common\Code;
 use App\Http\Logic\Aside\Template\TemplateLogic;
 use App\Http\Requests\Aside\Template\TemplateRequest;
-use App\Http\Requests\Scene;
 use App\Models\Template\ATemplate;
 use App\Models\Template\ATemplateHtml;
 use Illuminate\Validation\Rule;
@@ -39,8 +38,8 @@ class TemplateController extends BaseController
      * @author：dc
      * @time 2023/5/4 16:19
      */
-    public function edit(){
-        $this->save(Scene::$UPDATE);
+    public function edit(TemplateRequest $request){
+        $this->save($request->validated());
     }
 
     /**
@@ -48,8 +47,8 @@ class TemplateController extends BaseController
      * @author：dc
      * @time 2023/5/5 9:30
      */
-    public function insert(){
-        $this->save(Scene::$CREATE);
+    public function insert(TemplateRequest $request){
+        $this->save($request->validated());
     }
 
 
@@ -62,11 +61,7 @@ class TemplateController extends BaseController
      * @author：dc
      * @time 2023/5/11 10:13
      */
-    private function save($scene){
-
-
-        $data  = $this->verify(TemplateRequest::class,$scene);
-
+    private function save($data){
 
         TemplateLogic::instance()->save($data);
 

@@ -44,9 +44,9 @@ class TemplateRequest extends FormRequest
         ];
 
         // 更新场景
-//        if(!$this->isScene(Scene::$CREATE)){
-//            unset($rule['id']);
-//        }
+        if(!$this->is('a/template/insert')){
+            unset($rule['id']);
+        }
 
         return $rule;
     }

-<?php
-
-namespace App\Http\Requests;
-
-/**
- * @author：dc
- * @time 2023/5/11 14:49
- * Class Scene
- * @package App\Http\Requests
- */
-trait Scene {
-
-    /**
-     * 更新场景
-     */
-    static $UPDATE = 1;
-
-    /**
-     * 创建场景
-     */
-    static $CREATE = 0;
-
-    /**
-     * 删除场景
-     */
-    static $DELETE = -1;
-
-
-    private $scene;
-
-
-    /**
-     * @param $scene
-     * @return $this
-     * @author：dc
-     * @time 2023/5/11 17:14
-     */
-    public function setScene($scene){
-        var_dump($scene);
-        $this->scene = $scene;
-
-        return $this;
-    }
-
-
-    /**
-     * @return mixed
-     */
-    public function getScene()
-    {
-        return $this->scene;
-    }
-
-
-    /**
-     * @param $scene
-     * @return bool
-     * @author：dc
-     * @time 2023/5/11 17:14
-     */
-    public function isScene($scene){
-        return $this->scene === $scene;
-    }
-
-}