Browse Source

REPORT-98536 fvs替换frm-设计器变更

feature/x
Bruce.Deng 1 year ago
parent
commit
acb72723cc
  1. 4
      designer-base/src/main/resources/com/fr/design/images/buttonicon/new_other_normal.svg
  2. 8
      designer-realize/src/main/java/com/fr/start/MainDesigner.java
  3. BIN
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/local_fvs1.png
  4. BIN
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/local_fvs2.png
  5. BIN
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/local_fvs3.png
  6. BIN
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/local_fvs4.png
  7. 160
      designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/template_resource/local_templates.json

4
designer-base/src/main/resources/com/fr/design/images/buttonicon/new_other_normal.svg

@ -0,0 +1,4 @@
<svg width="16" height="17" viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0.5 15.6727V0.672668H11.2731L14.5 4.36054V15.6727H0.5Z" stroke="#333334"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 5.17267H6V7.17267H4V5.17267ZM3 4.17267H4H6H7V5.17267V7.17267V8.17267H6H4H3V7.17267V5.17267V4.17267ZM4 10.1727H6V12.1727H4V10.1727ZM3 9.17267H4H6H7V10.1727V12.1727V13.1727H6H4H3V12.1727V10.1727V9.17267ZM9 6.17267C9 6.72495 9.44772 7.17267 10 7.17267C10.5523 7.17267 11 6.72495 11 6.17267C11 5.62038 10.5523 5.17267 10 5.17267C9.44772 5.17267 9 5.62038 9 6.17267ZM10 4.17267C8.89543 4.17267 8 5.0681 8 6.17267C8 7.27724 8.89543 8.17267 10 8.17267C11.1046 8.17267 12 7.27724 12 6.17267C12 5.0681 11.1046 4.17267 10 4.17267ZM9 12.1727V10.1727H11V12.1727H9ZM8 9.17267H9H11H12V10.1727V12.1727V13.1727H11H9H8V12.1727V10.1727V9.17267Z" fill="#333334"/>
</svg>

After

Width:  |  Height:  |  Size: 885 B

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

@ -213,14 +213,18 @@ 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());
// 决策报表、聚合报表归入其他
MenuDef newOtherFileMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_Other_Template"));
newOtherFileMenuDef.setIconPath("/com/fr/design/images/buttonicon/new_other");
try { try {
if (DesignModuleFactory.getNewFormAction() != null) { if (DesignModuleFactory.getNewFormAction() != null) {
shortCuts.add((ShortCut) DesignModuleFactory.getNewFormAction().newInstance()); newOtherFileMenuDef.addShortCut((ShortCut) DesignModuleFactory.getNewFormAction().newInstance());
} }
} catch (Exception e) { } catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
} }
shortCuts.add(new NewPolyReportAction()); newOtherFileMenuDef.addShortCut(new NewPolyReportAction());
shortCuts.add(newOtherFileMenuDef);
return shortCuts.toArray(new ShortCut[0]); return shortCuts.toArray(new ShortCut[0]);
} }

BIN
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/local_fvs1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 802 KiB

BIN
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/local_fvs2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 KiB

BIN
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/local_fvs3.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 483 KiB

BIN
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/local_fvs4.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 181 KiB

160
designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/template_resource/local_templates.json

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