Browse Source

Pull request #11088: REPORT-87566 【单元格重复冻结】FRM-22.12.26的release分支,FRM设置冻结的窗口确认时无响应且日志有空指针报错

Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0

* commit 'af89224b12edfd54eee6d06a7a8bdc0bd90f7340':
  REPORT-87566 【单元格重复冻结】FRM-22.12.26的release分支,FRM设置冻结的窗口确认时无响应且日志有空指针报错
release/11.0
Destiny.Lin-林锦龙 2 years ago
parent
commit
0c22b7a9bd
  1. 2
      designer-realize/src/main/java/com/fr/design/report/freeze/FormECRepeatAndFreezeSettingPane.java
  2. 2
      designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java

2
designer-realize/src/main/java/com/fr/design/report/freeze/FormECRepeatAndFreezeSettingPane.java

@ -29,7 +29,7 @@ public class FormECRepeatAndFreezeSettingPane extends RepeatAndFreezeSettingPane
}
protected void addWriteFrozen(JPanel freezePanel, JPanel pagePanel) {
super.initWriteFrozenPane();
}
}

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

@ -206,7 +206,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
/**
* 填报冻结Pane
*/
private JPanel initWriteFrozenPane() {
protected JPanel initWriteFrozenPane() {
JPanel writePanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
// 填报冻结
UILabel writeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Frozen") + ":");

Loading…
Cancel
Save