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

* commit '45c04db287dd0a2ca7213b6817d5213dc8895b68':
  REPORT-35544 国际化-切换到韩文，内置服务器启动的时候，显示异常 修改代码
  CHART-9760 修改国际化名称
  CHART-9760 系列名设置优化
  REPORT-31992 日文设计器显示不全的问题 1.通过设置border数据，调整组件间距，使得被挤出界面的文本框正常显示 2.测试了每种语言下的bug所在的界面，发现改动并没有引起其它显示问题
  REPORT-35544 国际化-切换到韩文，内置服务器启动的时候，显示异常
  REPORT-35568 参数面板，添加多个控件，撤销，会出现一个蓝色的框线  撤回另一个任务的代码
  REPORT-35544 国际化-切换到韩文，内置服务器启动的时候，显示异常
  1.原本输出的日志里，WARN标签对应严重，ERROR标签对应警告 2.修改后，ERROR标签对应严重，WARN标签对应警告，并相应的修改其配色和计数 3.添加一些常量，使代码更符合帆软规范
  REPORT-35568 参数面板添加多个控件撤销会出现一个蓝色的框线
  REPORT-35568 参数面板，添加多个控件，撤销，会出现一个蓝色的框线

designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java

@@ -96,4 +96,11 @@ public class ProgressDialog extends UIDialog {
     public void updateLoadingText(String text) {
         this.text.setText(text);
     }
+
+    public void updateLoadingText(String text, FRFont font) {
+        if (font != null) {
+            this.text.setFont(font);
+        }
+        this.text.setText(text);
+    }
 }

designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java

@@ -395,7 +395,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         // 自定义
         custom = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Position_Custom"));
 
-        custom.setBorder(BorderFactory.createEmptyBorder(4, 20, 4, 5));
+        custom.setBorder(BorderFactory.createEmptyBorder(4, 15, 4, 5));
         ButtonGroup group = new ButtonGroup();
         group.setSelected(center.getModel(), true);
         group.add(center);
@@ -405,7 +405,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
 
         // 位置 距左
         final UILabel leftLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Position_Left"));
-        leftLabel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 10));
+        leftLabel.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 10));
         leftLocation = new UINumberField();
         leftLocation.setMinValue(0);
         leftLocation.setPreferredSize(new Dimension(40, 20));

designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java

@@ -38,7 +38,18 @@ public enum SupportLocaleImpl implements SupportLocale {
             set.add(Locale.TAIWAN);
             return set;
         }
-    }
+    },
 
+    /**
+     * 支持韩文
+     */
+    SUPPORT_KOREA {
+        @Override
+        public Set<Locale> support() {
+            Set<Locale> set = new HashSet<Locale>();
+            set.add(Locale.KOREA);
+            return set;
+        }
+    }
 
 }

designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@@ -8,6 +8,7 @@ import com.fr.design.ui.util.UIUtil;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.log.Log4jConfig;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
 import com.fr.third.apache.log4j.Level;
 import com.fr.third.apache.log4j.spi.LoggingEvent;
 import com.fr.third.apache.log4j.spi.ThrowableInformation;
@@ -53,12 +54,14 @@ public class DesignerLogHandler {
 
     private static final int SERVER_GAP_Y = -20;
 
-    private static final String ERROR_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + ":";
+    private static final String ERROR_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":";
 
-    private static final String WARN_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":";
+    private static final String WARN_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + ":";
 
     private static final String NORMAL_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Normal") + ":";
 
+    private static final String ACTION_MAP_KEY = "clear";
+
     public static DesignerLogHandler getInstance() {
 
         return HOLDER.singleton;
@@ -223,14 +226,14 @@ public class DesignerLogHandler {
             InputMap inputMap = resultPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
             inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER), DefaultEditorKit.copyAction);
             inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER), DefaultEditorKit.selectAllAction);
-            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_L, DEFAULT_MODIFIER), "clear");
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_L, DEFAULT_MODIFIER), ACTION_MAP_KEY);
             ActionMap actionMap = resultPane.getActionMap();
-            actionMap.put("clear", new AbstractAction() {
+            actionMap.put(ACTION_MAP_KEY, new AbstractAction() {
 
                 @Override
                 public void actionPerformed(ActionEvent evt) {
 
-                    resultPane.setText("");
+                    resultPane.setText(StringUtils.EMPTY);
                     caption.clearMessage();
                 }
             });
@@ -293,10 +296,10 @@ public class DesignerLogHandler {
 
             SimpleAttributeSet attrSet = new SimpleAttributeSet();
             if (style == DesignerLogger.ERROR_INT) {
-                StyleConstants.setForeground(attrSet, new Color(247, 148, 29));
+                StyleConstants.setForeground(attrSet, Color.RED);
                 StyleConstants.setBold(attrSet, true);
             } else if (style == DesignerLogger.WARN_INT) {
-                StyleConstants.setForeground(attrSet, Color.red);
+                StyleConstants.setForeground(attrSet, new Color(247, 148, 29));
                 StyleConstants.setBold(attrSet, true);
             } else if (style == DesignerLogger.INFO_INT) {
                 StyleConstants.setForeground(attrSet, Color.black);
@@ -330,9 +333,9 @@ public class DesignerLogHandler {
             LogMessageBar.getInstance().setMessage(message);
             if (level == DesignerLogger.INFO_INT && showInfo.isSelected()) {
                 caption.infoAdd();
-            } else if (level == DesignerLogger.ERROR_INT && showError.isSelected()) {
+            } else if (level == DesignerLogger.WARN_INT && showError.isSelected()) {
                 caption.errorAdd();
-            } else if (level == DesignerLogger.WARN_INT && showServer.isSelected()) {
+            } else if (level == DesignerLogger.ERROR_INT && showServer.isSelected()) {
                 caption.serverAdd();
             }
         }
@@ -343,7 +346,7 @@ public class DesignerLogHandler {
             this.copy.setEnabled(true);
             this.clear.setEnabled(true);
 
-            if (ComparatorUtils.equals(this.jTextArea.getText(), "")) {
+            if (ComparatorUtils.equals(this.jTextArea.getText(), StringUtils.EMPTY)) {
                 this.selectAll.setEnabled(false);
                 this.clear.setEnabled(false);
             }
@@ -367,7 +370,7 @@ public class DesignerLogHandler {
                 } else if (ComparatorUtils.equals(evt.getActionCommand(), LogHandlerArea.this.copy.getText())) {
                     LogHandlerArea.this.jTextArea.copy();
                 } else if (ComparatorUtils.equals(evt.getActionCommand(), LogHandlerArea.this.clear.getText())) {
-                    LogHandlerArea.this.jTextArea.setText("");
+                    LogHandlerArea.this.jTextArea.setText(StringUtils.EMPTY);
                     caption.clearMessage();
                 }
             }

designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java

@@ -2,12 +2,18 @@ package com.fr.start.server;
 
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.gui.iprogressbar.ProgressDialog;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.locale.impl.SupportLocaleImpl;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
 import com.fr.event.Null;
+import com.fr.general.FRFont;
+import com.fr.general.locale.LocaleAction;
+import com.fr.general.locale.LocaleCenter;
 
+import javax.swing.plaf.ColorUIResource;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -27,6 +33,11 @@ public class FineEmbedServerMonitor {
     private static final int STEP_HEARTBEAT = 40;
     private static volatile FineEmbedServerMonitor monitor;
     private static ProgressDialog progressBar = DesignerContext.getDesignerFrame().getProgressDialog();
+    //由于默认值的字体不支持韩文，所以要对韩文单独生成字体
+    private FRFont font = null;
+    private static final int FONT_RGB = 333334;
+    private static final int FONT_SIZE = 14;
+    private static final String FONT_NAME = "Dialog";
 
     private FineEmbedServerMonitor() {
     }
@@ -86,8 +97,15 @@ public class FineEmbedServerMonitor {
                 }
                 if (!DesignerContext.getDesignerFrame().getProgressDialog().isVisible()) {
                     DesignerContext.getDesignerFrame().showProgressDialog();
-                    DesignerContext.getDesignerFrame().getProgressDialog()
+                    //如果为韩文则改变字体
-                            .updateLoadingText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server"));
+                    LocaleCenter.buildAction(new LocaleAction() {
+                        @Override
+                        public void execute() {
+                            font = FRFont.getInstance().applySize(FONT_SIZE).applyForeground(new ColorUIResource(FONT_RGB)).applyName(FONT_NAME);
+                        }
+                    }, SupportLocaleImpl.SUPPORT_KOREA);
+                    String text = Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server");
+                    DesignerContext.getDesignerFrame().getProgressDialog().updateLoadingText(text, font);
                 }
                 DesignerContext.getDesignerFrame().updateProgress(getProgress());
             }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java

@@ -24,6 +24,8 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JTable;
 import javax.swing.event.ChangeEvent;
+import java.util.ArrayList;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Container;
@@ -31,8 +33,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 属性表 数据集界面: 系列名 使用字段名.
@@ -129,7 +129,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
      * @return 标题
      */
     public String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Chart_Enable_Field_Name");
+        return Toolkit.i18nText("Fine-Design_Basic_Chart_Field_Name");
     }
 
     /**

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java

@@ -14,15 +14,16 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.extended.chart.UIComboBoxWithNone;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.util.List;
 
 /**
  * 属性表 数据集 系列名使用 系列值  界面.
@@ -38,7 +39,7 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
     private boolean isNeedSummary = true;
 
     public SeriesNameUseFieldValuePane() {
-        seriesName = new UIComboBox();
+        seriesName = new UIComboBoxWithNone();
         seriesValue = new UIComboBox();
         calculateCombox = new CalculateComboBox();
         calculateCombox.reset();
@@ -184,7 +185,7 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
      * @return 界面标题
      */
     public String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Chart_Enable_Field_Value");
+        return Toolkit.i18nText("Fine-Design_Chart_Field_Value");
     }
 
     /**

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java

@@ -5,24 +5,25 @@ import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartdata.MoreNameCDDefinition;
 import com.fr.chart.chartdata.OneValueCDDefinition;
-import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.foldablepane.UIExpandablePane;
-import com.fr.design.gui.frpane.UIComboBoxPane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.design.utils.gui.UIComponentUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import java.util.ArrayList;
 import java.util.List;
 import java.awt.BorderLayout;
+import java.awt.CardLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * 属性表: 柱形, 饼图 数据集界面, "系列名使用"界面.
@@ -30,7 +31,7 @@ import java.awt.Dimension;
  * @author kunsnat E-mail:kunsnat@gmail.com
  * @version 创建时间：2012-12-26 下午03:17:08
  */
-public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
+public class SeriesTypeUseComboxPane extends BasicBeanPane<ChartCollection> {
 
     private SeriesNameUseFieldValuePane nameFieldValuePane;
     private SeriesNameUseFieldNamePane nameFieldNamePane;
@@ -39,50 +40,100 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
 
     private ChartDataPane parent;
     private Plot initplot;
-    private boolean isNeedSummary = true;
+    private boolean isNeedSummary;
+
+    protected UIButtonGroup<Integer> content;
+    protected JPanel cardPane;
 
     public SeriesTypeUseComboxPane(ChartDataPane parent, Plot initplot) {
         this.initplot = initplot;
         this.parent = parent;
-        cards = initPaneList();
         this.isNeedSummary = true;
         initComponents();
     }
 
+    protected void initComponents() {
+        nameFieldValuePane = createValuePane();
+        nameFieldNamePane = createNamePane();
+
+        cardPane = new JPanel(new CardLayout()) {
+            @Override
+            public Dimension getPreferredSize() {
+                if (content.getSelectedIndex() == 0) {
+                    return nameFieldValuePane.getPreferredSize();
+                } else {
+                    return nameFieldNamePane.getPreferredSize();
+                }
+            }
+        };
+        cardPane.add(nameFieldValuePane, nameFieldValuePane.title4PopupWindow());
+        cardPane.add(nameFieldNamePane, nameFieldNamePane.title4PopupWindow());
+
+        content = new UIButtonGroup<>(new String[]{nameFieldValuePane.title4PopupWindow(), nameFieldNamePane.title4PopupWindow()});
+
+        addItemChangeEvent();
+
+        initLayout();
+        content.setSelectedIndex(0);
+    }
+
+    private void addItemChangeEvent() {
+        content.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkCardPane();
+
+            }
+        });
+    }
+
+    protected void checkCardPane() {
+        comboBoxItemStateChanged();
+        CardLayout cl = (CardLayout) cardPane.getLayout();
+        if (content.getSelectedIndex() == 0) {
+            cl.show(cardPane, nameFieldValuePane.title4PopupWindow());
+        } else {
+            cl.show(cardPane, nameFieldNamePane.title4PopupWindow());
+        }
+    }
+
     protected void initLayout() {
         this.setLayout(new BorderLayout(4, LayoutConstants.VGAP_MEDIUM));
         JPanel northPane = new JPanel(new BorderLayout(4, 0));
-        UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"));
+        UILabel label1 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"));
         label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
-        northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null}));
+        JPanel borderLayoutPane = GUICoreUtils.createBorderLayoutPane(new Component[]{content, null, null, label1, null});
+        northPane.add(borderLayoutPane);
         northPane.setBorder(BorderFactory.createEmptyBorder(10, 24, 0, 15));
         cardPane.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
         this.add(northPane, BorderLayout.NORTH);
         this.add(cardPane, BorderLayout.CENTER);
-        dataScreeningPane =  new ChartDataFilterPane(this.initplot, parent);
+        dataScreeningPane = new ChartDataFilterPane(this.initplot, parent);
-        JPanel panel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 290, 24, dataScreeningPane);
+        JPanel panel = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 250, 24, dataScreeningPane);
-        panel.setBorder(BorderFactory.createEmptyBorder(0,5,0,5));
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
-        dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,5));
+        dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         this.add(panel, BorderLayout.SOUTH);
     }
 
-    protected UIComboBox createComboBox() {
+    public Dimension getPreferredSize() {
-        UIComboBox uiComboBox = new UIComboBox();
+        Dimension preferredSize = super.getPreferredSize();
-        UIComponentUtils.setPreferedWidth(uiComboBox, 100);
+        return new Dimension(260, (int) preferredSize.getHeight());
-        return uiComboBox;
     }
+
     /**
      * 检查box 是否使用, hasUse, 表示上层已经使用, 否则, 则此界面都可使用
+     *
      * @param hasUse 是否使用
      */
     public void checkUseBox(boolean hasUse) {
-        jcb.setEnabled(hasUse);
+        content.setEnabled(hasUse);
         nameFieldValuePane.checkUse(hasUse);
         dataScreeningPane.checkBoxUse();
     }
 
     /**
      * 切换 变更数据集时, 刷新Box选中项目
+     *
      * @param list 列表
      */
     public void refreshBoxListWithSelectTableData(List list) {
@@ -93,28 +144,20 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
     /**
      * 清空所有的box设置
      */
-    public void clearAllBoxList(){
+    public void clearAllBoxList() {
         nameFieldValuePane.clearAllBoxList();
         nameFieldNamePane.clearAllBoxList();
     }
 
     /**
      * 界面标题
+     *
      * @return 界面标题
      */
     protected String title4PopupWindow() {
         return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name_From");
     }
 
-    @Override
-    protected List<FurtherBasicBeanPane<? extends ChartCollection>> initPaneList() {
-        nameFieldValuePane = createValuePane();
-        nameFieldNamePane = createNamePane();
-        List<FurtherBasicBeanPane<? extends ChartCollection>> paneList = new ArrayList<FurtherBasicBeanPane<? extends ChartCollection>>();
-        paneList.add(nameFieldValuePane);
-        paneList.add(nameFieldNamePane);
-        return paneList;
-    }
 
     protected SeriesNameUseFieldValuePane createValuePane() {
         return new SeriesNameUseFieldValuePane();
@@ -135,15 +178,17 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
             nameFieldNamePane.populateBean(ob, isNeedSummary);
         }
         dataScreeningPane.populateBean(ob, isNeedSummary);
+        checkCardPane();
     }
 
     /**
      * 重新布局整个面板
+     *
      * @param isNeedSummary 是否需要汇总
      */
     public void relayoutPane(boolean isNeedSummary) {
         this.isNeedSummary = isNeedSummary;
-        if (jcb.getSelectedIndex() == 0) {
+        if (this.getSelectedIndex() == 0) {
             nameFieldValuePane.relayoutPane(this.isNeedSummary);
         } else {
             nameFieldNamePane.relayoutPane(this.isNeedSummary);
@@ -152,9 +197,8 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
     }
 
 
-    @Override
     protected void comboBoxItemStateChanged() {
-        if (jcb.getSelectedIndex() == 0) {
+        if (this.getSelectedIndex() == 0) {
             nameFieldValuePane.relayoutPane(this.isNeedSummary);
         } else {
             nameFieldNamePane.relayoutPane(this.isNeedSummary);
@@ -178,4 +222,21 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
         dataScreeningPane.updateBean(ob);
     }
 
+    /**
+     * 保存数据
+     *
+     * @return 待保存的对象
+     */
+    public ChartCollection updateBean() {
+        return null;
+    }
+
+
+    public int getSelectedIndex() {
+        return content.getSelectedIndex();
+    }
+
+    public void setSelectedIndex(int index) {
+        content.setSelectedIndex(index);
+    }
 }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ThirdTabPane.java

@@ -10,6 +10,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 
 import javax.swing.JPanel;
 import javax.swing.border.Border;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Component;
@@ -20,7 +21,6 @@ import java.awt.Graphics2D;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.List;
 
 
 public abstract class ThirdTabPane<T> extends BasicBeanPane<T>{
@@ -74,16 +74,6 @@ public abstract class ThirdTabPane<T> extends BasicBeanPane<T>{
 		}
 	}
 
-	@Override
-	public void paint(Graphics g) {
-		super.paint(g);
-		if (!paneList.isEmpty()) {
-			Graphics2D g2d = (Graphics2D)g;
-			g2d.setColor(UIConstants.LINE_COLOR);
-			g2d.drawLine(getWidth() - 2, tabPane.getPreferredSize().height, getWidth() - 2, getHeight() - 1);
-		}
-	}
-
 	protected void initLayout() {
 		this.setLayout(new BorderLayout());
 		if (!paneList.isEmpty()) {

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -760,6 +760,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
                 if (centerPane.isUpEditMode()) {
                     if (hasParameterPane()) {
                         parameterPane.populate(u.getApplyTarget());
+                        setAutoHeightForCenterPane();
                         DesignModuleFactory.getFormHierarchyPane().refreshRoot();
                     }
                 } else {
@@ -782,6 +783,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     private void applyAll(WorkBookUndoState u) {
         if (hasParameterPane()) {
             parameterPane.populate(u.getApplyTarget());
+            setAutoHeightForCenterPane();
             DesignModuleFactory.getFormHierarchyPane().refreshRoot();
         }
         //报表主体