优化列表显示

2025-09-22 20:13:32 +08:00 · 2018-03-31 14:45:39 +08:00
parent d6a018a8b7
commit 4bfdfba503
14 changed files with 157 additions and 106 deletions
--- a/OpenAuth.Mvc/Controllers/LoginController.cs
+++ b/OpenAuth.Mvc/Controllers/LoginController.cs
@@ -34,8 +34,6 @@ namespace OpenAuth.Mvc.Controllers
                    };
                    Response.Cookies.Add(cookie);
                    resp.Result = "/home/index";
-                    ///拿掉地址栏Token，因为特别不安全。
-                    ///小王，xxx系统的地址是多少。。。然后账号就
                }
                else
                {
@@ -53,34 +51,34 @@ namespace OpenAuth.Mvc.Controllers
        /// <summary>
        /// 开发者登录
        /// </summary>
-        public ActionResult LoginByDev()
+        public string LoginByDev()
        {
+            var resp = new Response();
            try
            {
                var result = AuthUtil.Login(_appKey, "System", "123456");
                if (result.Code == 200)
                {
-
                    var cookie = new HttpCookie("Token", result.Token)
                    {
                        Expires = DateTime.Now.AddDays(10)
                    };
                    Response.Cookies.Add(cookie);
-                    return Redirect("/home/index");
-                    ///拿掉地址栏Token，因为特别不安全。
-                    ///小王，xxx系统的地址是多少。。。然后账号就
                }
                else
                {
-                    return RedirectToAction("Index", "Login");
-
+                    resp.Code = 500;
+                    resp.Message = result.Message;
                }

            }
            catch (Exception e)
            {
-                return RedirectToAction("Index", "Login");
+                resp.Code = 500;
+                resp.Message = e.Message;
            }
+
+            return JsonHelper.Instance.Serialize(resp);
        }

        public ActionResult Logout()
--- a/OpenAuth.Mvc/Views/FlowInstances/Index.cshtml
+++ b/OpenAuth.Mvc/Views/FlowInstances/Index.cshtml
@@ -6,8 +6,13 @@
    @Html.Action("MenuHeader", "Home")
 </blockquote>

-<div style="display: flex;">
-    <ul id="tree" class="ztree" style="display: inline-block; width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
+<div class="layui-row">
+    <div class="layui-col-xs3">
+        <ul id="tree" class="ztree"
+            style="padding: 2px; border: 1px solid #ddd; overflow: auto;">
+        </ul>
+    </div>
+    <div class="layui-col-xs9">
        <table class="layui-table"
               lay-data="{height: 'full-80', page:true, id:'mainList'}"
               lay-filter="list" lay-size="sm">
@@ -36,7 +41,9 @@
            <span class="layui-badge layui-bg-green">已完成</span>
            {{# } }}
        </script>
+    </div>
 </div>
+
 <script type="text/html" id="barList">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
 </script>
--- a/OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml
+++ b/OpenAuth.Mvc/Views/FlowSchemes/Index.cshtml
@@ -6,8 +6,13 @@
    @Html.Action("MenuHeader", "Home")
 </blockquote>

-<div style="display: flex;">
-    <ul id="tree" class="ztree" style="display: inline-block; width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
+<div class="layui-row">
+    <div class="layui-col-xs3">
+        <ul id="tree" class="ztree"
+            style="padding: 2px; border: 1px solid #ddd; overflow: auto;">
+        </ul>
+     </div>
+    <div class="layui-col-xs9">
        <table class="layui-table"
               lay-data="{height: 'full-80', page:true, id:'mainList'}"
               lay-filter="list" lay-size="sm">
@@ -29,7 +34,9 @@
            </tr>
            </thead>
        </table>
+    </div>
 </div>
+
 <script type="text/html" id="barList">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
 </script>
--- a/OpenAuth.Mvc/Views/Forms/index.cshtml
+++ b/OpenAuth.Mvc/Views/Forms/index.cshtml
@@ -6,8 +6,13 @@
    @Html.Action("MenuHeader", "Home")
 </blockquote>

-<div style="display: flex;">
-    <ul id="tree" class="ztree" style="display: inline-block; width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
+
+<div class="layui-row">
+    <div class="layui-col-xs3">
+        <ul id="tree" class="ztree"
+            style="padding: 2px; border: 1px solid #ddd; overflow: auto;"></ul>
+    </div>
+    <div class="layui-col-xs9">
        <table class="layui-table"
               lay-data="{height: 'full-80', page:true, id:'mainList'}"
               lay-filter="list" lay-size="sm">
@@ -27,7 +32,9 @@
            </tr>
            </thead>
        </table>
+    </div>
 </div>
+
 <script type="text/html" id="barList">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
 </script>
--- a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
@@ -6,8 +6,13 @@
    @Html.Action("MenuHeader", "Home")
 </blockquote>

-<div style="display: flex;">
-    <ul id="tree" class="ztree" style="display: inline-block; width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
+<div class="layui-row">
+    <div class="layui-col-xs3">
+        <ul id="tree" class="ztree"
+            style="padding: 2px; border: 1px solid #ddd; overflow: auto;">
+        </ul>
+    </div>
+    <div class="layui-col-xs9">
        <table class="layui-table"
               lay-data="{height: 'full-80', page:true, id:'mainList'}"
               lay-filter="list" lay-size="sm">
@@ -23,6 +28,7 @@
            </tr>
            </thead>
        </table>
+    </div>
 </div>

 <!--列表右边的按钮-->
--- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
@@ -6,8 +6,12 @@
    @Html.Action("MenuHeader", "Home")
 </blockquote>

-<div style="display: flex;">
-    <ul id="tree" class="ztree" style="display: inline-block; width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
+<div class="layui-row">
+    <div class="layui-col-xs3">
+        <ul id="tree" class="ztree"
+            style="padding: 2px; border: 1px solid #ddd; overflow: auto;"></ul>
+    </div>
+    <div class="layui-col-xs9">
        <table class="layui-table"
               lay-data="{height: 'full-80', page:true, id:'mainList'}"
               lay-filter="list" lay-size="sm">
@@ -20,7 +24,9 @@
            </tr>
            </thead>
        </table>
+    </div>
 </div>
+
 <script type="text/html" id="barList">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
 </script>
--- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
@@ -6,8 +6,13 @@
    @Html.Action("MenuHeader", "Home")
 </blockquote>

-<div style="display: flex;">
-    <ul id="tree" class="ztree" style="display: inline-block; width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
+    <div class="layui-row">
+        <div class="layui-col-xs3">
+            <ul id="tree" class="ztree"
+                style="padding: 2px; border: 1px solid #ddd; overflow: auto;">
+            </ul>
+        </div>
+        <div class="layui-col-xs9">
            <table class="layui-table"
                   lay-data="{height: 'full-80', page:true, id:'mainList'}"
                   lay-filter="list" lay-size="sm">
@@ -23,7 +28,9 @@
                </tr>
                </thead>
            </table>
-</div>
+        </div>
+    </div>
+
 <script type="text/html" id="barList">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
 </script>
--- a/OpenAuth.Mvc/userJs/flowInstances.js
+++ b/OpenAuth.Mvc/userJs/flowInstances.js
@@ -59,6 +59,7 @@
            reload: load
        }
    }();
+    $("#tree").height($("div.layui-table-view").height());

    //添加（编辑）对话框
    var editDlg = function () {
--- a/OpenAuth.Mvc/userJs/flowSchemes.js
+++ b/OpenAuth.Mvc/userJs/flowSchemes.js
@@ -60,7 +60,7 @@
            reload: load
        }
    }();
-
+    $("#tree").height($("div.layui-table-view").height());

    //添加（编辑）对话框
    var editDlg = function () {
--- a/OpenAuth.Mvc/userJs/forms.js
+++ b/OpenAuth.Mvc/userJs/forms.js
@@ -62,6 +62,7 @@
            reload: load
        }
    }();
+    $("#tree").height($("div.layui-table-view").height());

    //添加（编辑）对话框
    var editDlg = function() {
--- a/OpenAuth.Mvc/userJs/login.js
+++ b/OpenAuth.Mvc/userJs/login.js
@@ -92,7 +92,14 @@ layui.config({

    //登录按钮事件
    form.on("submit(login)", function (data) {
-        window.location.href = "/Login/LoginByDev";
+        $.getJSON("/Login/LoginByDev",
+            function(data) {
+                if (data.Code == 200) {
+                    window.location.href = "/Home/Index";
+                } else {
+                    layer.msg(data.Message);
+                }
+            });
        return false;
    })
 })
--- a/OpenAuth.Mvc/userJs/orgs.js
+++ b/OpenAuth.Mvc/userJs/orgs.js
@@ -59,6 +59,7 @@ layui.config({
            reload: load
        }
    }();
+    $("#tree").height($("div.layui-table-view").height());

    //添加（编辑）对话框
    var editDlg = function() {
--- a/OpenAuth.Mvc/userJs/roles.js
+++ b/OpenAuth.Mvc/userJs/roles.js
@@ -59,6 +59,7 @@ layui.config({
            reload: load
        }
    }();
+    $("#tree").height($("div.layui-table-view").height());

    //添加（编辑）对话框
    var editDlg = function() {
--- a/OpenAuth.Mvc/userJs/users.js
+++ b/OpenAuth.Mvc/userJs/users.js
@@ -60,6 +60,8 @@ layui.config({
        }
    }();

+    $("#tree").height( $("div.layui-table-view").height());
+
    //添加（编辑）对话框
    var editDlg = function() {
        var vm = new Vue({