Browse Source

Pull request #6120: REPORT-60380 固定行数分页-服务器配置中,每页显示行数无法输入6789

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

* commit '7fe462a7c91c0776157a2d999583214531788cb2':
  REPORT-60380 固定行数分页-服务器配置中,每页显示行数无法输入6789
research/11.0
pengda 3 years ago
parent
commit
145c8465b4
  1. 2
      designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java
  2. 2
      designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java

2
designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java

@ -60,7 +60,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
private UICheckBox isPageFixedRowBox; private UICheckBox isPageFixedRowBox;
private UITextField pageFixedRowCountTextField; private UITextField pageFixedRowCountTextField;
private static final Color TIPS_FONT_COLOR = new Color(0x8f8f92); private static final Color TIPS_FONT_COLOR = new Color(0x8f8f92);
private static final Pattern ROW_COUNT = Pattern.compile("^[1-5][\\d]*$"); private static final Pattern ROW_COUNT = Pattern.compile("^[1-9][\\d]{0,2}$");
//固定行数分页,每页最多500行,最少1行数据 //固定行数分页,每页最多500行,最少1行数据
private static final int MAX_ROW_COUNT = 500; private static final int MAX_ROW_COUNT = 500;

2
designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java

@ -41,7 +41,7 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
private UICheckBox isPageFixedRowBox; private UICheckBox isPageFixedRowBox;
private UITextField pageFixedRowCountTextField; private UITextField pageFixedRowCountTextField;
private static final Color TIPS_FONT_COLOR = new Color(0x8f8f92); private static final Color TIPS_FONT_COLOR = new Color(0x8f8f92);
private static final Pattern ROW_COUNT = Pattern.compile("^[1-5][\\d]*$"); private static final Pattern ROW_COUNT = Pattern.compile("^[1-9][\\d]{0,2}$");
private static final String DEFAULT_ROW_COUNT = "30"; private static final String DEFAULT_ROW_COUNT = "30";
//固定行数分页,每页最多500行,最少1行数据 //固定行数分页,每页最多500行,最少1行数据

Loading…
Cancel
Save