From 0894b9328ae1c11146175b492ae348bbd4b13404 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 29 四月 2019 16:42:32 +0800
Subject: [PATCH] 加入统一消息提示功能 请用 vc.messege('错误内容')
---
WebService/src/main/java/com/java110/web/core/VueComponentElement.java | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 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..1ea09e4 100644
--- a/WebService/src/main/java/com/java110/web/core/VueComponentElement.java
+++ b/WebService/src/main/java/com/java110/web/core/VueComponentElement.java
@@ -1,13 +1,16 @@
package com.java110.web.core;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.web.smo.impl.LoginServiceSMOImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.thymeleaf.Arguments;
-import org.thymeleaf.dom.*;
+import org.thymeleaf.dom.Document;
+import org.thymeleaf.dom.Element;
+import org.thymeleaf.dom.Macro;
+import org.thymeleaf.dom.Node;
import org.thymeleaf.processor.element.AbstractMarkupSubstitutionElementProcessor;
+import org.thymeleaf.util.DOMUtils;
+import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
@@ -17,7 +20,9 @@
*/
public class VueComponentElement extends AbstractMarkupSubstitutionElementProcessor {
- private final static Logger logger = LoggerFactory.getLogger(VueComponentElement.class);
+ private static Logger logger = LoggerFactory.getLogger(VueComponentElement.class);
+
+ private static final String DIV_PROPERTY_COMPONENT = "data-component";
protected VueComponentElement(String elementName) {
@@ -31,25 +36,31 @@
List<Node> nodes = new ArrayList<>();
//鑾峰彇妯℃澘鍚嶇О
String componentName = element.getAttributeValue("name");
- String html = VueComponentTemplate.findTemplateByComponentCode(componentName+"."+VueComponentTemplate.COMPONENT_HTML);
- if(html == null){
- throw new RuntimeException("鍦ㄧ紦瀛樹腑鏈壘鍒扮粍浠躲��"+componentName+"銆�");
+ logger.debug("姝ｅ湪瑙ｆ瀽缁勪欢{}", componentName);
+ String html = VueComponentTemplate.findTemplateByComponentCode(componentName + "." + VueComponentTemplate.COMPONENT_HTML);
+ if (html == null) {
+ throw new RuntimeException("鍦ㄧ紦瀛樹腑鏈壘鍒扮粍浠躲��" + componentName + "銆�");
}
- Node nodeHtml = new Macro(html);
+ //List<Node> tmpNodes = DOMUtils.getHtml5DOMFor(new StringReader(html)).getChildren();
+ Document tmpDoc = DOMUtils.getLegacyHTML5DOMFor(new StringReader(html));
+ List<Node> tmpNodes = tmpDoc.getChildren();
- nodes.add(nodeHtml);
+ addDataComponent(tmpDoc, componentName);
+ for (Node tmpNode : tmpNodes) {
+ nodes.add(tmpNode);
+ }
//css
- String css = VueComponentTemplate.findTemplateByComponentCode(componentName+"."+VueComponentTemplate.COMPONENT_CSS);
- if(css != null){
- css = "<style type=\"text/css\">" + css +"</style>";
+ String css = VueComponentTemplate.findTemplateByComponentCode(componentName + "." + VueComponentTemplate.COMPONENT_CSS);
+ if (css != null) {
+ css = "<style type=\"text/css\">" + css + "</style>";
Node nodeCss = new Macro(css);
nodes.add(nodeCss);
}
- //css
- String js = VueComponentTemplate.findTemplateByComponentCode(componentName+"."+VueComponentTemplate.COMPONENT_JS);
- if(js != null){
- js = "<script type=\"text/javascript\">" + js +"</script>";
+ //js
+ String js = VueComponentTemplate.findTemplateByComponentCode(componentName + "." + VueComponentTemplate.COMPONENT_JS);
+ if (js != null) {
+ js = "<script type=\"text/javascript\">//<![CDATA[ \n" + js + "//]]>\n</script>";
Node nodeJs = new Macro(js);
nodes.add(nodeJs);
}
@@ -58,6 +69,17 @@
return nodes;
}
+ /**
+ * 鍔犲叆缁勪欢鍚嶇О鍒� HTML涓� 鏂逛究瀹氫綅闂
+ *
+ * @param tmpDoc 椤甸潰鑺傜偣
+ * @param componentCode 缁勪欢缂栫爜
+ */
+ private void addDataComponent(Document tmpDoc, String componentCode) {
+ Element tmpElement = tmpDoc.getFirstElementChild();
+ tmpElement.setAttribute(DIV_PROPERTY_COMPONENT, componentCode);
+ }
+
@Override
public int getPrecedence() {
return 1000;
--
Gitblit v1.8.0