diff --git a/pom.xml b/pom.xml index 2635ec9..b3bdc61 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ ${project.packaging} - lib + libs diff --git a/root/api/meta.js b/root/api/meta.js new file mode 100644 index 0000000..e69de29 diff --git a/root/api/qtask.js b/root/api/qtask.js new file mode 100644 index 0000000..e69de29 diff --git a/root/api/user.js b/root/api/user.js new file mode 100644 index 0000000..523600f --- /dev/null +++ b/root/api/user.js @@ -0,0 +1,9 @@ +//import red from '../res/js/red' + +const login = ({username, pwd}) => { + return {username}; +} + +const logout = () => { + +} \ No newline at end of file diff --git a/root/index.html b/root/index.html index 5ade6d0..2081cd5 100644 --- a/root/index.html +++ b/root/index.html @@ -100,15 +100,15 @@ /*{name: "DDL", url: "/qtask/ddl.html"},*/ {name: "MetaData", url: "/meta", nodes: [ /*{url:"/metadata/metatable/list.html", name:"TableList"},*/ - {url:"/metadata/metatable/metaTable.html", name:"MetaTable"}, + {url:"/metadata/metatable/metaTable.html", name:"MetaTable", icon: "icon-table"}, /*{url:"/metadata/metaLink.html", name:"MetaLink"},*/ - {url:"/metadata/metaService.html", name:"MetaService"}, - {url:"/metadata/dataList.html", name:"数据查询"}, + {url:"/metadata/metaService.html", name:"MetaService", icon:"icon-usecase"}, + {url:"/metadata/dataList.html", name:"数据查询", icon:"icon-bug"}, ] }, { name: "QTask", url: "/qtask", nodes: [ - {url:"/qtask/list.html", name:"QTask", icon:"icon-beaker"}, + {url:"/qtask/list.html", name:"QTask", icon:"icon-cube-alt"}, {url:"/qtask/debug.html", name:"QTask-Debug", icon:"icon-bug"}, ] }, diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html index 1612681..b6ec484 100644 --- a/root/metadata/dataList.html +++ b/root/metadata/dataList.html @@ -8,8 +8,8 @@

高级查询 - [测试用例]

- +
@@ -99,8 +99,10 @@ cols: [], filters: [] }, - tables: [], - table: "", + services:[], + service:"", + //tables: [], + //table: "", //filters: [], addFilter: "recompany", @@ -196,14 +198,14 @@ location.href = "/export/data?fBean=" + JSON.stringify(fBean) + "&platToken=" + red.getPlatToken() + "&cate=csv"; return; }, - tableList: function () { - red.getJSON("/meta/tablelist",{}, function (json) { - vm.tables = json; - vm.table = vm.tables[0].name; + serviceList: function () { + red.getJSON("/meta/service_list",{}, function (json) { + vm.services = json; + vm.service = vm.services[0].name; }); }, loadCfg: function () { - red.getJSON("/meta/listcfg", {key: vm.table, platToken: red.getPlatToken()}, function (json) { + red.getJSON("/meta/cfg", {key: this.service, platToken: red.getPlatToken()}, function (json) { vm.cfg = json; }); }, @@ -256,7 +258,7 @@ } }, mounted: function () { - this.tableList(); + this.serviceList(); } }); \ No newline at end of file diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html index ea90317..42475e6 100644 --- a/root/metadata/metaService.html +++ b/root/metadata/metaService.html @@ -1,4 +1,7 @@
- + @@ -54,8 +56,6 @@ 附加属性 备注 - - @@ -86,7 +86,6 @@ -
@@ -300,7 +299,7 @@ filters: [{name:"", filterType:[""]}] },//完整的元数据数据, move: false, - status: 0, //页面默认状态 + status: 7, //页面默认状态 table: "", //页面选择的业务类型 itemSort: [], //待保存的业务属性 diff --git a/root/res/css/red-kit.css b/root/res/css/red-kit.css index f146ab3..ae7ce81 100644 --- a/root/res/css/red-kit.css +++ b/root/res/css/red-kit.css @@ -138,4 +138,8 @@ th{ .data-list .table > thead > tr > th.sort-down:after { color: #145ccd; content: '\e6b8'; +} + +.table td, .table th{ + padding: 5px; } \ No newline at end of file diff --git a/root/user/login.html b/root/user/login.html index 004bb0a..1a18488 100644 --- a/root/user/login.html +++ b/root/user/login.html @@ -100,8 +100,10 @@ +