From 6d12549c8ca1c72f01ce317342dd0ff2e5a09166 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 6 Sep 2022 10:27:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Utility/ExcelExportForm.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ExcelExportForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ExcelExportForm.js index 55618e382..9c0393278 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ExcelExportForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/ExcelExportForm.js @@ -17,9 +17,21 @@ var bootstrap = function ($, learun) { var columnModel; if (iframeIndex) { var currentWin = top.frames['layui-layer-iframe' + iframeIndex]; + if (currentWin.$('#' + gridId).jfGrid()[0].dfop.rowdatas.length == 0) { + learun.alert.warning("暂无数据！"); + var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引 + parent.layer.close(index); //再执行关闭 + return; + } currentWin.$('#' + gridId).jfGridSet('reloadall'); columnModel = currentWin.$('#' + gridId).jfGridGet('settingInfo').headData; } else { + if (learun.frameTab.currentIframe().$('#' + gridId).jfGrid()[0].dfop.rowdatas.length == 0) { + learun.alert.warning("暂无数据！"); + var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引 + parent.layer.close(index); //再执行关闭 + return; + } learun.frameTab.currentIframe().$('#' + gridId).jfGridSet('reloadall'); columnModel = learun.frameTab.currentIframe().$('#' + gridId).jfGridGet('settingInfo').headData; } From 23486138f960178a2b9f7b0e65f4fb85deb89959 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 6 Sep 2022 11:05:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Web/Views/Login/Default/Index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js index 0d5ebb737..16f9cd334 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js @@ -165,7 +165,7 @@ if (res.data.pwd == true) { window.location.href = "/Home/Index?pwd=true"; } else if (res.data.pwdtip == true) { - window.location.href = "/Home/Index?pwdtip=true"; + window.location.href = "/Home/Index?pwd=true"; } else window.location.href = "/Home/Index";