diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html
index 5319295..a0b6f46 100644
--- a/root/metadata/dataList.html
+++ b/root/metadata/dataList.html
@@ -58,7 +58,7 @@
{{filter.label}}
@@ -300,7 +300,14 @@
});
},
loadCfg() {
- getCfg({name: this.service}).then(res => this.cfg = res);
+ getCfg({name: this.service}).then(res => {
+ res['type'] = res.filters[0]['name']
+
+ for (i in res["filters"]) {
+ res["filters"][i]['type'] = res["filters"][i]['filterType'][0]['name']
+ }
+ this.cfg = res
+ });
},
dealFieldFmt(bean, colFmt) { //处理字典数据 及 自定义函数处理数据
diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html
index 7783822..c36ab27 100644
--- a/root/metadata/metaService.html
+++ b/root/metadata/metaService.html
@@ -186,7 +186,6 @@
|
|
@@ -226,7 +225,6 @@
|
|
@@ -353,7 +351,6 @@
|
|
@@ -376,7 +373,7 @@
数据字段 |
展示名称 |
表单组件 |
- 数据格式化 |
+ 附加参数 |
表单校验 |
@@ -389,7 +386,6 @@
|
|
@@ -542,7 +538,7 @@
shows: [],
exports: [],
imports: [],
- filters: [{name: '', label: '', filterType: ['']}],
+ filters: [{name: '', label: '', filterType: [''], type:""}],
details: [],
edits: [],
dels: {cate: "", sql: "", qtask: ""}
@@ -676,7 +672,7 @@
}
}
let label = this.getFieldLabel(v[i])
- filters.push({name: v[i], label, filterType: ["EQUAL"], checked: false})//构造filter 对象
+ filters.push({name: v[i], label, filterType: ["EQUAL"], checked: false, inType:"INPUT"})//构造filter 对象
}
// 去除删除的
@@ -715,6 +711,9 @@
if (!shows[j]['label']) {
shows[j]['label'] = this.getFieldLabel(v[i])
}
+ if (!shows[j]['inType']) {
+ shows[j]['inType'] = "INPUT"
+ }
/*if (!shows[j]['fmt']) {
shows[j]['fmt'] = this.getFiledInExt(v[i])
}*/
@@ -800,7 +799,7 @@
continue c
}
}*/
- details.push({col: v[i], label: label})
+ details.push({col: v[i], label: label, inType: 'INPUT'})
}
//去除删除的
@@ -834,7 +833,7 @@
}
// 新的
let label = this.getFieldLabel(v[i])
- edits.push({col: v[i], label: label, cks:[]})
+ edits.push({col: v[i], label: label, cks:[], inType: 'INPUT'})
}
//去除删除的