1、支持列表自定义表头

2、业务完事,代码优化
This commit is contained in:
2019-04-23 20:54:42 +08:00
parent 8a03b03888
commit 211e59ea3b
8 changed files with 104 additions and 116 deletions

View File

@@ -192,7 +192,7 @@ public class MetaKit {
};
//listcfg
public static Function<MetaService, Kv> builderCfg = (m) -> {
/*public static Function<MetaService, Kv> builderCfg = (m) -> {
List<String> shows = m.getShows();
List<Map> filters = m.getFilters();
@@ -240,9 +240,9 @@ public class MetaKit {
_filters.add(filter);
});
/*shows.forEach(x -> {
*//*shows.forEach(x -> {
_shows.add(Kv.of("name", x).set("label", getFieldLabel(x)));
});*/
});*//*
Kv cfg = Kv.of();
cfg.set("title", m.getName())//业务名称
@@ -252,13 +252,13 @@ public class MetaKit {
.set("filters", _filters);//查询过滤条件
return cfg;
};
};*/
public static Map cfg(String name, String token) {
MetaService metaService = getMetaService(name, token);
Kv<String, MetaTable> metaTables = getMetaTables(metaService, false);
List<String> shows = metaService.getShows();
List<Map<String, String>> shows = metaService.getShows();
List<Map> edits = metaService.getEdits();
List<String> details = metaService.getDetails();
List<Map> filters = metaService.getFilters();
@@ -282,14 +282,13 @@ public class MetaKit {
});
//shows
List _shows = new ArrayList();
/*List _shows = new ArrayList();
shows.forEach(x -> {
MetaTable metaTable = metaTables.get(x.split("[.]")[0]); // 表别名
metaTable.getItems()
.stream()
metaTable.getItems().stream()
.filter(y -> x.split("[.]")[1].equals(y.getName()))
.findFirst().ifPresent(y -> _shows.add(Kv.of("col", x).set("order", true)));
});
});*/
//filters
List<Map> _filters = new ArrayList<>();
@@ -298,8 +297,7 @@ public class MetaKit {
MetaTable metaTable = metaTables.get(col.split("[.]")[0]); // 表别名
Kv filter = Kv.of();
metaTable.getItems()
.stream()
metaTable.getItems().stream()
.filter(y -> col.split("[.]")[1].equals(y.getName()))
.findFirst()
.ifPresent(y -> {
@@ -364,7 +362,7 @@ public class MetaKit {
return Kv.of()
.set("title", comment)
.set("items", _items2)
.set("shows", _shows)
.set("shows", shows)
.set("filters", _filters)
.set("edits", _edits)
.set("details", _details);
@@ -479,7 +477,7 @@ public class MetaKit {
return alias;
}),
metaService.getExports().stream().map(x -> x.split("[.]")[0]),
metaService.getShows().stream().map(x -> x.split("[.]")[0])/*, todo: xxx
metaService.getShows().stream().map(x -> x.get("col").split("[.]")[0])/*, todo: xxx
metaService.getEdits().stream().map(x -> x.split("[.]")[0])*/
);