diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs index 822b248b..24be0f5e 100644 --- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs @@ -23,22 +23,28 @@ namespace OpenAuth.Mvc.Controllers return View(); } - public ActionResult Assign(string firstId, string key) + [Authenticate] + public ActionResult Assign() { - ViewBag.FirstId = firstId; - ViewBag.ModuleType = key; - - var moduleWithChildren = AuthUtil.GetCurrentUser().Modules - .GenerateTree(u =>u.Id, u =>u.ParentId); - var modules = key == Define.USERMODULE ? App.LoadForUser(firstId) : App.LoadForRole(firstId); - - CheckModule(moduleWithChildren, modules); - - ViewBag.Modules = BuilderModules(moduleWithChildren); - return View(); } + //public ActionResult Assign(string firstId, string key) + //{ + // ViewBag.FirstId = firstId; + // ViewBag.ModuleType = key; + + // var moduleWithChildren = AuthUtil.GetCurrentUser().Modules + // .GenerateTree(u =>u.Id, u =>u.ParentId); + // var modules = key == Define.USERMODULE ? App.LoadForUser(firstId) : App.LoadForRole(firstId); + + // CheckModule(moduleWithChildren, modules); + + // ViewBag.Modules = BuilderModules(moduleWithChildren); + + // return View(); + //} + private void CheckModule(IEnumerable> moduleWithChildren, List modules) { foreach (var module in moduleWithChildren) diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index f361262e..a04ea0b5 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -166,6 +166,7 @@ + @@ -349,6 +350,7 @@ + diff --git a/OpenAuth.Mvc/Views/ModuleManager/Assign.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Assign.cshtml new file mode 100644 index 00000000..1b427989 --- /dev/null +++ b/OpenAuth.Mvc/Views/ModuleManager/Assign.cshtml @@ -0,0 +1,37 @@ +@section header +{ + +} + +
+
    + + + + + + + + + + + + +
    名称DomId样式图标排序号
    + + + +
    + + + \ No newline at end of file diff --git a/OpenAuth.Mvc/js/assign.js b/OpenAuth.Mvc/js/assign.js new file mode 100644 index 00000000..ec2f4a0d --- /dev/null +++ b/OpenAuth.Mvc/js/assign.js @@ -0,0 +1,71 @@ +layui.config({ + base: "/js/" +}).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth'], function () { + var form = layui.form, + //layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer, + layer = layui.layer, + $ = layui.jquery; + var table = layui.table; + var openauth = layui.openauth; + + //菜单列表 + var menucon = {}; //table的参数,如搜索key,点击tree的id + var menuList = function (options) { + if (options != undefined) { + $.extend(menucon, options); + } + table.reload('menuList', { + url: '/ModuleManager/LoadMenus', + where: menucon + }); + } + + //左边树状机构列表 + var ztree = function () { + var url = '/UserSession/QueryModuleList'; + var zTreeObj; + var setting = { + view: { selectedMulti: false }, + data: { + key: { + name: 'Name', + title: 'Name' + }, + simpleData: { + enable: true, + idKey: 'Id', + pIdKey: 'ParentId', + rootPId: 'null' + } + }, + callback: { + onClick: function (event, treeId, treeNode) { + menuList({ moduleId: treeNode.Id }); + } + } + }; + var load = function () { + $.getJSON(url, function (json) { + zTreeObj = $.fn.zTree.init($("#tree"), setting); + zTreeObj.addNodes(null, json); + menuList({ moduleId: json[0].Id }); + zTreeObj.expandAll(true); + }); + }; + load(); + return { + reload: load + } + }(); + + //监听菜单表格内部按钮 + table.on('tool(menulist)', function (obj) { + var data = obj.data; + if (obj.event === 'del') { //删除菜单 + openauth.del("/moduleManager/delMenu", + data.Id,menuList); + } + }); + + //监听页面主按钮操作 end +}) \ No newline at end of file diff --git a/OpenAuth.Mvc/js/categories.js b/OpenAuth.Mvc/js/categories.js index 5eef5d54..987b65c0 100644 --- a/OpenAuth.Mvc/js/categories.js +++ b/OpenAuth.Mvc/js/categories.js @@ -47,8 +47,6 @@ layui.config({ var load = function () { $.getJSON(url, function (json) { zTreeObj = $.fn.zTree.init($("#tree"), setting); - var newNode = { Name: "根节点", Id: null, ParentId: "" }; - json.push(newNode); zTreeObj.addNodes(null, json); mainList({ typeId: "" }); zTreeObj.expandAll(true); diff --git a/OpenAuth.Mvc/js/users.js b/OpenAuth.Mvc/js/users.js index 45e4cc45..55192000 100644 --- a/OpenAuth.Mvc/js/users.js +++ b/OpenAuth.Mvc/js/users.js @@ -149,7 +149,8 @@ layui.config({ var index = layer.open({ title: "为用户分配模块", type: 2, - content: "newsAdd.html", + area: ['800px', '500px'], + content: "/ModuleManager/Assign", success: function(layero, index) { }