Browse Source

Pull request #7194: REPORT-64103 游标分页

Merge in DESIGN/design from ~RINOUX/design:feature/x to feature/x

* commit 'c5ad17adbe6a8628be3a23f79d27586cac4e382b':
  REPORT-64103 游标分页
feature/x
rinoux 3 years ago
parent
commit
689164870d
  1. 14
      designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrPane.java

14
designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrPane.java

@ -39,6 +39,8 @@ public class CalculateAttrPane extends BasicBeanPane<CalculatorAttrMark> {
private UICheckBox multiSourceMode; private UICheckBox multiSourceMode;
private UICheckBox cursorPage;
private UISpinner treeExpandLayer; private UISpinner treeExpandLayer;
private JPanel treeConfigPanel; private JPanel treeConfigPanel;
@ -81,9 +83,17 @@ public class CalculateAttrPane extends BasicBeanPane<CalculatorAttrMark> {
multiSourceMode = new UICheckBox(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Feature_Multi_Source")); multiSourceMode = new UICheckBox(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Feature_Multi_Source"));
multiSourcePanel.add(multiSourceMode); multiSourcePanel.add(multiSourceMode);
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);
// calculateAttrPanel.add(calculatedEndPanel); // calculateAttrPanel.add(calculatedEndPanel);
calculateAttrPanel.add(queryCachePanel); calculateAttrPanel.add(queryCachePanel);
calculateAttrPanel.add(multiSourcePanel); calculateAttrPanel.add(multiSourcePanel);
calculateAttrPanel.add(cursorPagePanel);
treeConfigPanel = FRGUIPaneFactory.createTitledBorderPane( treeConfigPanel = FRGUIPaneFactory.createTitledBorderPane(
@ -144,6 +154,7 @@ public class CalculateAttrPane extends BasicBeanPane<CalculatorAttrMark> {
treeAsyncQuery.setSelected(attrMark.isTreeAsyncQuery()); treeAsyncQuery.setSelected(attrMark.isTreeAsyncQuery());
treeExpandLayer.setValue(attrMark.getTreeExpandLayer()); treeExpandLayer.setValue(attrMark.getTreeExpandLayer());
multiSourceMode.setSelected(attrMark.isUseMultiSourceMode()); multiSourceMode.setSelected(attrMark.isUseMultiSourceMode());
cursorPage.setSelected(!attrMark.isSqlPage());
isEmptyAttr = false; isEmptyAttr = false;
} }
@ -158,7 +169,8 @@ public class CalculateAttrPane extends BasicBeanPane<CalculatorAttrMark> {
return new CalculatorAttrMark(false, queryCache.isSelected()) return new CalculatorAttrMark(false, queryCache.isSelected())
.treeAsyncQuery(treeAsyncQuery.isSelected()) .treeAsyncQuery(treeAsyncQuery.isSelected())
.treeExpandLayer((int) treeExpandLayer.getValue()) .treeExpandLayer((int) treeExpandLayer.getValue())
.useMultiSourceMode(multiSourceMode.isSelected()); .useMultiSourceMode(multiSourceMode.isSelected())
.useSqlPage(!cursorPage.isSelected());
} }
/** /**

Loading…
Cancel
Save