From 2cbb4d04d8bdb83bf66f8aae79b129c8611f6fd5 Mon Sep 17 00:00:00 2001 From: bfc Date: Fri, 22 Mar 2019 10:11:50 +0800 Subject: [PATCH] . --- src/com/eversec/kit/creator/ICreator.java | 2 +- src/com/eversec/kit/creator/impl/page/VueKit.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/eversec/kit/creator/ICreator.java b/src/com/eversec/kit/creator/ICreator.java index 06b3484..1775e8e 100644 --- a/src/com/eversec/kit/creator/ICreator.java +++ b/src/com/eversec/kit/creator/ICreator.java @@ -77,7 +77,7 @@ public abstract class ICreator { public static Engine engine = Engine.use(); public static Map cateRelation = Kv.of("varchar", "String").set("text", "String").set("int", "Integer").set("bigint", "Long").set("long", "Long").set(null, "String").set("datetime", "Date"); - public static String[] fields = {"field","cate", "must","remark1", "remark2", "tag", "selects", "column","filter", "ck", "edit"}; + public static String[] fields = {"field","cate", "must","remark1", "remark2", "tag", "selects", "column","filter", "ck", "edit","update","xqzs"}; public static Gson gson = new Gson(); public static List sheetNames() { diff --git a/src/com/eversec/kit/creator/impl/page/VueKit.java b/src/com/eversec/kit/creator/impl/page/VueKit.java index a6c75ce..c46971b 100644 --- a/src/com/eversec/kit/creator/impl/page/VueKit.java +++ b/src/com/eversec/kit/creator/impl/page/VueKit.java @@ -19,11 +19,13 @@ public class VueKit extends PageKit { @Override public String createStr(String clazz, List fieldList, Map para) { + List ft = new ArrayList<>(); + ft.addAll(fieldList); List sc = new ArrayList<>(); List filterList = new ArrayList<>(); List detailsList = new ArrayList<>(); List editsList = new ArrayList<>(); - fieldList.forEach(x -> { + ft.forEach(x -> { x.put("field", (x.get("field") + "").trim()); x.put("isMust", isMust(x)); x.put("fieldType", getFiledType(x.get("cate")+"")); @@ -69,12 +71,12 @@ public class VueKit extends PageKit { }); Kv kv = createTplData(clazz); kv.set("remark", para.get("remark")); - kv.set("fieldList", fieldList); + kv.set("fieldList", ft); kv.set("showCol",sc); kv.set("fs",filterList); kv.set("detailsList",detailsList); kv.set("editsList",editsList); - kv.set("conditionLabel", getConditionLabel(fieldList, para)); + kv.set("conditionLabel", getConditionLabel(ft, para)); return engine.getTemplate(tplPath + "front/VueTpl.vue").renderToString(kv); }