Browse Source

Pull request #15937: REPORT-144979 【FR12】多租户环境不能新建模板

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

* commit '2dde7c9fd0b34f9078d2b4f7f7a99b05348841fb':
  REPORT-144979 【FR12】多租户环境不能新建模板
fbp/release
parent
commit
c6faec151a
  1. 6
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

6
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@ -2049,8 +2049,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
themeAttrMark = new TemplateThemeAttrMark(); themeAttrMark = new TemplateThemeAttrMark();
getTarget().addAttrMark(themeAttrMark); getTarget().addAttrMark(themeAttrMark);
} }
themeAttrMark.setName(theme.getName()); if (theme != null) {
themeAttrMark.setDark(theme.isDark()); themeAttrMark.setName(theme.getName());
themeAttrMark.setDark(theme.isDark());
}
} }
public String getTemplateOpenFailedTip() { public String getTemplateOpenFailedTip() {

Loading…
Cancel
Save