Browse Source

Merge pull request #11047 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '75685d3a8eef3baf6336a22ead8522363d71d4b3':
  REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
bugfix/11.0
superman 2 years ago
parent
commit
abc2d3d1f9
  1. 3
      designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java

3
designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java

@ -496,7 +496,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
this.repeatTitleRowPane.populateBean(defaultFT); this.repeatTitleRowPane.populateBean(defaultFT);
this.repeatTitleRowPane.setEnabled(false); this.repeatTitleRowPane.setEnabled(false);
usePageHeadFrozenRCheckBox.setEnabled(false); usePageHeadFrozenRCheckBox.setEnabled(false);
usePageFootFrozenRCheckBox.setEnabled(false);
} else { } else {
this.repeatTitleRowPane.populateBean(ft); this.repeatTitleRowPane.populateBean(ft);
useRepeatTitleRCheckBox.setSelected(true); useRepeatTitleRCheckBox.setSelected(true);
@ -507,6 +506,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
this.repeatFinisRowPane.populateBean(defaultFT); this.repeatFinisRowPane.populateBean(defaultFT);
this.repeatFinisRowPane.setEnabled(false); this.repeatFinisRowPane.setEnabled(false);
useRepeatFinisRCheckBox.setSelected(false); useRepeatFinisRCheckBox.setSelected(false);
usePageFootFrozenRCheckBox.setEnabled(false);
} else { } else {
this.repeatFinisRowPane.populateBean(ft); this.repeatFinisRowPane.populateBean(ft);
useRepeatFinisRCheckBox.setSelected(true); useRepeatFinisRCheckBox.setSelected(true);
@ -523,7 +523,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
this.repeatTitleColPane.populateBean(defaultFT); this.repeatTitleColPane.populateBean(defaultFT);
this.repeatTitleColPane.setEnabled(false); this.repeatTitleColPane.setEnabled(false);
usePageHeadFrozenCCheckBox.setEnabled(false); usePageHeadFrozenCCheckBox.setEnabled(false);
usePageFootFrozenCCheckBox.setEnabled(false);
} else { } else {
this.repeatTitleColPane.populateBean(ft); this.repeatTitleColPane.populateBean(ft);
useRepeatTitleCCheckBox.setSelected(true); useRepeatTitleCCheckBox.setSelected(true);

Loading…
Cancel
Save