Merge pull request #1163 in DESIGN/design from ~HUGH.C/design:feature/10.0 to feature/10.0

* commit 'd7b8ba9f3993239926e611ce7eb6d232af35e1c1':
  REPORT-21689 水印密度最小值限制，根据交互提供的内容补充

designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java

@@ -39,6 +39,7 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
     private String spinnerName = StringUtils.EMPTY;
     private UIObserverListener uiObserverListener;
     private GlobalNameListener globalNameListener = null;
+    private boolean lessMinValue = false;
 
 
     public UISpinner(double minValue, double maxValue, double dierta) {
@@ -97,6 +98,10 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
         return nextButton;
     }
 
+    public boolean isLessMinValue() {
+        return lessMinValue;
+    }
+
     public void setValue(double value) {
         setValue(value, true);
     }
@@ -113,7 +118,8 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
         if (globalNameListener != null && shouldResponseNameListener()) {
             globalNameListener.setGlobalName(spinnerName);
         }
-        value = value < minValue ? minValue : value;
+        lessMinValue = value < minValue;
+        value = lessMinValue ? minValue : value;
         value = value > maxValue ? maxValue : value;
         if (CommonUtils.equals(value, this.value)) {
             return;
@@ -135,7 +141,8 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
         if (globalNameListener != null && shouldResponseNameListener()) {
             globalNameListener.setGlobalName(spinnerName);
         }
-        value = value < minValue ? minValue : value;
+        lessMinValue = value < minValue;
+        value = lessMinValue ? minValue : value;
         value = value > maxValue ? maxValue : value;
 
         if (CommonUtils.equals(value, this.value)) {

designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

@@ -36,6 +36,7 @@ import java.awt.event.ItemListener;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.FocusAdapter;
 import java.awt.Dialog;
 import java.awt.FlowLayout;
 
@@ -269,14 +270,10 @@ public class WatermarkPane extends BasicPane {
      * @return
      */
     private FocusListener createFocusListener4GapNumberField(final UISpinner spinner, final int limitMinValue, final String messageStr) {
-        return new FocusListener() {
+        return new FocusAdapter() {
-            @Override
-            public void focusGained(FocusEvent e) {
-            }
-
             @Override
             public void focusLost(FocusEvent e) {
-                if (spinner.getValue() >= limitMinValue) {
+                if (!spinner.isLessMinValue()) {
                     return;
                 }
                 createGapDialog(new StringBuilder(messageStr).append(limitMinValue).toString());
@@ -294,8 +291,8 @@ public class WatermarkPane extends BasicPane {
     private MouseListener createMouseListener4GapNextButton(final UISpinner spinner, final int limitMinValue, final String messageStr) {
         MouseAdapter mouseAdapter = new MouseAdapter() {
             @Override
-            public void mousePressed(MouseEvent e) {
+            public void mouseReleased(MouseEvent e) {
-                if (spinner.getValue() >= limitMinValue) {
+                if (!spinner.isLessMinValue()) {
                     return;
                 }
                 createGapDialog(new StringBuilder(messageStr).append(limitMinValue).toString());