.

root/metadata/dataList.html

@@ -52,8 +52,8 @@
         <table class="table table-bordered table-hover" style="width: 100%">
             <thead>
             <tr>
-                <th v-for="field in cfg.cols"
-                    v-text="field.label"
+                <th v-for="field in cfg.shows"
+                    v-text="getFieldLabel(field.col)"
                     :class="{'sort':field.order>0, 'sort-up':field.col==order.col && order.desc==1, 'sort-down':field.col==order.col && order.desc!=1}"
                     @click="sortEvent(field.col)"
                 >
@@ -63,13 +63,10 @@
             </thead>
             <tbody>
             <tr v-for="row in list.rows">
-                <td v-for="field in cfg.cols" v-title="dealField(row, field.col)" v-text="dealField(row, field.col)"></td>
+                <td v-for="field in cfg.shows" v-title="dealField(row, field.col)" v-text="dealField(row, field.col)"></td>
             </tr>
             </tbody>
         </table>
-        <div>
-            <p v-text="list['rows'][0]"></p>
-        </div>
     </div>
     <div>
         <ul class="pager pull-right" style="margin: 5px 10px">
@@ -100,7 +97,8 @@
         el:".data-list",
         data: {
             cfg:{
-                cols: [],
+                items:[],
+                shows: [],
                 filters: []
             },
             services:[],
@@ -175,6 +173,7 @@
                 };
 
                 getDataList(fbean, json => {
+                    console.log(json)
                     vm.list = json;
                 });
             },
@@ -244,7 +243,7 @@
                 } else if (bean[field] == "unknown") { //特殊值处理
                     str = "";
                 } else {
-                    str = bean[field] || "";
+                    str = bean[field.replace('$', '.')] || "";
                 }
 
                 return str;
@@ -257,7 +256,24 @@
                     vm.order.desc = 1;
                 }
                 vm.findList();
-            }
+            },
+            getFieldLabel: function (col) {
+                if (!col) {
+                    return "";
+                }
+
+                var items = this.cfg.items[col.split("$")[0]];
+                if (items) {
+                    return items[col.split("$")[1]]['label']
+                    /*for (var i = 0; i < items.items.length; i++) {
+                        if (tableInfo.items[i].name == col.split("$")[1]) {
+                            return tableInfo.items[i].label;
+                        }
+                    }*/
+
+                }
+                return '';
+            },
         },
         mounted() {
             this.serviceList();

root/metadata/metaService.html

@@ -37,9 +37,9 @@
             <span class="input-group-btn" style="padding-left: 20px">
                 <button @click="status=3" :class="['btn',{'btn-primary':status==3}]" type="button"> 导出配置</button>
             </span>
-            <span class="input-group-btn">
+            <!--<span class="input-group-btn">
                 <button @click="status=4" :class="['btn',{'btn-primary':status==4}]" type="button"> 导入配置</button>
-            </span>
+            </span>-->
 
             <span class="input-group-btn" style="padding-left: 30px">
                 <button @click="save()" :class="['btn',{'btn-primary':status!=0},{'disabled':status==0}]" type="button"> 保存</button>
@@ -450,14 +450,14 @@
              */
             save: function () {
                 if (vm.status == 1 && vm.itemSort.length > 0) {
-                    red.post("/meta/itemsort", {
+                    red.postX("/meta/itemsort", {
                         serviceKey: vm.table,
                         items: JSON.stringify(vm.itemSort)
                     });
                 }
 
                 else if (vm.status == 2 && vm.itemEdit.length > 0) {
-                    red.post("/meta/itemupdate", {
+                    red.postX("/meta/itemupdate", {
                         serviceKey: vm.table,
                         items: JSON.stringify(vm.itemEdit)
                     });
@@ -468,16 +468,16 @@
 
                     var dataStr = JSON.stringify(red.replace$(items[vm.status]));
 
-                    red.post(urls[vm.status], {
+                    red.postX(urls[vm.status], {
                         serviceKey: this.service,
                         items: dataStr
                     });
                 }
 
                 else if (vm.status == 5) {
-                    var dataStr = JSON.stringify(red.replace$(vm.serviceInfo.shows));
+                    let dataStr = JSON.stringify(red.replace$(vm.serviceInfo.shows));
                     console.log("dataStr", dataStr);
-                    red.post("/meta/showsort", {
+                    red.postX("/meta/showsort", {
                         serviceKey: vm.service,
                         items: dataStr
                     });
@@ -490,7 +490,7 @@
                         filterData.push(this.filterMap[this.filterArr[i]]);
                     }
 
-                    red.post("/meta/filter_update", {
+                    red.postX("/meta/filter_update", {
                         serviceKey: vm.service,
                         filters: JSON.stringify(red.replace$(filterData))
                     });
@@ -499,7 +499,7 @@
 
                 else if (vm.status == 7) {
                     console.log(vm.row);
-                    red.post("/meta/dbplatupdate", vm.row)
+                    red.postX("/meta/dbplatupdate", vm.row)
                 }
 
                 else {

root/metadata/metatable/metaTable.html

@@ -56,7 +56,7 @@
                 <th>附加属性</th>
                 <th>备注</th>
             </tr>
-            <tr v-for="(item, index) in meta.items">
+            <tr v-for="(item, index) in meta.items" class="item">
                 <td v-show="status==3"><input type="checkbox" v-model="meta.exports" :value="item.name" class="form-control"></td>
                 <td v-show="status==4"><input type="checkbox" v-model="meta.imports" :value="item.name" class="form-control"></td>
                 <td v-show="status==5"><input type="checkbox" v-model="meta.shows" :value="item.name" class="form-control"></td>
@@ -395,7 +395,7 @@
             setMove: function () {
                 if (this.status == 1) {
                     $('#sortableList,table>tbody').sortable({
-                        selector: '.list-group-item, tr',
+                        selector: '.item', // '.list-group-item, tr',
                         finish: function (e) {
                             var rows = e.list;
                             vm.itemSort = [];
@@ -487,15 +487,17 @@
              *
              */
             save: function () {
+                console.log(this.itemSort)
                 if (vm.status == 1 && vm.itemSort.length > 0) {
-                    red.post("/meta/itemsort", {
+                    console.log(this.itemSort)
+                    red.postX("/meta/itemsort", {
                         serviceKey: vm.table,
                         items: JSON.stringify(vm.itemSort)
                     });
                 }
 
                 else if (vm.status == 2 && vm.itemEdit.length > 0) {
-                    red.post("/meta/itemupdate", {
+                    red.postX("/meta/itemupdate", {
                         serviceKey: vm.table,
                         items: JSON.stringify(vm.itemEdit)
                     });
@@ -528,7 +530,7 @@
 
                 else if (vm.status == 7) {
                     console.log(vm.row);
-                    red.post("/meta/dbplatupdate", {metaTable: JSON.stringify(vm.row)})
+                    red.postX("/meta/dbplatupdate", {metaTable: JSON.stringify(vm.row)})
                 }
 
                 else {