|
@@ -42,6 +42,8 @@ public class UpdateFtlMaker {
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
+
|
|
|
+ StringBuilder sbSearch = new StringBuilder();
|
|
|
StringBuilder sb1 = new StringBuilder();
|
|
|
StringBuilder sb2 = new StringBuilder();
|
|
|
sb1.append(space(9)).append("<th><input type=\"button\" value=\"全选\" onclick=\"multiSelectCheck()\" /></th>\r\n");
|
|
@@ -70,10 +72,23 @@ public class UpdateFtlMaker {
|
|
|
|
|
|
sb1.append(String.format(space(9) + "<th>%s</th>\r\n", attrDescr));
|
|
|
if (attrType.contains("Date")) {
|
|
|
- sb2.append(String.format(space(9) + "<th>${(item.%s?string('yyyy-MM-dd HH:mm:ss'))!}</th>\r\n",
|
|
|
+ sb2.append(String.format(space(9) + "<td>${(item.%s?string('yyyy-MM-dd HH:mm:ss'))!}</td>\r\n",
|
|
|
attrName));
|
|
|
} else {
|
|
|
+ sbSearch.append(space(11) + "<div class=\"row col-md-4\">\r\n");
|
|
|
+ sbSearch.append(space(12) + String.format("<label for=\"%s\">%s</label>\r\n", attrName, attrDescr));
|
|
|
+ sbSearch.append(space(12) + "<div class=\"col-sm-8\">\r\n");
|
|
|
+
|
|
|
+ sbSearch.append(space(12) + String.format("\t<#if globalDict['%s']?exists> \r\n", attrName));
|
|
|
+ sbSearch.append(space(12) + String.format("\t\t<select class=\"form-control\" name=\"%s\">\r\n", attrName));
|
|
|
+ sbSearch.append(space(12) + "\t\t\t<option value=\"\">请选择</option>\r\n");
|
|
|
+ sbSearch.append(space(12) + String.format("\t\t<#list globalDict['%s']?keys as key>\r\n", attrName));
|
|
|
+
|
|
|
if (attrType.toLowerCase().contains("int")) {
|
|
|
+ sbSearch.append(space(12) + String.format("\t\t\t<option value=\"${key}\"%s>${globalDict['%s'][key]!}</option>\r\n",
|
|
|
+ " ${(ret.model." + attrName + "?? && key==query." + attrName + "?c)?string( 'selected=\"selected\"','')}",
|
|
|
+ attrName));
|
|
|
+
|
|
|
sb2.append(String.format(
|
|
|
space(9) + "<td>\r\n"
|
|
|
+ space(10) + "<#if item.%s?? \r\n"
|
|
@@ -86,6 +101,10 @@ public class UpdateFtlMaker {
|
|
|
+ space(9) + "</td>\r\n",
|
|
|
attrName, attrName, attrName, attrName, attrName, attrName, attrName));
|
|
|
} else {
|
|
|
+ sbSearch.append(space(12) + String.format("\t\t\t<option value=\"${key}\"%s>${globalDict['%s'][key]!}</option>\r\n",
|
|
|
+ " ${(ret.model." + attrName + "?? && key==query." + attrName + ")?string( 'selected=\"selected\"','')}",
|
|
|
+ attrName));
|
|
|
+
|
|
|
sb2.append(String.format(
|
|
|
space(9) + "<td>\r\n"
|
|
|
+ space(10) + "<#if item.%s?? \r\n"
|
|
@@ -98,13 +117,22 @@ public class UpdateFtlMaker {
|
|
|
+ space(9) + "</td>\r\n",
|
|
|
attrName, attrName, attrName, attrName, attrName, attrName, attrName));
|
|
|
}
|
|
|
+
|
|
|
+ sbSearch.append(space(12) + "\t\t</#list>\r\n");
|
|
|
+ sbSearch.append(space(12) + "\t\t</select> \r\n");
|
|
|
+ sbSearch.append(space(12) + "\t<#else>\r\n");
|
|
|
+ sbSearch.append(space(12) + String.format("\t\t<input type=\"text\" class=\"form-control\" name=\"%s\" value=\"%s\" />\r\n",
|
|
|
+ attrName, "${query." + attrName + "!}"));
|
|
|
+ sbSearch.append(space(12) + "\t</#if>\r\n");
|
|
|
+ sbSearch.append(space(12) + "</div>\r\n");
|
|
|
+ sbSearch.append(space(11) + "</div>\r\n");
|
|
|
}
|
|
|
}
|
|
|
sb1.append(space(9) + "<th>操作</th>");
|
|
|
sb2.append(String.format(
|
|
|
space(9) + "<td><a href=\"###\" onclick=\"showModal('updatePage?%s=${item.%s}')\">编辑</a></td>",
|
|
|
keyName, keyName));
|
|
|
- return String.format(fileContent, sb1.toString(), sb2.toString());
|
|
|
+ return String.format(fileContent, sbSearch.toString(), sb1.toString(), sb2.toString());
|
|
|
}
|
|
|
|
|
|
public static String parse(boolean update, String tableComment, String keyName, List<String> attrNames,
|