Browse Source

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

* commit '83665d169e9db481b00e98ff22b606ee4eabf003':
  REPORT-21689 水印密度最小值限制,根据交互提供的内容补充
persist/11.0
ju.ju 5 years ago
parent
commit
e7365b7b1d
  1. 4
      designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java
  2. 2
      designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

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

@ -102,6 +102,10 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
return lessMinValue;
}
public void resetLessMinValue() {
lessMinValue = false;
}
public void setValue(double value) {
setValue(value, true);
}

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

@ -276,6 +276,7 @@ public class WatermarkPane extends BasicPane {
if (!spinner.isLessMinValue()) {
return;
}
spinner.resetLessMinValue();
createGapDialog(new StringBuilder(messageStr).append(limitMinValue).toString());
}
};
@ -295,6 +296,7 @@ public class WatermarkPane extends BasicPane {
if (!spinner.isLessMinValue()) {
return;
}
spinner.resetLessMinValue();
createGapDialog(new StringBuilder(messageStr).append(limitMinValue).toString());
}
};

Loading…
Cancel
Save