From 3f952f6a830d2c8335ab48a05671bba28f4a411b Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Fri, 19 Jul 2019 15:26:11 +0800 Subject: [PATCH] =?UTF-8?q?ObjectList=E9=80=89=E4=B8=AD/=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=E5=A2=9E=E5=8A=A0=E9=81=AE=E7=BD=A9?= =?UTF-8?q?=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/basics/domainCommGroupList.jsp | 35 ++++++++++++------- .../views/basics/ipCommonGroupCfgList.jsp | 32 ++++++++++------- .../views/basics/scriberidCommGroupList.jsp | 34 +++++++++++------- .../WEB-INF/views/basics/urlCommGroupList.jsp | 32 ++++++++++------- 4 files changed, 83 insertions(+), 50 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/basics/domainCommGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/domainCommGroupList.jsp index c4bcba168..284a7cd1c 100644 --- a/src/main/webapp/WEB-INF/views/basics/domainCommGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/domainCommGroupList.jsp @@ -103,12 +103,15 @@ top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ if(v=="ok"){ + loading('onloading'); window.location = url+"&ids="+ids+"&groupIds="+groupIds; } },{buttonsFocus:1}); top.$('.jbox-body .jbox-icon').css('top','55px'); }else{ // 未选中任何 批量 + loading('onloading'); + var myData = {}; var groupId = $("#groupId").val(); if($("#intype").val() != null && $("#intype").val() != ""){ @@ -118,11 +121,10 @@ myData["groupId"] = groupId; } - $.ajax({ + myAjax = $.ajax({ type:'post', url:'${ctx}/basics/domain/ajaxCheckIsLastOneCfgBatch', data:myData, - async:false, success:function(data,textStatus){// 处理返回结果 if(data.length > 0 && typeof(data) == 'object'){ canDel = false; @@ -134,17 +136,24 @@ } }); - if(!canDel){ - var shortStr = tipCompileIds.length > 6? tipCompileIds.substr(0,6)+"..." : tipCompileIds ; - tipInfoAdd = $.validator.messages.cancel_config_warn.replace("{0}","'"+shortStr+"'")+"，"; - } - top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ - if(v=="ok"){ - $("#searchForm").attr("action",url); - page(); - } - }); - + // myAjax异步请求完毕后执行 + $.when(myAjax).done(function() { + if(!canDel){ + var shortStr = tipCompileIds.length > 6? tipCompileIds.substr(0,6)+"..." : tipCompileIds ; + tipInfoAdd = $.validator.messages.cancel_config_warn.replace("{0}","'"+shortStr+"'")+"，"; + } + + top.$.jBox.closeTip(); + top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ + + if(v=="ok"){ + $("#searchForm").attr("action",url); + page(); + } + }); + + }); + } } diff --git a/src/main/webapp/WEB-INF/views/basics/ipCommonGroupCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/ipCommonGroupCfgList.jsp index 902c548a9..04de9075a 100644 --- a/src/main/webapp/WEB-INF/views/basics/ipCommonGroupCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/ipCommonGroupCfgList.jsp @@ -104,12 +104,15 @@ top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ if(v=="ok"){ + loading('onloading'); window.location = url+"&ids="+ids+"&groupIds="+groupIds; } },{buttonsFocus:1}); top.$('.jbox-body .jbox-icon').css('top','55px'); }else{ // 未选中任何 批量 + loading('onloading'); + var myData = {}; var groupId = $("#groupId").val(); if($("#intype").val() != null && $("#intype").val() != ""){ @@ -119,11 +122,10 @@ myData["groupId"] = groupId; } - $.ajax({ + myAjax = $.ajax({ type:'post', url:'${ctx}/basics/ip/ajaxCheckIsLastOneCfgBatch', data:myData, - async:false, success:function(data,textStatus){// 处理返回结果 if(data.length > 0 && typeof(data) == 'object'){ canDel = false; @@ -135,16 +137,22 @@ } }); - if(!canDel){ - var shortStr = tipCompileIds.length > 6? tipCompileIds.substr(0,6)+"..." : tipCompileIds ; - tipInfoAdd = $.validator.messages.cancel_config_warn.replace("{0}","'"+shortStr+"'")+"，"; - } - top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ - if(v=="ok"){ - $("#searchForm").attr("action",url); - page(); - } - }); + // myAjax异步请求完毕后执行 + $.when(myAjax).done(function() { + if(!canDel){ + var shortStr = tipCompileIds.length > 6? tipCompileIds.substr(0,6)+"..." : tipCompileIds ; + tipInfoAdd = $.validator.messages.cancel_config_warn.replace("{0}","'"+shortStr+"'")+"，"; + } + + top.$.jBox.closeTip(); + top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ + if(v=="ok"){ + $("#searchForm").attr("action",url); + page(); + } + }); + + }); } } diff --git a/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupList.jsp index 930a4e81e..c37874198 100644 --- a/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupList.jsp @@ -107,12 +107,15 @@ top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ if(v=="ok"){ + loading('onloading'); window.location = url+"&ids="+ids+"&groupIds="+groupIds; } },{buttonsFocus:1}); top.$('.jbox-body .jbox-icon').css('top','55px'); }else{ // 未选中任何 批量 + loading('onloading'); + var myData = {}; var groupId = $("#groupId").val(); if($("#intype").val() != null && $("#intype").val() != ""){ @@ -122,11 +125,10 @@ myData["groupId"] = groupId; } - $.ajax({ + myAjax = $.ajax({ type:'post', url:'${ctx}/basics/scriberId/ajaxCheckIsLastOneCfgBatch', data:myData, - async:false, success:function(data,textStatus){// 处理返回结果 if(data.length > 0 && typeof(data) == 'object'){ canDel = false; @@ -138,17 +140,23 @@ } }); - if(!canDel){ - var shortStr = tipCompileIds.length > 6? tipCompileIds.substr(0,6)+"..." : tipCompileIds ; - tipInfoAdd = $.validator.messages.cancel_config_warn.replace("{0}","'"+shortStr+"'")+"，"; - } - top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ - if(v=="ok"){ - $("#searchForm").attr("action",url); - page(); - } - }); - + // myAjax异步请求完毕后执行 + $.when(myAjax).done(function() { + if(!canDel){ + var shortStr = tipCompileIds.length > 6? tipCompileIds.substr(0,6)+"..." : tipCompileIds ; + tipInfoAdd = $.validator.messages.cancel_config_warn.replace("{0}","'"+shortStr+"'")+"，"; + } + + top.$.jBox.closeTip(); + top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ + if(v=="ok"){ + $("#searchForm").attr("action",url); + page(); + } + }); + + }); + } } diff --git a/src/main/webapp/WEB-INF/views/basics/urlCommGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/urlCommGroupList.jsp index f5412901d..0772f18f6 100644 --- a/src/main/webapp/WEB-INF/views/basics/urlCommGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/urlCommGroupList.jsp @@ -102,12 +102,15 @@ top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ if(v=="ok"){ + loading('onloading'); window.location = url+"&ids="+ids+"&groupIds="+groupIds; } },{buttonsFocus:1}); top.$('.jbox-body .jbox-icon').css('top','55px'); }else{ // 未选中任何 批量 + loading('onloading'); + var myData = {}; var groupId = $("#groupId").val(); if($("#intype").val() != null && $("#intype").val() != ""){ @@ -117,11 +120,10 @@ myData["groupId"] = groupId; } - $.ajax({ + myAjax = $.ajax({ type:'post', url:'${ctx}/basics/url/ajaxCheckIsLastOneCfgBatch', data:myData, - async:false, success:function(data,textStatus){// 处理返回结果 if(data.length > 0 && typeof(data) == 'object'){ canDel = false; @@ -133,16 +135,22 @@ } }); - if(!canDel){ - var shortStr = tipCompileIds.length > 6? tipCompileIds.substr(0,6)+"..." : tipCompileIds ; - tipInfoAdd = $.validator.messages.cancel_config_warn.replace("{0}","'"+shortStr+"'")+"，"; - } - top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ - if(v=="ok"){ - $("#searchForm").attr("action",url); - page(); - } - }); + // myAjax异步请求完毕后执行 + $.when(myAjax).done(function() { + if(!canDel){ + var shortStr = tipCompileIds.length > 6? tipCompileIds.substr(0,6)+"..." : tipCompileIds ; + tipInfoAdd = $.validator.messages.cancel_config_warn.replace("{0}","'"+shortStr+"'")+"，"; + } + + top.$.jBox.closeTip(); + top.$.jBox.confirm(tipInfoAdd+"","",function(v,h,f){ + if(v=="ok"){ + $("#searchForm").attr("action",url); + page(); + } + }); + + }); } }