diff --git a/OpenAuth.App/RoleManagerApp.cs b/OpenAuth.App/RoleManagerApp.cs index 8531da96..01c8c5a6 100644 --- a/OpenAuth.App/RoleManagerApp.cs +++ b/OpenAuth.App/RoleManagerApp.cs @@ -67,7 +67,8 @@ namespace OpenAuth.App var result = new GridData { - total = total, + records = total, + total = (int)Math.Ceiling((double)total/pagesize), rows = rolevms.ToList(), page = pageindex }; diff --git a/OpenAuth.Mvc/BllScripts/assignModule.js b/OpenAuth.Mvc/BllScripts/assignModule.js index 43910c87..105ddccb 100644 --- a/OpenAuth.Mvc/BllScripts/assignModule.js +++ b/OpenAuth.Mvc/BllScripts/assignModule.js @@ -176,4 +176,4 @@ var selected = function () { selected.reLoad(); -//@@ sourceURL=assignModule.js + diff --git a/OpenAuth.Mvc/BllScripts/categoryManager.js b/OpenAuth.Mvc/BllScripts/categoryManager.js index 6a3c127d..4fef6bba 100644 --- a/OpenAuth.Mvc/BllScripts/categoryManager.js +++ b/OpenAuth.Mvc/BllScripts/categoryManager.js @@ -130,68 +130,7 @@ var vm = new Vue({ }); //上级机构选择框 -var parent = function () { //ztree搜索框 - var zTreeObj; - var setting = { - view: { selectedMulti: false }, - data: { - key: { - name: 'Name', - title: 'Name' - }, - simpleData: { - enable: true, - idKey: 'Id', - pIdKey: 'ParentId', - rootPId: 'null' - } - }, - callback: { - onClick: onClick - } - }; - var showMenu = function () { - $("#menuContent").css({ left: "10px", top: $("#ParentName").outerHeight() + "px" }).slideDown("fast"); - $("body").bind("mousedown", onBodyDown); - }; - function onClick(e, treeId, treeNode) { - var nodes = zTreeObj.getSelectedNodes(); - - for (var i = 0, l = nodes.length; i < l; i++) { - vm.$set('ParentName', nodes[i].Name); - vm.$set('ParentId', nodes[i].Id); - break; - } - hideMenu(); - } - function onBodyDown(event) { - if (!(event.target.id == "menuContent" || $(event.target).parents("#menuContent").length > 0)) { - hideMenu(); - } - } - function hideMenu() { - $("#menuContent").fadeOut("fast"); - $("body").unbind("mousedown", onBodyDown); - } - return { - reload: function () { - var index = layer.load(); - $.getJSON("/CategoryManager/LoadForTree", { - page: 1, rows: 10000 - }, function (json) { - layer.close(index); - if (json.length == 0) { - vm.$set('ParentName', ''); - vm.$set('ParentId', ''); - return; - } - zTreeObj = $.fn.zTree.init($("#org"), setting, json); - zTreeObj.expandAll(true); - showMenu(); - }); - } - } -}(); +var parent = new ParentTree("/CategoryManager/LoadForTree","ParentName","ParentId"); //添加(编辑)对话框 var editDlg = function () { diff --git a/OpenAuth.Mvc/BllScripts/commonApply.js b/OpenAuth.Mvc/BllScripts/commonApply.js index 6b31ecea..f47d1e5d 100644 --- a/OpenAuth.Mvc/BllScripts/commonApply.js +++ b/OpenAuth.Mvc/BllScripts/commonApply.js @@ -3,11 +3,11 @@ var ztree = function () { var nodes = [ { name: "流程处理", children: [ - { name: "我的申请",value:'me' }, - { name: "待办事项",value:'inbox' }, - { name: "已办事项",value:'outbox' } + { name: "我的申请", value: 'me' }, + { name: "待办事项", value: 'inbox' }, + { name: "已办事项", value: 'outbox' } ], - value:'me' + value: 'me' } ]; var setting = { @@ -18,65 +18,15 @@ var ztree = function () { } } }; - var zTreeObj = $.fn.zTree.init($("#tree"), setting, nodes); + var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, nodes); zTreeObj.expandAll(true); }(); -//grid列表模块 -function MainGrid() { - var url = '/CommonApplies/Load?type='; - var selectedNode = 'me'; - this.maingrid = $('#maingrid').datagrid({ - showToolbar: false, - loadType:'GET', - filterThead: false, - target: $(this), - columns: [ - { - name: 'Id', - hide: true - }, - { - name: 'Name', - label: '申请名称', - width: 100 - }, - { - name: 'Comment', - label: '产品数量', - width: 100 - }, - - { - name: 'StateName', - label: '流程状态', - width: 100 - }, - { - name: 'State', - hide:true - } - ], - dataUrl: url + selectedNode, - fullGrid: true, - showLinenumber: true, - showCheckboxcol: true, - paging: true, - filterMult: false, - showTfoot: false - }); - this.reload = function (selected) { - if (selected != undefined) selectedNode = selected; - this.maingrid.datagrid('reload', { dataUrl: url + selectedNode }); - }; -}; -MainGrid.prototype = new Grid(); -var list = new MainGrid(); -var selectScheme = function(val) { +var selectScheme = function (val) { $("#WorkflowName").empty(); $.getJSON('/workflowschemas/Load', function (data) { - $.each(data.list, function (i, n) { + $.each(data.rows, function (i, n) { $("#WorkflowName").append(""); }); @@ -87,58 +37,131 @@ var selectScheme = function(val) { } +//grid列表模块 +function MainGrid() { + var url = '/CommonApplies/Load?type='; + var selectedId = 'me'; //ztree选中的模块 + this.maingrid = $('#maingrid') + .jqGrid({ + colModel: [ + { + name: 'Id', + index: 'Id', + hidden: true + }, + { + index: 'Name', + name: 'Name', + label: '申请名称' + }, + { + index: 'Comment', + name: 'Comment', + label: '申请描述' + }, + { + index: 'StateName', + name: 'StateName', + label: '流程状态' + }, + { + index: 'WorkflowName', + name: 'WorkflowName', + label:'流程名称' + } + ], + url: url + selectedId, + datatype: "json", + + viewrecords: true, + rowNum: 18, + pager: "#grid-pager", + altRows: true, + height: 'auto', + multiselect: true, + multiboxonly: true, + + loadComplete: function () { + var table = this; + setTimeout(function () { + updatePagerIcons(table); + }, + 0); + } + }).jqGrid('navGrid', "#grid-pager", { + edit: false, add: false, del: false, refresh: false, search: false + }); + + this.reload = function (id) { + if (id != undefined) selectedId = id; + this.maingrid.jqGrid("setGridParam", { url: url + selectedId }) + .trigger("reloadGrid", [{ page: 1 }]); //重载JQGrid + + }; +}; +MainGrid.prototype = new Grid(); +var list = new MainGrid(); +var vm = new Vue({ + el: '#editDlg' +}); + //添加(编辑)对话框 var editDlg = function () { + var update = false; var show = function () { - BJUI.dialog({ id: 'editDlg', title: '编辑对话框', target: '#editDlg' }); - - $("#btnSave").on("click", function () { - editDlg.save(); + layer.open({ + type: 1, + skin: 'layui-layer-rim', //加上边框 + title: "用户管理", //不显示标题 + area: ['400px', '300px'], //宽高 + content: $('#editDlg'), //捕获的元素 + btn: ['保存', '关闭'], + yes: function (index, layero) { + $.post("/CommonApplies/Add", vm.$data, function (data) { + layer.msg(data.Message); + if (data.Status) { + list.reload(); + ztree.reload(); + } + }, "json"); + }, + cancel: function (index) { + layer.close(index); + } }); } return { add: function () { //弹出添加 - show(); + update = false; selectScheme(); - $.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用 - $("#Id").val('00000000-0000-0000-0000-000000000000'); + show(); + vm.$set('$data', { + Id: '00000000-0000-0000-0000-000000000000', + }); }, update: function (ret) { //弹出编辑框 + update = true; show(); - $('#Id').val(ret.Id); - $('#Name').val(ret.Name); - $('#Comment').val(ret.Comment); - selectScheme(ret.WorkflowName); - }, - save: function () { //编辑-->保存 - $('#editForm').isValid(function (v) { - if (!v) return; //验证没通过 - $("#editForm").bjuiajax('ajaxForm', { - reload: false, - callback: function (json) { - if (json.statusCode != "200") { - $(this).alertmsg('warn', json.message); - return; - } - list.reload(); - } - }); - }); + vm.$set('$data', ret); + selectScheme(vm.WorkflowName); } }; }(); //删除 function del() { - var selected = list.getSelectedObj(); + var selected = list.getSelectedProperties("Id"); if (selected == null) return; - $.post('/CommonApplies/Delete?Id=' + selected.Id, function (data) { + $.post('/CommonApplies/Delete', + { ids: selected }, + function (data) { if (data.Status) { list.reload(); + ztree.reload(); } else { - $(this).alertmsg('warn', data.Message); + layer.msg(data.Message); } }, "json"); } @@ -179,4 +202,4 @@ function refresh() { list.reload(); } -//@@ sourceURL=goodsApply.js \ No newline at end of file + diff --git a/OpenAuth.Mvc/BllScripts/parentTree.js b/OpenAuth.Mvc/BllScripts/parentTree.js index f50c6e20..d98c7644 100644 --- a/OpenAuth.Mvc/BllScripts/parentTree.js +++ b/OpenAuth.Mvc/BllScripts/parentTree.js @@ -44,8 +44,12 @@ function ParentTree(url, name, id) { $("body").bind("mousedown", onBodyDown); }; - var setCheck = function() { //todo:设置初始选中的值 - //var value = vm.$get(options.idDom); + var setCheck = function() { //设置初始选中的值 + var value = vm.$get(options.idDOM); + var node = zTreeObj.getNodeByParam("Id", value, null); + if (node != null) { + zTreeObj.selectNode(node, false, false); + } } function onClick(e, treeId, treeNode) { var nodes = zTreeObj.getSelectedNodes(); @@ -81,6 +85,7 @@ function ParentTree(url, name, id) { return; } zTreeObj = $.fn.zTree.init($("#org"), setting, json); + setCheck(); zTreeObj.expandAll(true); showMenu(); }); diff --git a/OpenAuth.Mvc/BllScripts/parentTreeMultiple.js b/OpenAuth.Mvc/BllScripts/parentTreeMultiple.js new file mode 100644 index 00000000..b9833faf --- /dev/null +++ b/OpenAuth.Mvc/BllScripts/parentTreeMultiple.js @@ -0,0 +1,118 @@ +// *********************************************************************** +// Assembly : OpenAuth.Mvc +// Author : yubaolee +// Created : 10-16-2016 +// +// Last Modified By : yubaolee +// Last Modified On : 10-16-2016 +// *********************************************************************** +// +// 版权所有(C) 2015 +// +// 单击文本框弹出的选择列表,可以多选 +// *********************************************************************** + +function ParentTreeMultiple(url, name, id) { + var zTreeObj; + var options = { + text: 'Name', + key: 'Id', + parentKey: 'ParentId', + nameDOM: name, //显示的文本框ID,如:"#catetoryName" + idDOM: id //隐藏的文本框,如:"#categoryId" + } + var setting = { + view: { selectedMulti: true }, + check: { + enable: true, + chkStyle: "checkbox", + chkboxType: { "Y": "", "N": "" } //去掉勾选时级联 + }, + data: { + key: { + name: options.text, + title: options.text + }, + simpleData: { + enable: true, + idKey: options.key, + pIdKey: options.parentKey, + rootPId: 'null' + } + }, + callback: { + onClick: onClick, + onCheck: onCheck + } + }; + var showMenu = function () { + $("#menuContent").css({ left: "10px", top: $("#" + options.nameDOM).outerHeight() + "px" }).slideDown("fast"); + $("body").bind("mousedown", onBodyDown); + }; + + var setCheck = function () { //设置初始选中的值 + zTreeObj.checkAllNodes(false); + + var value = vm.$get(options.idDOM); + if (value == undefined) return; + var nodeids = value.split(","); + $.each(nodeids, + function() { + var node = zTreeObj.getNodeByParam("Id", this, null); + if (node != null) { + zTreeObj.checkNode(node, true, false); + } + }); + + } + function onClick(e, treeId, treeNode) { + var nodes = zTreeObj.getSelectedNodes(); + + for (var i = 0, l = nodes.length; i < l; i++) { + vm.$set(options.nameDOM, nodes[i].Name); + vm.$set(options.idDOM, nodes[i].Id); + break; + } + hideMenu(); + } + function onCheck(e, treeId, treeNode) { + var nodes = zTreeObj.getCheckedNodes(true); + + var ids = nodes.map(function (e) { return e.Id; }).join(","); + var names = nodes.map(function (e) { return e.Name; }).join(","); + + vm.$set(options.nameDOM, names); + vm.$set(options.idDOM, ids); + } + + function onBodyDown(event) { + if (!(event.target.id == "menuContent" || $(event.target).parents("#menuContent").length > 0)) { + hideMenu(); + } + } + function hideMenu() { + $("#menuContent").fadeOut("fast"); + $("body").unbind("mousedown", onBodyDown); + } + return { + reload: function () { + var index = layer.load(); + $.getJSON(url, + { + page: 1, rows: 10000 + }, + function (json) { + layer.close(index); + if (json.length == 0) { + vm.$set(options.nameDOM, ''); + vm.$set(options.idDOM, ''); + return; + } + zTreeObj = $.fn.zTree.init($("#org"), setting, json); + setCheck(); + zTreeObj.expandAll(true); + showMenu(); + }); + } + } +} \ No newline at end of file diff --git a/OpenAuth.Mvc/BllScripts/processDetail.js b/OpenAuth.Mvc/BllScripts/processDetail.js index 26cfd1d9..f83f6bc2 100644 --- a/OpenAuth.Mvc/BllScripts/processDetail.js +++ b/OpenAuth.Mvc/BllScripts/processDetail.js @@ -49,4 +49,4 @@ $(function () { }); }); -//@@ sourceURL=processDetail.js \ No newline at end of file + diff --git a/OpenAuth.Mvc/BllScripts/resourceManager.js b/OpenAuth.Mvc/BllScripts/resourceManager.js index cbb6079c..fb925b76 100644 --- a/OpenAuth.Mvc/BllScripts/resourceManager.js +++ b/OpenAuth.Mvc/BllScripts/resourceManager.js @@ -195,4 +195,4 @@ function refresh() { list.reload(); } -//@@ sourceURL=ResourceManager.js \ No newline at end of file + diff --git a/OpenAuth.Mvc/BllScripts/roleManager.js b/OpenAuth.Mvc/BllScripts/roleManager.js index bbce1fff..95b73504 100644 --- a/OpenAuth.Mvc/BllScripts/roleManager.js +++ b/OpenAuth.Mvc/BllScripts/roleManager.js @@ -1,5 +1,11 @@ -//左边分类导航树 -var orgtree = function () { +$(function () { + $("#Organizations").on("click", function () { + parent.reload(); + }); +}); + +//左边导航 +var ztree = function () { var url = '/OrgManager/LoadOrg'; var setting = { view: { selectedMulti: false }, @@ -24,13 +30,7 @@ var orgtree = function () { var load = function () { $.getJSON(url, function (json) { var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); - var firstId; //tree的第一个ID - if (json.length > 0) { - firstId = json[0].Id; - } else { - firstId = -1; - } - list.reload(firstId); + list.reload(); zTreeObj.expandAll(true); }); }; @@ -44,187 +44,129 @@ var orgtree = function () { //grid列表模块 function MainGrid() { var url = '/RoleManager/Load?orgId='; - var selectedId = '00000000-0000-0000-0000-000000000000'; //orgtree选中的模块 - this.maingrid = $('#maingrid').datagrid({ - showToolbar: false, - filterThead: false, - loadType: 'GET', - target: $(this), - columns: [ - { - name: 'Id', - label: '流水号', - width: 100 - , hide: true - }, - { - name: 'Name', - label: '角色名称', - width: 100 - }, - { - name: 'Status', - label: '当前状态', - width: 100 - , align: 'center', - items: [{ '0': '默认' }, { '1': '状态1' }], - }, - { - name: 'Type', - label: '角色类型', - width: 100 - , align: 'center', - items: [{ '0': '默认' }, { '1': '状态1' }], - }, - { - name: 'Organizations', - label: '所属部门名称', - width: 100 - }, - ], - dataUrl: url + selectedId, - fullGrid: true, - showLinenumber: true, - showCheckboxcol: true, - paging: true, - filterMult: false, - showTfoot: false, - - }); + var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块 + this.maingrid = $('#maingrid') + .jqGrid({ + colModel: [ + { + name: 'Id', + index: 'Id', + hidden: true + }, + { + index: 'Name', + name: 'Name', + label: '姓名' + }, + { + index: 'OrganizationIds', + name: 'OrganizationIds', + hidden: true + }, + { + index: 'Organizations', + name: 'Organizations', + label: '所属机构' + + } + ], + url: url + selectedId, + datatype: "json", + + viewrecords: true, + rowNum: 18, + pager: "#grid-pager", + altRows: true, + height: 'auto', + multiselect: true, + multiboxonly: true, + + loadComplete: function () { + var table = this; + setTimeout(function () { + updatePagerIcons(table); + }, + 0); + } + }).jqGrid('navGrid', "#grid-pager", { + edit: false, add: false, del: false, refresh: false, search: false + }); + this.reload = function (id) { if (id != undefined) selectedId = id; - this.maingrid.datagrid('reload', { dataUrl: url + selectedId }); + this.maingrid.jqGrid("setGridParam", { url: url + selectedId }) + .trigger("reloadGrid", [{ page: 1 }]); //重载JQGrid + }; }; MainGrid.prototype = new Grid(); var list = new MainGrid(); +var vm = new Vue({ + el: '#editDlg' +}); -//编辑时,选择上级弹出的树 -var parentTree = function () { - var nameDom = "#Organizations"; - var idDom = "#OrganizationIds"; - var zTreeObj; - var setting = { - view: { - selectedMulti: false - }, - check: { - enable: true, - chkStyle: "checkbox", - chkboxType: { "Y": "", "N": "" } //去掉勾选时级联 - }, - data: { - key: { - name: 'Name', - title: 'Name' - }, - simpleData: { - enable: true, - idKey: 'Id', - pIdKey: 'ParentId', - rootPId: 'null' - } - }, - callback: { - onClick: zTreeOnClick, - onCheck: zTreeCheck - } - }; - - - function zTreeCheck(event, treeId, treeNode) { - var nodes = zTreeObj.getCheckedNodes(true); - var ids = nodes.map(function (e) { return e.Id; }).join(","); - var names = nodes.map(function (e) { return e.Name; }).join(","); - - $(nameDom).val(names); - $(idDom).val(ids); - } - function zTreeOnClick(event, treeId, treeNode) { - zTreeObj.checkNode(treeNode, !treeNode.checked, true, true); - event.preventDefault(); - } - - return { - show: function () { - $.getJSON('/OrgManager/LoadOrg', function (json) { - zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json); - var orgstr = $(idDom).val(); - var name = ''; - if (orgstr != '') { - var nodeIds = orgstr.split(','); - $.each(nodeIds, function () { - var node = zTreeObj.getNodeByParam("Id", this, null); - name += ',' + node.Name; - zTreeObj.checkNode(node, true, true); - }); - $(nameDom).val(name.substr(1)); //显示名称 - } - zTreeObj.expandAll(true); - }); - } - }; -}(); +//上级机构选择框 +var parent = new ParentTreeMultiple("/OrgManager/LoadOrg", "Organizations", "OrganizationIds"); //添加(编辑)对话框 var editDlg = function () { var update = false; var show = function () { - BJUI.dialog({ id: 'editDlg', title: '编辑对话框', target: '#editDlg' }); - $("#btnSave").on("click", function () { - editDlg.save(); + layer.open({ + type: 1, + skin: 'layui-layer-rim', //加上边框 + title: "用户管理", //不显示标题 + area: ['400px', '300px'], //宽高 + content: $('#editDlg'), //捕获的元素 + btn: ['保存', '关闭'], + yes: function (index, layero) { + $.post("/RoleManager/Add", vm.$data, function (data) { + layer.msg(data.Message); + if (data.Status) { + list.reload(); + ztree.reload(); + } + }, "json"); + }, + cancel: function (index) { + layer.close(index); + } }); } return { add: function () { //弹出添加 update = false; show(); - $.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用 - $("#Id").val('00000000-0000-0000-0000-000000000000'); - parentTree.show(); - + vm.$set('$data', + { + Id: '00000000-0000-0000-0000-000000000000', + Sex: 0 + }); }, update: function (ret) { //弹出编辑框 update = true; show(); - $('#Id').val(ret.Id); - $('#Name').val(ret.Name); - $('#Status').selectpicker('val', ret.Status); - $('#Type').selectpicker('val', ret.Type); - $("#OrganizationIds").val(ret.OrganizationIds); - parentTree.show(); - }, - save: function () { //编辑-->保存 - $('#editForm').isValid(function (v) { - if (!v) return; //验证没通过 - $("#editForm").bjuiajax('ajaxForm', { - reload: false, - callback: function (json) { - if (json.statusCode != "200") { - $(this).alertmsg('warn', json.message); - return; - } - list.reload(); - orgtree.reload(); - } - }); - }); + vm.$set('$data', ret); } }; }(); + + //删除 function del() { - var selected = list.getSelectedObj(); + var selected = list.getSelectedProperties("Id"); if (selected == null) return; - $.post('/RoleManager/Delete?Id=' + selected.Id, function (data) { + $.post('/RoleManager/Delete', + { ids: selected }, + function (data) { if (data.Status) { list.reload(); - orgtree.reload(); + ztree.reload(); } else { - $(this).alertmsg('warn', data.message); + layer.msg(data.Message); } }, "json"); } @@ -301,4 +243,4 @@ function assignRoleElement(obj) { }); } -//@@ sourceURL=RoleManager.js \ No newline at end of file + diff --git a/OpenAuth.Mvc/BllScripts/stockManager.js b/OpenAuth.Mvc/BllScripts/stockManager.js index 94bb0244..40bd1df7 100644 --- a/OpenAuth.Mvc/BllScripts/stockManager.js +++ b/OpenAuth.Mvc/BllScripts/stockManager.js @@ -260,4 +260,4 @@ function refresh() { list.reload(); } -//@@ sourceURL=StockManager.js \ No newline at end of file + diff --git a/OpenAuth.Mvc/BllScripts/userRoleManager.js b/OpenAuth.Mvc/BllScripts/userRoleManager.js index da545232..e00971a8 100644 --- a/OpenAuth.Mvc/BllScripts/userRoleManager.js +++ b/OpenAuth.Mvc/BllScripts/userRoleManager.js @@ -122,4 +122,4 @@ var ztree = function () { function zTreeOnClick(event, treeId, treeNode) { userRolesList.reload(treeNode.Id); } -//@@ sourceURL=userRoleManager.js + diff --git a/OpenAuth.Mvc/BllScripts/usermanager.js b/OpenAuth.Mvc/BllScripts/usermanager.js index f523aacc..4b1b77f6 100644 --- a/OpenAuth.Mvc/BllScripts/usermanager.js +++ b/OpenAuth.Mvc/BllScripts/usermanager.js @@ -117,84 +117,7 @@ var vm = new Vue({ }); //上级机构选择框 -var parent = function () { //ztree搜索框 - var zTreeObj; - var setting = { - view: { selectedMulti: true }, - check: { - enable: true, - chkStyle: "checkbox", - chkboxType: { "Y": "", "N": "" } //去掉勾选时级联 - }, - data: { - key: { - name: 'Name', - title: 'Name' - }, - simpleData: { - enable: true, - idKey: 'Id', - pIdKey: 'ParentId', - rootPId: 'null' - } - }, - callback: { - onClick: onClick, - onCheck: onCheck - } - }; - var showMenu = function () { - $("#menuContent").css({ left: "10px", top: $("#Organizations").outerHeight() + "px" }).slideDown("fast"); - $("body").bind("mousedown", onBodyDown); - }; - function onClick(e, treeId, treeNode) { - var nodes = zTreeObj.getSelectedNodes(); - - for (var i = 0, l = nodes.length; i < l; i++) { - vm.$set('Organizations', nodes[i].Name); - vm.$set('OrganizationIds', nodes[i].Id); - break; - } - hideMenu(); - } - - function onCheck(e, treeId, treeNode) { - var nodes = zTreeObj.getCheckedNodes(true); - - var ids = nodes.map(function (e) { return e.Id; }).join(","); - var names = nodes.map(function (e) { return e.Name; }).join(","); - - vm.$set('Organizations', names); - vm.$set('OrganizationIds', ids); - } - function onBodyDown(event) { - if (!(event.target.id == "menuContent" || $(event.target).parents("#menuContent").length > 0)) { - hideMenu(); - } - } - function hideMenu() { - $("#menuContent").fadeOut("fast"); - $("body").unbind("mousedown", onBodyDown); - } - return { - reload: function () { - var index = layer.load(); - $.getJSON("/OrgManager/LoadOrg", { - page: 1, rows: 10000 - }, function (json) { - layer.close(index); - if (json.length == 0) { - vm.$set('Organizations', ''); - vm.$set('OrganizationIds', ''); - return; - } - zTreeObj = $.fn.zTree.init($("#org"), setting, json); - zTreeObj.expandAll(true); - showMenu(); - }); - } - } -}(); +var parent = new ParentTreeMultiple("/OrgManager/LoadOrg","Organizations","OrganizationIds"); //添加(编辑)对话框 var editDlg = function () { diff --git a/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js b/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js index 722fd088..57694758 100644 --- a/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js +++ b/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js @@ -75,4 +75,4 @@ function del() { }, "json"); } -//@@ sourceURL=workflowSchemaManager.js \ No newline at end of file + diff --git a/OpenAuth.Mvc/Controllers/CategoryManagerController.cs b/OpenAuth.Mvc/Controllers/CategoryManagerController.cs index cfa26f36..2889298c 100644 --- a/OpenAuth.Mvc/Controllers/CategoryManagerController.cs +++ b/OpenAuth.Mvc/Controllers/CategoryManagerController.cs @@ -28,9 +28,9 @@ namespace OpenAuth.Mvc.Controllers /// /// 加载分类下面的所有分类 /// - public string Load(Guid parentId, int pageCurrent = 1, int pageSize = 30) + public string Load(Guid parentId, int page = 1, int rows = 30) { - return JsonHelper.Instance.Serialize(_app.Load(parentId, pageCurrent, pageSize)); + return JsonHelper.Instance.Serialize(_app.Load(parentId, page, rows)); } public string LoadForTree() diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs index 993e2796..6d568d6b 100644 --- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs @@ -35,9 +35,9 @@ namespace OpenAuth.Mvc.Controllers /// /// 加载模块下面的所有模块 /// - public string Load(Guid orgId, int pageCurrent = 1, int pageSize = 30) + public string Load(Guid orgId, int page = 1, int rows = 30) { - return JsonHelper.Instance.Serialize(_app.Load(orgId, pageCurrent, pageSize)); + return JsonHelper.Instance.Serialize(_app.Load(orgId, page, rows)); } /// diff --git a/OpenAuth.Mvc/Controllers/ResourceManagerController.cs b/OpenAuth.Mvc/Controllers/ResourceManagerController.cs index 4f50f624..aea55e74 100644 --- a/OpenAuth.Mvc/Controllers/ResourceManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ResourceManagerController.cs @@ -45,9 +45,9 @@ namespace OpenAuth.Mvc.Controllers /// /// 加载某分类的所有Resources /// - public string Load(Guid categoryId, int pageCurrent = 1, int pageSize = 30) + public string Load(Guid categoryId, int page = 1, int rows = 30) { - return JsonHelper.Instance.Serialize(_app.Load(AuthUtil.GetUserName(), categoryId, pageCurrent, pageSize)); + return JsonHelper.Instance.Serialize(_app.Load(AuthUtil.GetUserName(), categoryId, page, rows)); } public string LoadForTree() diff --git a/OpenAuth.Mvc/Controllers/RoleManagerController.cs b/OpenAuth.Mvc/Controllers/RoleManagerController.cs index 4fb446de..e09bd213 100644 --- a/OpenAuth.Mvc/Controllers/RoleManagerController.cs +++ b/OpenAuth.Mvc/Controllers/RoleManagerController.cs @@ -1,8 +1,6 @@ using Infrastructure; using OpenAuth.App; -using OpenAuth.Domain; using System; -using System.Linq; using System.Web.Http; using System.Web.Mvc; using Newtonsoft.Json.Linq; @@ -51,13 +49,14 @@ namespace OpenAuth.Mvc.Controllers return JsonHelper.Instance.Serialize(_app.Load(orgId, pageCurrent, pageSize)); } - public string Delete(string Id) + [System.Web.Mvc.HttpPost] + public string Delete(Guid[] ids) { try { - foreach (var obj in Id.Split(',')) + foreach (var obj in ids) { - _app.Delete(Guid.Parse(obj)); + _app.Delete(obj); } } catch (Exception e) diff --git a/OpenAuth.Mvc/Controllers/StockManagerController.cs b/OpenAuth.Mvc/Controllers/StockManagerController.cs index 071f0188..9e3844aa 100644 --- a/OpenAuth.Mvc/Controllers/StockManagerController.cs +++ b/OpenAuth.Mvc/Controllers/StockManagerController.cs @@ -50,9 +50,9 @@ namespace OpenAuth.Mvc.Controllers /// /// 加载节点下面的所有Stocks /// - public string Load(Guid parentId, int pageCurrent = 1, int pageSize = 30) + public string Load(Guid parentId, int page = 1, int rows = 30) { - return JsonHelper.Instance.Serialize(_app.Load(AuthUtil.GetUserName(), parentId, pageCurrent, pageSize)); + return JsonHelper.Instance.Serialize(_app.Load(AuthUtil.GetUserName(), parentId, page, rows)); } public string Delete(Guid Id) diff --git a/OpenAuth.Mvc/Controllers/UserManagerController.cs b/OpenAuth.Mvc/Controllers/UserManagerController.cs index a8296ec8..212b6f80 100644 --- a/OpenAuth.Mvc/Controllers/UserManagerController.cs +++ b/OpenAuth.Mvc/Controllers/UserManagerController.cs @@ -45,9 +45,9 @@ namespace OpenAuth.Mvc.Controllers /// /// 加载组织下面的所有用户 /// - public string Load(Guid orgId, int pageCurrent = 1, int pageSize = 30) + public string Load(Guid orgId, int page = 1, int rows = 30) { - return JsonHelper.Instance.Serialize(_app.Load(orgId, pageCurrent, pageSize)); + return JsonHelper.Instance.Serialize(_app.Load(orgId, page, rows)); } [HttpPost] diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index 77ee9332..ad1ac108 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -182,6 +182,7 @@ + diff --git a/OpenAuth.Mvc/Views/CommonApplies/Index.cshtml b/OpenAuth.Mvc/Views/CommonApplies/Index.cshtml index 80c63542..83bfb70e 100644 --- a/OpenAuth.Mvc/Views/CommonApplies/Index.cshtml +++ b/OpenAuth.Mvc/Views/CommonApplies/Index.cshtml @@ -2,56 +2,83 @@ Layout = "~/Views/Shared/_Layout.cshtml"; } -@{ Html.RenderAction("MenuHeader", "Home");} -
-
-
-
    -
    - -
    -
    -
    -
    + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
      +
      +
      +
      +
      +
      +
      +
      + @Html.Action("MenuHeader", "Home") +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      -