Pull request #6528: REPORT-60528 修复之前在弹窗提示tablayout高度有问题的时候，判断处理逻辑不正确的问题

Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0

* commit 'f988f5ab2b622f255b1a0a8d0d4e8cbe478b29ac':
  REPORT-60528 修复之前在弹窗提示tablayout高度有问题的时候，判断处理逻辑不正确的问题

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

@@ -64,21 +64,18 @@ public class FRCardMainBorderLayoutAdapter extends FRBorderLayoutAdapter {
     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) {
+            JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-                // 手动拖动导致变矮的场景
+            if (jt != null && jt.getUndoManager().canUndo()) {
-                container.setSize(container.getBackupBound().getSize());
+                // 自适应布局平分高度导致变矮的场景，优先做撤销
-            } else {
-                // 自适应布局平分高度导致变矮的场景
                 UIUtil.invokeLaterIfNeeded(new Runnable() {
                     @Override
                     public void run() {
-                        JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-                        if (jt != null) {
                         jt.undo();
                     }
-                    }
                 });
-
+            } else if (container.getBackupBound() != null) {
+                // 手动拖动导致变矮的场景
+                container.setSize(container.getBackupBound().getSize());
             }
             return true;
         } else {