Browse Source

Merge pull request #11044 in DESIGN/design from feature/10.0 to feature/big-screen

* commit '622563b2731c4ac3de804fc82beac0bacd2e4d51':
  REPORT-87124 国际化设计器需要对服务平台做下隐藏
  REPORT-87124 国际化设计器需要对服务平台做下隐藏
  REPORT-87124 国际化设计器需要对服务平台做下隐藏
feature/big-screen
superman 2 years ago
parent
commit
ab14e21e90
  1. 12
      designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java
  2. 7
      designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

12
designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java

@ -171,5 +171,17 @@ public enum SupportLocaleImpl implements SupportLocale {
set.add(Locale.TAIWAN); set.add(Locale.TAIWAN);
return set; return set;
} }
},
/**
* 帮助-服务平台只针对中国大陆
*/
SERVICE_PLATFORM {
@Override
public Set<Locale> support() {
Set<Locale> set = new HashSet<>();
set.add(Locale.CHINA);
return set;
}
} }
} }

7
designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@ -562,16 +562,15 @@ public abstract class ToolBarMenuDock {
//远程不使用更新升级,产品演示 //远程不使用更新升级,产品演示
if (WorkContext.getCurrent().isLocal()) { if (WorkContext.getCurrent().isLocal()) {
shortCuts.add(new WebDemoAction()); shortCuts.add(new WebDemoAction());
if (!Locale.getDefault().equals(Locale.JAPAN) && !Locale.getDefault().equals(Locale.JAPANESE)) {
LocaleCenter.buildAction(() -> shortCuts.add(new SoftwareUpdateAction()), SupportLocaleImpl.UPDATE_HELP); LocaleCenter.buildAction(() -> shortCuts.add(new SoftwareUpdateAction()), SupportLocaleImpl.UPDATE_HELP);
} }
}
if (AlphaFineConfigManager.isALPHALicAvailable()) { if (AlphaFineConfigManager.isALPHALicAvailable()) {
shortCuts.add(new AlphaFineAction()); shortCuts.add(new AlphaFineAction());
} }
//服务平台 //服务平台(仅针对中国大陆)
shortCuts.add(new ServicePlatformAction()); LocaleCenter.buildAction(() -> shortCuts.add(new ServicePlatformAction()), SupportLocaleImpl.SERVICE_PLATFORM);
shortCuts.add(SeparatorDef.DEFAULT); shortCuts.add(SeparatorDef.DEFAULT);
if (DesignerEnvManager.getEnvManager().isOpenDebug()) { if (DesignerEnvManager.getEnvManager().isOpenDebug()) {

Loading…
Cancel
Save