Merge pull request #6018 in DESIGN/design from release/11.0 to feature/x

* commit 'e98af599cd982df89c83545d6397ce71d050cd08':
  REPORT-56481 修正错误
  REPORT-56481 决策报表-模板打开时一直弹出提醒
  Update designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
  Update designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
  REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动

designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java

@@ -60,7 +60,7 @@ public class DesignerPushUpdateManager {
 
     private String getFullLatestVersion() {
         try {
-            String url = CloudCenter.getInstance().acquireUrlByKind("jar10.update");
+            String url = CloudCenter.getInstance().acquireUrlByKind("jar11.update");
             if(StringUtils.isBlank(url)){
                 return StringUtils.EMPTY;
             }

designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@@ -350,7 +350,7 @@ public class UpdateMainDialog extends UIDialog {
         new SwingWorker<JSONObject, Void>() {
             @Override
             protected JSONObject doInBackground() throws Exception {
-                return new JSONObject(HttpToolbox.get(CloudCenter.getInstance().acquireUrlByKind("jar10.update")));
+                return new JSONObject(HttpToolbox.get(CloudCenter.getInstance().acquireUrlByKind("jar11.update")));
             }
 
             @Override

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java

@@ -7,8 +7,6 @@ import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.form.layout.FRBorderLayout;
 import com.fr.general.ComparatorUtils;
 
-
-import javax.swing.JOptionPane;
 import java.awt.BorderLayout;
 import java.awt.Rectangle;
 
@@ -46,18 +44,27 @@ public class FRCardMainBorderLayoutAdapter extends FRBorderLayoutAdapter {
         Rectangle rectangle = creator.getBounds();
         //不能超出控件边界
         if (ComparatorUtils.equals(constraints, BorderLayout.NORTH) || ComparatorUtils.equals(constraints, BorderLayout.SOUTH)) {
-            int containerHeight = container.getHeight();
-            if (rectangle.height > containerHeight) {
-                FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds"));
-                return true;
-            }
+            return isBeyondMinConstraint(rectangle.height, container.getHeight());
         } else if (ComparatorUtils.equals(constraints, BorderLayout.EAST) || ComparatorUtils.equals(constraints, BorderLayout.WEST)) {
-            int containerWidth = container.getWidth();
-            if (rectangle.width > containerWidth) {
-                FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds"));
-                return true;
-            }
+            return isBeyondMinConstraint(rectangle.width, container.getWidth());
         }
         return false;
     }
+
+    /**
+     * 是否超出最小限制
+     *
+     * @param minConstraint 最小限制
+     * @param value 数值
+     * @return 是否超出最小限制
+     */
+    private boolean isBeyondMinConstraint(int minConstraint, int value) {
+        if (minConstraint > value) {
+            FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds"));
+            container.setSize(container.getBackupBound().getSize());
+            return true;
+        } else {
+            return false;
+        }
+    }
 }