Browse Source

Pull request #5687: REPORT-57881 10.0.19一轮冒烟-断网时打开设计器内置帮助文档,日志中没有离线提示

Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0

* commit '9cb7f47c3236019950bc0a2f35e112eab776d2ee':
  REPORT-57881 10.0.19一轮冒烟-断网时打开设计器内置帮助文档,日志中没有离线提示
  CHART-20476 报表块内图表-超链悬浮窗设置项没了
persist/11.0
fanglei 3 years ago
parent
commit
5737bffbd8
  1. 5
      designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java
  2. 11
      designer-base/src/main/java/com/fr/design/login/AbstractDesignerSSO.java

5
designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java

@ -1,5 +1,6 @@
package com.fr.design.actions.help;
import com.fr.design.i18n.Toolkit;
import com.fr.design.login.AbstractDesignerSSO;
import com.fr.design.menu.MenuKeySet;
import com.fr.general.CloudCenter;
@ -52,6 +53,10 @@ public class TutorialAction extends AbstractDesignerSSO {
}
}
public String getOffLineWarnMessage() {
return Toolkit.i18nText("Fine-Design_Offline_Helptutorial_Msg");
}
public static final MenuKeySet HELP_TUTORIAL = new MenuKeySet() {
@Override
public char getMnemonic() {

11
designer-base/src/main/java/com/fr/design/login/AbstractDesignerSSO.java

@ -6,6 +6,9 @@ import com.fr.design.actions.UpdateAction;
import com.fr.design.login.utils.DesignerLoginUtils;
import com.fr.design.os.impl.SupportOSImpl;
import com.fr.design.utils.BrowseUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils;
import java.awt.event.ActionEvent;
import java.util.HashMap;
import java.util.Map;
@ -21,6 +24,10 @@ public abstract class AbstractDesignerSSO extends UpdateAction {
public void actionPerformed(ActionEvent event) {
String url = getJumpUrl();
if (!DesignerLoginUtils.isOnline()) {
String message = getOffLineWarnMessage();
if (StringUtils.isNotEmpty(message)) {
FineLoggerFactory.getLogger().warn(message);
}
BrowseUtils.browser(url);
return;
}
@ -47,4 +54,8 @@ public abstract class AbstractDesignerSSO extends UpdateAction {
}
public abstract String getJumpUrl();
public String getOffLineWarnMessage() {
return StringUtils.EMPTY;
}
}

Loading…
Cancel
Save