完成分配

OpenAuth.App/RoleManagerApp.cs

@@ -130,7 +130,7 @@ namespace OpenAuth.App
             foreach (var role in orgroles)
             {
                 RoleVM rolevm = role;
-                rolevm.IsBelongUser = userroles.Any(u => u.Id == role.Id);
+                rolevm.Checked = userroles.Any(u => u.Id == role.Id);
                 var orgs = _orgRepository.LoadByRole(role.Id);
                 rolevm.Organizations = string.Join(",", orgs.Select(u => u.Name).ToList());
                 rolevm.OrganizationIds = string.Join(",", orgs.Select(u => u.Id).ToList());
@@ -139,16 +139,6 @@ namespace OpenAuth.App
             return rolevms;
         }
 
-        public void AccessRole(Guid userId, Guid[] roleIds)
-        {
-            _relevanceRepository.AddRelevance("UserRole", roleIds.ToLookup(roleId => userId));
-        }
-
-        public void DelAccessRole(Guid userId, Guid[] roleids)
-        {
-            _relevanceRepository.DeleteBy("UserRole", roleids.ToLookup(roleId => userId));
-        }
-
         public List<Guid> GetUsersInRole(string ruleName)
         {
             var role = _repository.FindSingle(u => u.Name == ruleName);

OpenAuth.App/ViewModel/RoleVM.cs

@@ -55,7 +55,7 @@ namespace OpenAuth.App.ViewModel
         /// <summary>
         ///是否属于某用户 
         /// </summary>
-        public bool IsBelongUser { get; set; }
+        public bool Checked { get; set; }
 
         public static implicit operator RoleVM(Role role)
         {

OpenAuth.Domain/Service/ResManagerService.cs

@@ -157,7 +157,7 @@ namespace OpenAuth.Domain.Service
                 {
                     Id = element.Id,
                     Name = element.Name,
-                    IsBelongUser = accessed != null,
+                    Checked = accessed != null,
                     Description = element.Description,
                     Key = element.Key,
                     Status = element.Status

OpenAuth.Mvc/BllScripts/assignRes.js

@@ -12,92 +12,66 @@
 // <summary>分配资源模块处理</summary>
 // ***********************************************************************
 
+function renderLayui() {
+    layui.use(['layer', 'form'], function () {
+        var form = layui.form();
 
-$(document).ready(function () {
+        form.on('checkbox', function (data) {
-    $.CurrentDialog.find("#btnAccess").on("click", function () {
+            if (data.elem.checked) {
-        var ids = dlgList.getSelectedProperties('Id');
+                $.post('/RelevanceManager/Assign', {
-        if (ids == null) return;
+                    type: $("#moduleType").val(),
+                    firstId: $('#firstId').val(),
+                    secIds: data.value
+                }, function (json) {
+                    json = $.parseJSON(json);
 
-        $.post('/RelevanceManager/Assign', {
+                });
-            type: $("#moduleType").val(),
-            firstId: $('#firstId').val(),
-            secIds: ids
-        }, function (json) {
-            json = $.parseJSON(json);
-            if (json.statusCode != "200") {
-                $(this).alertmsg('warn', json.message);
-                return;
             }
-            dlgList.reload();
+            else {
-        });
+                $.post('/RelevanceManager/UnAssign', {
-    });
+                    type: $("#moduleType").val(),
-    $.CurrentDialog.find("#btnDelAccess").on("click", function () {
+                    firstId: $('#firstId').val(),
-        var ids = dlgList.getSelectedProperties('Id');
+                    secIds: data.value
-        if (ids == null) return;
+                }, function (json) {
+                    json = $.parseJSON(json);
 
-        $.post('/RelevanceManager/UnAssign', {
+                });
-            type: $("#moduleType").val(),
-            firstId: $('#firstId').val(),
-            secIds: ids
-        }, function (json) {
-            json = $.parseJSON(json);
-            if (json.statusCode != "200") {
-                $(this).alertmsg('warn', json.message);
-                return;
             }
-            dlgList.reload();
         });
-    });
-});
 
-//grid列表模块
+        form.render();
-function DialogList() {
+    });
+}
+
+var list = function () {
     var selectedId = '00000000-0000-0000-0000-000000000000';  //选中的ID
-    var url = '/ResourceManager/LoadWithAccess?cId=';
+    var url = '/ResourceManager/LoadWithAccess?firstId=' + $("#firstId").val() + "&key=" + $("#moduleType").val() + "&cId=";
-    this.maingrid = $.CurrentDialog.find('#maingrid').datagrid({
+    return {
-        showToolbar: false,
+        reload: function (id) {
-        loadType: 'GET',
+            if (id != undefined) selectedId = id;
-        filterThead: false,
+            $.getJSON(url + selectedId,
-        target: $(this),
+                function (data) {
-        columns: [
+                    var str = '';
-              {
+                    if (data.length > 0) {
-                  name: 'Id',
+                        $.each(data,
-                  label: '角色ID',
+                        function () {
-                  hide: true
+                            str += "<input type=\"checkbox\" name=\"\" value=\"" + this.Id + "\" title=\"" + this.Name + "\"";
-              },
+                            if (this.Checked) {
-              {
+                                str += " checked ";
-                  name: 'Name',
+                            }
-                  label: '资源名称',
+                            str += ">\r\n";
-                  width: 100
+                        });
-              },
+                    }
-
+                    $("#resources").html(str);
-              {
+                    renderLayui();
-                  name: 'IsBelongUser',
+                });
-                  label: '是否已经授权',
+        }
-                  type: 'select',
+    };
-                  align: 'center',
+}();
-                  items: [{ 'false': '未授权', 'true': '已授权' }],
+//左边导航
-                  width: 100
-              }
-        ],
-        dataUrl: url + selectedId + '&key=' + $('#moduleType').val() + '&firstId=' + $('#firstId').val(),
-        fullGrid: true,
-        showLinenumber: true,
-        showCheckboxcol: true,
-        paging: true,
-        filterMult: false,
-        showTfoot: false,
-      
-    });
-    this.reload = function (id) {
-        if (id != undefined) selectedId = id;
-        this.maingrid.datagrid('reload', { dataUrl: url + selectedId + '&key=' + $('#moduleType').val() + '&firstId=' + $('#firstId').val() });
-    }
-};
-DialogList.prototype = new Grid();
-var dlgList = new DialogList();
-
 var ztree = function () {
+    var url = "/CategoryManager/LoadForTree";
+
     var setting = {
         view: { selectedMulti: false },
         data: {
@@ -112,13 +86,24 @@ var ztree = function () {
                 rootPId: 'null'
             }
         },
-        callback: { onClick: zTreeOnClick }
+        callback: {
+            onClick: function (event, treeId, treeNode) {
+                list.reload(treeNode.Id);
+            }
+        }
     };
-    $.getJSON('/CategoryManager/LoadForTree', function (json) {
+    var load = function () {
-        var zTreeObj = $.fn.zTree.init($.CurrentDialog.find("#tree"), setting, json);
+        $.getJSON(url,
-        zTreeObj.expandAll(true);
+            function (json) {
-    });
+                var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json);
+                list.reload();
+                zTreeObj.expandAll(true);
+            });
+    };
+    load();
+
+    return {
+        reload: load
+    }
 }();
-function zTreeOnClick(event, treeId, treeNode) {
+
-    dlgList.reload(treeNode.Id);
-}

OpenAuth.Mvc/BllScripts/roleManager.js

@@ -207,16 +207,11 @@ function openRoleReourceAccess(obj) {
     var selected =  list.getSelectedObj();
     if (selected == null) return;
 
-    $(obj).dialog({
+    layer.open({
-        id: 'assignRes',
+        type: 2,
-        url: '/ResourceManager/AssignRes',
+        skin: 'layui-layer-rim', //加上边框
-        title: '为角色分配资源',
+        area: ['410px', '390px'], //宽高
-        width: 600,
+        content: '/ResourceManager/AssignRes?key=RoleResource&firstId=' + selected.Id
-        height: 380,
-        data: {
-            firstId: selected.Id,
-            key:"RoleResource"
-        }
     });
 }
 

OpenAuth.Mvc/BllScripts/userRoleManager.js

@@ -11,85 +11,67 @@
 // </copyright>
 // <summary>用户分配角色模块</summary>
 // ***********************************************************************
+function renderLayui() {
+    layui.use(['layer', 'form'], function () {
+        var form = layui.form();
 
+        form.on('checkbox', function (data) {
+            if (data.elem.checked) {
+                $.post('/RelevanceManager/Assign', {
+                    type: $("#moduleType").val(),
+                    firstId: $('#firstId').val(),
+                    secIds: data.value
+                }, function (json) {
+                    json = $.parseJSON(json);
 
-$(document).ready(function () {
+                });
-    $.CurrentDialog.find("#btnAccess").on("click", function () {
-        var ids = userRolesList.getSelectedProperties('Id');
-        if (ids == null) return;
-
-        $.post('/RoleManager/AccessRoles', {
-            userId: $('#userId').val(),
-            ids: ids
-        }, function (json) {
-            userRolesList.reload();
-        });
-    });
-    $.CurrentDialog.find("#btnDelAccess").on("click", function () {
-        var ids = userRolesList.getSelectedProperties('Id');
-        if (ids == null) return;
-
-        $.post('/RoleManager/DelAccessRoles', {
-            userId: $('#userId').val(),
-            ids: ids
-        }, function (json) {
-            userRolesList.reload();
-        });
-    });
-});
-
-//grid列表模块
-function UserRolesList() {
-    var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块
-    this.maingrid = $.CurrentDialog.find('#maingrid').datagrid({
-        showToolbar: false,
-        loadType: 'GET',
-        filterThead: false,
-        target: $(this),
-        columns: [
-            {
-                name: 'Id',
-                label: '角色ID',
-                hide: true
-            },
-            {
-                name: 'Name',
-                label: '角色名称',
-                width: 100
-            },
-              {
-                  name: 'Organizations',
-                  label: '所属组织',
-                  width: 100
-              },
-            {
-                name: 'IsBelongUser',
-                label: '是否已经授权',
-                type: 'select',
-                align: 'center',
-                items: [{ 'false': '未授权', 'true': '已授权' }],
-                width: 100
             }
-        ],
+            else {
-        data: [],
+                $.post('/RelevanceManager/UnAssign', {
-        fullGrid: true,
+                    type: $("#moduleType").val(),
-        showLinenumber: true,
+                    firstId: $('#firstId').val(),
-        showCheckboxcol: true,
+                    secIds: data.value
-        paging: true,
+                }, function (json) {
-        filterMult: false,
+                    json = $.parseJSON(json);
-        showTfoot: false,
-      
-    });
-    this.reload = function (id) {
-        if (id != undefined) selectedId = id;
-        console.log(id);
-        this.maingrid.datagrid('reload', { dataUrl: '/RoleManager/LoadForOrgAndUser?orgId=' + selectedId + '&userId=' + $('#userId').val() });
-    }
-};
-UserRolesList.prototype = new Grid();
-var userRolesList = new UserRolesList();
 
+                });
+            }
+        });
+
+        form.render();
+    });
+}
+
+var list = function () {
+    var selectedId = '00000000-0000-0000-0000-000000000000';  //选中的ID
+    var url = '/RoleManager/LoadForOrgAndUser?userId=' + $("#firstId").val()
+        + "&key=" + $("#moduleType").val() + "&orgId=";
+    return {
+        reload: function (id) {
+            if (id != undefined) selectedId = id;
+            $.getJSON(url + selectedId,
+                function (data) {
+                    var str = '';
+                    if (data.length > 0) {
+                        $.each(data,
+                        function () {
+                            str += "<input type=\"checkbox\" name=\"\" value=\"" + this.Id + "\" title=\"" + this.Name + "\"";
+                            if (this.Checked) {
+                                str += " checked ";
+                            }
+                            str += ">\r\n";
+                        });
+                    }
+                    $("#roles").html(str);
+                    renderLayui();
+                });
+        }
+    };
+}();
+//左边导航
 var ztree = function () {
+    var url = "/OrgManager/LoadOrg";
+
     var setting = {
         view: { selectedMulti: false },
         data: {
@@ -104,22 +86,24 @@ var ztree = function () {
                 rootPId: 'null'
             }
         },
-        callback: { onClick: zTreeOnClick }
+        callback: {
-    };
+            onClick: function (event, treeId, treeNode) {
-    $.getJSON('/OrgManager/LoadOrg', function (json) {
+                list.reload(treeNode.Id);
-        var zTreeObj = $.fn.zTree.init($("#tree"), setting, json);
+            }
-        var firstId;  //tree的第一个ID
-        if (json.length > 0) {
-            firstId = json[0].Id;
-        } else {
-            firstId = -1;
         }
-        userRolesList.reload(firstId);
+    };
-        zTreeObj.expandAll(true);
+    var load = function () {
+        $.getJSON(url,
+            function (json) {
+                var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json);
+                list.reload();
+                zTreeObj.expandAll(true);
+            });
+    };
+    load();
 
-    });
+    return {
+        reload: load
+    }
 }();
-function zTreeOnClick(event, treeId, treeNode) {
+
-    userRolesList.reload(treeNode.Id);
-}
- 

OpenAuth.Mvc/BllScripts/usermanager.js

@@ -218,15 +218,11 @@ function openUserRoleAccess(obj) {
     var selected = list.getSelectedObj();
     if (selected == null) return;
 
-    $(obj).dialog({
+    layer.open({
-        id: 'accessUserRole',
+        type: 2,
-        url: '/RoleManager/LookupMulti',
+        skin: 'layui-layer-rim', //加上边框
-        title: '为用户分配角色',
+        area: ['410px', '390px'], //宽高
-        width: 600,
+        content: '/RoleManager/LookupMulti?key=UserRole&firstId=' + selected.Id
-        height: 380,
-        data: {
-            userId: selected.Id
-        }
     });
 }
 
@@ -235,16 +231,11 @@ function openUserReourceAccess(obj) {
     var selected = list.getSelectedObj();
     if (selected == null) return;
 
-    $(obj).dialog({
+    layer.open({
-        id: 'accessUserResource',
+        type: 2,
-        url: '/ResourceManager/AssignRes',
+        skin: 'layui-layer-rim', //加上边框
-        title: '为用户分配资源',
+        area: ['410px', '390px'], //宽高
-        width: 600,
+        content: '/ResourceManager/AssignRes?key=UserResource&firstId=' + selected.Id
-        height: 380,
-        data: {
-            firstId: selected.Id,
-            key:"UserResource"
-        }
     });
 }
 

OpenAuth.Mvc/Controllers/RoleManagerController.cs

@@ -69,9 +69,10 @@ namespace OpenAuth.Mvc.Controllers
         }
 
         #region 为用户设置角色界面
-        public ActionResult LookupMulti(Guid userId)
+        public ActionResult LookupMulti(Guid firstId, string key)
         {
-            ViewBag.UserId = userId;
+            ViewBag.FirstId = firstId;
+            ViewBag.ModuleType = key;
             return View();
         }
 
@@ -80,20 +81,6 @@ namespace OpenAuth.Mvc.Controllers
             return JsonHelper.Instance.Serialize(_app.LoadForOrgAndUser(orgId, userId));
         }
 
-        [System.Web.Mvc.HttpPost]
-        public string AccessRoles(Guid userId, Guid[] ids)
-        {
-            _app.AccessRole(userId, ids);
-            return JsonHelper.Instance.Serialize(Result);
-        }
-
-        [System.Web.Mvc.HttpPost]
-        public string DelAccessRoles(Guid userId, Guid[] ids)
-        {
-            _app.DelAccessRole(userId, ids);
-            return JsonHelper.Instance.Serialize(Result);
-        }
-
         #endregion 为用户设置角色界面
     }
 }

OpenAuth.Mvc/Views/ResourceManager/AssignRes.cshtml

@@ -1,31 +1,26 @@
-<div class="bjui-pageHeader">
+
-    <div class="bjui-searchBar">
+@{
-        <input style="display: none" id="firstId" value="@ViewBag.FirstId"/>
+    Layout = null;
-        <input style="display: none" id="moduleType", value="@ViewBag.ModuleType"/>
+}
-        <div class="pull-right">
+<link href="~/Content/layui/css/layui.css" rel="stylesheet" />
-            <div class="alert alert-info search-inline">
+<link href="~/Content/mylayer.css" rel="stylesheet" />
-                <i class="fa fa-info-circle"></i> 点击行为单选，点击复选框可多选统一授权
+<script src="~/Content/layui/layui.js"></script>
-            </div>&nbsp;
+<script src="~/Content/plugins/jQuery/jQuery-2.1.4.min.js"></script>
-            <button type="button" class="btn btn-green" data-num="1" data-icon="plus" id="btnAccess">
+<script src="~/Content/plugins/zTree/js/jquery.ztree.core.js"></script>
-                授权选中
+<link href="/Content/plugins/zTree/css/metroStyle/metroStyle.css" rel="stylesheet" />
-            </button>&nbsp;
+
-            <button type="button" class="btn btn-danger" data-num="1" data-icon="trash" id="btnDelAccess">
+<div style="display: inline-block; width: 180px; height: 210px; padding: 10px; border: 1px solid #ddd; overflow: auto;">
-                取消授权
+    <input style="display: none" id="firstId" value="@ViewBag.FirstId" />
-            </button>&nbsp;
+    <input style="display: none" id="moduleType" , value="@ViewBag.ModuleType" />
-        </div>
+    <ul id="orgtree" class="ztree" style="width: 100%"></ul>
-    </div>
 </div>
 
-<div class="bjui-pageContent tableContent">
-    <div class="clearfix">
-        <div style="float: left; width: 220px; overflow: auto;" class="table table-bordered">
-            <ul id="tree" class="ztree"></ul>
-        </div>
 
-        <div style="margin-left: 225px;">
+<div class="site-tips" style="display: inline-block; height: 210px; width: 340px; padding: 10px; margin-left: 10px; vertical-align: top;" id="demo2-view">
-            <table id="maingrid" class="table table-bordered table-hover table-striped table-top"></table>
+    <form class="layui-form " action="" id="resources"></form>
-        </div>
-    </div>
 </div>
+
+
 <script src="~/BllScripts/grid.js"></script>
-<script src="~/BllScripts/assignRes.js"></script>
+<script src="~/BllScripts/assignRes.js"></script>
+

OpenAuth.Mvc/Views/RoleManager/LookupMulti.cshtml

@@ -1,31 +1,26 @@
-<div class="bjui-pageHeader">
+
-    <div class="bjui-searchBar">
+@{
-        <input style="display: none" id="userId" value="@ViewBag.UserId" />
+    Layout = null;
-        <div class="pull-right">
+}
-            <div class="alert alert-info search-inline">
+<link href="~/Content/layui/css/layui.css" rel="stylesheet" />
-                <i class="fa fa-info-circle"></i> 点击行为单选，点击复选框可多选统一授权
+<link href="~/Content/mylayer.css" rel="stylesheet" />
-            </div>&nbsp;
+<script src="~/Content/layui/layui.js"></script>
-            <button type="button" class="btn btn-green" data-num="1" data-icon="plus" id="btnAccess">
+<script src="~/Content/plugins/jQuery/jQuery-2.1.4.min.js"></script>
-                授权选中
+<script src="~/Content/plugins/zTree/js/jquery.ztree.core.js"></script>
-            </button>&nbsp;
+<link href="/Content/plugins/zTree/css/metroStyle/metroStyle.css" rel="stylesheet" />
-            <button type="button" class="btn btn-danger" data-num="1" data-icon="trash" id="btnDelAccess">
+
-                取消授权
+<div style="display: inline-block; width: 180px; height: 210px; padding: 10px; border: 1px solid #ddd; overflow: auto;">
-            </button>&nbsp;
+    <input style="display: none" id="firstId" value="@ViewBag.FirstId" />
-        </div>
+    <input style="display: none" id="moduleType" , value="@ViewBag.ModuleType" />
-    </div>
+    <ul id="orgtree" class="ztree" style="width: 100%"></ul>
 </div>
 
-<div class="bjui-pageContent tableContent">
-    <div class="clearfix">
-        <div style="float: left; width: 220px; overflow: auto;" class="table table-bordered">
-            <ul id="tree" class="ztree"></ul>
-        </div>
 
-        <div style="margin-left: 225px;">
+<div class="site-tips" style="display: inline-block; height: 210px; width: 340px; padding: 10px; margin-left: 10px; vertical-align: top;" id="demo2-view">
-            <table id="maingrid" class="table table-bordered table-hover table-striped table-top"></table>
+    <form class="layui-form " action="" id="roles"></form>
-        </div>
-    </div>
 </div>
 
+
 <script src="~/BllScripts/grid.js"></script>
-<script src="~/BllScripts/userRoleManager.js"></script>
+<script src="~/BllScripts/userRoleManager.js"></script>
+