Browse Source

Merge pull request #12465 in DESIGN/design from bugfix/11.0 to feature/x

* commit 'c37680070a0fe5f145293e5c3b1bb9f3beef9a8e':
  REPORT-99924 FR10升级到11后,导出图片字体显示问题
  REPORT-100182 单元测试修复-Harrison
feature/x
superman 1 year ago
parent
commit
8b605c399b
  1. 2
      designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TransformResultInfoTest.java
  2. 14
      designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java

2
designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TransformResultInfoTest.java

@ -19,7 +19,7 @@ public class TransformResultInfoTest {
resultInfo2.getTransformLog()); resultInfo2.getTransformLog());
TransformResultInfo resultInfo3 = TransformResultInfo.generateResult(TransformResult.UNSUPPORT, "unsupport"); TransformResultInfo resultInfo3 = TransformResultInfo.generateResult(TransformResult.UNSUPPORT, "unsupport");
Assert.assertEquals("unsupport\n" + Assert.assertEquals("unsupport\n" +
InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Transform_Unsupport_Tip"), InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_X_Unsupport_Tip"),
resultInfo3.getTransformLog()); resultInfo3.getTransformLog());
} }

14
designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java

@ -84,20 +84,20 @@ public class ImageExportPane extends AbstractExportPane {
private void initGlobalSettings() { private void initGlobalSettings() {
globalResolutionBtnS = new UIRadioButton("96dpi", true); globalResolutionBtnS = new UIRadioButton("96dpi");
globalResolutionBtnM = new UIRadioButton("192dpi"); globalResolutionBtnM = new UIRadioButton("192dpi", true);
globalResolutionBtnL = new UIRadioButton("300dpi"); globalResolutionBtnL = new UIRadioButton("300dpi");
wrapButtonsInButtonGroup(globalResolutionBtnS, globalResolutionBtnM, globalResolutionBtnL); wrapButtonsInButtonGroup(globalResolutionBtnS, globalResolutionBtnM, globalResolutionBtnL);
globalFormatJpg = new UIRadioButton("jpg", true); globalFormatJpg = new UIRadioButton("jpg");
globalFormatPng = new UIRadioButton("png"); globalFormatPng = new UIRadioButton("png", true);
wrapButtonsInButtonGroup(globalFormatJpg, globalFormatPng); wrapButtonsInButtonGroup(globalFormatJpg, globalFormatPng);
globalRenderQuality = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Quality_First"), true); globalRenderQuality = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Quality_First"));
globalRenderSpeed = new UIRadioButton(Toolkit.i18nText(("Fine-Design_Image_Export_Speed_Priority"))); globalRenderSpeed = new UIRadioButton(Toolkit.i18nText(("Fine-Design_Image_Export_Speed_Priority")), true);
wrapButtonsInButtonGroup(globalRenderQuality, globalRenderSpeed); wrapButtonsInButtonGroup(globalRenderQuality, globalRenderSpeed);
templateThumbnail = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Thumbnail")); templateThumbnail = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Thumbnail"), true);
templatePaging = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Paging")); templatePaging = new UIRadioButton(Toolkit.i18nText("Fine-Design_Image_Export_Paging"));
wrapButtonsInButtonGroup(templateThumbnail, templatePaging); wrapButtonsInButtonGroup(templateThumbnail, templatePaging);
} }

Loading…
Cancel
Save