gx

@@ -66,8 +66,15 @@ class VisualizationController extends BaseController
      * @time   :2023/11/15 11:20
      * @time   :2023/11/15 11:20
      */
      */
     public function getHtml(VisualizationLogic $logic){
     public function getHtml(VisualizationLogic $logic){
-        $html = $logic->getHtml();
-        $this->response('success',Code::SUCCESS,$html);
+        $this->request->validate([
+            'source'=>'required',
+            'source_id'=>'required',
+        ],[
+            'source.required' => '类型不能为空',
+            'source_id.required' => 'source_id不能为空',
+        ]);
+        $data = $logic->getHtml();
+        $this->response('success',Code::SUCCESS,['html'=>$data]);
     }
     }
 
 
     /**
     /**

@@ -59,8 +59,17 @@ class VisualizationLogic extends BaseLogic
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
             'source_id'=>$this->param['source_id'],
             'source_id'=>$this->param['source_id'],
         ]);
         ]);
+        if($this->param['source'] == 2){
+            if($this->param['source_id'] == 0){$source = 3;}else{$source = 2;}
+        }
+        if($this->param['source'] == 3){
+            if($this->param['source_id'] == 0){$source = 5;}else{$source = 4;}
+        }
+        if($this->param['source'] == 4){
+            if($this->param['source_id'] == 0){$source = 7;}else{$source = 6;}
+        }
         if($TemplateInfo === false){
         if($TemplateInfo === false){
-            $info = $this->model->read(['source'=>$this->map['source']],['html','source','id','project_id']);
+            $info = $this->model->read(['source'=>$source],['html','source','id','project_id']);
             if($info === false){
             if($info === false){
                 $this->fail('请先上传定制代码块');
                 $this->fail('请先上传定制代码块');
             }
             }