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

* commit '23ed07cf2ffa830c865a783c0546f4cbb8d33d98':
  REPORT-135591 控件显示增强不支持改变按钮组控件的字体 && REPORT-125065 自定义样式和主题预览效果不一致
  alpha搜索增加fvs文件

designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConstants.java

@@ -143,7 +143,7 @@ public class AlphaFineConstants {
 
     public static final String FIRST_PAGE = "-1";
 
-    public static final FileExtension[] FILE_EXTENSIONS = new FileExtension[]{FileExtension.CPT, FileExtension.FRM};
+    public static final FileExtension[] FILE_EXTENSIONS = new FileExtension[]{FileExtension.CPT, FileExtension.FRM, FileExtension.VIS};
 
     public static final int RECOMMEND_MAX_ITEM_NUM = 3;
 

designer-form/src/main/java/com/fr/design/widgettheme/ParaButtonSettingPane.java

@@ -38,6 +38,7 @@ public class ParaButtonSettingPane<T extends Widget> extends ButtonSettingPane<T
         fontColorButton.setColor(textStyle.getFontColor());
         bold.setSelected(textStyle.isBold());
         italic.setSelected(textStyle.isItalic());
+        fontNameSelectBox.setSelectedItem(textStyle.getName());
     }
 
     @Override
@@ -48,6 +49,7 @@ public class ParaButtonSettingPane<T extends Widget> extends ButtonSettingPane<T
         textStyle.setFontColor(fontColorButton.getColor());
         textStyle.setBold(bold.isSelected());
         textStyle.setItalic(italic.isSelected());
+        textStyle.setName((String) fontNameSelectBox.getSelectedItem());
         paraButtonTheme.setTextStyle(textStyle);
     }
 

designer-form/src/main/java/com/fr/design/widgettheme/ParaTreeEditorSettingPane.java

@@ -36,6 +36,7 @@ public class ParaTreeEditorSettingPane<T extends TreeEditor> extends TreeEditorS
         ThemeTextStyle textStyle = widgetTheme.getTextStyle();
         fontSizePane.setValue(textStyle.getFontSize());
         fontColorButton.setColor(textStyle.getFontColor());
+        fontNameSelectBox.setSelectedItem(textStyle.getName());
     }
 
     @Override
@@ -43,6 +44,7 @@ public class ParaTreeEditorSettingPane<T extends TreeEditor> extends TreeEditorS
         ThemeTextStyle textStyle = new ThemeTextStyle();
         textStyle.setFontSize(fontSizePane.getValue());
         textStyle.setFontColor(fontColorButton.getColor());
+        textStyle.setName((String) fontNameSelectBox.getSelectedItem());
         widgetTheme.setTextStyle(textStyle);
     }
 }