1、解决默认提供的删除功能异常 2、重构DbKit,解决存在的catalog未设置导致的查询失败

This commit is contained in:
2019-06-13 11:27:22 +08:00
parent 7590f73651
commit 61a90c8591
10 changed files with 85 additions and 39 deletions

View File

@@ -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 = "";

View File

@@ -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) {

View File

@@ -41,6 +41,11 @@
</tr>
</tbody>
</table>
<div v-show="!row || list.rows == 0" style="text-align: center">
<img src="../res/img/none.png">
<p>暂无数据</p>
</div>
</div>
<!-- modal-tpl -->