From 707e9ee6808929cc9af580b3c2d7de8fe42d8720 Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Fri, 16 Aug 2019 00:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=B9=E8=BF=9B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=20=E9=BB=98=E8=AE=A4=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/metadata/dataList.html    | 11 +++++++++--
 root/metadata/metaService.html | 17 ++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

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 @@
             <div class="input-group item">
                 <span class="input-group-addon" style="width: 130px;">{{filter.label}}</span>
                 <select class="form-control" v-model="filter['type']" style="width: 100px">
-                    <option v-for="(t, index) in filter.filterType" :value="t.name" v-text="t.remark"></option>
+                    <option v-for="(t, i) in filter.filterType" :value="t.name" v-text="t.remark"></option>
                 </select>
                 <span class="input-group-addon fix-border fix-padding"></span>
                 <input v-if="!filter.inType || filter.inType == 'INPUT'" type="text" class="form-control" v-model="filter['value']">
@@ -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 @@
                     <td style="padding: 1px;"><input v-model="item.label" class="form-control" style="width: 130px;padding: 0px"></td>
                     <td style="padding: 1px;">
                         <select v-model="item.inType" class="form-control" style="width: 130px">
-                            <option></option>
                             <option v-for="x in inTypes" :value="x">{{x}}</option>
                         </select>
                     </td>
@@ -226,7 +225,6 @@
                     <td style="padding: 1px;"><input v-model="item.label" class="form-control" style="padding: 0px"></td>
                     <td style="padding: 1px;">
                         <select v-model="item.inType" class="form-control" style="width: 130px">
-                            <option></option>
                             <option v-for="x in exportFmtTypes" :value="x">{{x}}</option>
                         </select>
                     </td>
@@ -353,7 +351,6 @@
                     <td style="padding: 1px;"><input v-model="item.label" class="form-control" style="width: 130px;padding: 0px"></td>
                     <td style="padding: 1px;">
                         <select v-model="item.inType" class="form-control" style="width: 130px">
-                            <option></option>
                             <option v-for="x in inTypes" :value="x">{{x}}</option>
                         </select>
                     </td>
@@ -376,7 +373,7 @@
                     <th>数据字段</th>
                     <th>展示名称</th>
                     <th>表单组件</th>
-                    <th>数据格式化</th>
+                    <th>附加参数</th>
                     <th>表单校验</th>
                 </tr>
                 </thead>
@@ -389,7 +386,6 @@
                     <td style="padding: 1px;"><input v-model="item.label" class="form-control" style="width: 100px;padding: 0px"></td>
                     <td style="padding: 1px;">
                         <select v-model="item.inType" class="form-control" style="width: 130px">
-                            <option></option>
                             <option v-for="x in inTypes" :value="x">{{x}}</option>
                         </select>
                     </td>
@@ -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'})
                 }
 
                 //去除删除的