From cea7d1c682ea46f8b39efa9e9eb581374a316d1f Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期五, 22 三月 2019 08:51:57 +0800
Subject: [PATCH] 尝试合并每个组件代码
---
WebService/src/main/java/com/java110/web/core/VueComponentElement.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/core/VueComponentElement.java b/WebService/src/main/java/com/java110/web/core/VueComponentElement.java
index 4a1450e..bc9adf7 100644
--- a/WebService/src/main/java/com/java110/web/core/VueComponentElement.java
+++ b/WebService/src/main/java/com/java110/web/core/VueComponentElement.java
@@ -7,7 +7,9 @@
import org.thymeleaf.Arguments;
import org.thymeleaf.dom.*;
import org.thymeleaf.processor.element.AbstractMarkupSubstitutionElementProcessor;
+import org.thymeleaf.util.DOMUtils;
+import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
@@ -35,9 +37,10 @@
if(html == null){
throw new RuntimeException("鍦ㄧ紦瀛樹腑鏈壘鍒扮粍浠躲��"+componentName+"銆�");
}
- Node nodeHtml = new Macro(html);
-
- nodes.add(nodeHtml);
+ List<Node> tmpNodes = DOMUtils.getHtml5DOMFor(new StringReader(html)).getChildren();
+ for(Node tmpNode : tmpNodes) {
+ nodes.add(tmpNode);
+ }
//css
String css = VueComponentTemplate.findTemplateByComponentCode(componentName+"."+VueComponentTemplate.COMPONENT_CSS);
if(css != null){
@@ -46,7 +49,7 @@
nodes.add(nodeCss);
}
- //css
+ //js
String js = VueComponentTemplate.findTemplateByComponentCode(componentName+"."+VueComponentTemplate.COMPONENT_JS);
if(js != null){
js = "<script type=\"text/javascript\">" + js +"</script>";
--
Gitblit v1.8.0