Browse Source

Merge remote-tracking branch 'origin/final/10.0' into final/10.0

final/10.0
pengda 4 years ago
parent
commit
38c22d8d66
  1. 8
      designer-base/src/main/java/com/fr/design/actions/community/TemplateStoreAction.java
  2. 2
      designer-base/src/main/resources/com/fr/design/login/login.js

8
designer-base/src/main/java/com/fr/design/actions/community/TemplateStoreAction.java

@ -2,6 +2,7 @@ package com.fr.design.actions.community;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.login.AbstractDesignerSSO;
import com.fr.design.mainframe.share.collect.ComponentCollector; import com.fr.design.mainframe.share.collect.ComponentCollector;
import com.fr.design.menu.MenuKeySet; import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.BrowseUtils; import com.fr.design.utils.BrowseUtils;
@ -13,7 +14,7 @@ import java.awt.event.ActionEvent;
/** /**
* created by Harrison on 2020/03/24 * created by Harrison on 2020/03/24
**/ **/
public class TemplateStoreAction extends UpdateAction { public class TemplateStoreAction extends AbstractDesignerSSO {
public TemplateStoreAction() { public TemplateStoreAction() {
@ -44,9 +45,8 @@ public class TemplateStoreAction extends UpdateAction {
}; };
@Override @Override
public void actionPerformed(ActionEvent e) { public String getJumpUrl() {
ComponentCollector.getInstance().collectTepMenuEnterClick(); ComponentCollector.getInstance().collectTepMenuEnterClick();
String url = CloudCenter.getInstance().acquireUrlByKind("design.market.template", "https://market.fanruan.com/template"); return CloudCenter.getInstance().acquireUrlByKind("design.market.template", "https://market.fanruan.com/template");
BrowseUtils.browser(url);
} }
} }

2
designer-base/src/main/resources/com/fr/design/login/login.js

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save