From 52f5214bbd7f81b1c44a43aba83746508ba86b97 Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Tue, 16 Apr 2019 21:57:41 +0800
Subject: [PATCH] .

---
 root/api/meta.js                              |  5 +-
 root/metadata/metatable/metaTable.html        | 48 ++++++++++++-------
 .../net/tccn/service/MetadataService.java     |  3 +-
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/root/api/meta.js b/root/api/meta.js
index 7b84dfb..3bbce38 100644
--- a/root/api/meta.js
+++ b/root/api/meta.js
@@ -3,9 +3,9 @@ const meta = {
     getTableList(callback) {
         red.getJSON("/meta/tablelist",{}, json => callback(json));
     },
-    getTableDetail({name}, callback) {
+    /*getTableDetail({name}, callback) {
         red.getJSON("/meta/tableinfo",{name}, json => callback(json));
-    },
+    },*/
 
     getServiceList(callback) {
         red.getJSON("/meta/service_list",{}, json => {
@@ -57,6 +57,7 @@ const meta = {
     linkInfo({alias}) {
         return red.postX('/meta/link_info', {alias})
     },
+
     tableInfo({name, alias}) {
         return red.postX('/meta/tableinfo', {name, alias})
     }
diff --git a/root/metadata/metatable/metaTable.html b/root/metadata/metatable/metaTable.html
index d9af7a4..09652ec 100644
--- a/root/metadata/metatable/metaTable.html
+++ b/root/metadata/metatable/metaTable.html
@@ -8,8 +8,8 @@
             <span class="input-group-btn">
                 <button class="btn btn-default" type="button">选择Table{{status}}</button>
             </span>
-            <select class="form-control" v-model="table" style="width: 180px;">
-                <option v-for="item in tables" :value="item.name"> {{item.name}}&nbsp;&nbsp;&nbsp;[{{item.comment}}]</option>
+            <select class="form-control" v-model="metaTable" style="width: 180px;">
+                <option v-for="item in tables" :value="item"> {{item.name}}&nbsp;&nbsp;&nbsp;[{{item.comment}}]</option>
             </select>
 
             <span class="input-group-btn pull-left" style="padding-left: 20px">
@@ -287,7 +287,7 @@
 </row>
 
 <script>
-    let {getTableList, getTableDetail} = meta;
+    let {getTableList, tableInfo} = meta;
     let {showOk} = red
 
     var vm = new Vue({
@@ -306,7 +306,10 @@
             },//完整的元数据数据，
             move: false,
             status: 7, //页面默认状态
-            table: "", //页面选择的业务类型
+            table: "", //页面选择的table表名称
+            alias: "", //页面选择的table表别名
+            metaTable: {},
+
             itemSort: [], //待保存的业务属性
 
             oldItems: [], //不被修改的字段属性
@@ -320,11 +323,15 @@
             filterArr:[]
         },
         watch: {
+            metaTable(v) {
+                this.name = v.name
+                this.alias = v.alias
+            },
             status: function (v) {
                 this.setMove(v)
             },
-            table: function (table) {
-                this.loadDetail(table);
+            alias: function () {
+                this.loadDetail();
             },
             "meta.items": {
                 handler: function (nv, ov) {
@@ -353,23 +360,28 @@
             },
             tables: function (v) {
                 if(v.length > 0) {
-                    vm.table = v[0]["name"];
+                    this.metaTable = v[0]
+                    //vm.table = v[0]["name"];
                 }
             },
             meta: function (v) {
                 vm.row = {key:v.key, dbPlatId: v.dbPlatId, catalog: v.catalog, name:v.name, comment:v.comment, alias: v.alias};
-                /*vm.filters = v.filters;
-                var filterArr = [];
-                vm.filters.forEach(function (item) {
-                    filterArr.push(item.name);
-                })
-                vm.filterArr = filterArr;*/
             },
 
         },
         methods: {
-            loadDetail(cate) {
-                getTableDetail({name: cate}, (json) => {
+            loadDetail() {
+                tableInfo({alias: this.alias}).then(res => {
+                    let row = res;
+                    vm.meta = row;
+                    let oldItems = [];
+                    row.items.forEach(item => {
+                        oldItems.push({label, name, remark, type, inType} = item)
+                    });
+                    vm.oldItems = oldItems;
+                })
+
+                /*getTableDetail({name: cate}, (json) => {
                     var row = json;
                     vm.meta = row;
                     var oldItems = [];
@@ -381,12 +393,12 @@
                         oldItems.push(d);
                     });
                     vm.oldItems = oldItems;
-                });
+                });*/
 
             },
             tableList() {
-                getTableList(json => {
-                    vm.tables = json;
+                getTableList(res => {
+                    vm.tables = res;
                 })
             },
             catalogs: function() {
diff --git a/src/main/java/net/tccn/service/MetadataService.java b/src/main/java/net/tccn/service/MetadataService.java
index af40b15..3029477 100644
--- a/src/main/java/net/tccn/service/MetadataService.java
+++ b/src/main/java/net/tccn/service/MetadataService.java
@@ -88,6 +88,7 @@ public class MetadataService extends BaseService { //arango
                 ).map(x -> Kv.of("name", x.getName())
                         .set("comment", x.getComment())
                         .set("catalog", x.getCatalog())
+                        .set("alias", x.getAlias())
                         .set("dbPlatId", x.getDbPlatId())
                 ).collect(Collectors.toList());
         jBean.setBody(list);
@@ -242,7 +243,7 @@ public class MetadataService extends BaseService { //arango
         JBean jBean = new JBean();
         //MetaTable metaTable = MetaKit.getMetaTableByAlias(alias);
         List<Kv> list = MetaKit.getMetaLinks().stream().filter(x ->
-                x.getTables()[0].equals(alias) || x.getTables()[0].equals(alias)
+                x.getTables()[0].equals(alias) || x.getTables()[1].equals(alias)
         ).map(x -> {
             MetaTable linkTable = MetaKit.getMetaTableByAlias(x.getTables()[0].equals(alias) ? x.getTables()[1] : x.getTables()[0]);
             Kv kv = Kv.of("name", linkTable.getName())