From d940defada0616a088031189a03db737f0fee073 Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 24 Mar 2022 11:29:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E9=A1=B5=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=A4=84=E7=90=86=EF=BC=8C=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AF=B9=E8=AF=9D=E6=A1=86=E4=B8=8D=E8=BF=98?= =?UTF-8?q?=E5=8E=9F=E5=88=86=E9=A1=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/LR_Content/plugin/grid/jfgrid.js | 1 + .../Views/LR_Content/script/lr-excel.js | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js index e78391a95..767cc70ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js @@ -2203,6 +2203,7 @@ dfop.rows = 1000000; data = data || dfop.param || {}; dfop.param = data.param || data; + dfop.running.pageparam.page = 1; _jfgrid.reload($self, dfop); break; case 'refresh': diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js index a617e48ef..d3bd95e31 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-excel.js @@ -61,6 +61,12 @@ callBack: function (id) { return top[id].acceptClick(); }, + end: function () { + if (learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows == 1000000) { + learun.frameTab.currentIframe().$('#' + item.F_GridId)[0].dfop.rows = 30; + learun.frameTab.currentIframe().$('#' + item.F_GridId).jfGridSet('reload'); + } + }, btn: ['导出Excel', '关闭'] }); });