From 5f6f736441895cd53fe891822f5edb0747deb8e2 Mon Sep 17 00:00:00 2001 From: pengda Date: Mon, 27 Sep 2021 10:18:27 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-58039=20=E6=94=AF=E6=8C=81=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E8=A1=8C=E6=95=B0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/parameter/FormParaTargetMode.java | 6 +- .../cell/settingpane/CellOtherSetPane.java | 68 ++++++++- .../fr/design/webattr/PageToolBarPane.java | 144 ++++++++++++++---- 3 files changed, 184 insertions(+), 34 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java index 72c7b8bfd1..02ea653f2b 100644 --- a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java +++ b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java @@ -1,7 +1,6 @@ package com.fr.design.form.parameter; -import com.fr.base.svg.IconUtils; import com.fr.design.designer.creator.XCreatorUtils; import com.fr.design.designer.properties.WidgetPropertyTable; import com.fr.design.gui.core.WidgetOption; @@ -12,6 +11,7 @@ import com.fr.form.main.parameter.FormParameterUI; import com.fr.form.parameter.FormSubmitButton; +import com.fr.form.ui.PageFixedRowComboBox; import java.util.ArrayList; public class FormParaTargetMode extends FormDesignerModeForSpecial { @@ -28,7 +28,9 @@ public class FormParaTargetMode extends FormDesignerModeForSpecial= '0' && ch <= '9')) { + event.consume(); + } + } + + @Override + public void caretPositionChanged(InputMethodEvent event) { + + } + }; + + KeyListener rowCountKeyListener = new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + String rowCount = pageFixedRowCountTextField.getText(); + if (!isRowCountValid(rowCount)) { + pageFixedRowCountTextField.setText(StringUtils.EMPTY); + } + } + }; + + private boolean isRowCountValid(String rowCount) { + Matcher matcher = ROW_COUNT.matcher(rowCount); + if(matcher.find()){ + int count = Integer.parseInt(matcher.group()); + return count > 0 && count < 501; + } + return false; + } }