From a9930a99dd41b687ec29fd6398cfbcbfd39db76d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 16 五月 2020 22:26:11 +0800
Subject: [PATCH] 阿拽。(251217411) 优化代码生成器
---
java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java b/java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java
index a1362f6..a65ad1d 100644
--- a/java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java
+++ b/java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.code.BaseGenerator;
+import com.java110.code.back.BaseGenerator;
import com.java110.code.web.GeneratorStart;
import org.springframework.util.StringUtils;
@@ -15,13 +15,13 @@
generatorComponentHtml(data);
generatorComponentJs(data);
generatorComponentJava(data);
- genneratorIListSmo(data);
- genneratorListSmoImpl(data);
+// genneratorIListSmo(data);
+// genneratorListSmoImpl(data);
- genneratorListListener(data);
+// genneratorListListener(data);
- genneratorServiceCodeConstant(data);
+// genneratorServiceCodeConstant(data);
}
@@ -86,7 +86,7 @@
String writePath = this.getClass().getResource("/").getPath()
- + "out/relationship/component/" + _currentObj.getString("package") + "/" + _currentObj.getString("templateCode") + "View/" + toUpperCaseFirstOne(_currentObj.getString("templateCode")) + "View.html";
+ + "out/relationship/component/" + _currentObj.getString("package") + "/" + _currentObj.getString("templateCode") + "View/" + _currentObj.getString("templateCode") + "View.html";
System.out.printf("writePath: " + writePath);
writeFile(writePath,
fileContext);
@@ -148,7 +148,7 @@
String writePath = this.getClass().getResource("/").getPath()
- + "out/relationship/component/" + _currentObj.getString("package") + "/" + _currentObj.getString("templateCode") + "View/" + toUpperCaseFirstOne(_currentObj.getString("templateCode")) + "View.js";
+ + "out/relationship/component/" + _currentObj.getString("package") + "/" + _currentObj.getString("templateCode") + "View/" + _currentObj.getString("templateCode") + "View.js";
System.out.printf("writePath: " + writePath);
writeFile(writePath,
fileContext);
@@ -202,7 +202,7 @@
JSONObject flow = flows.getJSONObject(flowIndex);
String showAffirmPage = data.getBoolean("needAffirm") ? " || " + data.getString("templateCode") + "Info.index == " + flows.size() : "";
allStep.append("<div v-if=\"" + data.getString("templateCode") + "Info.index == " + flowIndex + showAffirmPage + "\">\n" +
- " <vc:create name=\"" + flow.getString("vcName") + "\"\n" +
+ " <vc:create path=\"" + flow.getString("vcName") + "\"\n" +
" callBackListener=\"" + data.getString("templateCode") + "\"\n" +
" callBackFunction=\"notify\"\n" +
" ></vc:create>\n" +
@@ -256,7 +256,7 @@
}
- validateInfo.append("vc.emit('" + flow.getString("vcName") + "', 'onIndex', vc.component.serviceBindingInfo.index);\n");
+ validateInfo.append("vc.emit('" + flow.getString("vcName") + "', 'onIndex', vc.component."+data.getString("templateCode")+"Info.index);\n");
//濡傛灉鐩稿簲缁勪欢涓嶅瓨鍦紝鍒欐牴鎹粍浠堕厤缃嚜鍔ㄧ敓鎴�
if (!flow.getBoolean("existsComponent")) {
@@ -272,6 +272,18 @@
fileContext = fileContext.replace("@@jumpUrl@@", data.getString("successUrl"));
// 鏇挎崲 鏁版嵁鏍￠獙閮ㄥ垎浠ｇ爜
+
+ String needCheckCurrentData = "var _currentData = vc.component."+data.getString("templateCode")+"Info.infos[vc.component."+data.getString("templateCode")+"Info.index];\n" +
+ " if( _currentData == null || _currentData == undefined){\n" +
+ " vc.message(\"璇烽�夋嫨鎴栧～鍐欏繀閫変俊鎭痋");\n" +
+ " return ;\n" +
+ " }";
+
+ if(data.getBoolean("needAffirm")){
+ fileContext = fileContext.replace("@@needCheckCurrentData@@", "");
+ }else{
+ fileContext = fileContext.replace("@@needCheckCurrentData@@", needCheckCurrentData);
+ }
String writePath = this.getClass().getResource("/").getPath()
@@ -399,6 +411,7 @@
ifCode.append("" +
" if(!hasKey("+vcName+", \"" + flowObj.getString("flowKey") + "\")){\n" +
" "+vcName+".put(\"" + flowObj.getString("flowKey") + "\", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_" + flowObj.getString("flowKey") + "));\n" +
+ " "+vcName+".put(\"userId\", context.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));\n" +
" businesses.add(add" + toUpperCaseFirstOne(flowObj.getString("businessName")) + "("+vcName+", context));\n" +
" }\n");
@@ -437,7 +450,7 @@
String writePath = this.getClass().getResource("/").getPath()
- + "out/api/listener/" + data.getString("templateCode") + "/Binding" + toUpperCaseFirstOne(data.getString("templateCode")) + "Listener.java";
+ + "out/api/listener/" + data.getString("templateCode") + "/" + toUpperCaseFirstOne(data.getString("templateCode")) + "Binding"+"Listener.java";
System.out.printf("writePath: " + writePath);
writeFile(writePath,
fileContext);
--
Gitblit v1.8.0