作者 lyh

gx

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Bside\Template; @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Bside\Template;
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
6 use App\Http\Controllers\Bside\BaseController; 6 use App\Http\Controllers\Bside\BaseController;
7 use App\Http\Logic\Bside\BTemplate\BTemplateLogic; 7 use App\Http\Logic\Bside\BTemplate\BTemplateLogic;
  8 +use App\Http\Requests\Bside\TemplateRequest;
8 9
9 class BTemplateController extends BaseController 10 class BTemplateController extends BaseController
10 { 11 {
@@ -56,7 +57,15 @@ class BTemplateController extends BaseController @@ -56,7 +57,15 @@ class BTemplateController extends BaseController
56 * @method :post 57 * @method :post
57 * @time :2023/6/29 10:02 58 * @time :2023/6/29 10:02
58 */ 59 */
59 - public function save(BTemplateLogic $BTemplateLogic){ 60 + public function save(TemplateRequest $templateRequest,BTemplateLogic $BTemplateLogic){
  61 + if(isset($this->param['id'])){
  62 + $this->request->validate([
  63 + 'id'=>'required'
  64 + ],[
  65 + 'id.required' => 'ID不能为空'
  66 + ]);
  67 + }
  68 + $templateRequest->validated();
60 $BTemplateLogic->templateSave(); 69 $BTemplateLogic->templateSave();
61 $this->response('success'); 70 $this->response('success');
62 } 71 }
@@ -32,48 +32,19 @@ class TemplateRequest extends FormRequest @@ -32,48 +32,19 @@ class TemplateRequest extends FormRequest
32 */ 32 */
33 public function rules() 33 public function rules()
34 { 34 {
35 - $rule = [  
36 - 'css' => [],  
37 - 'script' => [],  
38 - 'html' => ['required'],  
39 - 'source' => ['required',Rule::in(array_column(ATemplateHtml::$sourceMap,'template'))],  
40 - 'source_id' => ['required','integer','gte:0'],  
41 - 'status' => ['required',Rule::in([0,1])],  
42 - 'section_list_id' => ['required'] 35 + return [
  36 + 'html'=>'required',
  37 + 'template_id'=>'required',
  38 + 'section_list_id'=>'required',
43 ]; 39 ];
44 -  
45 -  
46 - // 删除  
47 - if($this->is('b/template/status')){  
48 - unset($rule['css']);  
49 - unset($rule['script']);  
50 - unset($rule['html']);  
51 - }  
52 -  
53 - return $rule;  
54 } 40 }
55 41
56 -  
57 public function messages() 42 public function messages()
58 { 43 {
59 return [ 44 return [
60 -  
61 - 'html.required' => '自定义内容必须',  
62 -  
63 - 'source.required' => '数据错误',  
64 - 'source.in' => '数据错误',  
65 -  
66 - 'source_id.required' => '数据错误',  
67 - 'source_id.integer' => '数据错误',  
68 - 'source_id.gte' => '数据错误',  
69 -  
70 - 'status.required' => '状态错误',  
71 - 'status.in' => '状态错误',  
72 -  
73 -// 'section_list_id.required' => '必须填写',  
74 - 45 + 'html.required'=>'请填写html',
  46 + 'template_id.required'=>'模版id不能为空',
  47 + 'section_list_id.required'=>'所选择的模块',
75 ]; 48 ];
76 } 49 }
77 -  
78 -  
79 } 50 }