diff --git a/CodeSmith/CSharp/Web/index.js.cst b/CodeSmith/CSharp/Web/index.js.cst index c71aa831..376bb6e7 100644 --- a/CodeSmith/CSharp/Web/index.js.cst +++ b/CodeSmith/CSharp/Web/index.js.cst @@ -59,8 +59,11 @@ layui.config({ }; var load = function () { $.getJSON(url, function (json) { - zTreeObj = $.fn.zTree.init($("#tree"), setting, json); - mainList({ orgId: json[0].Id }); + zTreeObj = $.fn.zTree.init($("#tree"), setting); + var newNode = { Name: "根节点", Id: null, ParentId: "" }; + json.push(newNode); + zTreeObj.addNodes(null, json); + mainList({ orgId: "" }); zTreeObj.expandAll(true); }); }; @@ -90,7 +93,7 @@ layui.config({ }); var url = "/<%=ModuleName%>Manager/Add"; if (update) { - url = "/<%=ModuleName%>Manager/Update"; //暂时和添加一个地址 + url = "/<%=ModuleName%>Manager/Update"; } //提交数据 form.on('submit(formSubmit)', diff --git a/OpenAuth.App/ModuleManagerApp.cs b/OpenAuth.App/ModuleManagerApp.cs index 15e8a990..1c9a0ad5 100644 --- a/OpenAuth.App/ModuleManagerApp.cs +++ b/OpenAuth.App/ModuleManagerApp.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; using OpenAuth.Repository.Domain; -using OpenAuth.Repository.Interface; namespace OpenAuth.App { - public class ModuleManagerApp + public class ModuleManagerApp :BaseApp { - public IUnitWork _unitWork { get; set; } - - public void Delete(string id) + public void Add(Module model) { - // _unitWork.Delete(id); + ChangeModuleCascade(model); + Repository.Add(model); } - public void AddOrUpdate(Module vm) + public void Update(Module model) { - // _moduleManService.AddOrUpdate(vm); + ChangeModuleCascade(model); + Repository.Update(u =>u.Id, model); } #region 用户/角色分配模块 @@ -40,6 +39,5 @@ namespace OpenAuth.App } #endregion 用户/角色分配模块 - } } \ No newline at end of file diff --git a/OpenAuth.App/Response/ModuleView.cs b/OpenAuth.App/Response/ModuleView.cs index 5b59ce4f..aafe6f7c 100644 --- a/OpenAuth.App/Response/ModuleView.cs +++ b/OpenAuth.App/Response/ModuleView.cs @@ -12,6 +12,11 @@ namespace OpenAuth.App.Response /// public string Id { get; set; } + /// + /// 节点语义ID + /// + public string CascadeId { get; set; } + /// /// 名称 /// @@ -30,6 +35,12 @@ namespace OpenAuth.App.Response /// public string ParentId { get; set; } + /// + /// 父节点流水号 + /// + /// + public string ParentName { get; set; } + /// /// 节点图标文件名称 /// @@ -39,6 +50,11 @@ namespace OpenAuth.App.Response public bool Checked { get; set; } + /// + /// 排序号 + /// + public int SortNo { get; set; } + /// /// 模块中的元素 /// diff --git a/OpenAuth.Mvc/Controllers/HomeController.cs b/OpenAuth.Mvc/Controllers/HomeController.cs index f2216b7b..bf50419e 100644 --- a/OpenAuth.Mvc/Controllers/HomeController.cs +++ b/OpenAuth.Mvc/Controllers/HomeController.cs @@ -35,7 +35,7 @@ namespace OpenAuth.Mvc.Controllers { sb.Append(" - - - - - + @Html.Action("MenuHeader", "Home")
    + lay-filter="list" lay-size="sm"> diff --git a/OpenAuth.Mvc/Views/ModuleManager/Assign.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Assign.cshtml deleted file mode 100644 index d6bcddd8..00000000 --- a/OpenAuth.Mvc/Views/ModuleManager/Assign.cshtml +++ /dev/null @@ -1,19 +0,0 @@ -@{ - Layout = null; -} - - - - - - - - - - @Html.Raw(ViewBag.Modules) - - - - - - diff --git a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml index 0d19b172..9d344ae3 100644 --- a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml @@ -3,13 +3,6 @@ }
    -
    -
    - -
    - -
    @Html.Action("MenuHeader", "Home")
    @@ -17,26 +10,55 @@
      + lay-filter="list" lay-size="sm"> - - - - - - - - - - + + + + + + + + + +
      模块名称UrlIconName父节点名称排序号ID
      模块名称层级IDUrl图标父节点名称排序号
      + + + + + + + + + + + + + + + + + +
      名称DomId样式图标排序号
      + +
      - - + + +
      + +
      + +
      +
      +
      + +
      + +
      +
      @@ -62,8 +99,8 @@
      - - + + diff --git a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml index 28a69e21..6ba81d82 100644 --- a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml @@ -3,13 +3,6 @@ }
      -
      -
      - -
      - -
      @Html.Action("MenuHeader", "Home")
      @@ -17,7 +10,7 @@
        + lay-filter="list" lay-size="sm"> diff --git a/OpenAuth.Mvc/Views/ResourceManager/AssignRes.cshtml b/OpenAuth.Mvc/Views/ResourceManager/AssignRes.cshtml deleted file mode 100644 index 77be0ea8..00000000 --- a/OpenAuth.Mvc/Views/ResourceManager/AssignRes.cshtml +++ /dev/null @@ -1,26 +0,0 @@ - -@{ - Layout = null; -} - - - - - - - -
        - - -
          -
          - - -
          -
          -
          - - - - - diff --git a/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml b/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml deleted file mode 100644 index a5aa84e5..00000000 --- a/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml +++ /dev/null @@ -1,96 +0,0 @@ -@{ - Layout = "~/Views/Shared/_Layout.cshtml"; -} - - - - -
          -
          -
          -
          -
          -
          -
          -
          -
          -
            -
            -
            -
            -
            -
            -
            -
            - @Html.Action("MenuHeader", "Home") -
            -
            -
            -
            -
            -
            -
            -
            -
            -
            -
            - - - - - - - - - - - - - - diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml deleted file mode 100644 index 519f9392..00000000 --- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml +++ /dev/null @@ -1,82 +0,0 @@ -@{ - Layout = "~/Views/Shared/_Layout.cshtml"; -} - - - - - -
            -
            -
            -
            -
            -
            -
            -
            -
            -
              -
              -
              -
              -
              -
              -
              -
              - @Html.Action("MenuHeader", "Home") -
              -
              -
              -
              -
              -
              -
              -
              -
              -
              -
              -
              -
              -
              -
              -
              - - - - - - - - - diff --git a/OpenAuth.Mvc/Views/RoleManager/LookupMulti.cshtml b/OpenAuth.Mvc/Views/RoleManager/LookupMulti.cshtml deleted file mode 100644 index 4eeaf211..00000000 --- a/OpenAuth.Mvc/Views/RoleManager/LookupMulti.cshtml +++ /dev/null @@ -1,26 +0,0 @@ - -@{ - Layout = null; -} - - - - - - - -
              - - -
                -
                - - -
                -
                -
                - - - - - diff --git a/OpenAuth.Mvc/Views/StockManager/Index.cshtml b/OpenAuth.Mvc/Views/StockManager/Index.cshtml deleted file mode 100644 index d82654ae..00000000 --- a/OpenAuth.Mvc/Views/StockManager/Index.cshtml +++ /dev/null @@ -1,101 +0,0 @@ -@{ - Layout = "~/Views/Shared/_Layout.cshtml"; -} - - - - - -
                -
                -
                -
                -
                -
                -
                -
                -
                -
                  -
                  -
                  -
                  -
                  -
                  -
                  -
                  - @Html.Action("MenuHeader", "Home") -
                  -
                  -
                  -
                  -
                  -
                  -
                  -
                  -
                  -
                  -
                  -
                  -
                  -
                  -
                  -
                  - - - - - - - - diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml index bfd28ec7..97896069 100644 --- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml @@ -3,25 +3,14 @@ }
                  -
                  -
                  - -
                  - -
                  @Html.Action("MenuHeader", "Home") - @* - - - *@
                    + lay-filter="list" lay-size="sm"> diff --git a/OpenAuth.Mvc/js/modules.js b/OpenAuth.Mvc/js/modules.js index 7f0385ee..be3159bc 100644 --- a/OpenAuth.Mvc/js/modules.js +++ b/OpenAuth.Mvc/js/modules.js @@ -20,6 +20,19 @@ layui.config({ where: config }); } + + //菜单列表 + 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 = '/ModuleManager/LoadModule'; @@ -46,7 +59,10 @@ layui.config({ }; var load = function () { $.getJSON(url, function (json) { - zTreeObj = $.fn.zTree.init($("#tree"), setting, json); + zTreeObj = $.fn.zTree.init($("#tree"), setting); + var newNode = { Name: "根节点", Id: null, ParentId: "" }; + json.push(newNode); + zTreeObj.addNodes(null, json); mainList({ pId: "" }); zTreeObj.expandAll(true); }); @@ -75,9 +91,9 @@ layui.config({ }, end: mainList }); - var url = "/moduleManager/AddOrUpdate"; + var url = "/moduleManager/Add"; if (update) { - url = "/moduleManager/AddOrUpdate"; //暂时和添加一个地址 + url = "/moduleManager/Update"; } //提交数据 form.on('submit(formSubmit)', @@ -95,7 +111,8 @@ layui.config({ add: function() { //弹出添加 update = false; show({ - Id: '' + Id: "", + SortNo:1 }); }, update: function(data) { //弹出编辑框 @@ -109,7 +126,8 @@ layui.config({ table.on('tool(list)', function (obj) { var data = obj.data; if (obj.event === 'detail') { //查看 - layer.msg('ID：' + data.Id + ' 的查看操作'); + //layer.msg('ID：' + data.Id + ' 的查看操作'); + menuList({moduleId:data.Id}); } }); diff --git a/OpenAuth.Repository/Domain/Module.cs b/OpenAuth.Repository/Domain/Module.cs index dc25dead..bf299fae 100644 --- a/OpenAuth.Repository/Domain/Module.cs +++ b/OpenAuth.Repository/Domain/Module.cs @@ -10,36 +10,25 @@ using System; using System.Collections.Generic; using System.Text; +using OpenAuth.Repository.Core; namespace OpenAuth.Repository.Domain { /// /// 功能模块表 /// - public partial class Module : Entity + public partial class Module : TreeEntity { public Module() { - this.CascadeId= string.Empty; - this.Name= string.Empty; this.Url= string.Empty; this.HotKey= string.Empty; this.IconName= string.Empty; this.Status= 0; - this.ParentName= string.Empty; this.Vector= string.Empty; this.SortNo= 0; - this.ParentId= string.Empty; } - /// - /// 节点语义ID - /// - public string CascadeId { get; set; } - /// - /// 功能模块名称 - /// - public string Name { get; set; } /// /// 主页面URL /// @@ -64,10 +53,7 @@ namespace OpenAuth.Repository.Domain /// 当前状态 /// public int Status { get; set; } - /// - /// 父节点名称 - /// - public string ParentName { get; set; } + /// /// 矢量图标 /// @@ -76,10 +62,6 @@ namespace OpenAuth.Repository.Domain /// 排序号 /// public int SortNo { get; set; } - /// - /// 父节点流水号 - /// - public string ParentId { get; set; } } } \ No newline at end of file