From 2f73a671db8bf132baaba12a5c2a9c3b611589e9 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 01 八月 2019 17:14:26 +0800
Subject: [PATCH] 修复 添加房屋时的侦听 类修改

---
 java110-code-generator/src/main/java/com/java110/code/relationship/GeneratorBindingComponent.java |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 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 284c67a..608edbe 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
@@ -21,7 +21,7 @@
 
         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);
@@ -162,13 +162,19 @@
      * @param data
      */
     private void genneratorServiceCodeConstant(JSONObject data) {
-        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/constant/ServiceCodeConstant.java").getFile());
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/relationship/constant/ServiceCodeConstant.java").getFile());
         String fileContext = sb.toString();
 
-        fileContext = super.replaceTemplateContext(fileContext, data);
+        fileContext = super.replaceBindingTemplateContext(fileContext, data);
+
+        String variable = data.getString("package").indexOf("Package") >0 ?
+                    data.getString("package").replace("Package","") :
+                    data.getString("package");
+        variable += ("." + data.getString("templateCode"));
+        fileContext = fileContext.replace("@@constantVariable@@", variable);
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/constant/" + data.getString("templateCode") + "/ServiceCode" + toUpperCaseFirstOne(data.getString("templateCode")) + "Constant.java";
+                + "out/relationship/constant/" + data.getString("templateCode") + "/ServiceCode" + toUpperCaseFirstOne(data.getString("templateCode")) + "Constant.java";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
@@ -250,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")) {
@@ -267,6 +273,18 @@
 
         // 鏇挎崲 鏁版嵁鏍¢獙閮ㄥ垎浠g爜
 
+        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()
                 + "out/relationship/component/" + data.getString("package") + "/" + data.getString("templateCode") + "/" + data.getString("templateCode") + ".js";

--
Gitblit v1.8.0