Browse Source

Merge pull request #866 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'a6c51d368c778431c2e61d2e703d3e3868a4445d':
  REPORT-16689 重复与冻结设置初始值大于尾值没有恢复默认初始值
bugfix/10.0
Hades 5 years ago
parent
commit
fae202e2fe
  1. 6
      designer-realize/src/main/java/com/fr/design/report/freeze/RepeatColPane.java
  2. 6
      designer-realize/src/main/java/com/fr/design/report/freeze/RepeatRowPane.java

6
designer-realize/src/main/java/com/fr/design/report/freeze/RepeatColPane.java

@ -21,8 +21,10 @@ public class RepeatColPane extends FreezeAndRepeatPane {
@Override
public void populateBean(FT ob) {
((ColSpinner)start).setValue((ob.getFrom() + 1));
((ColSpinner)end).setValue((ob.getTo() + 1));
if (ob.getFrom() <= ob.getTo()) {
((ColSpinner)start).setValue((ob.getFrom() + 1));
((ColSpinner)end).setValue((ob.getTo() + 1));
}
}
@Override

6
designer-realize/src/main/java/com/fr/design/report/freeze/RepeatRowPane.java

@ -21,8 +21,10 @@ public class RepeatRowPane extends FreezeAndRepeatPane {
@Override
public void populateBean(FT ob) {
((RowSpinner)start).setValue((ob.getFrom() + 1));
((RowSpinner)end).setValue((ob.getTo() + 1));
if (ob.getFrom() <= ob.getTo()) {
((RowSpinner)start).setValue((ob.getFrom() + 1));
((RowSpinner)end).setValue((ob.getTo() + 1));
}
}
@Override

Loading…
Cancel
Save