diff --git a/OpenAuth.Domain/Service/ModuleEleManService.cs b/OpenAuth.Domain/Service/ModuleEleManService.cs index 6f6fe880..262b863c 100644 --- a/OpenAuth.Domain/Service/ModuleEleManService.cs +++ b/OpenAuth.Domain/Service/ModuleEleManService.cs @@ -76,10 +76,7 @@ namespace OpenAuth.Domain.Service { return listVms; } - if (moduleId == Guid.Empty) return listVms; - string modulename = service.GetModulesQuery().SingleOrDefault(u => u.Id == moduleId).Name; - foreach (var element in service.GetModuleElementsQuery().Where(u =>u.ModuleId ==moduleId)) { var accessed = _unitWork.FindSingle(u =>u.Key == accessType @@ -90,8 +87,7 @@ namespace OpenAuth.Domain.Service Name = element.Name, ModuleId = element.ModuleId, DomId = element.DomId, - ModuleName = modulename, - Accessed = accessed != null + Checked = accessed != null }; listVms.Add(vm); } diff --git a/OpenAuth.Mvc/BllScripts/assignModuleElement.js b/OpenAuth.Mvc/BllScripts/assignModuleElement.js index c2b481b2..e35cbfa6 100644 --- a/OpenAuth.Mvc/BllScripts/assignModuleElement.js +++ b/OpenAuth.Mvc/BllScripts/assignModuleElement.js @@ -10,94 +10,72 @@ //Description: 分配模块菜单(按钮) // *********************************************************************** -$(document).ready(function () { - $.CurrentDialog.find("#btnAccess").on("click", function () { - var ids = dlgList.getSelectedProperties('Id'); - if (ids == null) return; +function renderLayui() { + layui.use(['layer', 'form'], function () { + var form = layui.form(); - $.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; + 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); + + }); } - dlgList.reload(); - }); - }); - $.CurrentDialog.find("#btnDelAccess").on("click", function () { - var ids = dlgList.getSelectedProperties('Id'); - if (ids == null) return; + else { + $.post('/RelevanceManager/UnAssign', { + type: $("#moduleType").val(), + firstId: $('#firstId').val(), + secIds: data.value + }, 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列表模块 -function DialogList() { + form.render(); + }); +} + +var list = function () { var selectedId = '00000000-0000-0000-0000-000000000000'; //选中的ID - var url = '/ModuleElementManager/LoadWithAccess?tId='; - this.maingrid = $.CurrentDialog.find('#maingrid').datagrid({ - showToolbar: false, - loadType: 'GET', - filterThead: false, - target: $(this), - columns: [ - { - name: 'Id', - label: '元素名称', - hide: true - }, - { - name: 'Name', - label: '元素名称', - width: 80 - }, - { - name: 'ModuleName', - label: '所属模块', - width: 80 - }, - { - name: 'Accessed', - label: '是否已经授权', - align: 'center', - items: [{ 'false': '未授权', 'true': '已授权' }], - width: 80 - } - ], - 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() }); + var url = '/ModuleElementManager/LoadWithAccess?firstId=' + $("#firstId").val() + "&key=" + $("#moduleType").val() + "&tId="; + return { + reload: function (id) { + if (id != undefined) selectedId = id; + $.getJSON(url + selectedId, + function (data) { + var str = ''; + if (data.length > 0) { + $.each(data, + function () { + str += " + /// 加载用户模块 + /// + /// The user identifier. + /// System.String. + public string LoadForUser(Guid firstId) + { + var orgs = _app.LoadForUser(firstId); + return JsonHelper.Instance.Serialize(orgs); + } + + /// + /// 加载角色模块 + /// + /// The role identifier. + /// System.String. + public string LoadForRole(Guid firstId) + { + var orgs = _app.LoadForRole(firstId); + return JsonHelper.Instance.Serialize(orgs); + } + public string LoadModuleWithRoot() { var orgs = AuthUtil.GetCurrentUser().Modules.MapToList(); diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index 55389211..227449a9 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -1059,21 +1059,6 @@ - - - - - - - - - - - - - - - diff --git a/OpenAuth.Mvc/Views/ModuleElementManager/AssignModuleElement.cshtml b/OpenAuth.Mvc/Views/ModuleElementManager/AssignModuleElement.cshtml index a06e4e69..6515c7df 100644 --- a/OpenAuth.Mvc/Views/ModuleElementManager/AssignModuleElement.cshtml +++ b/OpenAuth.Mvc/Views/ModuleElementManager/AssignModuleElement.cshtml @@ -1,31 +1,25 @@ -
- +@{ + Layout = null; +} + + + + + + + +
+ + +
    -
    -
    -
    -
      -
      -
      -
      -
      -
      +
      +
      +
      + + \ No newline at end of file diff --git a/OpenAuth.Mvc/obj/Release/Package/PackageTmp/BllScripts/assignModuleElement.js b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/BllScripts/assignModuleElement.js new file mode 100644 index 00000000..c2b481b2 --- /dev/null +++ b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/BllScripts/assignModuleElement.js @@ -0,0 +1,133 @@ +// *********************************************************************** +// Assembly : OpenAuth.Mvc +// Author : yubaolee +// Created : 04-19-2016 +// +// Last Modified By : yubaolee +// Last Modified On : 05-26-2016 +// Contact : www.cnblogs.com/yubaolee +// File: assignModuleElement.js +//Description: 分配模块菜单(按钮) +// *********************************************************************** + +$(document).ready(function () { + $.CurrentDialog.find("#btnAccess").on("click", function () { + var ids = dlgList.getSelectedProperties('Id'); + if (ids == null) return; + + $.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(); + }); + }); + $.CurrentDialog.find("#btnDelAccess").on("click", function () { + var ids = dlgList.getSelectedProperties('Id'); + if (ids == null) return; + + $.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列表模块 +function DialogList() { + var selectedId = '00000000-0000-0000-0000-000000000000'; //选中的ID + var url = '/ModuleElementManager/LoadWithAccess?tId='; + this.maingrid = $.CurrentDialog.find('#maingrid').datagrid({ + showToolbar: false, + loadType: 'GET', + filterThead: false, + target: $(this), + columns: [ + { + name: 'Id', + label: '元素名称', + hide: true + }, + { + name: 'Name', + label: '元素名称', + width: 80 + }, + { + name: 'ModuleName', + label: '所属模块', + width: 80 + }, + { + name: 'Accessed', + label: '是否已经授权', + align: 'center', + items: [{ 'false': '未授权', 'true': '已授权' }], + width: 80 + } + ], + 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 setting = { + view: { selectedMulti: false }, + data: { + key: { + name: 'Name', + title: 'Name' + }, + simpleData: { + enable: true, + idKey: 'Id', + pIdKey: 'ParentId', + rootPId: 'null' + } + }, + callback: { onClick: zTreeOnClick } + }; + + var url; + var type = $("#moduleType"); + if (type.val() == "UserElement") { + url = '/ModuleManager/LoadForUser'; + } else { + url = '/ModuleManager/LoadForRole'; + } + + $.getJSON(url, { firstId: $("#firstId").val() }, function(json) { + var zTreeObj = $.fn.zTree.init($.CurrentDialog.find("#tree"), setting, json); + zTreeObj.expandAll(true); + }); +}(); +function zTreeOnClick(event, treeId, treeNode) { + dlgList.reload(treeNode.Id); +} \ No newline at end of file diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/1_close.png b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/1_close.png similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/1_close.png rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/1_close.png diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/1_open.png b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/1_open.png similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/1_open.png rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/1_open.png diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/2.png b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/2.png similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/2.png rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/2.png diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/3.png b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/3.png similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/3.png rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/3.png diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/5.png b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/5.png similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/5.png rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/5.png diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/6.png b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/6.png similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/6.png rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/6.png diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/7.png b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/7.png similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/7.png rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/7.png diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/8.png b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/8.png similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/8.png rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/8.png diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/9.png b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/9.png similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/diy/9.png rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/diy/9.png diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/line_conn.gif b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/line_conn.gif similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/line_conn.gif rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/line_conn.gif diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/loading.gif b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/loading.gif similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/loading.gif rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/loading.gif diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/zTreeStandard.gif b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/zTreeStandard.gif similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/zTreeStandard.gif rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/zTreeStandard.gif diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/zTreeStandard.png b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/zTreeStandard.png similarity index 100% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/img/zTreeStandard.png rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/img/zTreeStandard.png diff --git a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/zTreeStyle.css b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/zTreeStyle.css similarity index 99% rename from OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/zTreeStyle.css rename to OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/zTreeStyle.css index 4a1705b1..f06554e3 100644 --- a/OpenAuth.Mvc/Content/plugins/zTree/css/zTreeStyle/zTreeStyle.css +++ b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Content/styles/zTreeStyle/zTreeStyle.css @@ -1,7 +1,7 @@ /*------------------------------------- zTree Style -version: 3.5.19 +version: 3.4 author: Hunter.z email: hunter.z@263.net website: http://code.google.com/p/jquerytree/ diff --git a/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Views/ModuleElementManager/AssignModuleElement.cshtml b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Views/ModuleElementManager/AssignModuleElement.cshtml new file mode 100644 index 00000000..a06e4e69 --- /dev/null +++ b/OpenAuth.Mvc/obj/Release/Package/PackageTmp/Views/ModuleElementManager/AssignModuleElement.cshtml @@ -0,0 +1,31 @@ +
      + +
      + +
      +
      +
      +
        +
        + +
        +
        +
        +
        +
        + + \ No newline at end of file diff --git a/Release/Content/BJUI/themes/css/img/diy/6.png b/Release/Content/BJUI/themes/css/img/diy/6.png new file mode 100644 index 00000000..070b8352 Binary files /dev/null and b/Release/Content/BJUI/themes/css/img/diy/6.png differ