diff --git a/conf/application.xml b/conf/application.xml index bd16f8d..6d20863 100644 --- a/conf/application.xml +++ b/conf/application.xml @@ -1,7 +1,6 @@ - - + @@ -12,10 +11,9 @@ - + - - + diff --git a/conf/application.xsd b/conf/application.xsd new file mode 100644 index 0000000..9c0d7d4 --- /dev/null +++ b/conf/application.xsd @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/root/api/meta.js b/root/api/meta.js index 190d69b..0655d41 100644 --- a/root/api/meta.js +++ b/root/api/meta.js @@ -19,9 +19,9 @@ const meta = { getServiceInfo({name}, callback) { red.getJSON("/meta/service_info",{name}, res => { - let {name, comment, table, edits, imports, shows, exports, filters, details} = red.replacePoint(res) + let {name, comment, table, edits, imports, shows, exports, filters, details, dels} = red.replacePoint(res) - callback({name, comment, table, edits, imports, shows, exports, filters, details}); + callback({name, comment, table, edits, imports, shows, exports, filters, details, dels}); }); }, getServiceDetail({name}, callback) { @@ -78,6 +78,10 @@ const meta = { edits = red.replace$(edits); return red.postX('/meta/editsave', {name, edits: JSON.stringify(edits)}) }, + delSave({name, dels}) { + dels = red.replace$(dels); + return red.postX('/meta/delsave', {name, dels: JSON.stringify(dels)}) + }, // Meta-Table tableList() { @@ -99,6 +103,10 @@ const meta = { } else if (cate == 'json') { } + }, + + del({name, id}) { + return red.postX('/data/del', {name, data: JSON.stringify({id})}) } } diff --git a/root/api/qtask.js b/root/api/qtask.js index 129e1ab..d99fc12 100644 --- a/root/api/qtask.js +++ b/root/api/qtask.js @@ -6,6 +6,6 @@ const qtask = { return red.postX('_qtask/save',{task}) }, qtaskDebug({task}) { - return red.postX('_qtask/debug',{task}) + return red.postX('_qtask/debug',{task:JSON.stringify(task)}) } } \ No newline at end of file diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html index c8e25cb..7f12374 100644 --- a/root/metadata/dataList.html +++ b/root/metadata/dataList.html @@ -74,9 +74,11 @@ + @@ -86,10 +88,14 @@ - + @@ -223,7 +229,8 @@ return {1:"男",2:"女"}[v] || "未知性别" } - let {getServiceList, getCfg, getDataList, exportData} = meta; + let {getServiceList, getCfg, getDataList, exportData, del} = meta + let {showOk} = red var vm = new Vue({ el:".data-list", data: { @@ -237,11 +244,12 @@ services: [], service: "", - addFilter: "recompany", + addFilter: "", para: {}, list: {rows: [], total: 0}, limit: {pn: 1, ps: 10, total: 0}, order: {col: "id", desc: 1}, + pk: "", detailData: {} }, watch: { @@ -271,7 +279,6 @@ this.list = {rows:[], total:0}; let fbean = this.buildFBean(); getDataList(fbean, json => { - console.log(json) vm.list = json; }); }, @@ -420,6 +427,12 @@ edit() { $('#edit').modal({moveable: true}); }, + del() { + let name = this.service + let pk = this.detailData[this.cfg.pk] + + del({name, id: pk}).then(res => showOk) + }, showInfo() { $('#f-info').modal({moveable: true}) } diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html index 202e96a..10c49df 100644 --- a/root/metadata/metaService.html +++ b/root/metadata/metaService.html @@ -67,7 +67,10 @@ - + + + + @@ -137,7 +140,8 @@ - + + @@ -146,7 +150,19 @@ + + +
操作
详情 编辑 + 删除
数据字段 表头名称格式化格式化类型附加参数
+ + + + +
@@ -293,6 +309,49 @@ + + +
+
删除策略
+
+
+ + + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+
+
@@ -340,7 +399,7 @@