From bf47d41dddf76c58a41692e492014499f9d433ae Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 09 八月 2019 23:13:48 +0800
Subject: [PATCH] 服务绑定 及 代码生成器开发测试完成
---
java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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..6e0ae18 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
@@ -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);
@@ -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");
--
Gitblit v1.8.0