Pull request #14999: 无jira任务， fbp/release 合 fbp/feature

Merge in DESIGN/design from fbp/release to fbp/feature

* commit '5490ecead6b64846a32506a3586851ee12d0208a':
  无JIRA任务 改了前端bug，更新一波js
  js高级编辑缩放
  无jira任务,适配驱动改动

designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fanruan.datasource.driver.bean.DriverLoaderBean;
 import com.fine.swing.ui.layout.Layouts;
 import com.fine.theme.icon.LazyIcon;
 import com.fine.theme.utils.FineUIUtils;
@@ -361,7 +362,7 @@ public class JDBCDefPane extends JPanel {
     private void initMap() {
         Map<String, DriverLoader> driverLoaders = null;
         try {
-            driverLoaders = ConnectionRepository.getInstance().getDriverLoaders();
+            driverLoaders = toDriverLoaders(ConnectionRepository.getInstance().getDriverLoaders());
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
             driverLoaders = new HashMap<>();
@@ -370,6 +371,24 @@ public class JDBCDefPane extends JPanel {
         nameAndRepresent = getDriverLoaderAndRepresent(driverLoaders);
     }
 
+    private Map<String, DriverLoader> toDriverLoaders(Map<String, DriverLoaderBean> driverLoaders) {
+        Map<String, DriverLoader> map = new HashMap<>();
+        for (Map.Entry<String, DriverLoaderBean> entry : driverLoaders.entrySet()) {
+            map.put(entry.getKey(), createDriverLoader(entry.getValue()));
+        }
+        return map;
+    }
+
+    private DriverLoader createDriverLoader(DriverLoaderBean value) {
+        DriverLoader driverLoader = new DriverLoader();
+        driverLoader.setName(value.getName());
+        driverLoader.setDriverClass(value.getDriverClass());
+        driverLoader.setDriverJarFiles(value.getDriverJarFiles());
+        driverLoader.setLoadingStrategy(value.getLoadingStrategy());
+        driverLoader.setDriverList(value.getDriverList());
+        return driverLoader;
+    }
+
     private HashBiMap<String, String> getDriverLoaderAndRepresent(Map<String, DriverLoader> driverLoaders) {
         HashBiMap<String, String> driverHashBiMap = HashBiMap.create();
         if (WorkContext.getCurrent().isWarDeploy()) {

designer-base/src/main/java/com/fr/design/javascript/JSContentWithDescriptionPane.java

@@ -762,7 +762,7 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
     private JPanel createTipsPane() {
         JPanel tipsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         tipsPane.setLayout(new BorderLayout(4, 4));
-        tipsPane.setBorder(BorderFactory.createEmptyBorder(30, 2, 0, 0));
+        tipsPane.setBorder(new ScaledEmptyBorder(30, 2, 0, 0));
         JPanel searchPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         searchPane.setLayout(new BorderLayout(4, 4));
         keyWordTextField.setPlaceholder(Toolkit.i18nText("Fine-Design_Search_Interface"));

designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java

@@ -30,6 +30,7 @@ import java.util.List;
 
 import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.theme.utils.FineUIScale.scale;
 
 public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
     private static final int BOTTOM_BORDER = 12;
@@ -73,7 +74,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
                 cell(FineUIUtils.wrapComponentWithTitle(importedJsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))).weight(0.5),
                 cell(FineUIUtils.wrapComponentWithTitle(parameterPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))).weight(0.5)
         ).getComponent());
-        topPane.setPreferredSize(new Dimension(super.getPreferredSize().width, 150));
+        topPane.setPreferredSize(new Dimension(super.getPreferredSize().width, scale(150)));
 
         this.setLayout(new BorderLayout());
         this.add(topPane, BorderLayout.NORTH);