Browse Source

Merge pull request #1494 in DESIGN/design from ~PENGDA/design:bugfix/10.0 to bugfix/10.0

* commit 'c0f0f90e353b6955294b4777f7532e09006f7a5d':
  REPORT-27985 frm里报表块单元格超链设置缺少选项
bugfix/10.0
pengda 5 years ago
parent
commit
b681f47c47
  1. 2
      designer-form/src/main/java/com/fr/design/mainframe/JForm.java

2
designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@ -811,6 +811,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
* @param index 切换位置 * @param index 切换位置
*/ */
public void tabChanged(int index) { public void tabChanged(int index) {
this.index = index;
if (index == ELEMENTCASE_TAB) { if (index == ELEMENTCASE_TAB) {
formDesign.setReportBlockEditing(true); formDesign.setReportBlockEditing(true);
ecTabAction(); ecTabAction();
@ -818,7 +819,6 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
formDesign.setReportBlockEditing(false); formDesign.setReportBlockEditing(false);
formTabAction(); formTabAction();
} }
this.index = index;
refreshToolArea(); refreshToolArea();
this.cardLayout.show(tabCenterPane, CARDNAME[index]); this.cardLayout.show(tabCenterPane, CARDNAME[index]);
if (elementCaseDesign != null && index == ELEMENTCASE_TAB) { if (elementCaseDesign != null && index == ELEMENTCASE_TAB) {

Loading…
Cancel
Save