From e52f941086fe6a1e1bfef7a092bcf20c24fcf598 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Mon, 28 Aug 2017 14:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer/src/com/fr/design/widget/ValueWidgetPane.java       | 5 +++--
 designer/src/com/fr/design/widget/WidgetPane.java            | 4 ++--
 .../src/com/fr/design/widget/ui/DateEditorDefinePane.java    | 1 -
 .../fr/design/widget/ui/designer/DateEditorDefinePane.java   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/designer/src/com/fr/design/widget/ValueWidgetPane.java b/designer/src/com/fr/design/widget/ValueWidgetPane.java
index a588a8151..2205f785d 100644
--- a/designer/src/com/fr/design/widget/ValueWidgetPane.java
+++ b/designer/src/com/fr/design/widget/ValueWidgetPane.java
@@ -26,16 +26,17 @@ public class ValueWidgetPane extends WidgetPane {
 	}
 
 	public JPanel initNorthPane(){
+		JPanel northPane = super.initNorthPane();
 		label = new UILabel("     " + Inter.getLocText(new String[]{"Widget", "Value"})+ ":");
 		label.setVisible(false);
 		widgetValuePane = new JPanel();
 		widgetValuePane.setLayout(FRGUIPaneFactory.createBorderLayout());
 		double p = TableLayout.PREFERRED;
 		double f = TableLayout.FILL;
-		double[] columnSize = {p, p, p, f};
+		double[] columnSize = {p, p, f};
 		double[] rowSize = {p};
 		Component[][] components = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText(new String[]{"FR-Designer_Selection", "FR-Designer_Widget"})), editorTypeComboBox, label,widgetValuePane},
+				new Component[]{northPane, label,widgetValuePane},
 		};
 		JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
 		return jPanel;
diff --git a/designer/src/com/fr/design/widget/WidgetPane.java b/designer/src/com/fr/design/widget/WidgetPane.java
index 5e73ac790..ac7a9ac0e 100644
--- a/designer/src/com/fr/design/widget/WidgetPane.java
+++ b/designer/src/com/fr/design/widget/WidgetPane.java
@@ -32,10 +32,10 @@ import java.util.Vector;
  */
 public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener {
 
-    protected EditorTypeComboBox editorTypeComboBox;
+    private EditorTypeComboBox editorTypeComboBox;
     private CellWidgetCardPane cellEditorCardPane;
     private boolean shouldFireSelectedEvent = true;
-    protected JPanel northPane;
+    private JPanel northPane;
 
     public WidgetPane() {
         this(null);
diff --git a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
index 141675d15..9adb2f14f 100644
--- a/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
+++ b/designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
@@ -129,7 +129,6 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 					currentSamplelabel = timeSampleLabel;
 				}
 				refreshPreviewLabel();
-				CellWidgetPropertyPane.getInstance().update();
 			}
 		};
 		fomatHeadPane.add(fomatHeadGroup, BorderLayout.NORTH);
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
index 90fb8de97..2a99a9965 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
@@ -78,7 +78,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
         };
         double[] rowSize = {p, p, p, p, p, p, p, p, p, p};
         double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 3}, {1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        int[][] rowCount = {{1, 1}, {1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 10);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));