From 853ed30ffb2746ea5eb6aff4c7409e34dbd0ba82 Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Wed, 3 Apr 2019 11:10:00 +0800
Subject: [PATCH] =?UTF-8?q?'=E4=BD=BF=E7=94=A8ES6=E8=AF=AD=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E5=96=84=E9=87=8D=E6=9E=84=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/api/meta.js                       | 92 ++++++++++++++++++++++++++
 root/api/user.js                       | 15 ++++-
 root/index.html                        | 36 +++++-----
 root/metadata/metaService.html         | 40 +++++------
 root/metadata/metatable/metaTable.html | 20 ++----
 root/user/login.html                   | 36 +++++-----
 6 files changed, 165 insertions(+), 74 deletions(-)

diff --git a/root/api/meta.js b/root/api/meta.js
index e69de29..424727b 100644
--- a/root/api/meta.js
+++ b/root/api/meta.js
@@ -0,0 +1,92 @@
+/*import red from '../res/js/red'*/
+
+/*const getPlats = (callback) => {
+    red.getJSON("/meta/plat_list", {}, json => callback(json));
+}
+
+const getTableList = (callback) => {
+    red.getJSON("/meta/tablelist",{}, function (json) {
+        callback(json);
+    });
+}
+
+const getTableDetail = ({name}, callback) => {
+    red.getJSON("/meta/tableinfo",{name}, function (json) {
+        callback(json);
+    });
+}
+
+const getServiceList = (callback) => {
+    red.getJSON("/meta/service_list",{}, function (json) {
+        json = red.replacePoint(json);
+        callback(json);
+    });
+}
+
+const getServiceInfo = ({name}, callback) => {
+    red.getJSON("/meta/service_info",{name}, res => {
+        let row = red.replacePoint(res);
+        row.shows = row.shows || [];
+        row.exports = row.exports || [];
+        row.imports = row.imports || [];
+        row.filters = row.filters || [];
+
+        callback(row);
+    });
+}
+
+function getServiceDetail({name}, callback) {
+    red.getJSON("/meta/service_detail",{name}, function (json) {
+        json = red.replacePoint(json)
+        callback(json);
+    });
+}*/
+const meta = {
+    getPlats: (callback) => {
+        red.getJSON("/meta/plat_list", {}, json => callback(json));
+    },
+    getTableList: (callback) => {
+        red.getJSON("/meta/tablelist",{}, function (json) {
+            callback(json);
+        });
+    },
+    getTableDetail: ({name}, callback) => {
+        red.getJSON("/meta/tableinfo",{name}, function (json) {
+            callback(json);
+        });
+    },
+
+    getServiceList: (callback) => {
+        red.getJSON("/meta/service_list",{}, function (json) {
+            json = red.replacePoint(json);
+            callback(json);
+        });
+    },
+    getServiceInfo: ({name}, callback) => {
+        red.getJSON("/meta/service_info",{name}, res => {
+            let row = red.replacePoint(res);
+            row.shows = row.shows || [];
+            row.exports = row.exports || [];
+            row.imports = row.imports || [];
+            row.filters = row.filters || [];
+
+            callback(row);
+        });
+    },
+    getServiceDetail: ({name}, callback) => {
+        red.getJSON("/meta/service_detail",{name}, function (json) {
+            json = red.replacePoint(json)
+            callback(json);
+        });
+    }
+}
+
+/*
+export {
+    getTableList,
+    getPlats,
+    getServiceDetail,
+    getServiceInfo,
+    getServiceList,
+    getTableDetail
+}*/
diff --git a/root/api/user.js b/root/api/user.js
index 523600f..34c6703 100644
--- a/root/api/user.js
+++ b/root/api/user.js
@@ -1,9 +1,18 @@
 //import red from '../res/js/red'
 
-const login = ({username,  pwd}) => {
-    return {username};
+const login = ({username,  pwd}, callback) => {
+    $.post("/user/login", {username,  pwd}, function (json) {
+        callback(json);
+    });
 }
 
 const logout = () => {
+    red.getJSON("/user/logout",{}, function () {
+        red.showMsg({msg:"退出成功"});
+        setTimeout(() => {
+            location.href = "/user/login.html";
+        }, 2000)
+    })
+}
 
-}
\ No newline at end of file
+export {login, logout}
diff --git a/root/index.html b/root/index.html
index 2081cd5..86a1e74 100644
--- a/root/index.html
+++ b/root/index.html
@@ -4,9 +4,9 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>MetaKit</title>
-    <link rel="stylesheet" href="../res/zui/css/zui.min.css">
-    <link rel="stylesheet" href="../res/css/zui-theme.css">
-    <link rel="stylesheet" href="../res/css/red-kit.css">
+    <link rel="stylesheet" href="./res/zui/css/zui.min.css">
+    <link rel="stylesheet" href="./res/css/zui-theme.css">
+    <link rel="stylesheet" href="./res/css/red-kit.css">
     <style>
         .logo h1{
             float: left;
@@ -84,13 +84,17 @@
     </row>
 </div>
 
-<script src="../res/zui/lib/jquery/jquery.js"></script>
-<script src="../res/zui/js/zui.js"></script>
-<script src="../res/zui/lib/sortable/zui.sortable.js"></script>
-<script src="../res/js/red.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/vue"></script>
+<script src="https://cdn.jsdelivr.net/npm/vue" async></script>
+<script src="./res/zui/lib/jquery/jquery.js" defer></script>
+<script src="./res/zui/js/zui.js" defer></script>
+<script src="./res/js/red.js" defer></script>
+<script src="./api/meta.js" defer></script>
+<script src="./res/zui/lib/sortable/zui.sortable.js" defer></script>
 <!--<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>-->
-<script>
+<script type="module">
+    import { logout } from './api/user.js'
+    /*import meta from './api/meta.js'*/
+    //import { getServiceInfo, getServiceDetail, getServiceList } from './api/meta.js'
     var vm = new Vue({
         el: ".container-fluid",
         data: {
@@ -150,7 +154,7 @@
             }
         },
         methods: {
-            loadPage: function (page) {
+            loadPage(page) {
                 if (page && this.page.url == page.url) {
                     return false;
                 }
@@ -158,17 +162,13 @@
                 this.page = page;
                 $("#main").load(page.url);
             },
-            loadMain: function (item) {
+            loadMain(item) {
                 this.menus = item.nodes || [item];
                 this.pageId = item.name;
             },
-            logout: function () {
-                red.getJSON("/user/logout",{}, function () {
-                    red.showMsg({msg:"退出成功"});
-                    setTimeout(() => {
-                        location.href = "/user/login.html";
-                    }, 2000)
-                })
+            logout() {
+                console.log(12321)
+                logout()
             }
         },
         mounted: function () {
diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html
index 42475e6..b93b253 100644
--- a/root/metadata/metaService.html
+++ b/root/metadata/metaService.html
@@ -214,8 +214,11 @@
 
 </row>
 
-<script src="res/zui/lib/sortable/zui.sortable.js"></script>
 <script>
+    //import { login } from '../api/user.js'
+    //import { getServiceInfo, getServiceDetail, getServiceList } from '/api/meta.js'
+    let { getServiceInfo, getServiceDetail, getServiceList } = meta;
+
     var vm = new Vue({
         el: ".meta-service",
         data: {
@@ -312,25 +315,19 @@
             },
         },
         methods: {
-            loadInfo: function (name) {
-                red.getJSON("/meta/service_info",{name: name}, function (json) {
-
-                    var row = red.replacePoint(json);
-                    row.shows = row.shows || [];
-                    row.exports = row.exports || [];
-                    row.imports = row.imports || [];
-                    row.filters = row.filters || [];
-                    vm.serviceInfo = row;
-                });
+            loadInfo(name) {
+                getServiceInfo({name}, (json) => {
+                    vm.serviceInfo = json;
+                })
             },
-            loadDetail: function (name) {
-                red.getJSON("/meta/service_detail",{name: name}, function (json) {
-                    vm.serviceDetail = red.replacePoint(json);
-                });
+            loadDetail(name) {
+                getServiceDetail({name}, (json) => {
+                    vm.serviceDetail = json;
+                })
             },
-            serviceList: function () {
-                red.getJSON("/meta/service_list",{}, function (json) {
-                    vm.services = red.replacePoint(json);
+            serviceList() {
+                getServiceList(json => {
+                    vm.services = json;
                 });
             },
             getFieldLabel: function (col) {
@@ -518,13 +515,6 @@
             });*/
 
             this.serviceList();
-
-            /*$(window).keydown(function (event) {
-                // 监听 Ctrl + Enter 可全屏查看
-                if (event.ctrlKey && event.keyCode == 13) {
-                    vm.save();
-                }
-            });*/
         }
     });
 
diff --git a/root/metadata/metatable/metaTable.html b/root/metadata/metatable/metaTable.html
index 9ad8310..e7ac856 100644
--- a/root/metadata/metatable/metaTable.html
+++ b/root/metadata/metatable/metaTable.html
@@ -282,8 +282,9 @@
 
 </row>
 
-<script src="res/zui/lib/sortable/zui.sortable.js"></script>
 <script>
+    let { getTableList,getTableDetail } = meta;
+
     var vm = new Vue({
         el: ".meta-list",
         data: {
@@ -362,12 +363,10 @@
 
         },
         methods: {
-            loadDetail: function (cate) {
-                //this.status = 0;
-                red.getJSON("/meta/tableinfo",{name: cate}, function (json) {
+            loadDetail(cate) {
+                getTableDetail({name: cate}, (json) => {
                     var row = json;
                     vm.meta = row;
-
                     var oldItems = [];
                     row.items.forEach(function (item) {
                         var d = {};
@@ -380,15 +379,10 @@
                 });
 
             },
-            tableList: function () {
-                red.getJSON("/meta/tablelist",{}, function (json) {
+            tableList() {
+                getTableList(json => {
                     vm.tables = json;
-                });
-
-                /*red.getJSON("/meta/service_info",{name: "user_service"}, function (json) {
-                    var x = red.replaceAll(json);
-                    console.log(x)
-                });*/
+                })
             },
             catalogs: function() {
                 var dbPlats = this.dbPlats;
diff --git a/root/user/login.html b/root/user/login.html
index 1a18488..58cb405 100644
--- a/root/user/login.html
+++ b/root/user/login.html
@@ -100,10 +100,13 @@
 <script src="../res/zui/lib/jquery/jquery.js"></script>
 <script src="../res/zui/js/zui.js"></script>
 <script src="../res/js/red.js"></script>
-<!--<script src="../api/user.js"></script>//-->
+<!--<script src="../api/user.js"></script>-->
+<!--<script src="../api/meta.js"></script>-->
 <script src="https://cdn.jsdelivr.net/npm/vue"></script>
-<script>
-    //import { login } from '../api/user.js'
+<script type="module">
+    import { login,logout } from '../api/user.js'
+    import { getPlats } from '../api/meta.js'
+
     var vm = new Vue({
         el: ".login",
         data: {
@@ -117,23 +120,26 @@
         },
         methods: {
             loginCheck: function ({username,  pwd}) {
-                /*login({username,  pwd}).then(res => {
-                    console.log("res", res)
-                });*/
-                $.post("/user/login", {username,  pwd}, function (json) {
+                login({username,  pwd}, function (json) {
                     if (json.code == 0) {
-                        vm.loadPlats();
-                        red.showMsg({msg:"请选择业务平台"})
-                        setTimeout(function () {
-                            vm.choose = true;
-                            //location.href = "/";
-                        }, 500);
+                        getPlats(function (json) {
+                            red.showMsg({msg:"请选择业务平台"})
+
+                            vm.sysPlats = json;
+                            if (!vm.sysPlat) {
+                                vm.sysPlat = json[0];
+                            }
+                            red.setData("sysPlats", json);
+                            setTimeout(function () {
+                                vm.choose = true;
+                            }, 500);
+                        })
                     } else {
                         red.showMsg({msg: json.message})
                     }
                 });
             },
-            loadPlats: function () {
+            /*loadPlats: function () {
                 var para = {
                     doc:"sys_plat",
                     shows: JSON.stringify(["_id", "_key", "name", "token","remark", "status"])
@@ -145,7 +151,7 @@
                     }
                     red.setData("sysPlats", json);
                 });
-            },
+            },*/
             goIndex: function () {
                 if (!this.sysPlat) {
                     red.showMsg({msg:"请选择选择业务平台", type:"error"});