From 211e59ea3b36e557ba411df3dad42865cfe8d130 Mon Sep 17 00:00:00 2001 From: lxyer <237809796@qq.com> Date: Tue, 23 Apr 2019 20:54:42 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=94=AF=E6=8C=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4=202=E3=80=81?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=AE=8C=E4=BA=8B=EF=BC=8C=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- root/api/meta.js | 16 +-- root/metadata/dataList.html | 2 +- root/metadata/metaService.html | 136 ++++++++---------- root/res/css/red-kit.css | 9 ++ src/main/java/net/tccn/base/MetaKit.java | 24 ++-- .../java/net/tccn/dbq/parser/ParseMysql.java | 10 +- src/main/java/net/tccn/meta/MetaService.java | 15 +- .../net/tccn/service/MetadataService.java | 8 +- 8 files changed, 104 insertions(+), 116 deletions(-) diff --git a/root/api/meta.js b/root/api/meta.js index 5013c92..54fed50 100644 --- a/root/api/meta.js +++ b/root/api/meta.js @@ -18,16 +18,6 @@ const meta = { }, getServiceInfo({name}, callback) { red.getJSON("/meta/service_info",{name}, res => { - /*let row = red.replacePoint(res) - console.log(row) - - //let [name, comment, table, edits, imports, shows, exports, filters] = red.replacePoint(res); - - - row.shows = row.shows || []; - row.exports = row.exports || []; - row.imports = row.imports || []; - row.filters = row.filters || [];*/ let {name, comment, table, edits, imports, shows, exports, filters} = red.replacePoint(res) @@ -67,6 +57,12 @@ const meta = { return red.postX('/meta/tableinfo', {name, alias}) }, + //meta-service + showSave({name, shows}) { + shows = red.replace$(shows); + return red.postX('/meta/showsort', {name, shows: JSON.stringify(shows)}) + }, + // Meta-Table itemSort({alias, items}) { return red.postX('/meta/itemsort', {alias, items: JSON.stringify(items)}) diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html index ccc0a0f..8f6b880 100644 --- a/root/metadata/dataList.html +++ b/root/metadata/dataList.html @@ -83,7 +83,7 @@ diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html index c2f2e05..734d7dc 100644 --- a/root/metadata/metaService.html +++ b/root/metadata/metaService.html @@ -106,7 +106,7 @@ - + @@ -122,23 +122,23 @@
-
展示字段配置
+
列表配置
- - + + - - - + +
字段名中文名数据字段表头名称
- + + {{getFieldLabel(item)}}
@@ -274,9 +274,7 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/root/res/css/red-kit.css b/root/res/css/red-kit.css index 1806dcf..d1a710e 100644 --- a/root/res/css/red-kit.css +++ b/root/res/css/red-kit.css @@ -174,4 +174,13 @@ th{ .tlist>li>a:hover { background-color: #e2effc; border-radius: 2px 0 0 2px; +} + +/* 为可拖动的条目应用可移动光标类型 */ +tr {cursor: move} + +/* 为正在被拖动的条目应用半透明外观 */ +tr.dragging { + visibility: visible; + opacity: .3; } \ No newline at end of file diff --git a/src/main/java/net/tccn/base/MetaKit.java b/src/main/java/net/tccn/base/MetaKit.java index e227153..9cc0e81 100644 --- a/src/main/java/net/tccn/base/MetaKit.java +++ b/src/main/java/net/tccn/base/MetaKit.java @@ -192,7 +192,7 @@ public class MetaKit { }; //listcfg - public static Function builderCfg = (m) -> { + /*public static Function builderCfg = (m) -> { List shows = m.getShows(); List 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 metaTables = getMetaTables(metaService, false); - List shows = metaService.getShows(); + List> shows = metaService.getShows(); List edits = metaService.getEdits(); List details = metaService.getDetails(); List 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 _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])*/ ); diff --git a/src/main/java/net/tccn/dbq/parser/ParseMysql.java b/src/main/java/net/tccn/dbq/parser/ParseMysql.java index 973aea6..5f075e8 100644 --- a/src/main/java/net/tccn/dbq/parser/ParseMysql.java +++ b/src/main/java/net/tccn/dbq/parser/ParseMysql.java @@ -105,10 +105,14 @@ public class ParseMysql implements Parser { Kv tables = MetaKit.getMetaTables(metaService, false);//所有的关联表信息 MetaTable metaTable = tables.get(metaService.getTable());//基础元数据 - List shows = metaService.getShows();//查询的属性 + List> shows = metaService.getShows();//查询的属性 List _filters = fBean.getFilters().stream().map(Filter::getCol).collect(Collectors.toList()); - List links = MetaKit.getMetaLinks(metaService.getTable(), shows, _filters); + List links = MetaKit.getMetaLinks( + metaService.getTable(), + shows.stream().map(x -> x.get("col")).collect(Collectors.toList()), + _filters + ); //查询条件 List filters = fBean.getFilters(); Limit limit = fBean.getLimit(); @@ -131,7 +135,7 @@ public class ParseMysql implements Parser { if (!isEmpty.test(shows)) { shows.forEach(x -> { //buf.append("`").append("x").append("`").append(","); - bufSelect.append(x).append(" as ").append("'").append(x).append("',"); + bufSelect.append(x.get("col")).append(" as ").append("'").append(x.get("col")).append("',"); }); bufSelect.deleteCharAt(bufSelect.length() - 1); } else { diff --git a/src/main/java/net/tccn/meta/MetaService.java b/src/main/java/net/tccn/meta/MetaService.java index f12b5d7..aa30cff 100644 --- a/src/main/java/net/tccn/meta/MetaService.java +++ b/src/main/java/net/tccn/meta/MetaService.java @@ -17,11 +17,9 @@ public class MetaService extends Doc { private String name; //业务标识 private String table; //主体表别名 private String comment; //业务中文名 - //private List links; //["link._key1","link._key2"] - private String sysPlatId; //平台id - private List shows = new ArrayList<>(); + private List> shows = new ArrayList<>(); private List edits = new ArrayList<>(); private List details = new ArrayList<>(); private List filters = new ArrayList<>(); @@ -64,19 +62,12 @@ public class MetaService extends Doc { public void setSysPlatId(String sysPlatId) { this.sysPlatId = sysPlatId; } - /*public List getLinks() { - return links; - } - public void setLinks(List links) { - this.links = links; - }*/ - - public List getShows() { + public List> getShows() { return shows; } - public void setShows(List shows) { + public void setShows(List> shows) { this.shows = shows; } diff --git a/src/main/java/net/tccn/service/MetadataService.java b/src/main/java/net/tccn/service/MetadataService.java index 7328765..5199801 100644 --- a/src/main/java/net/tccn/service/MetadataService.java +++ b/src/main/java/net/tccn/service/MetadataService.java @@ -149,12 +149,12 @@ public class MetadataService extends BaseService { //arango } @RestMapping(name = "showsort", comment = "展示字段修改") - public JBean showSort(String serviceKey , List items, @RestParam(name = "platToken") String token) { - if (items == null || items.size() == 0) return null; + public JBean showSort(String name , List> shows, @RestParam(name = "platToken") String token) { + if (shows == null || shows.size() == 0) return null; - MetaService metaService = MetaKit.getMetaService(serviceKey, token); + MetaService metaService = MetaKit.getMetaService(name, token); - metaService.setShows(items); + metaService.setShows(shows); metaService.update(); MetaKit.reload(metaService); return JBean.OK;