Merge pull request #11390 in DESIGN/design from final/10.0 to persist/10.0

* commit 'd75ca7e2c55eaf266d9c36be31cf1df6a4355977':
  REPORT-88307 控件-标签控件-将设计器中的“字体大小”改为“字体” 同步10
  REPORT-87779 FR10决策报表：不同tablayout会存在同名tab
  REPORT-87787 10.0新增启动报错，File not exists:/com/fr/design/images/platform/platform

designer-base/src/main/java/com/fr/design/actions/UpdateAction.java

@@ -185,13 +185,25 @@ public abstract class UpdateAction extends ShortCut implements Action {
 	 * @param resource 图标资源路径
 	 */
 	public void setSmallIcon(String resource) {
+		setSmallIcon(resource, true);
+	}
+
+	/**
+	 * 使用传入资源url的方式设置Icon，会自动设置_normal.svg，然后通过needDisable参数判断是否需要自动设置_disable.svg
+	 * 因为有些地方是不需要设置灰化图标的，所以不存在灰化图标资源，这边如果一并设置，就会报错文件找不到
+	 * @param resource
+	 * @param needDisable
+	 */
+	public void setSmallIcon(String resource, boolean needDisable) {
 		if (StringUtils.equals(resource, StringUtils.EMPTY)) {
 			this.putValue(Action.SMALL_ICON, null);
 			return;
 		}
 		this.putValue(Action.SMALL_ICON, IconUtils.readIcon(resource));
+		if (needDisable) {
 			this.putValue(UpdateAction.DISABLED_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_DISABLED));
 		}
+	}
 
 	public void setSmallIcon(Icon[] smallIcon, boolean white) {
 		this.putValue(Action.SMALL_ICON, smallIcon);

designer-base/src/main/java/com/fr/design/mainframe/platform/ServicePlatformAction.java

@@ -20,7 +20,7 @@ import java.net.URI;
 public class ServicePlatformAction extends UpdateAction {
     public ServicePlatformAction() {
         this.setName(Toolkit.i18nText("Fine-Design_Basic_Service_Platform_Title"));
-        this.setSmallIcon("/com/fr/design/images/platform/platform");
+        this.setSmallIcon("/com/fr/design/images/platform/platform", false);
     }
 
     @Override

designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java

@@ -68,7 +68,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
         int[][] rowCount = {{1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
         UILabel widgetValueLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value"));
         widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
-        UILabel fontLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size"));
+        UILabel fontLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font"));
         fontLabel.setVerticalAlignment(SwingConstants.TOP);
         Component[][] components = new Component[][]{
                 new Component[]{widgetValueLabel, formWidgetValuePane},

designer-form/src/main/java/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java

@@ -44,7 +44,7 @@ public abstract class ButtonGroupDefinePane<T extends ButtonGroup> extends Field
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
                 new Component[]{widgetValueLabel, formWidgetValuePane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")), dictionaryEditor},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font")), fontSizePane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane},
                 new Component[]{buttonGroupDictPane, null}
         };
         double[] rowSize = {p, p, p, p, p, p, p};