From e52452de27673c6d794fc2d8ae96f33abc25dc0c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 29 三月 2020 12:11:23 +0800
Subject: [PATCH] 调整代码生成器

---
 java110-code-generator/src/main/java/com/java110/code/web/GeneratorEditComponent.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/java110-code-generator/src/main/java/com/java110/code/web/GeneratorEditComponent.java b/java110-code-generator/src/main/java/com/java110/code/web/GeneratorEditComponent.java
index 2de78ce..7f84d5c 100644
--- a/java110-code-generator/src/main/java/com/java110/code/web/GeneratorEditComponent.java
+++ b/java110-code-generator/src/main/java/com/java110/code/web/GeneratorEditComponent.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 org.springframework.util.StringUtils;
 
 public class GeneratorEditComponent extends BaseGenerator {
@@ -41,7 +41,7 @@
         JSONArray columns = data.getJSONArray("columns");
         for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
             JSONObject column = columns.getJSONObject(columnIndex);
-            if (column.getBoolean("hasDefaultValue")) {
+            if ("none".equals(column.getString("inputType"))) {
                 continue;
             }
             String required = column.getBoolean("required") ? "蹇呭~" : "閫夊~";
@@ -65,7 +65,11 @@
                         "         <option selected  disabled value=\"\">"+ required + "锛岃閫夋嫨" + column.getString("cnCode") + "</option>\n" +
                         "         " +option+
                         "  </select>";
-            } else {
+            } else if("textarea".equals(column.getString("inputType"))){
+                inputStr = "<textarea  placeholder=\"" + required + "锛岃濉啓" + column.getString("cnCode") + "\" class=\"form-control\""+
+                        " v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info."+column.getString("code")+"\">"+
+                        "</textarea>";
+            }else {
                 inputStr = "           <input v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info."+column.getString("code")+"\" " +
                         "                  type=\"text\" placeholder=\"" + required + "锛岃濉啓" + column.getString("cnCode") + "\" class=\"form-control\">\n";
             }
@@ -82,7 +86,7 @@
 
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/edit-" + data.getString("templateCode") + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
+                + "out/web/component/"+data.getString("templateCode")+"Package/edit-" + data.getString("templateCode") + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);
@@ -149,7 +153,7 @@
 
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/component/edit-" + data.getString("templateCode") + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + ".js";
+                + "out/web/component/"+data.getString("templateCode")+"Package/edit-" + data.getString("templateCode") + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + ".js";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);

--
Gitblit v1.8.0