Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Bside\Template;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\BTemplate\BTemplateLogic;
+use App\Http\Requests\Bside\TemplateRequest;
 
 class BTemplateController extends BaseController
 {
@@ -56,7 +57,15 @@ class BTemplateController extends BaseController
      * @method :post
      * @time   :2023/6/29 10:02
      */
-    public function save(BTemplateLogic $BTemplateLogic){
+    public function save(TemplateRequest $templateRequest,BTemplateLogic $BTemplateLogic){
+        if(isset($this->param['id'])){
+            $this->request->validate([
+                'id'=>'required'
+            ],[
+                'id.required' => 'ID不能为空'
+            ]);
+        }
+        $templateRequest->validated();
         $BTemplateLogic->templateSave();
         $this->response('success');
     }

@@ -32,48 +32,19 @@ class TemplateRequest extends FormRequest
      */
     public function rules()
     {
-        $rule = [
-            'css'   =>  [],
-            'script'   =>  [],
-            'html'   =>  ['required'],
-            'source'   =>  ['required',Rule::in(array_column(ATemplateHtml::$sourceMap,'template'))],
-            'source_id'   =>  ['required','integer','gte:0'],
-            'status'   =>  ['required',Rule::in([0,1])],
-            'section_list_id'   =>  ['required']
+        return [
+            'html'=>'required',
+            'template_id'=>'required',
+            'section_list_id'=>'required',
         ];
-
-
-        // 删除
-        if($this->is('b/template/status')){
-            unset($rule['css']);
-            unset($rule['script']);
-            unset($rule['html']);
-        }
-
-        return $rule;
     }
 
-
     public function messages()
     {
         return [
-
-            'html.required'  =>  '自定义内容必须',
-
-            'source.required'  =>  '数据错误',
-            'source.in'  =>  '数据错误',
-
-            'source_id.required'  =>  '数据错误',
-            'source_id.integer'  =>  '数据错误',
-            'source_id.gte'  =>  '数据错误',
-
-            'status.required'  =>  '状态错误',
-            'status.in'  =>  '状态错误',
-
-//            'section_list_id.required'  =>  '必须填写',
-
+            'html.required'=>'请填写html',
+            'template_id.required'=>'模版id不能为空',
+            'section_list_id.required'=>'所选择的模块',
         ];
     }
-
-
 }