From f62372fd9be56a77c0db6288847e85dd1c4e795f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Mon, 11 Oct 2021 15:51:17 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-60528=20=E5=86=B3=E7=AD=96=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E7=BB=99=E4=B8=80=E4=B8=AA=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E8=BE=83=E5=B0=8F=E7=9A=84tab=E5=86=85=E6=8B=96=E5=85=A5?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9D=97=EF=BC=8C=E4=BC=9A=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=8F=90=E7=A4=BA=E2=80=9C=E8=B6=85=E5=87=BA?=
 =?UTF-8?q?=E6=88=96=E8=80=85=E5=B0=8F=E4=BA=8Etablayout=E8=BE=B9=E7=95=8C?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=83=BD=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E2=80=9D=EF=BC=9B=E5=AE=A2=E6=88=B7=E6=A8=A1=E6=9D=BF=E7=9A=84?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=8D=E6=96=AD=E8=A7=A6=E5=8F=91=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=97=A0=E6=B3=95=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/FRCardMainBorderLayoutAdapter.java | 49 ++++++++++++++-----
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java
index 9718d4a6f..726c39706 100644
--- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java
@@ -4,11 +4,12 @@ import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
 import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.form.layout.FRBorderLayout;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.general.ComparatorUtils;
 
-
-import javax.swing.JOptionPane;
 import java.awt.BorderLayout;
 import java.awt.Rectangle;
 
@@ -46,18 +47,42 @@ 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"));
+            if (container.getBackupBound() != null) {
+                // 手动拖动导致变矮的场景
+                container.setSize(container.getBackupBound().getSize());
+            } else {
+                // 自适应布局平分高度导致变矮的场景
+                UIUtil.invokeLaterIfNeeded(new Runnable() {
+                    @Override
+                    public void run() {
+                        JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+                        if (jt != null) {
+                            jt.undo();
+                        }
+                    }
+                });
+
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
 }