Browse Source

Merge pull request #1 in ~NEIL/design from bugfix/10.0 to release/10.0

* commit '2ac41d22f71d91eab15690a4f156a9cea9491409':
  合代码冲突
  REPORT-27985 frm里报表块单元格超链设置缺少选项
  REPORT-26915 疫情大屏模板导出内置模板为空
  fix
  MOBILE-25615 高度重置问题
feature/big-screen
neil 5 years ago
parent
commit
883240b8bd
  1. 5
      designer-base/src/main/java/com/fr/file/RenameExportFILE.java
  2. 2
      designer-form/src/main/java/com/fr/design/mainframe/JForm.java

5
designer-base/src/main/java/com/fr/file/RenameExportFILE.java

@ -99,4 +99,9 @@ public class RenameExportFILE extends AbstractFILE {
} }
return out; return out;
} }
@Override
public void closeTemplate() throws Exception {
//do nothing
}
} }

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

@ -818,6 +818,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();
@ -825,7 +826,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