lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-04-05 17:38:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

调整数据库菜单表结构，可以动态加载按钮，注意更新数据库结构并重新初始化数据库

Browse Source
This commit is contained in:
yubaolee 2015-12-05 16:07:53 +08:00
parent 135723f563
commit af5e04d62f
16 changed files with 805 additions and 1090 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenAuth.Domain/Module.cs
View File

@ -6,12 +6,12 @@ using System.Linq;
namespace OpenAuth.Domain
{
/// <summary>
/// 系统模块
/// 用户ID
/// </summary>
public partial class Module
{
/// <summary>
/// 模块ID
/// 用户ID
/// </summary>
/// <returns></returns>
public int Id { get; set; }

36
OpenAuth.Domain/ModuleElement.cs
View File

@ -29,10 +29,10 @@ namespace OpenAuth.Domain
public string Name { get; set; }
/// <summary>
/// 组织类型
/// 元素的类型(如：button/a）
/// </summary>
/// <returns></returns>
public int Type { get; set; }
public string Type { get; set; }
/// <summary>
/// 功能模块Id
@ -40,6 +40,30 @@ namespace OpenAuth.Domain
/// <returns></returns>
public int ModuleId { get; set; }
/// <summary>
/// 元素附加属性
/// </summary>
/// <returns></returns>
public string Attr { get; set; }
/// <summary>
/// 元素调用脚本
/// </summary>
/// <returns></returns>
public string Script { get; set; }
/// <summary>
/// 元素图标
/// </summary>
/// <returns></returns>
public string Icon { get; set; }
/// <summary>
/// 元素样式
/// </summary>
/// <returns></returns>
public string Class { get; set; }
/// <summary>
/// 备注
/// </summary>
@ -52,9 +76,13 @@ namespace OpenAuth.Domain
this.Id= 0;
this.DomId= string.Empty;
this.Name= string.Empty;
this.Type= 0;
this.Type = string.Empty;
this.ModuleId= 0;
this.Remark= string.Empty;
this.Attr= string.Empty;
this.Script= string.Empty;
this.Icon= string.Empty;
this.Class= string.Empty;
this.Remark= string.Empty;
}

56
OpenAuth.Domain/ModuleElementGrant.cs
View File

@ -1,56 +0,0 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
namespace OpenAuth.Domain
{
/// <summary>
/// 用户ID
/// </summary>
public partial class ModuleElementGrant
{
/// <summary>
/// 用户ID
/// </summary>
/// <returns></returns>
public int Id { get; set; }
/// <summary>
/// 元素流水号
/// </summary>
/// <returns></returns>
public int ElementId { get; set; }
/// <summary>
/// 用户流水号
/// </summary>
/// <returns></returns>
public int UserId { get; set; }
/// <summary>
/// 角色流水号
/// </summary>
/// <returns></returns>
public int RoleId { get; set; }
/// <summary>
/// 权限类型
/// </summary>
/// <returns></returns>
public int GrantType { get; set; }
public ModuleElementGrant()
{
this.Id= 0;
this.ElementId= 0;
this.UserId= 0;
this.RoleId= 0;
this.GrantType= 0;
}
}
}

1
OpenAuth.Domain/OpenAuth.Domain.csproj
View File

@ -51,7 +51,6 @@
<Compile Include="Interface\IUserRepository.cs" />
<Compile Include="Module.cs" />
<Compile Include="ModuleElement.cs" />
<Compile Include="ModuleElementGrant.cs" />
<Compile Include="Org.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Relevance.cs" />

152
OpenAuth.Domain/Relevance.cs
View File

@ -1,77 +1,77 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
namespace OpenAuth.Domain
{
/// <summary>
/// 用户ID
/// </summary>
public partial class Relevance
{
/// <summary>
/// 用户ID
/// </summary>
/// <returns></returns>
public int Id { get; set; }
/// <summary>
/// 第一个表主键ID
/// </summary>
/// <returns></returns>
public int FirstId { get; set; }
/// <summary>
/// 第二个表主键ID
/// </summary>
/// <returns></returns>
public int SecondId { get; set; }
/// <summary>
/// 描述
/// </summary>
/// <returns></returns>
public string Description { get; set; }
/// <summary>
///
/// </summary>
/// <returns></returns>
public string Key { get; set; }
/// <summary>
/// 状态
/// </summary>
/// <returns></returns>
public int Status { get; set; }
/// <summary>
/// 授权时间
/// </summary>
/// <returns></returns>
public System.DateTime OperateTime { get; set; }
/// <summary>
/// 授权人
/// </summary>
/// <returns></returns>
public int OperatorId { get; set; }
public Relevance()
{
this.Id= 0;
this.FirstId= 0;
this.SecondId= 0;
this.Description= string.Empty;
this.Key= string.Empty;
this.Status= 0;
this.OperateTime= DateTime.Now;
this.OperatorId= 0;
}
}
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
namespace OpenAuth.Domain
{
/// <summary>
/// 用户ID
/// </summary>
public partial class Relevance
{
/// <summary>
/// 用户ID
/// </summary>
/// <returns></returns>
public int Id { get; set; }
/// <summary>
/// 第一个表主键ID
/// </summary>
/// <returns></returns>
public int FirstId { get; set; }
/// <summary>
/// 第二个表主键ID
/// </summary>
/// <returns></returns>
public int SecondId { get; set; }
/// <summary>
/// 描述
/// </summary>
/// <returns></returns>
public string Description { get; set; }
/// <summary>
///
/// </summary>
/// <returns></returns>
public string Key { get; set; }
/// <summary>
/// 状态
/// </summary>
/// <returns></returns>
public int Status { get; set; }
/// <summary>
/// 授权时间
/// </summary>
/// <returns></returns>
public System.DateTime OperateTime { get; set; }
/// <summary>
/// 授权人
/// </summary>
/// <returns></returns>
public int OperatorId { get; set; }
public Relevance()
{
this.Id= 0;
this.FirstId= 0;
this.SecondId= 0;
this.Description= string.Empty;
this.Key= string.Empty;
this.Status= 0;
this.OperateTime= DateTime.Now;
this.OperatorId= 0;
}
}
}

139
OpenAuth.Mvc/Controllers/ModuleElementManagerController.cs
View File

@ -1,69 +1,72 @@
// ***********************************************************************
// Assembly : OpenAuth.Mvc
// Author : Yubao Li
// Created : 12-02-2015
//
// Last Modified By : Yubao Li
// Last Modified On : 12-02-2015
// ***********************************************************************
// <copyright file="ModuleElementManagerController.cs" company="">
// Copyright (c) . All rights reserved.
// </copyright>
// <summary>模块元素管理，无需权限控制</summary>
// ***********************************************************************
using System;
using System.Web.Mvc;
using Infrastructure;
using OpenAuth.App;
using OpenAuth.Domain;
using OpenAuth.Mvc.Models;
namespace OpenAuth.Mvc.Controllers
{
public class ModuleElementManagerController : Controller
{
private readonly BjuiResponse _bjuiResponse = new BjuiResponse();
private ModuleElementManagerApp _app;
public ModuleElementManagerController()
{
_app = (ModuleElementManagerApp) DependencyResolver.Current.GetService(typeof (ModuleElementManagerApp));
}
public ActionResult Index(int id = 0)
{
ViewBag.ModuleId = id;
return View(_app.LoadByModuleId(id));
}
[HttpPost]
public string AddOrEditButton(ModuleElement button)
{
try
{
_app.AddOrUpdate(button);
}
catch (Exception e)
{
_bjuiResponse.statusCode = "300";
_bjuiResponse.message = e.Message;
}
return JsonHelper.Instance.Serialize(_bjuiResponse);
}
public string DelButton(int id)
{
try
{
_app.Delete(id);
}
catch (Exception e)
{
_bjuiResponse.statusCode = "300";
_bjuiResponse.message = e.Message;
}
return JsonHelper.Instance.Serialize(_bjuiResponse);
}
}
// ***********************************************************************
// Assembly : OpenAuth.Mvc
// Author : Yubao Li
// Created : 12-02-2015
//
// Last Modified By : Yubao Li
// Last Modified On : 12-02-2015
// ***********************************************************************
// <copyright file="ModuleElementManagerController.cs" company="">
// Copyright (c) . All rights reserved.
// </copyright>
// <summary>模块元素管理，无需权限控制</summary>
// ***********************************************************************
using System;
using System.Data.Entity.Validation;
using System.Web.Mvc;
using Infrastructure;
using OpenAuth.App;
using OpenAuth.Domain;
using OpenAuth.Mvc.Models;
namespace OpenAuth.Mvc.Controllers
{
public class ModuleElementManagerController : Controller
{
private readonly BjuiResponse _bjuiResponse = new BjuiResponse();
private ModuleElementManagerApp _app;
public ModuleElementManagerController()
{
_app = (ModuleElementManagerApp) DependencyResolver.Current.GetService(typeof (ModuleElementManagerApp));
}
public ActionResult Index(int id = 0)
{
ViewBag.ModuleId = id;
return View(_app.LoadByModuleId(id));
}
[HttpPost]
public string AddOrEditButton(ModuleElement button)
{
try
{
var newbtn = new ModuleElement();
button.CopyTo(newbtn);
_app.AddOrUpdate(newbtn);
}
catch (DbEntityValidationException e)
{
_bjuiResponse.statusCode = "300";
_bjuiResponse.message = e.Message;
}
return JsonHelper.Instance.Serialize(_bjuiResponse);
}
public string DelButton(int id)
{
try
{
_app.Delete(id);
}
catch (Exception e)
{
_bjuiResponse.statusCode = "300";
_bjuiResponse.message = e.Message;
}
return JsonHelper.Instance.Serialize(_bjuiResponse);
}
}
}

128
OpenAuth.Mvc/Views/ModuleElementManager/Index.cshtml
View File

@ -1,61 +1,69 @@
@model IEnumerable<OpenAuth.Domain.ModuleElement>
<script type="text/javascript">
//删除回调
$('#tableButtons').on('afterdelete.bjui.tabledit', function(e) {
var $tbody = $(e.relatedTarget);
console.log('你删除了一条数据，还有['+ $tbody.find('> tr').length +']条数据！');
})
</script>
<div class="bjui-pageHeader">
<div class="bjui-searchBar">
<div class="alert alert-info search-inline"><i class="fa fa-info-circle"></i> 双击行可编辑</div>&nbsp;
<button type="button" class="btn-green" data-toggle="tableditadd" data-target="#tableButtons" data-num="1" data-icon="plus">
添加新按钮
</button>&nbsp;
</div>
</div>
<div class="bjui-pageContent tableContent">
<form id="j_custom_form" class="pageForm" data-toggle="validate" method="post">
<table id="tableButtons" class="table table-bordered table-hover table-striped table-top"
data-toggle="tabledit" data-initnum="0" data-action="/ModuleElementManager/AddOrEditButton" data-single-noindex="true">
<thead>
<tr data-idname="Id">
<th width="80" title="按钮标识"><input type="text" name="DomId" data-rule="required" value="" size="5"></th>
<th width="80" title="按钮显示"><input type="text" name="Name" data-rule="required" value="" size="5"></th>
<th title="备注"><textarea name="Remark" data-toggle="autoheight"></textarea></th>
<th width="80" title="所属模块ID"><input readonly="readonly" type="text" value="@ViewBag.ModuleId" name="ModuleId"/></th>
<th title="操作" width="100">
<a href="javascript:;" class="btn btn-green" data-toggle="dosave">增加</a>
<a href="javascript:;" class="btn btn-red row-del">取消</a>
</th>
</tr>
</thead>
<tbody>
@foreach (var element in Model)
{
<tr data-id="@element.Id">
<td>@element.DomId</td>
<td>@element.Name</td>
<td>@element.Remark</td>
<td>@ViewBag.ModuleId</td>
<td data-noedit="true">
<input type="text" style="display: none" value="@element.Id" id="element_@element.Id" />
<button type="button" class="btn-green" data-toggle="doedit">编辑</button>
<a href="/ModuleElementManager/DelButton?id={#element_@element.Id}" class="btn btn-red row-del"
data-confirm-msg="确定要删除该行信息吗？">删</a>
</td>
</tr>
}
</tbody>
</table>
</form>
</div>
<div class="bjui-pageFooter">
<ul>
<li><button type="button" class="btn-close" data-icon="close">关闭</button></li>
</ul>
@model IEnumerable<OpenAuth.Domain.ModuleElement>
<script type="text/javascript">
//删除回调
$('#tableButtons').on('afterdelete.bjui.tabledit', function(e) {
var $tbody = $(e.relatedTarget);
console.log('你删除了一条数据，还有['+ $tbody.find('> tr').length +']条数据！');
})
</script>
<div class="bjui-pageHeader">
<div class="bjui-searchBar">
<div class="alert alert-info search-inline"><i class="fa fa-info-circle"></i> 双击行可编辑</div>&nbsp;
<button type="button" class="btn-green" data-toggle="tableditadd" data-target="#tableButtons" data-num="1" data-icon="plus">
添加新按钮
</button>&nbsp;
</div>
</div>
<div class="bjui-pageContent tableContent">
<form id="j_custom_form" class="pageForm" data-toggle="validate" method="post">
<table id="tableButtons" class="table table-bordered table-hover table-striped table-top"
data-toggle="tabledit" data-initnum="0" data-action="/ModuleElementManager/AddOrEditButton" data-single-noindex="true">
<thead>
<tr data-idname="Id">
<th width="80" title="元素类型"><input type="text" name="Type" data-rule="required" value="button" size="5"></th>
<th width="80" title="按钮标识"><input type="text" name="DomId" data-rule="required" value="" size="5"></th>
<th width="80" title="按钮显示"><input type="text" name="Name" data-rule="required" value="" size="5"></th>
<th width="120" title="按钮样式"><input type="text" name="Class" data-rule="required" value="btn-green btn-nm" size="5"></th>
<th width="80" title="按钮图标"><input type="text" name="Icon" data-rule="required" value="pencil" size="5"></th>
<th width="120" title="按钮脚本"><textarea name="Script" data-toggle="autoheight" value="javascript:;"></textarea></th>
<th width="120" title="附加属性"><textarea name="Attr" data-toggle="autoheight"></textarea></th>
<th width="80" title="所属模块ID"><input readonly="readonly" type="text" value="@ViewBag.ModuleId"
name="ModuleId"/></th>
<th title="操作" width="100">
<a href="javascript:;" class="btn btn-green" data-toggle="dosave">增加</a>
<a href="javascript:;" class="btn btn-red row-del">取消</a>
</th>
</tr>
</thead>
<tbody>
@foreach (var element in Model)
{
<tr data-id="@element.Id">
<td>@element.Type</td>
<td>@element.DomId</td>
<td>@element.Name</td>
<td>@element.Class</td>
<td>@element.Icon</td>
<td>@element.Script</td>
<td>@element.Attr</td>
<td>@ViewBag.ModuleId</td>
<td data-noedit="true">
<input type="text" style="display: none" value="@element.Id" id="element_@element.Id"/>
<button type="button" class="btn-green" data-toggle="doedit">编辑</button>
<a href="/ModuleElementManager/DelButton?id={#element_@element.Id}" class="btn btn-red row-del"
data-confirm-msg="确定要删除该行信息吗？">删</a>
</td>
</tr>
}
</tbody>
</table>
</form>
</div>
<div class="bjui-pageFooter">
<ul>
<li><button type="button" class="btn-close" data-icon="close">关闭</button></li>
</ul>
</div>

3
OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
View File

@ -186,6 +186,9 @@
$(this).dialog({
id: 'editDialog',
width: 820,
height: 500,
mask:true,
url: '/ModuleElementManager/Index?id=' + selected,
title: '为模块分配按钮'
});

38
OpenAuth.Mvc/Views/UserManager/Index.cshtml
View File

@ -1,15 +1,37 @@
@{
@using System.Text
@{
string _prefix = "user";
var _treeId = _prefix + "Tree";
var _gridId = _prefix + "Grid";
var _treeDetail = _prefix + "Detail";
}
<div class="bjui-pageContent">
<div class="clearfix">
<div style="float: left; width: 220px; overflow: auto;" class="table table-bordered">
<ul id="@_treeId" class="ztree"></ul>
</div>
<div class="bjui-pageHeader" style="margin-left: 225px">
<div class="bjui-searchBar">
<div class="bjui-searchBar">
@{
var sb = new StringBuilder();
foreach (var element in ViewBag.Module.Elements)
{
sb.Append("<" + element.Type
+" data-icon='" + element.Icon+"' "
+" class='" + element.Class+"' "
+" onclick='" + element.Script+"' " + element.Attr
+ ">"+element.Name +"</" + element.Type +">");
}
@Html.Raw(sb.ToString())
}
</div>
</div>
</div>
<div id="@_treeDetail" style="margin-left: 225px;">
</div>
</div>
@ -29,25 +51,15 @@
$('#@_treeDetail').empty()
.append('<table id="@_gridId" class="table table-bordered"></table>');
@{
string strBtns = string.Empty;
foreach (var element in ViewBag.Module.Elements)
{
strBtns +="<button type=\"button\" class =\"btn btn-green\">"+element.Name +"</button>";
}
}
grid = $(gridid).datagrid({
gridTitle: '用户列表',
showToolbar: true,
showToolbar: false,
filterThead: false,
toolbarItem: 'refresh, |, del',
toolbarCustom: '<a href="/UserManager/Add" class="btn btn-green" data-icon ="plus" ' +
'data-toggle="dialog" data-id="dialog-mask" data-mask="true" data-on-close="refreshGrid">添加</a>' +
'<button class=" btn-green" onclick="editOrg()" data-icon="pencil" type="button">编辑</button>' +
'<button type="button" class="btn btn-green" onclick="openModuleAccess(this)">为用户分配模块</button>' +
'<button type="button" class ="btn btn-green" onclick="openRoleAccess(this)">为用户分配角色</button>' + '@strBtns',
'<button type="button" class ="btn btn-green" onclick="openRoleAccess(this)">为用户分配角色</button>',
columns: [
{
name: 'Id',

24
OpenAuth.Repository/Models/Mapping/ModuleElementGrantMap.cs
View File

@ -1,24 +0,0 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.Data.Entity.ModelConfiguration;
using OpenAuth.Domain;
namespace OpenAuth.Repository.Models.Mapping
{
public class ModuleElementGrantMap : EntityTypeConfiguration<ModuleElementGrant>
{
public ModuleElementGrantMap()
{
// Primary Key
this.HasKey(t => t.Id);
// Properties
// Table & Column Mappings
this.ToTable("ModuleElementGrant");
this.Property(t => t.Id).HasColumnName("Id");
this.Property(t => t.ElementId).HasColumnName("ElementId");
this.Property(t => t.UserId).HasColumnName("UserId");
this.Property(t => t.RoleId).HasColumnName("RoleId");
this.Property(t => t.GrantType).HasColumnName("GrantType");
}
}
}

22
OpenAuth.Repository/Models/Mapping/ModuleElementMap.cs
View File

@ -20,9 +20,25 @@ namespace OpenAuth.Repository.Models.Mapping
.IsRequired()
.HasMaxLength(255);
this.Property(t => t.Attr)
.IsRequired()
.HasMaxLength(500);
this.Property(t => t.Script)
.IsRequired()
.HasMaxLength(500);
this.Property(t => t.Icon)
.IsRequired()
.HasMaxLength(255);
this.Property(t => t.Class)
.IsRequired()
.HasMaxLength(255);
this.Property(t => t.Remark)
.IsRequired()
.HasMaxLength(4000);
.HasMaxLength(200);
// Table & Column Mappings
this.ToTable("ModuleElement");
@ -31,6 +47,10 @@ namespace OpenAuth.Repository.Models.Mapping
this.Property(t => t.Name).HasColumnName("Name");
this.Property(t => t.Type).HasColumnName("Type");
this.Property(t => t.ModuleId).HasColumnName("ModuleId");
this.Property(t => t.Attr).HasColumnName("Attr");
this.Property(t => t.Script).HasColumnName("Script");
this.Property(t => t.Icon).HasColumnName("Icon");
this.Property(t => t.Class).HasColumnName("Class");
this.Property(t => t.Remark).HasColumnName("Remark");
}
}

70
OpenAuth.Repository/Models/Mapping/RelevanceMap.cs
View File

@ -1,35 +1,35 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.Data.Entity.ModelConfiguration;
using OpenAuth.Domain;
namespace OpenAuth.Repository.Models.Mapping
{
public class RelevanceMap : EntityTypeConfiguration<Relevance>
{
public RelevanceMap()
{
// Primary Key
this.HasKey(t => t.Id);
// Properties
this.Property(t => t.Description)
.IsRequired()
.HasMaxLength(100);
this.Property(t => t.Key)
.IsRequired()
.HasMaxLength(100);
// Table & Column Mappings
this.ToTable("Relevance");
this.Property(t => t.Id).HasColumnName("Id");
this.Property(t => t.FirstId).HasColumnName("FirstId");
this.Property(t => t.SecondId).HasColumnName("SecondId");
this.Property(t => t.Description).HasColumnName("Description");
this.Property(t => t.Key).HasColumnName("Key");
this.Property(t => t.Status).HasColumnName("Status");
this.Property(t => t.OperateTime).HasColumnName("OperateTime");
this.Property(t => t.OperatorId).HasColumnName("OperatorId");
}
}
}
using System.ComponentModel.DataAnnotations.Schema;
using System.Data.Entity.ModelConfiguration;
using OpenAuth.Domain;
namespace OpenAuth.Repository.Models.Mapping
{
public class RelevanceMap : EntityTypeConfiguration<Relevance>
{
public RelevanceMap()
{
// Primary Key
this.HasKey(t => t.Id);
// Properties
this.Property(t => t.Description)
.IsRequired()
.HasMaxLength(100);
this.Property(t => t.Key)
.IsRequired()
.HasMaxLength(100);
// Table & Column Mappings
this.ToTable("Relevance");
this.Property(t => t.Id).HasColumnName("Id");
this.Property(t => t.FirstId).HasColumnName("FirstId");
this.Property(t => t.SecondId).HasColumnName("SecondId");
this.Property(t => t.Description).HasColumnName("Description");
this.Property(t => t.Key).HasColumnName("Key");
this.Property(t => t.Status).HasColumnName("Status");
this.Property(t => t.OperateTime).HasColumnName("OperateTime");
this.Property(t => t.OperatorId).HasColumnName("OperatorId");
}
}
}

2
OpenAuth.Repository/Models/OpenAuthDBContext.cs
View File

@ -19,7 +19,6 @@ namespace OpenAuth.Repository.Models
public DbSet<Module> Modules { get; set; }
public DbSet<ModuleElement> ModuleElements { get; set; }
public DbSet<ModuleElementGrant> ModuleElementGrants { get; set; }
public DbSet<Org> Orgs { get; set; }
public DbSet<Relevance> Relevances { get; set; }
public DbSet<Role> Roles { get; set; }
@ -31,7 +30,6 @@ namespace OpenAuth.Repository.Models
{
modelBuilder.Configurations.Add(new ModuleMap());
modelBuilder.Configurations.Add(new ModuleElementMap());
modelBuilder.Configurations.Add(new ModuleElementGrantMap());
modelBuilder.Configurations.Add(new OrgMap());
modelBuilder.Configurations.Add(new RelevanceMap());
modelBuilder.Configurations.Add(new RoleMap());

1
OpenAuth.Repository/OpenAuth.Repository.csproj
View File

@ -54,7 +54,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="BaseRepository.cs" />
<Compile Include="Models\Mapping\ModuleElementGrantMap.cs" />
<Compile Include="Models\Mapping\ModuleElementMap.cs" />
<Compile Include="Models\Mapping\ModuleMap.cs" />
<Compile Include="Models\Mapping\OrgMap.cs" />

606
数据库设计关系图/PDM_OA.pdb
View File

File diff suppressed because it is too large Load Diff

613
数据库设计关系图/PDM_OA.pdm
View File

File diff suppressed because it is too large Load Diff