From 45da81e1167fecb16cfae5c74e1eca8115bbbcdd Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 17 七月 2019 17:57:18 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-code-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/java110-code-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java b/java110-code-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java
index e630ab8..bf8de3b 100644
--- a/java110-code-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java
+++ b/java110-code-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java
@@ -18,7 +18,27 @@
genneratorListSmoImpl(data);
genneratorListListener(data);
+ genneratorServiceCodeConstant(data);
+
+
+ }
+
+ /**
+ * 鐢熸垚甯搁噺绫�
+ * @param data
+ */
+ private void genneratorServiceCodeConstant(JSONObject data) {
+ StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/constant/ServiceCodeConstant.java").getFile());
+ String fileContext = sb.toString();
+
+ fileContext = super.replaceTemplateContext(fileContext, data);
+
+ String writePath = this.getClass().getResource("/").getPath()
+ + "out/web/constant/" + data.getString("templateCode") + "/ServiceCode" + toUpperCaseFirstOne(data.getString("templateCode")) + "Constant.java";
+ System.out.printf("writePath: " + writePath);
+ writeFile(writePath,
+ fileContext);
}
@@ -41,7 +61,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") ? "蹇呭～" : "閫夊～";
@@ -53,7 +73,7 @@
String option = "";
- for (int valueIndex = 0; valueIndex <= selectValues.length; valueIndex++) {
+ for (int valueIndex = 0; valueIndex < selectValues.length; valueIndex++) {
String value = selectValues[valueIndex];
@@ -65,7 +85,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=\"add" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info."+column.getString("code")+"\">"+
+ "</textarea>";
+ }else {
inputStr = " <input v-model=\"add" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info."+column.getString("code")+"\" " +
" type=\"text\" placeholder=\"" + required + "锛岃濉啓" + column.getString("cnCode") + "\" class=\"form-control\">\n";
}
@@ -213,7 +237,7 @@
String writePath = this.getClass().getResource("/").getPath()
- + "out/web/smo/" + data.getString("templateCode") + "/Add" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMOImpl.java";
+ + "out/web/smo/" + data.getString("templateCode") + "/impl/Add" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMOImpl.java";
System.out.printf("writePath: " + writePath);
writeFile(writePath,
fileContext);
--
Gitblit v1.8.0