Browse Source

Pull request #12119: REPORT-95494 frm停售-设计器变更

Merge in DESIGN/design from ~DESTINY.LIN/design:feature/x to feature/x

* commit '701aa6cbd71efdd0d9374c0def9b923d4bbcdc24':
  REPORT-95494 frm停售-设计器变更 过一下规范
  REPORT-95494 frm停售-设计器变更 过一下规范
  REPORT-95494 frm停售-设计器变更 过一下规范
  REPORT-95494 frm停售-设计器变更
feature/x
Destiny.Lin-林锦龙 2 years ago
parent
commit
40101c9ca4
  1. 3
      designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java
  2. 2
      designer-realize/src/main/java/com/fr/start/MainDesigner.java

3
designer-base/src/main/java/com/fr/design/mainframe/NorthRegionContainerPane.java

@ -157,7 +157,8 @@ public class NorthRegionContainerPane extends JPanel {
if (!DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) { if (!DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
ad.createAlphaFinePane().setVisible(false); ad.createAlphaFinePane().setVisible(false);
} }
northEastPane.add(ad.createGuideEntryPane()); /// 新手引导功能,暂时屏蔽
// northEastPane.add(ad.createGuideEntryPane());
northEastPane.add(ad.createNotificationCenterPane()); northEastPane.add(ad.createNotificationCenterPane());
OSSupportCenter.buildAction(new OSBasedAction() { OSSupportCenter.buildAction(new OSBasedAction() {

2
designer-realize/src/main/java/com/fr/start/MainDesigner.java

@ -213,7 +213,6 @@ public class MainDesigner extends BaseDesigner {
ArrayList<ShortCut> shortCuts = new ArrayList<ShortCut>(); ArrayList<ShortCut> shortCuts = new ArrayList<ShortCut>();
// shortCuts.add(new NewWorkBookXAction()); // shortCuts.add(new NewWorkBookXAction());
shortCuts.add(new NewWorkBookAction()); shortCuts.add(new NewWorkBookAction());
shortCuts.add(new NewPolyReportAction());
try { try {
if (DesignModuleFactory.getNewFormAction() != null) { if (DesignModuleFactory.getNewFormAction() != null) {
shortCuts.add((ShortCut) DesignModuleFactory.getNewFormAction().newInstance()); shortCuts.add((ShortCut) DesignModuleFactory.getNewFormAction().newInstance());
@ -221,6 +220,7 @@ public class MainDesigner extends BaseDesigner {
} catch (Exception e) { } catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
} }
shortCuts.add(new NewPolyReportAction());
return shortCuts.toArray(new ShortCut[0]); return shortCuts.toArray(new ShortCut[0]);
} }

Loading…
Cancel
Save