check bugs

CodeSmith/CSharp/Web/Index.cshtml.cst

@@ -18,31 +18,38 @@ Description="连接的数据库" %>
 {
     <link rel="stylesheet" href="/css/treetable.css" />
 }
-<blockquote class="layui-elem-quote news_search toolList">
+<blockquote class="layui-elem-quote news_search toolList" id="menus">
-    @Html.Action("MenuHeader", "Home")
 </blockquote>
 
-<div style="display: flex;">
+    <div class="layui-row">
-    <ul id="tree" class="ztree" style="display: inline-block; width: 180px; padding: 10px; border: 1px solid #ddd; overflow: auto;"></ul>
+        <div class="layui-col-xs2">
-    <table class="layui-table"
+            <ul id="tree" class="ztree"
-           lay-data="{height: 'full-80', page:true, id:'mainList'}"
+                style="padding: 2px; border: 1px solid #ddd; overflow: auto;">
-           lay-filter="list"  lay-size="sm">
+            </ul>
-        <thead>
+        </div>
-        <tr>
+        <div class="layui-col-xs10">
-            <th lay-data="{checkbox:true, fixed: true}"></th>
+            <table class="layui-table"
-        <% foreach (ColumnSchema column in this.SourceTable.Columns) {%>
+                lay-data="{height: 'full-80', page:true, id:'mainList'}"
-            <th lay-data="{field:'<%=column.Name%>', width:150}"><%=Tools.GetDescription(column)%></th>
+                lay-filter="list"  lay-size="sm">
-        <% }%>
+                <thead>
-            <th lay-data="{fixed: 'right', width:160, align:'center', toolbar: '#barList'}"></th>
+                <tr>
-        </tr>
+                    <th lay-data="{checkbox:true, fixed: true}"></th>
-        </thead>
+                <% foreach (ColumnSchema column in this.SourceTable.Columns) {%>
-    </table>
+                    <th lay-data="{field:'<%=column.Name%>', width:150}"><%=Tools.GetDescription(column)%></th>
-</div>
+                <% }%>
+                    <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-mini" lay-event="detail">查看</a>
+    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
 </script>
 
-<!--用户添加/编辑窗口-->
+
+<!--添加/编辑窗口-->
 <div id="divEdit" style="display: none">
     <form class="layui-form" action=""  id="formEdit">
 <% foreach (ColumnSchema column in this.SourceTable.Columns) {
@@ -97,6 +104,6 @@ Description="连接的数据库" %>
 </div>
 
 <script type="text/javascript" src="/layui/layui.js"></script>
-<script type="text/javascript" src="/js/<%=ModuleName%>s.js"></script>
+<script type="text/javascript" src="/userJs/<%=ModuleName%>s.js"></script>
 
 

CodeSmith/CSharp/Web/index.js.cst

@@ -13,15 +13,17 @@ Author: yubaolee
 
 layui.config({
     base: "/js/"
-}).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth'], function () {
+}).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth', 'utils'], 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 toplayer = (top == undefined || top.layer === undefined) ? layer : top.layer;  //顶层的LAYER
     layui.droptree("/UserSession/GetOrgs", "#Organizations", "#OrganizationIds");
 
+    $("#menus").loadMenus("<%=ModuleName%>");
+   
     //主列表加载，可反复调用进行刷新
     var config= {};  //table的参数，如搜索key，点击tree的id
     var mainList = function (options) {

OpenAuth.App/OpenAuth.App.csproj

@@ -105,6 +105,7 @@
     <Compile Include="AutofacExt.cs" />
     <Compile Include="BaseApp.cs" />
     <Compile Include="AuthorizeApp.cs" />
+    <Compile Include="ResourceApp.cs" />
     <Compile Include="CategoryApp.cs" />
     <Compile Include="Define.cs" />
     <Compile Include="Flow\FlowRuntime.cs" />
@@ -114,6 +115,7 @@
     <Compile Include="FormApp.cs" />
     <Compile Include="Request\IdPageReq.cs" />
     <Compile Include="Request\PageReq.cs" />
+    <Compile Include="Request\QueryResourcesReq.cs" />
     <Compile Include="Request\QueryCategoriesReq.cs" />
     <Compile Include="Request\QueryFlowInstanceListReq.cs" />
     <Compile Include="Request\QueryFlowSchemeListReq.cs" />

OpenAuth.App/Request/QueryResourcesReq.cs

@@ -0,0 +1,11 @@
+namespace OpenAuth.App.Request
+{
+    public class QueryResourcesReq : PageReq
+    {
+        /// <summary>
+        /// TypeID
+        /// </summary>
+        public string TypeId { get; set; }
+
+    }
+}

OpenAuth.App/ResourceApp.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenAuth.App.Request;
+using OpenAuth.App.Response;
+using OpenAuth.Repository.Domain;
+
+namespace OpenAuth.App
+{
+    /// <summary>
+    /// 分类管理
+    /// </summary>
+    public class ResourceApp:BaseApp<Resource>
+    {
+
+        public IEnumerable<Resource> Get(string type)
+        {
+            return Repository.Find(u => u.TypeId == type);
+        }
+
+        public void Add(Resource resource)
+        {
+            if (string.IsNullOrEmpty(resource.Id))
+            {
+                resource.Id = Guid.NewGuid().ToString();
+            }
+            Repository.Add(resource);
+        }
+
+        public void Update(Resource resource)
+        {
+            Repository.Update(u =>u.Id,resource);
+        }
+
+
+        public TableData All(QueryResourcesReq request)
+        {
+            var result = new TableData();
+            var resources =  UnitWork.Find<Resource>(null) ;
+            if (!string.IsNullOrEmpty(request.key))
+            {
+                resources = resources.Where(u => u.Name.Contains(request.key) || u.Id.Contains(request.key));
+            }
+
+            if (!string.IsNullOrEmpty(request.TypeId))
+            {
+                resources = resources.Where(u => u.TypeId == request.TypeId);
+            }
+
+
+            result.data = resources.OrderBy(u => u.TypeId)
+                .Skip((request.page - 1) * request.limit)
+                .Take(request.limit).ToList();
+            result.count = resources.Count();
+            return result;
+        }
+
+    }
+}

OpenAuth.Mvc/Controllers/ResourcesController.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Web.Http;
+using System.Web.Mvc;
+using Infrastructure;
+using OpenAuth.App;
+using OpenAuth.App.Request;
+using OpenAuth.App.Response;
+using OpenAuth.Repository.Domain;
+
+namespace OpenAuth.Mvc.Controllers
+{
+    public class ResourcesController : BaseController
+    {
+        public ResourceApp App { get; set; }
+
+        //
+        // GET: /UserManager/
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+        public string All([FromUri]QueryResourcesReq request)
+        {
+            TableData data = new TableData();
+            data = App.All(request);
+            return JsonHelper.Instance.Serialize(data);
+        }
+
+        [System.Web.Mvc.HttpPost]
+        public string Delete(string[] ids)
+        {
+            Response resp = new Response();
+            try
+            {
+                App.Delete(ids);
+            }
+            catch (Exception e)
+            {
+                resp.Code = 500;
+                resp.Message = e.Message;
+            }
+            return JsonHelper.Instance.Serialize(resp);
+        }
+
+        [System.Web.Mvc.HttpPost]
+        public string Add(Resource obj)
+        {
+            Response resp = new Response();
+            try
+            {
+                App.Add(obj);
+            }
+            catch (Exception e)
+            {
+                resp.Code = 500;
+                resp.Message = e.Message;
+            }
+            return JsonHelper.Instance.Serialize(resp);
+        }
+
+        [System.Web.Mvc.HttpPost]
+        public string Update(Resource obj)
+        {
+            Response resp = new Response();
+            try
+            {
+                App.Update(obj);
+            }
+            catch (Exception e)
+            {
+                resp.Code = 500;
+                resp.Message = e.Message;
+            }
+            return JsonHelper.Instance.Serialize(resp);
+        }
+
+
+    }
+}

OpenAuth.Mvc/OpenAuth.Mvc.csproj

@@ -24,6 +24,7 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <WebGreaseLibPath>..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
+    <Use64BitIISExpress />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -142,6 +143,7 @@
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="Controllers\BaseController.cs" />
+    <Compile Include="Controllers\ResourcesController.cs" />
     <Compile Include="Controllers\CategoriesController.cs" />
     <Compile Include="Controllers\ErrorController.cs" />
     <Compile Include="Controllers\FlowInstancesController.cs" />
@@ -200,6 +202,7 @@
     <Content Include="layui\css\modules\laydate\default\font.css" />
     <Content Include="userJs\assignRole.js" />
     <Content Include="userJs\flowinstanceDetail.js" />
+    <Content Include="userJs\resources.js" />
     <Content Include="userJs\verification.js" />
     <Content Include="userJs\flowInstanceEdit.js" />
     <Content Include="userJs\flowInstanceWait.js" />
@@ -645,6 +648,7 @@
     <Content Include="Views\FlowInstances\Wait.cshtml" />
     <Content Include="Views\RoleManager\Assign.cshtml" />
     <Content Include="Views\FlowInstances\Detail.cshtml" />
+    <Content Include="Views\Resources\Index.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="layui\lay\modules\mobile\" />

OpenAuth.Mvc/Views/Resources/Index.cshtml

@@ -0,0 +1,131 @@
+@section header
+{
+    <link rel="stylesheet" href="/css/treetable.css" />
+}
+<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">
+        <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:'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 id="divEdit" style="display: none">
+    <form class="layui-form" 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>
+            <div class="layui-input-block">
+                <input type="text" name="Key" v-model="Key" 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="Name" v-model="Name" 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="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">
+                <input type="text" name="Description" v-model="Description" 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="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>
+        </div>
+
+       
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formSubmit">立即提交</button>
+                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<script type="text/javascript" src="/layui/layui.js"></script>
+<script type="text/javascript" src="/userJs/Resources.js"></script>
+
+

OpenAuth.Mvc/userJs/resources.js

@@ -0,0 +1,158 @@
+layui.config({
+    base: "/js/"
+}).use(['form', 'vue', 'ztree', 'layer', 'jquery', 'table', 'droptree', 'openauth', 'utils'], function () {
+    var form = layui.form,
+        layer = layui.layer,
+        $ = layui.jquery;
+    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");
+
+    //主列表加载，可反复调用进行刷新
+    var config = {};  //table的参数，如搜索key，点击tree的id
+    var mainList = function (options) {
+        if (options != undefined) {
+            $.extend(config, options);
+        }
+        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
+        }
+    }();
+
+    //添加（编辑）对话框
+    var editDlg = function () {
+        var vm = new Vue({
+            el: "#formEdit"
+        });
+        var update = false;  //是否为更新
+        var show = function (data) {
+            var title = update ? "编辑信息" : "添加";
+            layer.open({
+                title: title,
+                area: ["500px", "400px"],
+                type: 1,
+                content: $('#divEdit'),
+                success: function () {
+                    vm.$set('$data', data);
+                },
+                end: mainList
+            });
+            var url = "/Resources/Add";
+            if (update) {
+                url = "/Resources/Update";
+            }
+            //提交数据
+            form.on('submit(formSubmit)',
+                function (data) {
+                    $.post(url,
+                        data.field,
+                        function (data) {
+                            layer.msg(data.Message);
+                        },
+                        "json");
+                    return false;
+                });
+        }
+        return {
+            add: function () { //弹出添加
+                update = false;
+                show({
+                    Id: ''
+                });
+            },
+            update: function (data) { //弹出编辑框
+                update = true;
+                show(data);
+            }
+        };
+    }();
+
+    //监听表格内部按钮
+    table.on('tool(list)', function (obj) {
+        var data = obj.data;
+        if (obj.event === 'detail') {      //查看
+            layer.msg('ID：' + data.Id + ' 的查看操作');
+        }
+    });
+
+
+    //监听页面主按钮操作
+    var active = {
+        btnDel: function () {      //批量删除
+            var checkStatus = table.checkStatus('mainList')
+                , data = checkStatus.data;
+            openauth.del("/Resources/Delete",
+                data.map(function (e) { return e.Id; }),
+                mainList);
+        }
+        , btnAdd: function () {  //添加
+            editDlg.add();
+        }
+        , btnEdit: function () {  //编辑
+            var checkStatus = table.checkStatus('mainList')
+                , data = checkStatus.data;
+            if (data.length != 1) {
+                layer.msg("请选择编辑的行，且同时只能编辑一行");
+                return;
+            }
+            editDlg.update(data[0]);
+        }
+
+        , search: function () {   //搜索
+            mainList({ key: $('#key').val() });
+        }
+        , btnRefresh: function () {
+            mainList();
+        }
+    };
+
+    $('.toolList .layui-btn').on('click', function () {
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+    });
+
+    //监听页面主按钮操作 end
+})