Merge pull request #6539 in DESIGN/design from feature/10.0 to feature/x

* commit '809ec20b4acb58f62c96c9393df12c5116ecdd5e':
  REPORT-60528 修复之前在弹窗提示tablayout高度有问题的时候，判断处理逻辑不正确的问题
  REPORT-61654 弹窗内容显示不全
  REPORT-61610 fix:回退最开始关于 相同的图表类型，不会新建图表配置界面 的逻辑改动

designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@@ -1,7 +1,7 @@
 com.fr.design.mainframe.check.CheckButton=230*118
 com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=550*185
 com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=490*35
-com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=490*280
+com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=550*280
 com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=450*95
 com.fr.design.version.detail.label=700*30

designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java

@@ -16,14 +16,6 @@ import com.fr.design.gui.chart.ChartEditPaneProvider;
 import com.fr.design.gui.frpane.UITitlePanel;
 import com.fr.design.mainframe.chart.ChartEditPane;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.GeneralContext;
-import com.fr.plugin.context.PluginContext;
-import com.fr.plugin.injectable.PluginModule;
-import com.fr.plugin.manage.PluginFilter;
-import com.fr.plugin.observer.PluginEvent;
-import com.fr.plugin.observer.PluginEventListener;
-import com.fr.plugin.observer.PluginEventType;
-import com.fr.stable.AssistUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -43,12 +35,8 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
 
     protected ChartEditPane chartEditPane;
 
-    //ID一样的话 不用新建chartEditPane
-    private String currentID;
-
     private ChartPropertyPane() {
         initComponent();
-        addListener();
     }
 
     protected void initComponent() {
@@ -56,33 +44,11 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
         this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
     }
 
-    private void addListener() {
-        GeneralContext.listenPlugin(PluginEventType.AfterRun, new PluginEventListener() {
-            @Override
-            public void on(PluginEvent event) {
-                //禁用启用图表插件 这边id置空。这样展示图表配置属性不管和上一个id是否一样 都新建chartEditPane
-                currentID = null;
-            }
-        }, new PluginFilter() {
-
-            @Override
-            public boolean accept(PluginContext context) {
-
-                return context.contain(PluginModule.ExtraChartDesign);
-            }
-        });
-    }
-
     @Override
     public void updateChartEditPane(String plotID) {
-        if (!AssistUtils.equals(currentID, plotID)) {
         chartEditPane = ChartTypeInterfaceManager.getInstance().getChartEditPane(plotID);
         chartEditPane.setContainer(container);
-            currentID = plotID;
         resetChartEditPane();
-        } else {
-            chartEditPane.resetLastChartCollection();
-        }
     }
 
     @Override

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) {
-                // 手动拖动导致变矮的场景
-                container.setSize(container.getBackupBound().getSize());
-            } else {
-                // 自适应布局平分高度导致变矮的场景
+            JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+            if (jt != null && jt.getUndoManager().canUndo()) {
+                // 自适应布局平分高度导致变矮的场景，优先做撤销
                 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 {