From d62ee4d9179e3b352b44f0d5528de3ac6286083d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 四月 2019 18:25:57 +0800
Subject: [PATCH] 员工权限开发
---
WebService/src/main/java/com/java110/web/core/VueComponentElement.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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..1e520e6 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;
@@ -31,13 +33,16 @@
List<Node> nodes = new ArrayList<>();
//鑾峰彇妯℃澘鍚嶇О
String componentName = element.getAttributeValue("name");
+ logger.debug("姝ｅ湪瑙ｆ瀽缁勪欢{}",componentName);
String html = VueComponentTemplate.findTemplateByComponentCode(componentName+"."+VueComponentTemplate.COMPONENT_HTML);
if(html == null){
throw new RuntimeException("鍦ㄧ紦瀛樹腑鏈壘鍒扮粍浠躲��"+componentName+"銆�");
}
- Node nodeHtml = new Macro(html);
-
- nodes.add(nodeHtml);
+ //List<Node> tmpNodes = DOMUtils.getHtml5DOMFor(new StringReader(html)).getChildren();
+ List<Node> tmpNodes = DOMUtils.getLegacyHTML5DOMFor(new StringReader(html)).getChildren();
+ for(Node tmpNode : tmpNodes) {
+ nodes.add(tmpNode);
+ }
//css
String css = VueComponentTemplate.findTemplateByComponentCode(componentName+"."+VueComponentTemplate.COMPONENT_CSS);
if(css != null){
@@ -46,10 +51,10 @@
nodes.add(nodeCss);
}
- //css
+ //js
String js = VueComponentTemplate.findTemplateByComponentCode(componentName+"."+VueComponentTemplate.COMPONENT_JS);
if(js != null){
- js = "<script type=\"text/javascript\">" + js +"</script>";
+ js = "<script type=\"text/javascript\">//<![CDATA[ \n" + js +"//]]>\n</script>";
Node nodeJs = new Macro(js);
nodes.add(nodeJs);
}
--
Gitblit v1.8.0