From 184bc1462dff8d41c6de5610755f0bf6eb9ec538 Mon Sep 17 00:00:00 2001 From: rinoux Date: Thu, 16 Dec 2021 17:08:23 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"REPORT-64103=20=E6=B8=B8=E6=A0=87?= =?UTF-8?q?=E5=88=86=E9=A1=B5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bd6e6ed7ad8b6989a58fa62bbb136420d71cb1f9. --- .../java/com/fr/design/report/ReportEnginePane.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java b/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java index 5dd21a289..6d1f2ef0a 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java @@ -13,7 +13,6 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; import com.fr.general.SiteCenter; -import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; import com.fr.report.core.ReportUtils; import com.fr.report.stable.LayerReportAttr; @@ -55,7 +54,6 @@ public class ReportEnginePane extends BasicBeanPane { private JLayeredPane engineSettingPane; private UICheckBox clientPaging; private UICheckBox pageQueryBox; - private UICheckBox cursorPage; private JPanel outPagingEngineSelectPane; private JPanel outEngineXSettingPane; private JPanel pageQueryPane; @@ -125,14 +123,6 @@ public class ReportEnginePane extends BasicBeanPane { private void createEngineXSettingPane(){ outEngineXSettingPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine")); outEngineXSettingPane.setBounds(0, 0, 570, 240); - JPanel cursorPagePanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true); - cursorPage = new UICheckBox(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Calculate_Prefer_Cursor_Pagination")); - UILabel tipLabel = new UILabel(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Calculate_Prefer_SQL_Pagination_Tip")); - tipLabel.setForeground(Color.GRAY); - cursorPagePanel.add(cursorPage); - cursorPagePanel.add(tipLabel); - - outEngineXSettingPane.add(cursorPagePanel); } private void createLineEngineSettingPane(){ @@ -252,7 +242,6 @@ public class ReportEnginePane extends BasicBeanPane { engineSettingPane.moveToFront(outEngineXSettingPane); outEngineXSettingPane.setVisible(true); outLineEngineSettingPane.setVisible(false); - cursorPage.setSelected(!ob.isSqlPage()); }else { engineSettingPane.moveToFront(outLineEngineSettingPane); outEngineXSettingPane.setVisible(false); @@ -272,7 +261,6 @@ public class ReportEnginePane extends BasicBeanPane { public LayerReportAttr updateBean() { //这里注意一下怎么更新的,后续可能存在判断为空的调用,从而对老引擎造成影响。 LayerReportAttr attr = new LayerReportAttr(); - attr.setSqlPage(!cursorPage.isSelected()); attr.setPageQuery(pageQueryBox.isSelected()); attr.setCountPerPage(Math.min(500, (countPerPageEditor.getValue()).intValue())); attr.setClientPaging(clientPaging.isSelected());