From 522f9ae0f9d4f83ebfa7a4dc37b3f0964851c47f Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期五, 07 六月 2019 16:08:29 +0800
Subject: [PATCH] 车位售卖完成
---
WebService/src/main/java/com/java110/web/core/VueComponentElement.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 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 7c9329c..89443da 100644
--- a/WebService/src/main/java/com/java110/web/core/VueComponentElement.java
+++ b/WebService/src/main/java/com/java110/web/core/VueComponentElement.java
@@ -1,6 +1,5 @@
package com.java110.web.core;
-import com.java110.common.util.Assert;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -9,14 +8,14 @@
import org.thymeleaf.dom.Element;
import org.thymeleaf.dom.Macro;
import org.thymeleaf.dom.Node;
+import org.thymeleaf.exceptions.TemplateProcessingException;
import org.thymeleaf.processor.element.AbstractMarkupSubstitutionElementProcessor;
import org.thymeleaf.util.DOMUtils;
import java.io.StringReader;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* 缁勪欢 鑷畾涔夋爣绛惧姛鑳界被
@@ -43,7 +42,7 @@
//鑾峰彇妯℃澘鍚嶇О
String componentName = element.getAttributeValue("name");
- logger.debug("姝ｅ湪瑙ｆ瀽缁勪欢{}", componentName);
+ logger.debug("姝ｅ湪瑙ｆ瀽缁勪欢{},{}", componentName, new Date().getTime());
String html = VueComponentTemplate.findTemplateByComponentCode(componentName + "." + VueComponentTemplate.COMPONENT_HTML);
if (html == null) {
throw new RuntimeException("鍦ㄧ紦瀛樹腑鏈壘鍒扮粍浠躲��" + componentName + "銆�");
@@ -69,11 +68,13 @@
if (js != null) {
js = dealJs(js, element);
+ js = dealJsAddComponentCode(js, element);
js = "<script type=\"text/javascript\">//<![CDATA[ \n" + js + "//]]>\n</script>";
Node nodeJs = new Macro(js);
nodes.add(nodeJs);
}
+ logger.debug("瑙ｆ瀽瀹屾垚缁勪欢{},{}", componentName, new Date().getTime());
return nodes;
}
@@ -101,18 +102,35 @@
}
String[] tmpType = tmpProTypes.split(",");
+ StringBuffer propsJs = new StringBuffer("\nvar $props = {};\n");
for (String type : tmpType) {
if (StringUtils.isEmpty(type) || !type.contains(":")) {
continue;
}
String[] types = type.split(":");
- if (!element.hasAttribute(types[0].trim())) {
- throw new RuntimeException("鏈厤缃粍浠跺睘鎬�" + types[0]);
+ String attrKey = types[0].replace(" ", "")
+ .replace("\n", "")
+ .replace("\r", "");
+ if (!element.hasAttribute(attrKey)) {
+ String componentName = element.getAttributeValue("name");
+ logger.error("缁勪欢" + componentName + "鏈厤缃粍浠跺睘鎬� " + attrKey);
+ throw new TemplateProcessingException("缁勪欢[" + componentName + "]鏈厤缃粍浠跺睘鎬�" + attrKey);
}
- String vcType = element.getAttributeValue(types[0]);
- js = js.replace(types[0], vcType);
-
+ String vcType = element.getAttributeValue(attrKey);
+ if (types[1].equals("vc.propTypes.string")) {
+ vcType = "'" + vcType + "'";
+ }
+ propsJs.append("$props." + attrKey + "=" + vcType + ";\n");
}
+
+ //灏唒ropsJs 鎻掑叆鍒� 绗竴涓� { 涔嬪悗
+ int position = js.indexOf("{");
+ if (position < 0) {
+ String componentName = element.getAttributeValue("name");
+ logger.error("缁勪欢" + componentName + "瀵瑰簲js 鏈寘鍚� {} ");
+ throw new TemplateProcessingException("缁勪欢" + componentName + "瀵瑰簲js 鏈寘鍚� {} ");
+ }
+ js = new StringBuffer(js).insert(position + 1, propsJs).toString();
return js;
}
@@ -125,7 +143,13 @@
*/
private String dealJsAddComponentCode(String js, Element element) {
- return "";
+ if (!element.hasAttribute("code")) {
+ return js;
+ }
+
+ String code = element.getAttributeValue("code");
+
+ return js.replace("@vc_", code);
}
/**
--
Gitblit v1.8.0