diff --git a/OpenAuth.Mvc/BllScripts/categoryManager.js b/OpenAuth.Mvc/BllScripts/categoryManager.js
index 4fef6bba..4cef9b08 100644
--- a/OpenAuth.Mvc/BllScripts/categoryManager.js
+++ b/OpenAuth.Mvc/BllScripts/categoryManager.js
@@ -176,20 +176,10 @@ var editDlg = function () {
//删除
function del() {
- var selected = list.getSelectedProperties("Id");
- if (selected == null) return;
-
- $.post('/CategoryManager/Delete',
- { ids: selected },
- function (data) {
- if (data.Status) {
- list.reload();
- ztree.reload();
- }
- else {
- layer.msg(data.Message);
- }
- }, "json");
+ list.del("Id", "/CategoryManager/Delete", function () {
+ list.reload();
+ ztree.reload();
+ });
}
//自定义的编辑按钮
diff --git a/OpenAuth.Mvc/BllScripts/commonApply.js b/OpenAuth.Mvc/BllScripts/commonApply.js
index 1cbb74cd..02ab1366 100644
--- a/OpenAuth.Mvc/BllScripts/commonApply.js
+++ b/OpenAuth.Mvc/BllScripts/commonApply.js
@@ -150,20 +150,11 @@ var editDlg = function () {
//删除
function del() {
- var selected = list.getSelectedProperties("Id");
- if (selected == null) return;
+ list.del("Id", "/CommonApplies/Delete", function () {
+ list.reload();
+ ztree.reload();
+ });
- $.post('/CommonApplies/Delete',
- { ids: selected },
- function (data) {
- if (data.Status) {
- list.reload();
- ztree.reload();
- }
- else {
- layer.msg(data.Message);
- }
- }, "json");
}
//自定义的编辑按钮
diff --git a/OpenAuth.Mvc/BllScripts/grid.js b/OpenAuth.Mvc/BllScripts/grid.js
index d620a822..a7fdf864 100644
--- a/OpenAuth.Mvc/BllScripts/grid.js
+++ b/OpenAuth.Mvc/BllScripts/grid.js
@@ -12,32 +12,33 @@
// maingrid基类
// ***********************************************************************
-function Grid() { }
+function Grid() {}
-Grid.prototype.selectObjs = function () {
- var ids = this.maingrid.jqGrid('getGridParam', 'selarrrow');
+Grid.prototype.selectObjs = function() {
+ var ids = this.maingrid.jqGrid("getGridParam", "selarrrow");
if (ids.length == 0) {
return null;
}
var ret = new Array();
var maingrid = this.maingrid;
- $(ids).each(function () {
- var obj = maingrid.jqGrid('getRowData', this);
- ret.push(obj);
- });
+ $(ids)
+ .each(function() {
+ var obj = maingrid.jqGrid("getRowData", this);
+ ret.push(obj);
+ });
return ret;
};
//选择多行对象
-Grid.prototype.getSelectedMany = function () {
+Grid.prototype.getSelectedMany = function() {
return this.selectObjs();
};
//选择单行对象
-Grid.prototype.getSelectedObj = function () {
- var row = this.maingrid.jqGrid('getGridParam', 'selrow');
+Grid.prototype.getSelectedObj = function() {
+ var row = this.maingrid.jqGrid("getGridParam", "selrow");
if (row) {
- var ret = this.maingrid.jqGrid('getRowData', row);
+ var ret = this.maingrid.jqGrid("getRowData", row);
return ret;
} else {
return null;
@@ -45,11 +46,33 @@ Grid.prototype.getSelectedObj = function () {
};
//返回选择多行的属性JSON，默认选择id属性，如果选择其他属性，可重写
-Grid.prototype.getSelectedProperties = function (propName) {
+Grid.prototype.getSelectedProperties = function(propName) {
var selected = this.selectObjs();
var result = new Array();
if (selected != null) {
- result = selected.map(function (elem) { return elem[propName]; });
+ result = selected.map(function(elem) { return elem[propName]; });
}
return result;
+};
+
+//删除操作，服务端的接收必须是post且参数为string[] ids
+Grid.prototype.del = function(idname, url, callback) {
+ var selected = this.getSelectedProperties(idname);
+ if (selected == null) return;
+
+ var lid = layer.confirm("确定要删除所选？",
+ null,
+ function() {
+ layer.close(lid);
+ $.post(url,
+ { ids: selected },
+ function(data) {
+ if (data.Status) {
+ callback();
+ } else {
+ layer.msg(data.Message);
+ }
+ },
+ "json");
+ });
};
\ No newline at end of file
diff --git a/OpenAuth.Mvc/BllScripts/moduleElementMan.js b/OpenAuth.Mvc/BllScripts/moduleElementMan.js
index e14fcd0d..6ed3ea30 100644
--- a/OpenAuth.Mvc/BllScripts/moduleElementMan.js
+++ b/OpenAuth.Mvc/BllScripts/moduleElementMan.js
@@ -160,19 +160,12 @@ var editDlg = function () {
//删除
function del() {
+ list.del("Id", "/ModuleElementManager/Del", function () {
+ list.reload();
+ });
+
var selected = list.getSelectedProperties("Id");
if (selected == null) return;
-
- $.post('/ModuleElementManager/Del',
- { ids: selected },
- function (data) {
- if (data.Status) {
- list.reload();
- }
- else {
- layer.msg(data.Message);
- }
- }, "json");
}
//自定义的编辑按钮
diff --git a/OpenAuth.Mvc/BllScripts/modulemanager.js b/OpenAuth.Mvc/BllScripts/modulemanager.js
index 76743bc0..4a30a16e 100644
--- a/OpenAuth.Mvc/BllScripts/modulemanager.js
+++ b/OpenAuth.Mvc/BllScripts/modulemanager.js
@@ -6,7 +6,7 @@
//左边导航
var ztree = function () {
- var url = '/ModuleManager/LoadModuleWithRoot';
+ var url = '/ModuleManager/LoadModule';
var setting = {
view: { selectedMulti: false },
data: {
@@ -123,7 +123,7 @@ var vm = new Vue({
});
//上级机构选择框
-var parent = new ParentTree("/moduleManager/LoadForTree", "ParentName", "ParentId");
+var parent = new ParentTree("/moduleManager/LoadModule", "ParentName", "ParentId");
//添加（编辑）对话框
var editDlg = function () {
@@ -169,19 +169,11 @@ var editDlg = function () {
//删除
function del() {
- var selected = list.getSelectedProperties("Id");
- if (selected == null) return;
+ list.del("Id", "/moduleManager/Delete", function () {
+ list.reload();
+ ztree.reload();
+ });
- $.post('/moduleManager/Delete',
- { ids: selected }, function (data) {
- if (data.Status) {
- list.reload();
- ztree.reload();
- }
- else {
- $(this).alertmsg('warn', data.Message);
- }
- }, "json");
}
//自定义的编辑按钮
diff --git a/OpenAuth.Mvc/BllScripts/orgManager.js b/OpenAuth.Mvc/BllScripts/orgManager.js
index af8bfa26..db81bb27 100644
--- a/OpenAuth.Mvc/BllScripts/orgManager.js
+++ b/OpenAuth.Mvc/BllScripts/orgManager.js
@@ -165,19 +165,10 @@ var editDlg = function () {
//删除
function del() {
- var selected = list.getSelectedProperties("Id");
- if (selected == null) return;
-
- $.post('/OrgManager/DelOrg',
- { ids: selected }, function (data) {
- if (data.Status) {
- list.reload();
- ztree.reload();
- }
- else {
- layer.msg(data.Message);
- }
- }, "json");
+ list.del("Id", "/OrgManager/DelOrg", function () {
+ list.reload();
+ ztree.reload();
+ });
}
//自定义的编辑按钮
diff --git a/OpenAuth.Mvc/BllScripts/resourceManager.js b/OpenAuth.Mvc/BllScripts/resourceManager.js
index fb925b76..59b51283 100644
--- a/OpenAuth.Mvc/BllScripts/resourceManager.js
+++ b/OpenAuth.Mvc/BllScripts/resourceManager.js
@@ -163,19 +163,10 @@ var editDlg = function () {
//删除
function del() {
- var selected = list.getSelectedProperties("Id");
- if (selected == null) return;
-
- $.post('/ResourceManager/Delete',
- { ids: selected }, function (data) {
- if (data.Status) {
- list.reload();
- ztree.reload();
- }
- else {
- $(this).alertmsg('warn', data.Message);
- }
- }, "json");
+ list.del("Id", "/ResourceManager/Delete", function () {
+ list.reload();
+ ztree.reload();
+ });
}
//自定义的编辑按钮
diff --git a/OpenAuth.Mvc/BllScripts/roleManager.js b/OpenAuth.Mvc/BllScripts/roleManager.js
index 9394feb3..b8a7bbeb 100644
--- a/OpenAuth.Mvc/BllScripts/roleManager.js
+++ b/OpenAuth.Mvc/BllScripts/roleManager.js
@@ -155,20 +155,10 @@ var editDlg = function () {
//删除
function del() {
- var selected = list.getSelectedProperties("Id");
- if (selected == null) return;
-
- $.post('/RoleManager/Delete',
- { ids: selected },
- function (data) {
- if (data.Status) {
- list.reload();
- ztree.reload();
- }
- else {
- layer.msg(data.Message);
- }
- }, "json");
+ list.del("Id", "/RoleManager/Delete",function() {
+ list.reload();
+ ztree.reload();
+ });
}
//自定义的编辑按钮
diff --git a/OpenAuth.Mvc/BllScripts/stockManager.js b/OpenAuth.Mvc/BllScripts/stockManager.js
index caac506f..949de2c3 100644
--- a/OpenAuth.Mvc/BllScripts/stockManager.js
+++ b/OpenAuth.Mvc/BllScripts/stockManager.js
@@ -163,20 +163,10 @@ var editDlg = function () {
//删除
function del() {
- var selected = list.getSelectedProperties("Id");
- if (selected == null) return;
-
- $.post('/StockManager/Delete',
- { ids: selected },
- function (data) {
- if (data.Status) {
- list.reload();
- ztree.reload();
- }
- else {
- layer.msg(data.Message);
- }
- }, "json");
+ list.del("Id", "/StockManager/Delete", function () {
+ list.reload();
+ ztree.reload();
+ });
}
//自定义的编辑按钮
diff --git a/OpenAuth.Mvc/BllScripts/usermanager.js b/OpenAuth.Mvc/BllScripts/usermanager.js
index 0e06e9bb..e969b552 100644
--- a/OpenAuth.Mvc/BllScripts/usermanager.js
+++ b/OpenAuth.Mvc/BllScripts/usermanager.js
@@ -166,20 +166,10 @@ var editDlg = function () {
//删除
function del() {
- var selected = list.getSelectedProperties("Id");
- if (selected == null) return;
-
- $.post('/UserManager/Delete',
- { ids: selected },
- function (data) {
- if (data.Status) {
- list.reload();
- ztree.reload();
- }
- else {
- layer.msg(data.Message);
- }
- }, "json");
+ list.del("Id", "/UserManager/Delete", function () {
+ list.reload();
+ ztree.reload();
+ });
}
diff --git a/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js b/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js
index 6da38394..761c418e 100644
--- a/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js
+++ b/OpenAuth.Mvc/BllScripts/workflowSchemaManager.js
@@ -52,19 +52,9 @@ var vm = new Vue({
//删除
function del() {
- var selected = list.getSelectedProperties("Code");
- if (selected == null) return;
-
- $.post('/WorkflowSchemas/Del',
- { codes: selected },
- function (data) {
- if (data.Status) {
- list.reload();
- }
- else {
- layer.msg(data.Message);
- }
- }, "json");
+ list.del("Code", "/WorkflowSchemas/Del", function () {
+ list.reload();
+ });
}
//自定义的编辑按钮
diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
index a31d357b..5cd3aaa6 100644
--- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
@@ -109,15 +109,6 @@ namespace OpenAuth.Mvc.Controllers
return JsonHelper.Instance.Serialize(_app.Load(orgId, page, rows));
}
- ///
- /// 直接加载所有的模块
- ///
- public string LoadForTree()
- {
- var orgs = AuthUtil.GetCurrentUser().ModuleWithChildren;
- return JsonHelper.Instance.Serialize(orgs);
- }
-
///
/// 加载用户模块
///
@@ -140,7 +131,7 @@ namespace OpenAuth.Mvc.Controllers
return JsonHelper.Instance.Serialize(orgs);
}
- public string LoadModuleWithRoot()
+ public string LoadModule()
{
var orgs = AuthUtil.GetCurrentUser().Modules.MapToList();
return JsonHelper.Instance.Serialize(orgs);
diff --git a/OpenAuth.Mvc/Controllers/WorkflowSchemasController.cs b/OpenAuth.Mvc/Controllers/WorkflowSchemasController.cs
index 4c785b7a..2a6d19c0 100644
--- a/OpenAuth.Mvc/Controllers/WorkflowSchemasController.cs
+++ b/OpenAuth.Mvc/Controllers/WorkflowSchemasController.cs
@@ -24,11 +24,11 @@ namespace OpenAuth.Mvc.Controllers
}
[HttpPost]
- public string Del(string[] codes)
+ public string Del(string[] ids)
{
try
{
- _app.Del(codes);
+ _app.Del(ids);
}
catch (Exception e)
{
diff --git a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
index fecf2158..4587749e 100644
--- a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
@@ -6,7 +6,7 @@
diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
index 22c45bec..77aa6843 100644
--- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
@@ -7,7 +7,7 @@
diff --git a/OpenAuth.Mvc/Views/StockManager/Index.cshtml b/OpenAuth.Mvc/Views/StockManager/Index.cshtml
index 5ec78862..d82654ae 100644
--- a/OpenAuth.Mvc/Views/StockManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/StockManager/Index.cshtml
@@ -7,7 +7,7 @@
diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
index 99e72c0c..2f830ee0 100644
--- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
@@ -7,7 +7,7 @@
diff --git a/OpenAuth.Mvc/Views/WorkflowSchemas/Index.cshtml b/OpenAuth.Mvc/Views/WorkflowSchemas/Index.cshtml
index f7a9aa30..e8a4a647 100644
--- a/OpenAuth.Mvc/Views/WorkflowSchemas/Index.cshtml
+++ b/OpenAuth.Mvc/Views/WorkflowSchemas/Index.cshtml
@@ -7,7 +7,7 @@