Merge pull request #15184 in DESIGN/design from fbp/master to fbp/release

* commit '51a9b4032060cc10c69412742cd0db8a02952100':
  REPORT-138544 【fr-fbp冒烟】服务器数据集没有数据连接的权限，异常报错不符合预期
  REPORT-138579 fix: ComboBox宽度重复缩放导致布局异常
  REPORT-138579 fix: ComboBox宽度重复缩放导致布局异常
  REPORT-138440  fix: 字体大小调整
  REPORT-138572 【fr-fbp冒烟】【数据源】模板左下角点击加号新建数据集，名称不会和已有的服务器数据集校验

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -1,7 +1,6 @@
 package com.fr.design.data;
 
 import com.fanruan.ComponentUtils;
-import com.fanruan.config.impl.data.TableDataConfigProviderFactory;
 import com.fr.base.StoreProcedureParameter;
 import com.fr.base.TableData;
 import com.fr.concurrent.NamedThreadFactory;
@@ -20,6 +19,7 @@ import com.fr.data.impl.storeproc.StoreProcedureHelper;
 import com.fr.data.operator.DataOperator;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
+import com.fr.design.data.datapane.preview.TableDataBeanHelper;
 import com.fr.design.data.tabledata.wrapper.MultiResultTableDataNameWrapper;
 import com.fr.design.data.tabledata.wrapper.MultiResultTableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.ServerTableDataWrapper;
@@ -316,7 +316,7 @@ public abstract class DesignTableDataManager {
             names.add(entry.getKey());
         }
         //服务器数据集
-        Map<String, TableData> tableDatas = TableDataConfigProviderFactory.getInstance().getTableDatas();
+        Map<String, TableData> tableDatas = TableDataBeanHelper.getServerTableDatas();
         for (Map.Entry<String, TableData> entry : tableDatas.entrySet()) {
             names.add(entry.getKey());
         }

designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java

@@ -198,9 +198,8 @@ public class TableDataBeanHelper {
             tableData.setPageQuerySql(DataEncryptionHelper.decrypt(bean.getPageQuery()));
         }
         Connection connection = connectionMap.get(bean.getDatabase());
-        if (connection != null) {
-            tableData.setDatabase(new NameDatabaseConnection(bean.getDatabase()));
-        } else {
+        tableData.setDatabase(new NameDatabaseConnection(bean.getDatabase()));
+        if (connection == null) {
             FineLoggerFactory.getLogger().info("not find conn by {}", bean.getDatabase());
         }
         String sql = SqlUtils.clearSqlComments(DataEncryptionHelper.decrypt(bean.getQuery()));

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java

@@ -17,6 +17,7 @@ import com.fr.stable.StringUtils;
 
 import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX;
 import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE;
+import static com.fine.theme.utils.FineUIScale.scale;
 
 
 public class MaxMemRowCountPanel extends UIToolbar {
@@ -24,9 +25,9 @@ public class MaxMemRowCountPanel extends UIToolbar {
 	private static final int MAX_IN_MEMORY = 1;
 	private static final String[] CACHE_LIST = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save_All_Records_In_Memory"),
 												com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Mem_Row_Count") };
-	private static final int MAX_WIDTH = getMaxComBoBoxWidth() > 200 ? 350 : 280;
+	private static final int MAX_WIDTH = getMaxWidth();
 	private static final int MAX_COMPONENT_COUNT_OF_MAX_MEMORY = 4;
-	private static int getMaxComBoBoxWidth() {
+	private static int getMaxWidth() {
 		int maxWidth = GraphHelper.getWidth(CACHE_LIST[0]);
 		for (int i = 1; i < CACHE_LIST.length; i++) {
 			int width = GraphHelper.getWidth(CACHE_LIST[i]);
@@ -34,6 +35,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
 				maxWidth = width;
 			}
 		}
+		maxWidth = maxWidth > scale(200) ? scale(350) : scale(280);
 		return maxWidth;
 	}
 

designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java

@@ -162,7 +162,7 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser
         int renderFix = FineUIScale.scale(5);
         int comboHeight = FineUIUtils.getAndScaleInt("ComboBox.comboHeight", 24);
         //renderFix的原因在于：render里，每一个项前面了空了一格，要多几像素
-        return new Dimension(FineUIScale.scale(super.getPreferredSize().width) + renderFix, comboHeight);
+        return new Dimension(super.getPreferredSize().width + renderFix, comboHeight);
     }
 
     public void refreshBoxItems(List list) {

designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrPane.java

@@ -64,7 +64,7 @@ public class CalculateAttrPane extends BasicBeanPane<CalculatorAttrMark> {
 
         JPanel featureFlagPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         ActionLabel featureLabel = new ActionLabel(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Experimental_Feature"));
-        featureLabel.setFont(new Font(null, Font.PLAIN, 10));
+        FineUIStyle.setStyle(featureLabel, FineUIStyle.HYPER_LINK_LABEL);
         featureLabel.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {