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/GeneratorEditComponent.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 5729bb5..7cc3253 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
@@ -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") ? "蹇呭～" : "閫夊～";
@@ -53,7 +53,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 +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";
}
--
Gitblit v1.8.0