From 9ae57bab4111399cd3060d033fedcb3fad68138e Mon Sep 17 00:00:00 2001 From: yubao Date: Fri, 8 Dec 2017 06:33:47 +0800 Subject: [PATCH] check bugs --- OpenAuth.Mvc/BllScripts/assignModule.js | 42 --- .../BllScripts/assignModuleElement.js | 114 -------- OpenAuth.Mvc/BllScripts/assignRes.js | 109 -------- OpenAuth.Mvc/BllScripts/categoryManager.js | 200 -------------- OpenAuth.Mvc/BllScripts/clientData.js | 19 -- OpenAuth.Mvc/BllScripts/flowDesign.js | 142 ---------- OpenAuth.Mvc/BllScripts/flowInstance.js | 203 --------------- OpenAuth.Mvc/BllScripts/formDesign.js | 122 --------- OpenAuth.Mvc/BllScripts/login.js | 21 -- OpenAuth.Mvc/BllScripts/moduleElementMan.js | 186 -------------- OpenAuth.Mvc/BllScripts/processDetail.js | 52 ---- OpenAuth.Mvc/BllScripts/queryString.js | 44 ---- OpenAuth.Mvc/BllScripts/resourceManager.js | 189 -------------- OpenAuth.Mvc/BllScripts/roleManager.js | 221 ---------------- OpenAuth.Mvc/BllScripts/stockManager.js | 189 -------------- OpenAuth.Mvc/BllScripts/userRoleManager.js | 109 -------- OpenAuth.Mvc/BllScripts/usermanager.js | 243 ------------------ OpenAuth.Mvc/OpenAuth.Mvc.csproj | 17 -- OpenAuth.Mvc/Views/OrgManager/Index.cshtml | 4 +- OpenAuth.Mvc/js/openauth.js | 2 +- OpenAuth.Mvc/js/orgs.js | 7 +- 21 files changed, 7 insertions(+), 2228 deletions(-) delete mode 100644 OpenAuth.Mvc/BllScripts/assignModule.js delete mode 100644 OpenAuth.Mvc/BllScripts/assignModuleElement.js delete mode 100644 OpenAuth.Mvc/BllScripts/assignRes.js delete mode 100644 OpenAuth.Mvc/BllScripts/categoryManager.js delete mode 100644 OpenAuth.Mvc/BllScripts/clientData.js delete mode 100644 OpenAuth.Mvc/BllScripts/flowDesign.js delete mode 100644 OpenAuth.Mvc/BllScripts/flowInstance.js delete mode 100644 OpenAuth.Mvc/BllScripts/formDesign.js delete mode 100644 OpenAuth.Mvc/BllScripts/login.js delete mode 100644 OpenAuth.Mvc/BllScripts/moduleElementMan.js delete mode 100644 OpenAuth.Mvc/BllScripts/processDetail.js delete mode 100644 OpenAuth.Mvc/BllScripts/queryString.js delete mode 100644 OpenAuth.Mvc/BllScripts/resourceManager.js delete mode 100644 OpenAuth.Mvc/BllScripts/roleManager.js delete mode 100644 OpenAuth.Mvc/BllScripts/stockManager.js delete mode 100644 OpenAuth.Mvc/BllScripts/userRoleManager.js delete mode 100644 OpenAuth.Mvc/BllScripts/usermanager.js diff --git a/OpenAuth.Mvc/BllScripts/assignModule.js b/OpenAuth.Mvc/BllScripts/assignModule.js deleted file mode 100644 index fb469145..00000000 --- a/OpenAuth.Mvc/BllScripts/assignModule.js +++ /dev/null @@ -1,42 +0,0 @@ -// *********************************************************************** -// Assembly : OpenAuth.Mvc -// Author : yubaolee -// Created : 04-16-2016 -// -// Last Modified By : yubaolee -// Last Modified On : 04-16-2016 -// *********************************************************************** -// -// 版权所有(C) 2015 -// -// 分配组织 -// *********************************************************************** -layui.use(['layer', 'form'], function () { - var form = layui.form(); - - form.on('checkbox', function (data) { - if (data.elem.checked) - { - $.post('/RelevanceManager/Assign', { - type: $("#moduleType").val(), - firstId: $('#firstId').val(), - secIds: data.value - }, function (json) { - json = $.parseJSON(json); - - }); - } - else - { - $.post('/RelevanceManager/UnAssign', { - type: $("#moduleType").val(), - firstId: $('#firstId').val(), - secIds: data.value - }, function (json) { - json = $.parseJSON(json); - - }); - } - }); -}); - diff --git a/OpenAuth.Mvc/BllScripts/assignModuleElement.js b/OpenAuth.Mvc/BllScripts/assignModuleElement.js deleted file mode 100644 index e35cbfa6..00000000 --- a/OpenAuth.Mvc/BllScripts/assignModuleElement.js +++ /dev/null @@ -1,114 +0,0 @@ -// *********************************************************************** -// Assembly : OpenAuth.Mvc -// Author : yubaolee -// Created : 04-19-2016 -// -// Last Modified By : yubaolee -// Last Modified On : 05-26-2016 -// Contact : www.cnblogs.com/yubaolee -// File: assignModuleElement.js -//Description: 分配模块菜单（按钮） -// *********************************************************************** - -function renderLayui() { - layui.use(['layer', 'form'], function () { - var form = layui.form(); - - form.on('checkbox', function (data) { - if (data.elem.checked) { - $.post('/RelevanceManager/Assign', { - type: $("#moduleType").val(), - firstId: $('#firstId').val(), - secIds: data.value - }, function (json) { - json = $.parseJSON(json); - - }); - } - else { - $.post('/RelevanceManager/UnAssign', { - type: $("#moduleType").val(), - firstId: $('#firstId').val(), - secIds: data.value - }, function (json) { - json = $.parseJSON(json); - - }); - } - }); - - form.render(); - }); -} - -var list = function () { - var selectedId = '00000000-0000-0000-0000-000000000000'; //选中的ID - var url = '/ModuleElementManager/LoadWithAccess?firstId=' + $("#firstId").val() + "&key=" + $("#moduleType").val() + "&tId="; - return { - reload: function (id) { - if (id != undefined) selectedId = id; - $.getJSON(url + selectedId, - function (data) { - var str = ''; - if (data.length > 0) { - $.each(data, - function () { - str += " -// 版权所有(C) 2015 -// -// 分配资源模块处理 -// *********************************************************************** - -function renderLayui() { - layui.use(['layer', 'form'], function () { - var form = layui.form(); - - form.on('checkbox', function (data) { - if (data.elem.checked) { - $.post('/RelevanceManager/Assign', { - type: $("#moduleType").val(), - firstId: $('#firstId').val(), - secIds: data.value - }, function (json) { - json = $.parseJSON(json); - - }); - } - else { - $.post('/RelevanceManager/UnAssign', { - type: $("#moduleType").val(), - firstId: $('#firstId').val(), - secIds: data.value - }, function (json) { - json = $.parseJSON(json); - - }); - } - }); - - form.render(); - }); -} - -var list = function () { - var selectedId = '00000000-0000-0000-0000-000000000000'; //选中的ID - var url = '/ResourceManager/LoadWithAccess?firstId=' + $("#firstId").val() + "&key=" + $("#moduleType").val() + "&cId="; - return { - reload: function (id) { - if (id != undefined) selectedId = id; - $.getJSON(url + selectedId, - function (data) { - var str = ''; - if (data.length > 0) { - $.each(data, - function () { - str += "分类管理 -// *********************************************************************** - -$(function () { - $("#ParentName").on("click", function () { - parent.reload(); - }); -}); - -//左边导航 -var ztree = function () { - var url = '/CategoryManager/LoadForTree'; - 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) { - list.reload(treeNode.Id); - } - } - }; - var load = function () { - $.getJSON(url, function (json) { - var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); - list.reload(); - zTreeObj.expandAll(true); - }); - }; - load(); - - return { - reload: load - } -}(); - -//grid列表模块 -function MainGrid() { - var url = '/CategoryManager/Load?parentId='; - var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块 - this.maingrid = $('#maingrid') - .jqGrid({ - colModel: [ - { - name: 'Id', - index: 'Id', - hidden: true - }, - { - index: 'CascadeId', - name: 'CascadeId', - label: '节点语义ID' - }, - { - index: 'Name', - name: 'Name', - 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("/CategoryManager/LoadForTree","ParentName","ParentId"); - -//添加（编辑）对话框 -var editDlg = function () { - var update = false; - var show = function () { - layer.open({ - type: 1, - skin: 'layui-layer-rim', //加上边框 - title: "分类管理", //不显示标题 - area: ['400px', '300px'], //宽高 - content: $('#editDlg'), //捕获的元素 - btn: ['保存', '关闭'], - yes: function (index, layero) { - $.post("/CategoryManager/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(); - vm.$set('$data', { - Id: '00000000-0000-0000-0000-000000000000', - SortNo: 0 - }); - }, - update: function (ret) { //弹出编辑框 - update = true; - show(); - vm.$set('$data', ret); - } - }; -}(); - -//删除 -function del() { - list.del("Id", "/CategoryManager/Delete", function () { - list.reload(); - ztree.reload(); - }); -} - -//自定义的编辑按钮 -function edit() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - editDlg.update(selected); -} - -function add() { - editDlg.add(); -} - -function refresh() { - list.reload(); -} \ No newline at end of file diff --git a/OpenAuth.Mvc/BllScripts/clientData.js b/OpenAuth.Mvc/BllScripts/clientData.js deleted file mode 100644 index eb658cac..00000000 --- a/OpenAuth.Mvc/BllScripts/clientData.js +++ /dev/null @@ -1,19 +0,0 @@ -$(function() { - $.getclientdata(); -}); - -var clientuserData = []; -$.getclientdata = function () { - $.ajax({ - url: "/UserManager/GetAccessedUsers", - type: "get", - dataType: "json", - async: false, - success: function (data) { - clientuserData = data; - }, - error: function (XMLHttpRequest, textStatus, errorThrown) { - console.log("加载可访问的用户列表失败！"); - } - }); -} \ No newline at end of file diff --git a/OpenAuth.Mvc/BllScripts/flowDesign.js b/OpenAuth.Mvc/BllScripts/flowDesign.js deleted file mode 100644 index 45bed6b9..00000000 --- a/OpenAuth.Mvc/BllScripts/flowDesign.js +++ /dev/null @@ -1,142 +0,0 @@ -//grid列表模块 -function MainGrid() { - var url = '/FlowDesign/Load'; - this.maingrid = $('#maingrid') - .jqGrid({ - colModel: [ - { label: '主键', name: 'Id', hidden: true }, - { label: '流程编号', name: 'SchemeCode', index: 'SchemeCode', width: 100, align: 'left' }, - { label: '流程名称', name: 'SchemeName', index: 'SchemeName', width: 150, align: 'left' }, - - { label: '模板版本', name: 'SchemeVersion', index: 'SchemeVersion', width: 180, align: 'left' }, - { label: '状态Id', name: 'EnabledMark', index: 'EnabledMark', hidden: true }, - { - label: "状态", name: "EnabledMarklabel", index: "EnabledMarklabel", width: 50, align: "center", - formatter: function (cellvalue, options, rowObject) { - if (rowObject.enabledmark == 1) { - return '启用'; - } else if (rowObject.enabledmark == 0) { - return '停用'; - } else { - return '草稿'; - } - } - }, - - { label: "最近编辑用户", name: "ModifyUserName", index: "ModifyUserName", width: 90, align: "left" }, - {label: "最近编辑时间", name: "ModifyDate", index: "ModifyDate", width: 150, align: "left"}, - - { label: "备注", name: "Description", index: "Description", width: 200, align: "left" } - - ], - url: url, - 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) { - this.maingrid.jqGrid("setGridParam", { url: url }) - .trigger("reloadGrid", [{ page: 1 }]); //重载JQGrid - - }; -}; -MainGrid.prototype = new Grid(); -var list = new MainGrid(); - -//删除 -function del() { - list.del("Id", "/FlowManage/FlowDesign/RemoveForm", function () { - list.reload(); - }); -} - -//自定义的编辑按钮 -function edit() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - - layer.open({ - type: 2, - title:selected.Code, - skin: 'layui-layer-rim', //加上边框 - area: ['1200px', '700px'], //宽高 - maxmin: true, //开启最大化最小化按钮 - content: '/FlowManage/FlowDesign/FlowSchemeBuider?keyValue=' + selected.Id, - end: function () { - list.reload(); - } - }); - -} - -//创建流程模版 -function add() { - layer.open({ - type: 2, - skin: 'layui-layer-rim', //加上边框 - area: ['1200px', '700px'], //宽高 - maxmin: true, //开启最大化最小化按钮 - content: '/FlowManage/FlowDesign/FlowSchemeBuider', - end: function() { - list.reload(); - } - }); -} - -//预览 -function preview() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - - layer.open({ - type: 2, - skin: 'layui-layer-rim', //加上边框 - area: ['1200px', '700px'], //宽高 - maxmin: true, //开启最大化最小化按钮 - content: '/FlowManage/FlowDesign/PreviewIndex?keyValue=' + selected.Id + "&schemeVersion=" + selected.SchemeVersion, - end: function () { - list.reload(); - } - }); -} - - -//创建新实例 -function addInstance() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - - layer.open({ - type: 2, - skin: 'layui-layer-rim', //加上边框 - area: ['1200px', '700px'], //宽高 - maxmin: true, //开启最大化最小化按钮 - content: '/FlowManage/FlowInstances/FlowProcessNewForm?keyValue=' + selected.Id, - }); -} - - - diff --git a/OpenAuth.Mvc/BllScripts/flowInstance.js b/OpenAuth.Mvc/BllScripts/flowInstance.js deleted file mode 100644 index c20ceb0a..00000000 --- a/OpenAuth.Mvc/BllScripts/flowInstance.js +++ /dev/null @@ -1,203 +0,0 @@ -//左边分类导航树 -var ztree = function () { - var nodes = [ - { - name: "流程处理", - children: [ - { name: "我的申请", value: "me" }, - { name: "待办事项", value: "inbox" }, - { name: "已办事项", value: "outbox" } - ], - value: "me" - } - ]; - var setting = { - view: { selectedMulti: false }, - callback: { - onClick: function (event, treeId, treeNode) { - list.reload(treeNode.value); - } - } - }; - var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, nodes); - zTreeObj.expandAll(true); -}(); - -var selectScheme = function (val) { - $("#WorkflowName").empty(); - $.getJSON("/workflowschemas/Load", - function (data) { - $.each(data.rows, - function (i, n) { - $("#WorkflowName").append(""); - }); - - if (val != undefined) { - $("#WorkflowName").val(val); - } - }); -}; - - -//grid列表模块 -function MainGrid() { - var url = "/FlowInstances/Load?type="; - var selectedId = "me"; //ztree选中的模块 - this.maingrid = $("#maingrid") - .jqGrid({ - colModel: [ - { - name: "Id", - index: "Id", - hidden: true - }, - { - name: "ProcessSchemeId", - index: "ProcessSchemeId", - hidden: true - }, - { - name: "ActivityId", - index: "ActivityId", - hidden: true - }, - { - name: "CreateUserId", - index: "CreateUserId", - hidden: true - }, - - { - index: "Code", - name: "Code", - label: "流程编号" - }, - - { - index: "CustomName", - name: "CustomName", - label: "申请标题" - }, - { - name: "CreateUserName", - index: "CreateUserName", - label: "申请人" - }, - { - index: "ActivityName", - name: "ActivityName", - label: "当前节点" - }, - { - index: "CreateDate", - name: "CreateDate", - 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(); - - -//删除 -function del() { - list.del("Id", - "/FlowInstances/Delete", - function () { - list.reload(); - ztree.reload(); - }); - -} - - -//进度详情 -function detail() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - - layer.open({ - type: 2, - title: selected.Name, - skin: "layui-layer-rim", //加上边框 - area: ["800px", "600px"], //宽高 - content: "/FlowManage/FlowInstances/ProcessLookForm?processSchemeId=" + selected.ProcessSchemeId + "&activityId=" + selected.ActivityId, - maxmin: true, //开启最大化最小化按钮 - end: function () { - list.reload(); - } - }); -} - -//审核 -function verificationForm() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - - layer.open({ - type: 2, - title: selected.Name, - skin: "layui-layer-rim", //加上边框 - area: ["1200px", "700px"], //宽高 - content: "/FlowManage/FlowInstances/VerificationForm?processSchemeId=" - + selected.ProcessSchemeId + "&activityId=" - + selected.ActivityId + "&processInstanceId=" - + selected.Id + "&createuserid=" - + selected.CreateUserId + "&createusername=" + selected.CreateUserName + "&description=" - + selected.Description, - maxmin: true, //开启最大化最小化按钮 - end: function () { - list.reload(); - } - }); -} - -function add() { - layer.msg('请在流程设计列表中发起流程！'); -} - -function refresh() { - list.reload(); -} - - diff --git a/OpenAuth.Mvc/BllScripts/formDesign.js b/OpenAuth.Mvc/BllScripts/formDesign.js deleted file mode 100644 index 88c220fb..00000000 --- a/OpenAuth.Mvc/BllScripts/formDesign.js +++ /dev/null @@ -1,122 +0,0 @@ -//grid列表模块 -function MainGrid() { - var url = '/FormDesign/Load'; - this.maingrid = $('#maingrid') - .jqGrid({ - colModel: [ - { label: '主键', name: 'Id', hidden: true }, - { label: '表单编号', name: 'FrmCode', index: 'FrmCode', width: 100, align: 'left' }, - { label: '表单名称', name: 'FrmName', index: 'FrmName', width: 150, align: 'left' }, - - { label: '状态', name: 'EnabledMark', index: 'EnabledMark', hidden: true }, - { - label: "状态", name: "EnabledMarklabel", index: "EnabledMarklabel", width: 50, align: "center", - formatter: function (cellvalue, options, rowObject) { - if (rowObject.enabledmark == 0) { - return '停用'; - } else { - return '启用'; - } - } - }, - - { label: "最近编辑用户", name: "ModifyUserName", index: "ModifyUserName", width: 90, align: "left" }, - {label: "最近编辑时间", name: "ModifyDate", index: "ModifyDate", width: 150, align: "left"}, - - { label: "备注", name: "Description", index: "Description", width: 200, align: "left" } - - ], - url: url, - 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) { - this.maingrid.jqGrid("setGridParam", { url: url }) - .trigger("reloadGrid", [{ page: 1 }]); //重载JQGrid - - }; -}; -MainGrid.prototype = new Grid(); -var list = new MainGrid(); - -//删除 -function del() { - list.del("Id", "/FlowManage/FormDesign/RemoveForm", function () { - list.reload(); - }); -} - -//自定义的编辑按钮 -function edit() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - - layer.open({ - type: 2, - title:selected.Code, - skin: 'layui-layer-rim', //加上边框 - area: ['1000px', '700px'], //宽高 - maxmin: true, //开启最大化最小化按钮 - content: '/FlowManage/FormDesign/FrmBuider?keyValue=' + selected.Id, - end: function () { - list.reload(); - } - }); - -} - -//创建表单模版 -function add() { - layer.open({ - type: 2, - skin: 'layui-layer-rim', //加上边框 - area: ['1000px', '700px'], //宽高 - maxmin: true, //开启最大化最小化按钮 - content: '/FlowManage/FormDesign/FrmBuider', - end: function() { - list.reload(); - } - }); -} - -//预览 -function preview() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - - layer.open({ - type: 2, - title:'表单预览', - skin: 'layui-layer-rim', //加上边框 - area: ['1000px', '700px'], //宽高 - maxmin: true, //开启最大化最小化按钮 - content: '/FlowManage/FormDesign/FormPreview?keyValue=' + selected.Id + "&FrmVersion=" + selected.FrmVersion, - end: function () { - list.reload(); - } - }); -} - - diff --git a/OpenAuth.Mvc/BllScripts/login.js b/OpenAuth.Mvc/BllScripts/login.js deleted file mode 100644 index 093038c3..00000000 --- a/OpenAuth.Mvc/BllScripts/login.js +++ /dev/null @@ -1,21 +0,0 @@ -layui.use(["form"], - function() { - var form = layui.form(), layer = layui.layer; - - //监听提交 - form.on("submit(*)", - function(data) { - $.post( - "/login/index", - data.field, - function(data) { - var result = JSON.parse(data); - if (result.Status) { - location.href = result.Result; - } else { - layer.msg(result.Message); - } - }); - return false; - }); - }); \ No newline at end of file diff --git a/OpenAuth.Mvc/BllScripts/moduleElementMan.js b/OpenAuth.Mvc/BllScripts/moduleElementMan.js deleted file mode 100644 index 6ed3ea30..00000000 --- a/OpenAuth.Mvc/BllScripts/moduleElementMan.js +++ /dev/null @@ -1,186 +0,0 @@ -// *********************************************************************** -// Assembly : OpenAuth.Mvc -// Author : yubaolee -// Created : 04-07-2016 -// -// Last Modified By : yubaolee -// Last Modified On : 04-07-2016 -// *********************************************************************** -// -// 模块按钮管理 -// -// -// *********************************************************************** - -var moduleId = $("#selectedModuleId").val(); //外部传递的moduleId - -$(function () { - $('#btnAddElement').on('click', function () { //添加菜单 - add(); - }); - - $('#btnEditElement').on('click', function () { //编辑菜单 - edit(); - }); - - $('#btnDelElement').on('click', function () { //删除菜单 - del(); - }); -}); - -//grid列表模块 -function MainGrid() { - var url = '/ModuleElementManager/Get?moduleId='; - this.maingrid = $('#maingrid') - .jqGrid({ - colModel: [ - { - name: 'Id', - index: 'Id', - hidden: true - }, - { - index: 'Name', - name: 'Name', - label: '名称' - }, - { - index: 'DomId', - name: 'DomId', - label: 'DOM ID' - }, - { - index: 'Icon', - name: 'Icon', - label:'图标' - }, - - { - index: 'Remark', - name: 'Remark', - label: '描述' - - }, - { - index: 'Class', - name: 'Class', - label: '样式' - }, - { - index: 'Script', - name: 'Script', - label: '脚本' - }, - { - index: 'Sort', - name: 'Sort', - label: '排序' - }, - { - index: 'ModuleId', - name: 'ModuleId', - hidden:true - } - ], - url: url + moduleId, - 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 () { - this.maingrid.jqGrid("setGridParam", { url: url + moduleId }) - .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 () { - layer.open({ - type: 1, - skin: 'layui-layer-rim', //加上边框 - title: "用户管理", //不显示标题 - area: ['400px', '300px'], //宽高 - content: $('#editDlg'), //捕获的元素 - btn: ['保存', '关闭'], - yes: function (index, layero) { - $.post("/ModuleElementManager/AddOrEditButton", vm.$data, function (data) { - layer.msg(data.Message); - if (data.Status) { - list.reload(); - } - }, "json"); - }, - cancel: function (index) { - layer.close(index); - } - }); - } - return { - add: function () { //弹出添加 - update = false; - show(); - vm.$set('$data', { - Id: '00000000-0000-0000-0000-000000000000', - Sort: 1, - ModuleId:moduleId - }); - }, - update: function (ret) { //弹出编辑框 - update = true; - show(); - vm.$set('$data', ret); - } - }; -}(); - -//删除 -function del() { - list.del("Id", "/ModuleElementManager/Del", function () { - list.reload(); - }); - - var selected = list.getSelectedProperties("Id"); - if (selected == null) return; -} - -//自定义的编辑按钮 -function edit() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - editDlg.update(selected); -} - -function add() { - editDlg.add(); -} - -function refresh() { - list.reload(); -} diff --git a/OpenAuth.Mvc/BllScripts/processDetail.js b/OpenAuth.Mvc/BllScripts/processDetail.js deleted file mode 100644 index de82451a..00000000 --- a/OpenAuth.Mvc/BllScripts/processDetail.js +++ /dev/null @@ -1,52 +0,0 @@ - -var wfdesigner = undefined; - -function wfdesignerRedraw() { - var data; - - if (wfdesigner != undefined) { - data = wfdesigner.data; - wfdesigner.destroy(); - } - var processid = $("#processId").val(); - var schemecode = $("#schemeCode").val(); - - wfdesigner = new WorkflowDesigner({ - name: 'simpledesigner', - apiurl: '/Designer/API', - renderTo: 'wfdesigner', - imagefolder: '/images/', - graphwidth: 850, - graphheight: 450 - }); - - if (data == undefined) { - var p = { schemecode: schemecode, processid: processid, readonly: true }; - if (wfdesigner.exists(p)) - wfdesigner.load(p); - else - wfdesigner.create(); - } else { - wfdesigner.data = data; - wfdesigner.render(); - } -} - -wfdesignerRedraw(); - -$(function () { - $(".workflowcmd") - .on("click", function () { //执行命令 - $.post("/FlowInstances/ExeCmd?id=" +$("#processId").val() +"&cmd=" +$(this).val() , - function (data) { - if (data.Status) { - location.reload(); - } - else { - alert(data.Message); - } - },'json'); - }); -}); - - diff --git a/OpenAuth.Mvc/BllScripts/queryString.js b/OpenAuth.Mvc/BllScripts/queryString.js deleted file mode 100644 index d9bf17e1..00000000 --- a/OpenAuth.Mvc/BllScripts/queryString.js +++ /dev/null @@ -1,44 +0,0 @@ -// *********************************************************************** -// Assembly : OpenAuth.Mvc -// Author : yubaolee -// Created : 09-04-2016 -// -// Last Modified By : yubaolee -// Last Modified On : 09-04-2016 -// *********************************************************************** -// -// 版权所有(C) 2015 -// -// 解析URL中的参数 -// *********************************************************************** - -var QueryString = function () { - // This function is anonymous, is executed immediately and - // the return value is assigned to QueryString! - var query_string = {}; - var query = window.location.search.substring(1); - var vars = query.split("&"); - for (var i = 0; i < vars.length; i++) { - var pair = vars[i].split("="); - // If first entry with this name - if (typeof query_string[pair[0]] === "undefined") { - query_string[pair[0]] = pair[1]; - // If second entry with this name - } else if (typeof query_string[pair[0]] === "string") { - var arr = [query_string[pair[0]], pair[1]]; - query_string[pair[0]] = arr; - // If third or later entry with this name - } else { - query_string[pair[0]].push(pair[1]); - } - } - return query_string; -}(); - -(function ($) { - $.getUrlParam = function (name) { - var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); - var r = window.location.search.substr(1).match(reg); - if (r != null) return unescape(r[2]); return null; - } -})(jQuery); diff --git a/OpenAuth.Mvc/BllScripts/resourceManager.js b/OpenAuth.Mvc/BllScripts/resourceManager.js deleted file mode 100644 index 59b51283..00000000 --- a/OpenAuth.Mvc/BllScripts/resourceManager.js +++ /dev/null @@ -1,189 +0,0 @@ -$(function () { - $("#CategoryName").on("click", function () { - parent.reload(); - }); -}); - -//左边导航 -var ztree = function () { - var url = '/CategoryManager/LoadForTree'; - 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) { - list.reload(treeNode.Id); - } - } - }; - var load = function () { - $.getJSON(url, function (json) { - var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); - list.reload(); - zTreeObj.expandAll(true); - }); - }; - load(); - - return { - reload: load - } -}(); - -//grid列表模块 -function MainGrid() { - var url = '/ResourceManager/Load?categoryId='; - var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块 - this.maingrid = $('#maingrid') - .jqGrid({ - colModel: [ - { - name: 'Id', - index: 'Id', - hidden: true - }, - { - index: 'Key', - name: 'Key', - label: '资源标识' - }, - { - index: 'Name', - name: 'Name', - label: '分类名称' - }, - { - index: 'CategoryName', - name: 'CategoryName', - label: '所属分类' - }, - { - index: 'CategoryId', - name: 'CategoryId', - 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("/CategoryManager/LoadForTree", "CategoryName", "CategoryId"); - -//添加（编辑）对话框 -var editDlg = function () { - var update = false; - var show = function () { - layer.open({ - type: 1, - skin: 'layui-layer-rim', //加上边框 - title: "用户管理", //不显示标题 - area: ['400px', '300px'], //宽高 - content: $('#editDlg'), //捕获的元素 - btn: ['保存', '关闭'], - yes: function (index, layero) { - $.post("/ResourceManager/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(); - vm.$set('$data', { - Id: '00000000-0000-0000-0000-000000000000', - SortNo: 0 - }); - }, - update: function (ret) { //弹出编辑框 - update = true; - show(); - vm.$set('$data', ret); - } - }; -}(); - -//删除 -function del() { - list.del("Id", "/ResourceManager/Delete", function () { - list.reload(); - ztree.reload(); - }); -} - -//自定义的编辑按钮 -function edit() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - editDlg.update(selected); -} - -function add() { - editDlg.add(); -} - -function refresh() { - list.reload(); -} - - diff --git a/OpenAuth.Mvc/BllScripts/roleManager.js b/OpenAuth.Mvc/BllScripts/roleManager.js deleted file mode 100644 index 4093cc33..00000000 --- a/OpenAuth.Mvc/BllScripts/roleManager.js +++ /dev/null @@ -1,221 +0,0 @@ -$(function () { - $("#Organizations").on("click", function () { - parent.reload(); - }); -}); - -//左边导航 -var ztree = function () { - var url = '/UserSession/GetOrgs'; - 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) { - list.reload(treeNode.Id); - } - } - }; - var load = function () { - $.getJSON(url, function (json) { - var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); - list.reload(); - zTreeObj.expandAll(true); - }); - }; - load(); - - return { - reload: load - } -}(); - -//grid列表模块 -function MainGrid() { - var url = '/RoleManager/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: '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.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 ParentTreeMultiple("/UserSession/GetOrgs", "Organizations", "OrganizationIds"); - -//添加（编辑）对话框 -var editDlg = function () { - var update = false; - var show = function () { - 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(); - vm.$set('$data', - { - Id: '00000000-0000-0000-0000-000000000000', - Sex: 0 - }); - }, - update: function (ret) { //弹出编辑框 - update = true; - show(); - vm.$set('$data', ret); - } - }; -}(); - - - -//删除 -function del() { - list.del("Id", "/RoleManager/Delete",function() { - list.reload(); - ztree.reload(); - }); -} - -//自定义的编辑按钮 -function edit() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - editDlg.update(selected); -} - -function add() { - editDlg.add(); -} - -function refresh() { - list.reload(); -} - -//为角色分配模块 -function assignRoleModule(obj) { - - var selected = list.getSelectedObj(); - if (selected == null) return; - - layer.open({ - type: 2, - skin: 'layui-layer-rim', //加上边框 - area: ['410px', '390px'], //宽高 - content: '/ModuleManager/Assign?key=RoleModule&firstId=' + selected.Id - }); -} - -//为角色分配资源 -function openRoleReourceAccess(obj) { - var selected = list.getSelectedObj(); - if (selected == null) return; - - layer.open({ - type: 2, - skin: 'layui-layer-rim', //加上边框 - area: ['600px', '300px'], //宽高 - content: '/ResourceManager/AssignRes?key=RoleResource&firstId=' + selected.Id - }); -} - -//为角色分配菜单 -function assignRoleElement(obj) { - var selected = list.getSelectedObj(); - if (selected == null) return; - - layer.open({ - type: 2, - skin: 'layui-layer-rim', //加上边框 - area: ['600px', '300px'], //宽高 - content: '/ModuleElementManager/AssignModuleElement?key=RoleElement&firstId=' + selected.Id - }); -} - - diff --git a/OpenAuth.Mvc/BllScripts/stockManager.js b/OpenAuth.Mvc/BllScripts/stockManager.js deleted file mode 100644 index 76fc5bdd..00000000 --- a/OpenAuth.Mvc/BllScripts/stockManager.js +++ /dev/null @@ -1,189 +0,0 @@ -$(function () { - $("#ParentName").on("click", function () { - parent.reload(); - }); -}); - -//左边导航 -var ztree = function () { - var url = '/UserSession/GetOrgs'; - 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) { - list.reload(treeNode.Id); - } - } - }; - var load = function () { - $.getJSON(url, function (json) { - var zTreeObj = $.fn.zTree.init($("#orgtree"), setting, json); - list.reload(); - zTreeObj.expandAll(true); - }); - }; - load(); - - return { - reload: load - } -}(); - -//grid列表模块 -function MainGrid() { - var url = '/StockManager/Load?parentId='; - 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: 'Viewable', - name: 'Viewable', - label: '可见范围' - }, - { - index: 'OrgId', - name: 'OrgId', - hidden: true - }, - - { - index: 'Number', - name: 'Number', - label: '数量' - - }, - { - index: 'ParentName', - name: 'ParentName', - 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("/UserSession/GetOrgs", "ParentName", "OrgId"); - -//添加（编辑）对话框 -var editDlg = function () { - var update = false; - var show = function () { - layer.open({ - type: 1, - skin: 'layui-layer-rim', //加上边框 - title: "进出库管理", //不显示标题 - area: ['400px', '300px'], //宽高 - content: $('#editDlg'), //捕获的元素 - btn: ['保存', '关闭'], - yes: function (index, layero) { - $.post("/StockManager/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(); - vm.$set('$data', { - Id: '00000000-0000-0000-0000-000000000000', - Number: 1 - }); - }, - update: function (ret) { //弹出编辑框 - update = true; - show(); - vm.$set('$data', ret); - } - }; -}(); - -//删除 -function del() { - list.del("Id", "/StockManager/Delete", function () { - list.reload(); - ztree.reload(); - }); -} - -//自定义的编辑按钮 -function edit() { - var selected = list.getSelectedObj(); - if (selected == null) { - return; - } - editDlg.update(selected); -} - -function add() { - editDlg.add(); -} - -function refresh() { - list.reload(); -} - - diff --git a/OpenAuth.Mvc/BllScripts/userRoleManager.js b/OpenAuth.Mvc/BllScripts/userRoleManager.js deleted file mode 100644 index 88ea93af..00000000 --- a/OpenAuth.Mvc/BllScripts/userRoleManager.js +++ /dev/null @@ -1,109 +0,0 @@ -// *********************************************************************** -// Assembly : OpenAuth.Mvc -// Author : yubaolee -// Created : 04-13-2016 -// -// Last Modified By : yubaolee -// Last Modified On : 04-13-2016 -// *********************************************************************** -// -// 版权所有(C) 2015 -// -// 用户分配角色模块 -// *********************************************************************** -function renderLayui() { - layui.use(['layer', 'form'], function () { - var form = layui.form(); - - form.on('checkbox', function (data) { - if (data.elem.checked) { - $.post('/RelevanceManager/Assign', { - type: $("#moduleType").val(), - firstId: $('#firstId').val(), - secIds: data.value - }, function (json) { - json = $.parseJSON(json); - - }); - } - else { - $.post('/RelevanceManager/UnAssign', { - type: $("#moduleType").val(), - firstId: $('#firstId').val(), - secIds: data.value - }, function (json) { - json = $.parseJSON(json); - - }); - } - }); - - form.render(); - }); -} - -var list = function () { - var selectedId = '00000000-0000-0000-0000-000000000000'; //选中的ID - var url = '/RoleManager/LoadForOrgAndUser?userId=' + $("#firstId").val() - + "&key=" + $("#moduleType").val() + "&orgId="; - return { - reload: function (id) { - if (id != undefined) selectedId = id; - $.getJSON(url + selectedId, - function (data) { - var str = ''; - if (data.length > 0) { - $.each(data, - function () { - str += " - - - - - - - - - - - - - - - - - diff --git a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml index 1cf7a8b7..28a69e21 100644 --- a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml @@ -61,8 +61,8 @@
- - + + diff --git a/OpenAuth.Mvc/js/openauth.js b/OpenAuth.Mvc/js/openauth.js index 607301be..6fbb5a98 100644 --- a/OpenAuth.Mvc/js/openauth.js +++ b/OpenAuth.Mvc/js/openauth.js @@ -37,7 +37,7 @@ layui.define(['jquery', 'layer'], function (exports) { layer.confirm('真的删除么', function (index) { $.post(url, { ids: dataids }, function (data) { - if (data.Status) { + if (data.Code == 200) { if (callback != undefined) callback(); } else { layer.msg(data.Message); diff --git a/OpenAuth.Mvc/js/orgs.js b/OpenAuth.Mvc/js/orgs.js index 6e2f7887..64ca4678 100644 --- a/OpenAuth.Mvc/js/orgs.js +++ b/OpenAuth.Mvc/js/orgs.js @@ -75,9 +75,9 @@ layui.config({ }, end: mainList }); - var url = "/OrgManager/AddOrUpdate"; + var url = "/OrgManager/Add"; if (update) { - url = "/OrgManager/AddOrUpdate"; //暂时和添加一个地址 + url = "/OrgManager/Update"; //暂时和添加一个地址 } //提交数据 form.on('submit(formSubmit)', @@ -95,7 +95,8 @@ layui.config({ add: function() { //弹出添加 update = false; show({ - Id: '' + Id: '', + SortNo:1 }); }, update: function(data) { //弹出编辑框