Browse Source

Pull request #6245: REPORT-61054 & REPORT-61055

Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0

* commit '304eb116e14d4c078d295dedb561e3cc91fe1dc1':
  REPORT-61055 【主题获取】主题导出插件几个小问题
  REPORT-61054 【主题获取】有主题xml的组件和组件包的预览图提示缺失文字
bugfix/11.0
starryi 3 years ago
parent
commit
6099e93b82
  1. 4
      designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeEditorPane.java
  2. 19
      designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java
  3. 2
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetPopupPreviewPane.java

4
designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeEditorPane.java

@ -267,6 +267,10 @@ public abstract class TemplateThemeEditorPane<T extends TemplateTheme> extends J
return nameTextField.checkValid(); return nameTextField.checkValid();
} }
public String getThemeName() {
return nameTextField.getText();
}
public List<Color> getCurrentColorScheme() { public List<Color> getCurrentColorScheme() {
return colorListPane.update(); return colorListPane.update();
} }

19
designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java

@ -60,6 +60,8 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
private UIButton saveButton = new UIButton(); private UIButton saveButton = new UIButton();
private UIButton saveAsButton = new UIButton(); private UIButton saveAsButton = new UIButton();
private TemplateThemeProfileActionListener actionListener = new TemplateThemeProfileActionAdapter();
public TemplateThemeProfilePane(TemplateThemeConfig<T> config) { public TemplateThemeProfilePane(TemplateThemeConfig<T> config) {
super(); super();
this.config = config; this.config = config;
@ -112,6 +114,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
return; return;
} }
saveButton.setEnabled(valid && isMutable); saveButton.setEnabled(valid && isMutable);
actionListener.onThemeNameChecked(themeEditorPane.getThemeName(), valid);
} }
}); });
@ -138,6 +141,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
if (saveAsButton != null) { if (saveAsButton != null) {
saveAsButton.setEnabled(StringUtils.isNotEmpty(name)); saveAsButton.setEnabled(StringUtils.isNotEmpty(name));
} }
isPopulating = false; isPopulating = false;
} }
@ -330,4 +334,19 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
this.dispose(); this.dispose();
} }
} }
public void addProfileActionListener(TemplateThemeProfileActionListener actionListener) {
if (actionListener != null) {
this.actionListener = actionListener;
}
}
public interface TemplateThemeProfileActionListener {
void onThemeNameChecked(String name, boolean valid);
}
public static class TemplateThemeProfileActionAdapter implements TemplateThemeProfileActionListener {
@Override
public void onThemeNameChecked(String name, boolean valid) { }
}
} }

2
designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetPopupPreviewPane.java

@ -162,7 +162,7 @@ public class OnlineWidgetPopupPreviewPane extends AbstractWidgetPopupPreviewPane
String themeName = widget.getThemeName(); String themeName = widget.getThemeName();
if (StringUtils.isNotEmpty(themeName)) { if (StringUtils.isNotEmpty(themeName)) {
suitableThemeNamePane.setVisible(true); suitableThemeNamePane.setVisible(true);
suitableThemeNameLabel.setText(themeName); suitableThemeNameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_Suitable_Theme_Prefix") + themeName);
} else { } else {
suitableThemeNamePane.setVisible(false); suitableThemeNamePane.setVisible(false);
} }

Loading…
Cancel
Save