From 61a90c8591d0cd2b773299398c6b0428c0ab22bc Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Thu, 13 Jun 2019 11:27:22 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=9A=84=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E5=BC=82=E5=B8=B8=202=E3=80=81=E9=87=8D=E6=9E=84DbKit=EF=BC=8C?=
=?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AD=98=E5=9C=A8=E7=9A=84catalog=E6=9C=AA?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AF=BC=E8=87=B4=E7=9A=84=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
root/metadata/dataList.html | 27 ++++++++++++++++--
root/metadata/metatable/metaTable.html | 28 +++++++++----------
root/qtask/list.html | 5 ++++
src/main/java/net/tccn/base/MetaKit.java | 14 +++++-----
src/main/java/net/tccn/dbq/DbExecutors.java | 4 +--
.../java/net/tccn/dbq/jdbc/api/DbKit.java | 24 ++++++++++++----
.../java/net/tccn/dbq/jdbc/api/DbSource.java | 1 +
.../net/tccn/dbq/jdbc/api/DbSourceMysql.java | 7 ++++-
.../java/net/tccn/service/_DbService.java | 10 +++----
src/test/java/RunTest.java | 4 +--
10 files changed, 85 insertions(+), 39 deletions(-)
diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html
index 7f12374..86aa939 100644
--- a/root/metadata/dataList.html
+++ b/root/metadata/dataList.html
@@ -299,7 +299,30 @@
},
dealFieldFmt(bean, colFmt) { //处理字典数据 及 自定义函数处理数据
- if (colFmt["fmt"]) {
+ let v = ""
+
+ if (colFmt.inType == "DICT") {
+ // 取字典值返回
+ v = bean[colFmt["col"]]
+ }
+ else if (colFmt.inType == "INPUT_DAY") {
+
+ v = bean[colFmt["col"]]
+ }
+ else if (colFmt.inType == "INPUT_TIME") {
+
+ v = bean[colFmt["col"]]
+ }
+ else if (colFmt.inType == "INPUT_FUNC") {
+
+ v = bean[colFmt["col"]]
+ }
+ else {
+ v = bean[colFmt["col"]]
+ }
+ return v + " -> "+colFmt.inType
+
+ /*if (colFmt["fmt"]) {
let fmt = colFmt["fmt"]
let cate = ""
if (fmt.indexOf("|") > 0) {
@@ -323,7 +346,7 @@
} else {
//console.log(`k-v:${colFmt["col"]}-${bean[colFmt["col"]]}`)
return bean[colFmt["col"]]
- }
+ }*/
},
dealField(bean, field) {
let str = "";
diff --git a/root/metadata/metatable/metaTable.html b/root/metadata/metatable/metaTable.html
index 77dce60..190348d 100644
--- a/root/metadata/metatable/metaTable.html
+++ b/root/metadata/metatable/metaTable.html
@@ -224,7 +224,6 @@
}
}
- console.log(itemEdit)
this.itemEdit = itemEdit;
},
deep: true
@@ -289,10 +288,10 @@
$('#show>table>tbody').sortable({
selector: 'tr',
finish: function (e) {
- var rows = e.list;
- var shows = [];
- for (var i = 0; i < rows.length; i++) {
- var item = $(rows[i]).find("input[name='name']").val();
+ let rows = e.list;
+ let shows = [];
+ for (let i = 0; i < rows.length; i++) {
+ let item = $(rows[i]).find("input[name='name']").val();
shows.push(item);
}
vm.meta.shows = shows;
@@ -302,10 +301,10 @@
$('#import>table>tbody').sortable({
selector: 'tr',
finish: function (e) {
- var rows = e.list;
- var shows = [];
- for (var i = 0; i < rows.length; i++) {
- var item = $(rows[i]).find("input[name='name']").val();
+ let rows = e.list;
+ let shows = [];
+ for (let i = 0; i < rows.length; i++) {
+ let item = $(rows[i]).find("input[name='name']").val();
shows.push(item);
}
vm.meta.imports = shows;
@@ -329,10 +328,10 @@
$('#filter>table>tbody').sortable({
selector: 'tr',
finish: function (e) {
- var rows = e.list;
- var filterArr = [];
- for (var i = 0; i < rows.length; i++) {
- var item = $(rows[i]).find("input[name='name']").val();
+ let rows = e.list;
+ let filterArr = [];
+ for (let i = 0; i < rows.length; i++) {
+ let item = $(rows[i]).find("input[name='name']").val();
filterArr.push(item);
}
vm.filterArr = filterArr;
@@ -399,7 +398,8 @@
}
},
dealTableLabel(table) {
- return `${table.name} [${table.comment}] (${table.linkCount})`
+ // (${table.linkCount})
+ return `${table.name} [${table.comment}]`
},
getFieldLabel (col) {
if (!col) {
diff --git a/root/qtask/list.html b/root/qtask/list.html
index 7d2ddc6..bb76e50 100644
--- a/root/qtask/list.html
+++ b/root/qtask/list.html
@@ -41,6 +41,11 @@
+
+
+
+
暂无数据
+