From 315bed73112b850788ac137f1e68515e1fbb820a Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Mon, 9 Oct 2017 16:09:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E9=85=8D=E7=BD=AE=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E5=A4=A7=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/quickeditor/CellQuickEditor.java     |  2 +-
 .../chartquick/BasicChartQuickEditor.java           | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/designer/src/com/fr/quickeditor/CellQuickEditor.java b/designer/src/com/fr/quickeditor/CellQuickEditor.java
index 2b5ce14c7..43b291c97 100644
--- a/designer/src/com/fr/quickeditor/CellQuickEditor.java
+++ b/designer/src/com/fr/quickeditor/CellQuickEditor.java
@@ -66,7 +66,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {p, f};
-        double[] rowSize = {p, p};
+        double[] rowSize = {p, f};
         JComponent centerBody = createCenterBody();
         JPanel topContent = initTopContent();
         if (isScrollAll()) {
diff --git a/designer/src/com/fr/quickeditor/chartquick/BasicChartQuickEditor.java b/designer/src/com/fr/quickeditor/chartquick/BasicChartQuickEditor.java
index c0671dfb8..7873f5089 100644
--- a/designer/src/com/fr/quickeditor/chartquick/BasicChartQuickEditor.java
+++ b/designer/src/com/fr/quickeditor/chartquick/BasicChartQuickEditor.java
@@ -11,11 +11,10 @@ import com.fr.quickeditor.CellQuickEditor;
 import com.fr.report.cell.Elem;
 
 import javax.swing.*;
-import java.awt.*;
 
 
 public class BasicChartQuickEditor extends CellQuickEditor {
-    private JPanel content;
+    private BaseChartPropertyPane editingPropertyPane;
 
     public BasicChartQuickEditor() {
         super();
@@ -23,9 +22,9 @@ public class BasicChartQuickEditor extends CellQuickEditor {
 
     @Override
     public JComponent createCenterBody() {
-        content = new JPanel();
-        content.setLayout(new BorderLayout());
-        return content;
+        editingPropertyPane = DesignModuleFactory.getChartPropertyPane();
+        editingPropertyPane.setBorder(BorderFactory.createEmptyBorder());
+        return editingPropertyPane;
     }
 
     @Override
@@ -40,16 +39,12 @@ public class BasicChartQuickEditor extends CellQuickEditor {
 
     @Override
     protected void refreshDetails() {
-        BaseChartPropertyPane editingPropertyPane;
         BaseChartCollection collection;
         Selection selection = tc.getSelection();
         Elem element;
         CellSelection cs = (CellSelection) selection;
         element = tc.getEditingElementCase().getCellElement(cs.getColumn(), cs.getRow());
         collection = (BaseChartCollection) element.getValue();
-        editingPropertyPane = DesignModuleFactory.getChartPropertyPane();
-        editingPropertyPane.setBorder(BorderFactory.createEmptyBorder());
-        content.add(editingPropertyPane, BorderLayout.CENTER);
         editingPropertyPane.populateChartPropertyPane(collection, tc);
     }