Merge pull request #9379 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '2da02f8fbc188033e600a3e1e3c7e1907c7e0d6a':
  REPORT-74603 嵌入式数据库的限制访问
  REPORT-67316 决策报表-客户模板是绝对布局固定大小的，复制客户模板里的tab到一个新建的绝对布局固定大小frm，保存关闭再打开新建模板，tab下的报表块尺寸变了

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

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.base.TemplateUtils;
 import com.fr.data.core.db.JDBCSecurityChecker;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.JDBCDatabaseConnection;
@@ -195,7 +196,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
             Connection connection = entry.getValue();
             if (connection instanceof JDBCDatabaseConnection) {
                 try {
-                    JDBCSecurityChecker.checkURL(((JDBCDatabaseConnection) connection).getURL());
+                    JDBCSecurityChecker.checkURL(TemplateUtils.render(((JDBCDatabaseConnection) connection).getURL()));
                     JDBCSecurityChecker.checkValidationQuery(((JDBCDatabaseConnection) connection).getDbcpAttr().getValidationQuery());
                 } catch (SQLException e) {
                     throw new SQLException(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Invalid_Config", entry.getKey()) + ", " + e.getMessage(), e.getCause());

designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java

@@ -401,4 +401,22 @@ public class XCreatorUtils {
         }
         return container;
     }
+
+    /**
+     * 循环遍历组件，调整组件间隙
+     * @param creator
+     */
+    //循环遍历布局，按百分比调整子组件大小
+    public static void traverAndAdjust(XCreator creator, double percent) {
+        for (int i = 0; i < creator.getComponentCount(); i++) {
+            Object object = creator.getComponent(i);
+            if (object instanceof XCreator) {
+                XCreator temp = (XCreator) object;
+                temp.adjustCompSize(percent);
+                traverAndAdjust(temp, percent);
+            }
+        }
+
+    }
+
 }

designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java

@@ -472,4 +472,9 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 	public void setShowOuterShadowBorder(boolean showOuterShadowBorder) {
 		this.showOuterShadowBorder = showOuterShadowBorder;
 	}
+
+	@Override
+	public void recalculateChildrenSize() {
+
+	}
 }

designer-form/src/main/java/com/fr/design/mainframe/FormArea.java

@@ -5,6 +5,7 @@ import com.fr.common.inputevent.InputEventBaseOnOS;
 import com.fr.design.designer.beans.events.DesignerEditListener;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWBorderLayout;
 import com.fr.design.designer.creator.XWFitLayout;
@@ -428,7 +429,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         if (root.acceptType(XWFitLayout.class)) {
             XWFitLayout layout = (XWFitLayout) root;
             layout.setContainerPercent(value / DEFAULT_SLIDER);
-            traverAndAdjust(layout, percent);
+            XCreatorUtils.traverAndAdjust(layout, percent);
             layout.adjustCreatorsWhileSlide(percent);
 
             // 拖动滑块，先将内部组件百分比大小计算，再计算容器大小
@@ -464,7 +465,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         if (root.acceptType(XWFitLayout.class)) {
             XWFitLayout layout = (XWFitLayout) root;
             layout.setContainerPercent(1.0);
-            traverAndAdjust(layout, 0.0);
+            XCreatorUtils.traverAndAdjust(layout, 0.0);
             layout.adjustCreatorsWhileSlide(0.0);
             // 拖动滑块，先将内部组件百分比大小计算，再计算容器大小
 
@@ -487,19 +488,6 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         }
     }
 
-    //循环遍历布局，按百分比调整子组件大小
-    private void traverAndAdjust(XCreator creator, double percent) {
-        for (int i = 0; i < creator.getComponentCount(); i++) {
-            Object object = creator.getComponent(i);
-            if (object instanceof XCreator) {
-                XCreator temp = (XCreator) object;
-                temp.adjustCompSize(percent);
-                traverAndAdjust(temp, percent);
-            }
-        }
-
-    }
-
     /**
      * 增加刻度条
      */

designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java

@@ -16,6 +16,7 @@ import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.fun.FormWidgetOptionProvider;
 import com.fr.design.utils.ComponentUtils;
+import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.main.Form;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WTitleLayout;
@@ -291,6 +292,9 @@ public class FormSelectionUtils {
     public static XCreator copyXcreator(Form form, XCreator xCreator) throws CloneNotSupportedException{
         Widget copied = (Widget) xCreator.toData().clone();
         XCreator copiedCreator = XCreatorUtils.createXCreator(copied, xCreator.getSize());
+        //主要用来处理组件间隔和padding，保证界面上展示的组件尺寸是计算过padding和组件间隔的
+        LayoutUtils.layoutContainer(copiedCreator);
+        XCreatorUtils.traverAndAdjust(copiedCreator, 0.0);
         ArrayList<String> nameSpace = new ArrayList<>();
         copyWidgetName(form, nameSpace, copiedCreator);
         return copiedCreator;