check bugs

This commit is contained in:
yubaolee@163.com 2018-04-13 16:18:30 +08:00
parent 785cfcc533
commit 9e7e8f82ae
10 changed files with 96 additions and 184 deletions

View File

@ -105,6 +105,8 @@
<Compile Include="AutofacExt.cs" />
<Compile Include="BaseApp.cs" />
<Compile Include="AuthorizeApp.cs" />
<Compile Include="Request\QueryAppListReq.cs" />
<Compile Include="AppManager.cs" />
<Compile Include="ResourceApp.cs" />
<Compile Include="CategoryApp.cs" />
<Compile Include="Define.cs" />

View File

@ -33,7 +33,7 @@ namespace OpenAuth.App
}
public TableData All(QueryResourcesReq request)
public TableData Load(QueryResourcesReq request)
{
var result = new TableData();
var resources = UnitWork.Find<Resource>(null) ;

View File

@ -20,11 +20,9 @@ namespace OpenAuth.Mvc.Controllers
return View();
}
public string All([FromUri]QueryResourcesReq request)
public string Load([FromUri]QueryResourcesReq request)
{
TableData data = new TableData();
data = App.All(request);
return JsonHelper.Instance.Serialize(data);
return JsonHelper.Instance.Serialize(App.Load(request));
}
[System.Web.Mvc.HttpPost]

View File

@ -143,6 +143,7 @@
<Compile Include="App_Start\FilterConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="Controllers\BaseController.cs" />
<Compile Include="Controllers\ApplicationsController.cs" />
<Compile Include="Controllers\ResourcesController.cs" />
<Compile Include="Controllers\CategoriesController.cs" />
<Compile Include="Controllers\ErrorController.cs" />

View File

@ -31,7 +31,7 @@
<!--用户添加/编辑窗口-->
<div id="divEdit" style="display: none">
<form class="layui-form" action="" id="formEdit">
<form class="layui-form layui-form-pane" action="" id="formEdit">
<div class="layui-form-item">
<label class="layui-form-label">类型标识</label>

View File

@ -4,54 +4,33 @@
}
<blockquote class="layui-elem-quote news_search toolList" id="menus"></blockquote>
<div class="layui-row">
<div class="layui-col-xs2">
<ul id="tree" class="ztree"
style="padding: 2px; border: 1px solid #ddd; overflow: auto;"></ul>
</div>
<div class="layui-col-xs10">
<div class="layui-card">
<table class="layui-table"
lay-data="{height: 'full-80', page:true, id:'mainList'}"
lay-filter="list" lay-size="sm">
<thead>
<tr>
<th lay-data="{checkbox:true, fixed: true}"></th>
<th lay-data="{field:'Id', width:150}">资源表ID</th>
<th lay-data="{field:'CascadeId', width:150}">节点语义ID</th>
<th lay-data="{field:'Key', width:150}">资源英文唯一标识</th>
<th lay-data="{field:'Key', width:150}">资源标识</th>
<th lay-data="{field:'Name', width:150}">名称</th>
<th lay-data="{field:'Status', width:150}">当前状态</th>
<th lay-data="{field:'SortNo', width:150}">排序号</th>
<th lay-data="{field:'Description', width:150}">描述</th>
<th lay-data="{field:'ParentId', width:150}">父节点流水号</th>
<th lay-data="{field:'AppId', width:150}">资源所属应用</th>
<th lay-data="{field:'TypeName', width:150}">分类名称</th>
<th lay-data="{field:'TypeId', width:150}">分类ID</th>
<th lay-data="{fixed: 'right', width:160, align:'center', toolbar: '#barList'}"></th>
</tr>
</thead>
</table>
</div>
</div>
<script type="text/html" id="barList">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
</script>
</div>
<!--添加/编辑窗口-->
<div id="divEdit" style="display: none">
<form class="layui-form" action="" id="formEdit">
<form class="layui-form layui-form-pane" action="" id="formEdit">
<input type="hidden" name="Id" v-model="Id" />
<div class="layui-form-item">
<label class="layui-form-label">节点语义ID</label>
<div class="layui-input-block">
<input type="text" name="CascadeId" v-model="CascadeId" required lay-verify="required"
placeholder="节点语义ID" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">资源英文唯一标识</label>
<label class="layui-form-label">资源标识</label>
<div class="layui-input-block">
<input type="text" name="Key" v-model="Key" required lay-verify="required"
placeholder="资源英文唯一标识" autocomplete="off" class="layui-input">
@ -64,20 +43,7 @@
placeholder="名称" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">当前状态</label>
<div class="layui-input-block">
<input type="radio" name="Status" value="1" title="value1" checked>
<input type="radio" name="Status" value="0" title="value2">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">排序号</label>
<div class="layui-input-block">
<input type="radio" name="SortNo" value="1" title="value1" checked>
<input type="radio" name="SortNo" value="0" title="value2">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">描述</label>
<div class="layui-input-block">
@ -85,36 +51,19 @@
placeholder="描述" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">父节点流水号</label>
<label class="layui-form-label">所属应用</label>
<div class="layui-input-block">
<input type="text" name="ParentId" v-model="ParentId" required lay-verify="required"
placeholder="父节点流水号" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">资源所属应用</label>
<div class="layui-input-block">
<input type="text" name="AppId" v-model="AppId" required lay-verify="required"
placeholder="资源所属应用" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">分类名称</label>
<div class="layui-input-block">
<input type="text" name="TypeName" v-model="TypeName" required lay-verify="required"
placeholder="分类名称" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">分类ID</label>
<div class="layui-input-block">
<input type="text" name="TypeId" v-model="TypeId" required lay-verify="required"
placeholder="分类ID" autocomplete="off" class="layui-input">
</div>
<input id="AppName" name="AppName" v-model="AppName" class="layui-input" />
<input id="AppId" name="AppId" v-model="AppId" type="hidden" />
<div id="menuContent" class="menuContent" style="display: none;">
<ul id="org" class="ztree"></ul>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-input-block">

View File

@ -7,60 +7,24 @@
var table = layui.table;
var openauth = layui.openauth;
var toplayer = (top == undefined || top.layer === undefined) ? layer : top.layer; //顶层的LAYER
//layui.droptree("/UserSession/GetOrgs", "#Organizations", "#OrganizationIds");
$("#menus").loadMenus("Resource");
layui.droptree("/Applications/GetList", "#AppName", "#AppId", false);
//主列表加载,可反复调用进行刷新
var config = {}; //table的参数如搜索key点击tree的id
var mainList = function(options) {
if (options != undefined) {
$.extend(config, options);
}
table.reload('mainList', {
table.reload('mainList',
{
url: '/Resources/Load',
where: config
});
}
//左边树状机构列表
var ztree = function () {
var url = '/UserSession/GetOrgs';
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) {
mainList({ orgId: treeNode.Id });
}
}
};
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({ orgId: "" });
zTreeObj.expandAll(true);
});
};
load();
return {
reload: load
}
}();
mainList();
//添加(编辑)对话框
var editDlg = function () {

View File

@ -20,9 +20,7 @@
`演示直达`
* 联通http://113.204.18.84:1802
* 电信http://222.178.90.18:1802
* http://demo.openauth.me:1802
####当前版本
@ -34,7 +32,7 @@
* 前端采用 vue + layui + ztree + gooflow + leipiformdesign
* 后端采用 asp.net mvc + EF + autofac + swagger + json.net
* 后端采用 asp.net mvc + Web API + EF + autofac + swagger + json.net
* 代码生成工具 CodeSmith