正在显示
2 个修改的文件
包含
17 行增加
和
7 行删除
| @@ -442,13 +442,6 @@ class BTemplateLogic extends BaseLogic | @@ -442,13 +442,6 @@ class BTemplateLogic extends BaseLogic | ||
| 442 | */ | 442 | */ |
| 443 | public function handleVisualizationParam($html,$source, $is_list,$is_custom,$data){ | 443 | public function handleVisualizationParam($html,$source, $is_list,$is_custom,$data){ |
| 444 | if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION){//定制项目 | 444 | if($this->user['is_customized'] == BTemplate::IS_VISUALIZATION){//定制项目 |
| 445 | - $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型 | ||
| 446 | - //查看当前页面是否定制,是否开启可视化 | ||
| 447 | - $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面 | ||
| 448 | - if (in_array($type, $page_array)) {//当前页面是定制界面 | ||
| 449 | - $data['html'] = $html; | ||
| 450 | - $data['type'] = BTemplate::ALL_HTML; | ||
| 451 | - }else{ | ||
| 452 | //TODO::扩展模块定制单独处理 | 445 | //TODO::扩展模块定制单独处理 |
| 453 | if($is_custom == BTemplate::IS_CUSTOM){ | 446 | if($is_custom == BTemplate::IS_CUSTOM){ |
| 454 | $customModuleModel = new CustomModule(); | 447 | $customModuleModel = new CustomModule(); |
| @@ -460,8 +453,20 @@ class BTemplateLogic extends BaseLogic | @@ -460,8 +453,20 @@ class BTemplateLogic extends BaseLogic | ||
| 460 | if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION) { | 453 | if($info['list_customized'] == BTemplate::IS_VISUALIZATION || $info['detail_customized'] == BTemplate::IS_VISUALIZATION) { |
| 461 | $data['html'] = $html; | 454 | $data['html'] = $html; |
| 462 | $data['type'] = BTemplate::ALL_HTML; | 455 | $data['type'] = BTemplate::ALL_HTML; |
| 456 | + }else{ | ||
| 457 | + $mainInfo = $this->handleTemplateHtml($html); | ||
| 458 | + $data['main_html'] = $mainInfo['main_html']; | ||
| 459 | + $data['main_css'] = $mainInfo['main_css']; | ||
| 463 | } | 460 | } |
| 461 | + return $this->success($data); | ||
| 464 | } | 462 | } |
| 463 | + $type = $this->getCustomizedType($source, $is_list);//获取定制界面类型 | ||
| 464 | + //查看当前页面是否定制,是否开启可视化 | ||
| 465 | + $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面 | ||
| 466 | + if (in_array($type, $page_array)) {//当前页面是定制界面 | ||
| 467 | + $data['html'] = $html; | ||
| 468 | + $data['type'] = BTemplate::ALL_HTML; | ||
| 469 | + }else{ | ||
| 465 | $mainInfo = $this->handleTemplateHtml($html); | 470 | $mainInfo = $this->handleTemplateHtml($html); |
| 466 | $data['main_html'] = $mainInfo['main_html']; | 471 | $data['main_html'] = $mainInfo['main_html']; |
| 467 | $data['main_css'] = $mainInfo['main_css']; | 472 | $data['main_css'] = $mainInfo['main_css']; |
-
请 注册 或 登录 后发表评论