修改界面，重构授权代码

OpenAuth.Mvc/BllScripts/modulemanager.js

@@ -1,107 +1,10 @@
-// ***********************************************************************
-// Assembly         : OpenAuth.Mvc
-// Author           : yubaolee
-// Created          : 04-06-2016
-//
-// Last Modified By : yubaolee
-// Last Modified On : 04-06-2016
-// ***********************************************************************
-// <copyright file="modulemanager.js" company="www.cnblogs.com/yubaolee">
-//     版权所有(C) 2015
-// </copyright>
-// <summary>模块管理脚本</summary>
-// ***********************************************************************
-
-//grid列表模块
-function MainGrid() {
-    var url = '/ModuleManager/Load?orgId=';
-    var selectedId = '00000000-0000-0000-0000-000000000000';  //ztree选中的模块
-    this.maingrid = $('#maingrid').datagrid({
-        showToolbar: false,
-        filterThead: false,
-        loadType: 'GET',
-        target: $(this),
-        columns: [
-               {
-                   name: 'Id',
-                   label: '功能模块流水号',
-                   width: 100
-                    , hide: true
-               },
-               {
-                   name: 'CascadeId',
-                   label: '节点语义ID',
-                   width: 100
-               },
-               {
-                   name: 'Name',
-                   label: '功能模块名称',
-                   width: 100
-               },
-               {
-                   name: 'Url',
-                   label: '主页面URL',
-                   width: 100
-               },
-
-               {
-                   name: 'IsLeaf',
-                   label: '是否叶子节点',
-                   width: 100
-                     , type: 'select',
-                   align: 'center',
-                   items: [{ 'false': '否' }, { 'true': '是' }],
-               },
-               {
-                   name: 'IsAutoExpand',
-                   label: '是否自动展开',
-                   width: 100
-                     , type: 'select',
-                   align: 'center',
-                   items: [{ 'false': '否' }, { 'true': '是' }],
-               },
-               {
-                   name: 'Status',
-                   label: '当前状态',
-                   width: 100
-                     , type: 'select',
-                   align: 'center',
-                   items: [{ '0': '默认' }, { '1': '状态1' }],
-               },
-               {
-                   name: 'ParentName',
-                   label: '父节点名称',
-                   width: 100
-               },
-               {
-                   name: 'Vector',
-                   label: '矢量图标',
-                   width: 100
-               },
-               {
-                   name: 'SortNo',
-                   label: '排序号',
-                   width: 100
-               },
-        ],
-        dataUrl: url + selectedId,
-        fullGrid: true,
-        showLinenumber: true,
-        showCheckboxcol: true,
-        paging: true,
-        filterMult: false,
-        showTfoot: false,
-      
+$(function () {
+    $("#ParentName").on("click", function () {
+        parent.reload();
     });
-    this.reload = function (id) {
-        if (id != undefined) selectedId = id;
-        this.maingrid.datagrid('reload', { dataUrl: url + selectedId });
-    };
-};
-MainGrid.prototype = new Grid();
-var list = new MainGrid();
+});
 
-//左边分类导航树
+//左边导航
 var ztree = function () {
     var url = '/ModuleManager/LoadModuleWithRoot';
     var setting = {
@@ -118,152 +21,159 @@ var ztree = function () {
                 rootPId: 'null'
             }
         },
-        callback: { onClick: zTreeOnClick }
-    };
-    $.getJSON(url, function (json) {
-        $.fn.zTree.init($("#tree"), setting, json).expandAll(true);
-    });
-    function zTreeOnClick(event, treeId, treeNode) {
-        list.reload(treeNode.Id);
-    }
-
-    return {
-        reload: function () {
-            $.getJSON(url, function (json) {
-                $.fn.zTree.init($("#tree"), setting, json).expandAll(true);
-            });
-        }
-    }
-}();
-
-//编辑时，选择上级弹出的树
-var parentTree = function () {
-    var nameDom = "#ParentName";
-    var idDom = "#ParentId";
-    var zTreeObj;
-    var setting = {
-        view: {
-            selectedMulti: false
-        },
-        check: {
-            enable: true,
-            chkStyle: "radio",  //单选
-            radioType: "all"
-        },
-        data: {
-            key: {
-                name: 'Name',
-                title: 'Name'
-            },
-            simpleData: {
-                enable: true,
-                idKey: 'Id',
-                pIdKey: 'ParentId',
-                rootPId: 'null'
-            }
-        },
         callback: {
-            onClick: zTreeOnClick,
-            onCheck: zTreeCheck
+            onClick: function (event, treeId, treeNode) {
+                list.reload(treeNode.Id);
+            }
         }
     };
-
-    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();
-    }
+    var load = function () {
+        $.getJSON(url, function (json) {
+            var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json);
+            list.reload();
+            zTreeObj.expandAll(true);
+        });
+    };
+    load();
 
     return {
-        show: function () {
-            $.getJSON('/moduleManager/LoadForTree', 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);
-            });
-        }
-    };
+        reload: load
+    }
 }();
 
+//grid列表模块
+function MainGrid() {
+    var url = '/ModuleManager/Load?orgId=';
+    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: 'Url',
+                    name: 'Url',
+                    label: '模块地址'
+                },
+                {
+                    index: 'IconName',
+                    name: 'IconName',
+                    label: '图标'
+                },
+                {
+                    index: 'ParentName',
+                    name: 'ParentName',
+                    label: '所属模块'
+                },
+                 {
+                     index: 'ParentId',
+                     name: 'ParentId',
+                     hidden: true
+                 },
+
+                {
+                    index: 'SortNo',
+                    name: 'SortNo',
+                    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 parent = new ParentTree("/moduleManager/LoadForTree", "ParentName", "ParentId");
+
 //添加（编辑）对话框
 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: ['450px', '400px'], //宽高
+            content: $('#editDlg'), //捕获的元素
+            btn: ['保存', '关闭'],
+            yes: function (index, layero) {
+                $.post("/moduleManager/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',
+                SortNo: 0
+            });
         },
         update: function (ret) {  //弹出编辑框
             update = true;
             show();
-            $('#Id').val(ret.Id);
-            $('#CascadeId').val(ret.CascadeId);
-            $('#Name').val(ret.Name);
-            $('#Url').val(ret.Url);
-            $('#HotKey').val(ret.HotKey);
-            $('#ParentId').val(ret.ParentId);
-            $('#IsLeaf').selectpicker('val', ret.IsLeaf?"true":"false");
-            $('#IsAutoExpand').selectpicker('val', ret.IsAutoExpand?"true":"false");
-            $('#IconName').val(ret.IconName);
-            $('#Status').val(ret.Status);
-            $('#ParentName').val(ret.ParentName);
-            $('#Vector').val(ret.Vector);
-            $('#SortNo').val(ret.SortNo);
-            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();
-                        ztree.reload();
-                    }
-                });
-            });
+            vm.$set('$data', ret);
         }
     };
 }();
 
-
 //删除
 function del() {
-    var selected = list.getSelectedObj();
+    var selected = list.getSelectedProperties("Id");
     if (selected == null) return;
 
-    $.post('/moduleManager/Delete?Id=' + selected.Id, function (data) {
+    $.post('/moduleManager/Delete',
+    { ids: selected }, function (data) {
         if (data.Status) {
             list.reload();
             ztree.reload();
@@ -291,6 +201,7 @@ function refresh() {
     list.reload();
 }
 
+
 //为模块分配按钮
 function assignButton() {
     var selected = list.getSelectedObj();
@@ -304,8 +215,6 @@ function assignButton() {
         url: '/ModuleElementManager/Index?id=' + selected.Id,
         title: '为模块分配按钮',
         width: '800',
-        height:'600'
+        height: '600'
     });
 }
-
-//@@ sourceURL=moduleManager.js

OpenAuth.Mvc/BllScripts/orgManager.js

@@ -118,68 +118,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("/OrgManager/LoadOrg", {
-                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("/OrgManager/LoadOrg","ParentName", "ParentId");
 
 //添加（编辑）对话框
 var editDlg = function () {

OpenAuth.Mvc/BllScripts/parentTree.js

@@ -0,0 +1,89 @@
+// ***********************************************************************
+// Assembly         : OpenAuth.Mvc
+// Author           : yubaolee
+// Created          : 10-16-2016
+//
+// Last Modified By : yubaolee
+// Last Modified On : 10-16-2016
+// ***********************************************************************
+// <copyright file="parentTree.js" company="www.cnblogs.com/yubaolee">
+//     版权所有(C) 2015
+// </copyright>
+// <summary>单击文本框弹出的选择列表</summary>
+// ***********************************************************************
+
+function ParentTree(url, name, id) {
+    var zTreeObj;
+    var options = {
+        text: 'Name',
+        key: 'Id',
+        parentKey: 'ParentId',
+        nameDOM: name,   //显示的文本框ID，如："#catetoryName"
+        idDOM: id   //隐藏的文本框，如："#categoryId"
+    }
+    var setting = {
+        view: { selectedMulti: false },
+        data: {
+            key: {
+                name: options.text,
+                title: options.text
+            },
+            simpleData: {
+                enable: true,
+                idKey: options.key,
+                pIdKey: options.parentKey,
+                rootPId: 'null'
+            }
+        },
+        callback: {
+            onClick: onClick
+        }
+    };
+    var showMenu = function () {
+        $("#menuContent").css({ left: "10px", top: $("#" + options.nameDOM).outerHeight() + "px" }).slideDown("fast");
+        $("body").bind("mousedown", onBodyDown);
+    };
+
+    var setCheck = function() {   //todo:设置初始选中的值
+        //var value = vm.$get(options.idDom);
+    }
+    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 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);
+                zTreeObj.expandAll(true);
+                showMenu();
+            });
+        }
+    }
+}

OpenAuth.Mvc/BllScripts/resourceManager.js

@@ -1,5 +1,5 @@
 $(function () {
-    $("#ParentName").on("click", function () {
+    $("#CategoryName").on("click", function () {
         parent.reload();
     });
 });
@@ -117,68 +117,7 @@ var vm = new Vue({
 });
 
 //上级机构选择框
-var parent = function (name,id) {   //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: $("#"+name).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(name, nodes[i].Name);
-            vm.$set(id, 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(name, '');
-                    vm.$set(id, '');
-                    return;
-                }
-                zTreeObj = $.fn.zTree.init($("#org"), setting, json);
-                zTreeObj.expandAll(true);
-                showMenu();
-            });
-        }
-    }
-}("CategoryName","CategoryId");
+var parent = new ParentTree("/CategoryManager/LoadForTree", "CategoryName", "CategoryId");
 
 //添加（编辑）对话框
 var editDlg = function () {
@@ -192,7 +131,7 @@ var editDlg = function () {
             content: $('#editDlg'), //捕获的元素
             btn: ['保存', '关闭'],
             yes: function (index, layero) {
-                $.post("/CategoryManager/Add", vm.$data, function (data) {
+                $.post("/ResourceManager/Add", vm.$data, function (data) {
                     layer.msg(data.Message);
                     if (data.Status) {
                         list.reload();