Browse Source

Pull request #7205: Revert "REPORT-64103 游标分页"

Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0

* commit '184bc1462dff8d41c6de5610755f0bf6eb9ec538':
  Revert "REPORT-64103 游标分页"
bugfix/11.0
rinoux 3 years ago
parent
commit
87655021f3
  1. 12
      designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java

12
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.layout.TableLayoutHelper;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.general.SiteCenter; import com.fr.general.SiteCenter;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.report.core.ReportUtils; import com.fr.report.core.ReportUtils;
import com.fr.report.stable.LayerReportAttr; import com.fr.report.stable.LayerReportAttr;
@ -55,7 +54,6 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
private JLayeredPane engineSettingPane; private JLayeredPane engineSettingPane;
private UICheckBox clientPaging; private UICheckBox clientPaging;
private UICheckBox pageQueryBox; private UICheckBox pageQueryBox;
private UICheckBox cursorPage;
private JPanel outPagingEngineSelectPane; private JPanel outPagingEngineSelectPane;
private JPanel outEngineXSettingPane; private JPanel outEngineXSettingPane;
private JPanel pageQueryPane; private JPanel pageQueryPane;
@ -125,14 +123,6 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
private void createEngineXSettingPane(){ private void createEngineXSettingPane(){
outEngineXSettingPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine")); outEngineXSettingPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine"));
outEngineXSettingPane.setBounds(0, 0, 570, 240); 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(){ private void createLineEngineSettingPane(){
@ -252,7 +242,6 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
engineSettingPane.moveToFront(outEngineXSettingPane); engineSettingPane.moveToFront(outEngineXSettingPane);
outEngineXSettingPane.setVisible(true); outEngineXSettingPane.setVisible(true);
outLineEngineSettingPane.setVisible(false); outLineEngineSettingPane.setVisible(false);
cursorPage.setSelected(!ob.isSqlPage());
}else { }else {
engineSettingPane.moveToFront(outLineEngineSettingPane); engineSettingPane.moveToFront(outLineEngineSettingPane);
outEngineXSettingPane.setVisible(false); outEngineXSettingPane.setVisible(false);
@ -272,7 +261,6 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
public LayerReportAttr updateBean() { public LayerReportAttr updateBean() {
//这里注意一下怎么更新的,后续可能存在判断为空的调用,从而对老引擎造成影响。 //这里注意一下怎么更新的,后续可能存在判断为空的调用,从而对老引擎造成影响。
LayerReportAttr attr = new LayerReportAttr(); LayerReportAttr attr = new LayerReportAttr();
attr.setSqlPage(!cursorPage.isSelected());
attr.setPageQuery(pageQueryBox.isSelected()); attr.setPageQuery(pageQueryBox.isSelected());
attr.setCountPerPage(Math.min(500, (countPerPageEditor.getValue()).intValue())); attr.setCountPerPage(Math.min(500, (countPerPageEditor.getValue()).intValue()));
attr.setClientPaging(clientPaging.isSelected()); attr.setClientPaging(clientPaging.isSelected());

Loading…
Cancel
Save