From 1aee96151d99eb9eb06c4bc3357f3e43357d70e8 Mon Sep 17 00:00:00 2001
From: tanghc <thc8719@163.com>
Date: Wed, 20 Mar 2019 14:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/service/routeManager.html           |  59 +++++++-
 .../pages/service/routeManager.js             | 134 ++++++++++++------
 2 files changed, 140 insertions(+), 53 deletions(-)

diff --git a/sop-admin/sop-admin-front/pages/service/routeManager.html b/sop-admin/sop-admin-front/pages/service/routeManager.html
index 032a1950..e283f866 100644
--- a/sop-admin/sop-admin-front/pages/service/routeManager.html
+++ b/sop-admin/sop-admin-front/pages/service/routeManager.html
@@ -43,12 +43,14 @@
                 </form>
             </div>
 
-            <div class="layui-btn-group demoTable">
-                <button class="layui-btn layui-btn-ms layui-btn-normal" lay-event="addRoute">
-                    <i class="layui-icon layui-icon-add-circle-fine"></i>添加路由
-                </button>
-            </div>
             <table class="layui-hide" id="routeTable" lay-filter="routeTable"></table>
+            <script type="text/html" id="toolbar">
+                <div class="layui-btn-container">
+                    <button class="layui-btn layui-btn-ms layui-btn-normal" lay-event="add">
+                        <i class="layui-icon layui-icon-add-1"></i>添加路由
+                    </button>
+                </div>
+            </script>
             <script type="text/html" id="optBar" >
                 <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit">修改</a>
             </script>
@@ -58,8 +60,53 @@
 
 </div>
 
+<div id="addWin" style="display: none;padding: 20px;">
+    <form id="addForm" class="layui-form" action="" lay-filter="addWinFilter">
+        <input type="hidden" name="serviceId" />
+        <input type="hidden" name="profile" />
+        <div class="layui-form-item">
+            <label class="layui-form-label">id</label>
+            <div class="layui-input-block">
+                <input type="text" name="id" class="layui-input"/>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">uri</label>
+            <div class="layui-input-block">
+                <input type="text" name="uri" lay-verify="required" class="layui-input"/>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">path</label>
+            <div class="layui-input-block">
+                <input type="text" name="path" class="layui-input"/>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">忽略验证</label>
+            <div class="layui-input-block">
+                <input type="radio" name="ignoreValidate" value="true" title="是">
+                <input type="radio" name="ignoreValidate" value="false" title="否">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">状态</label>
+            <div class="layui-input-block">
+                <input type="radio" name="disabled" value="false" title="启用">
+                <input type="radio" name="disabled" value="true" title="<span class='x-red'>禁用</span>">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="addWinSubmitFilter">保存</button>
+                <button type="button" class="layui-btn layui-btn-primary" onclick="layer.closeAll()">取消</button>
+            </div>
+        </div>
+    </form>
+</div>
+
 <div id="updateWin" style="display: none;padding: 20px;">
-    <form class="layui-form" action="" lay-filter="updateWinFilter">
+    <form id="updateForm" class="layui-form" action="" lay-filter="updateWinFilter">
         <input type="hidden" name="serviceId" />
         <input type="hidden" name="profile" />
         <div class="layui-form-item">
diff --git a/sop-admin/sop-admin-front/pages/service/routeManager.js b/sop-admin/sop-admin-front/pages/service/routeManager.js
index 7fcc5d69..1ad562bf 100644
--- a/sop-admin/sop-admin-front/pages/service/routeManager.js
+++ b/sop-admin/sop-admin-front/pages/service/routeManager.js
@@ -4,6 +4,9 @@ lib.use(['element', 'table', 'tree', 'form'], function () {
     var currentServiceId;
     var routeTable;
     var profile = window.profile;
+    var $updateForm = $('#updateForm');
+    var $addForm = $('#addForm');
+    var smTitle;
 
     form.on('submit(searchFilter)', function (data) {
         var param = data.field;
@@ -12,7 +15,7 @@ lib.use(['element', 'table', 'tree', 'form'], function () {
         return false;
     });
 
-    //监听提交
+    // 监听修改提交
     form.on('submit(updateWinSubmitFilter)', function(data) {
         ApiUtil.post('route.update', data.field, function (resp) {
             layer.closeAll();
@@ -21,6 +24,15 @@ lib.use(['element', 'table', 'tree', 'form'], function () {
         return false;
     });
 
+    // 监听保存提交
+    form.on('submit(addWinSubmitFilter)', function(data) {
+        ApiUtil.post('route.add', data.field, function (resp) {
+            layer.closeAll();
+            routeTable.reload();
+        })
+        return false;
+    });
+
     function initTree() {
         ApiUtil.post('service.list', {profile: profile}, function (resp) {
             var serviceList = resp.data;
@@ -61,6 +73,7 @@ lib.use(['element', 'table', 'tree', 'form'], function () {
         searchTable({
             serviceId: serviceId
         });
+        smTitle = '[ <strong>profile：</strong>' + profile + '&nbsp;&nbsp;&nbsp;&nbsp;<strong>serviceId：</strong>' + currentServiceId + ' ]';
     }
 
     /**
@@ -74,52 +87,7 @@ lib.use(['element', 'table', 'tree', 'form'], function () {
         };
 
         if (!routeTable) {
-            routeTable = table.render({
-                elem: '#routeTable'
-                , url: ApiUtil.createUrl('route.list')
-                , where: postData
-                , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
-                , cols: [[
-                    {field: 'id', title: 'id(接口名+版本号)', width: 250}
-                    , {field: 'uri', title: 'uri', width: 200}
-                    , {field: 'path', title: 'path', width: 200}
-                    , {
-                        field: 'ignoreValidate', width: 80, title: '忽略验证', templet: function (row) {
-                            return row.ignoreValidate
-                                ? '<span class="x-red">是</span>'
-                                : '<span>否</span>';
-                        }
-                    }
-                    , {
-                        field: 'disabled', title: '状态', width: 80, templet: function (row) {
-                            return row.disabled
-                                ? '<span class="x-red">禁用</span>'
-                                : '<span class="x-green">启用</span>';
-                        }
-                    }
-                    , {fixed: 'right', title: '操作', toolbar: '#optBar', width: 100}
-                ]]
-            });
-
-            //监听单元格事件
-            table.on('tool(routeTable)', function(obj) {
-                var data = obj.data;
-                if(obj.event === 'edit'){
-                    //表单初始赋值
-                    data.disabled = data.disabled + '';
-                    data.ignoreValidate = data.ignoreValidate + '';
-                    data.serviceId = currentServiceId;
-                    data.profile = profile;
-                    form.val('updateWinFilter', data)
-
-                    layer.open({
-                        type: 1
-                        ,title: '修改路由'
-                        ,area: ['500px', '400px']
-                        ,content: $('#updateWin') //这里content是一个DOM，注意：最好该元素要存放在body最外层，否则可能被其它的相对元素所影响
-                    });
-                }
-            });
+            routeTable = initTable(postData);
         } else {
             routeTable.reload({
                 where: postData
@@ -127,6 +95,78 @@ lib.use(['element', 'table', 'tree', 'form'], function () {
         }
     }
 
+    function initTable(postData) {
+        var routeTable = table.render({
+            elem: '#routeTable'
+            , toolbar: '#toolbar'
+            , url: ApiUtil.createUrl('route.list')
+            , where: postData
+            , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
+            , cols: [[
+                {field: 'id', title: 'id(接口名+版本号)', width: 250}
+                , {field: 'uri', title: 'uri', width: 200}
+                , {field: 'path', title: 'path', width: 200}
+                , {
+                    field: 'ignoreValidate', width: 80, title: '忽略验证', templet: function (row) {
+                        return row.ignoreValidate
+                            ? '<span class="x-red">是</span>'
+                            : '<span>否</span>';
+                    }
+                }
+                , {
+                    field: 'disabled', title: '状态', width: 80, templet: function (row) {
+                        return row.disabled
+                            ? '<span class="x-red">禁用</span>'
+                            : '<span class="x-green">启用</span>';
+                    }
+                }
+                , {fixed: 'right', title: '操作', toolbar: '#optBar', width: 100}
+            ]]
+        });
+
+        //监听单元格事件
+        table.on('tool(routeTable)', function(obj) {
+            var data = obj.data;
+            if(obj.event === 'edit'){
+                $updateForm.get(0).reset();
+                //表单初始赋值
+                data.profile = profile;
+                data.serviceId = currentServiceId;
+                data.disabled = data.disabled + '';
+                data.ignoreValidate = data.ignoreValidate + '';
+                form.val('updateWinFilter', data)
+
+                layer.open({
+                    type: 1
+                    ,title: '修改路由' + smTitle
+                    ,area: ['500px', '400px']
+                    ,content: $('#updateWin') //这里content是一个DOM，注意：最好该元素要存放在body最外层，否则可能被其它的相对元素所影响
+                });
+            }
+        });
+        table.on('toolbar(routeTable)', function(obj) {
+            if (obj.event === 'add') {
+                $addForm.find('input[name=id]').prop('readonly', false);
+                $addForm.get(0).reset();
+                var data = {};
+                data.profile = profile;
+                data.serviceId = currentServiceId;
+                data.id = '';
+                // 新加的路由先设置成禁用
+                data.disabled = 'true';
+                data.ignoreValidate = 'false';
+                form.val('addWinFilter', data);
+                layer.open({
+                    type: 1
+                    ,title: '添加路由' + smTitle
+                    ,area: ['500px', '400px']
+                    ,content: $('#addWin')
+                });
+            }
+        });
+        return routeTable;
+    }
+
     initTree();
 
 });
\ No newline at end of file