Browse Source

Merge pull request #619 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0

* commit '3340efa251188cf404bd83bd1e6d0d828c087ca2':
  REPORT-12865 文件控件,ie11下图标显示不出来了
  rt
  REPORT-9679 去除国际化影响,后续feature合进来之后统一定义成常量
final/10.0
zack 6 years ago
parent
commit
584b79b9ef
  1. 2
      designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java
  2. 2
      designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java

2
designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java

@ -129,7 +129,7 @@ public class ReportWebWidgetConstants {
BaseUtils.readIcon("/com/fr/web/images/appendRow.png"), AppendColumnRow.class); BaseUtils.readIcon("/com/fr/web/images/appendRow.png"), AppendColumnRow.class);
public static final WidgetOption DELETECOLUMNROW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Delete_Record"), public static final WidgetOption DELETECOLUMNROW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Delete_Record"),
BaseUtils.readIcon("/com/fr/web/images/deleteRow.png"), DeleteColumnRow.class); BaseUtils.readIcon("/com/fr/web/images/deleteRow.png"), DeleteColumnRow.class);
public static final WidgetOption VERIFY = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Data_Verify"), BaseUtils.readIcon("/com/fr/web/images/verify.gif"), public static final WidgetOption VERIFY = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Data_Verify"), BaseUtils.readIcon("/com/fr/web/images/verify.png"),
Verify.class); Verify.class);
public static final WidgetOption SUBMITFORCIBLY = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Submit_Forcibly"), public static final WidgetOption SUBMITFORCIBLY = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Submit_Forcibly"),
BaseUtils.readIcon("/com/fr/web/images/save2.png"), SubmitForcibly.class); BaseUtils.readIcon("/com/fr/web/images/save2.png"), SubmitForcibly.class);

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

@ -370,7 +370,7 @@ public class ImagePreLoader {
"com/fr/web/images/scale.png", "com/fr/web/images/scale.png",
"com/fr/web/images/appendRow.png", "com/fr/web/images/appendRow.png",
"com/fr/web/images/deleteRow.png", "com/fr/web/images/deleteRow.png",
"com/fr/web/images/verify.gif", "com/fr/web/images/verify.png",
"com/fr/web/images/save2.png", "com/fr/web/images/save2.png",
"com/fr/design/images/m_file/export.png", "com/fr/design/images/m_file/export.png",
"com/fr/web/images/showValue.png", "com/fr/web/images/showValue.png",

Loading…
Cancel
Save