Merge pull request #1386 in BA/design from ~KERRY/design:release/9.0 to release/9.0

* commit 'c01c548754352517470949b5aaa5255752ee4b76':
  REPORT-5209 9.0控件属性面板交互问题

designer/src/com/fr/design/widget/CellWidgetCardPane.java

@@ -2,7 +2,7 @@ package com.fr.design.widget;
 
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DataCreatorUI;
-import com.fr.design.designer.IntervalConstants;
+import com.fr.design.dialog.AttrScrollPane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.foldablepane.UIExpandablePane;
@@ -51,38 +51,24 @@ public class CellWidgetCardPane extends BasicPane {
 
         this.removeAll();
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        final JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-
-        BasicScrollPane basicScrollPane = new BasicScrollPane() {
-            @Override
-            protected JPanel createContentPane() {
-                return jPanel;
-            }
-
-            @Override
-            public void populateBean(Object ob) {
-
-            }
-
-            @Override
-            protected String title4PopupWindow() {
-                return null;
-            }
-        };
-        this.add(basicScrollPane, BorderLayout.CENTER);
-
         //k
         tabbedPane = new CardLayout();
         center = new JPanel(tabbedPane);
-        jPanel.add(center, BorderLayout.CENTER);
+        this.add(center, BorderLayout.CENTER);
-        jPanel.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L6, 0, 0));
         attriTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         eventTabPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        eventTabPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
         initPaneList();
         eventPane = initWidgetEventPane(pane);
         eventTabPane.add(eventPane, BorderLayout.CENTER);
         //k
-        center.add(attriTabPane, Inter.getLocText("FR-Designer_Attribute"));
+        BasicScrollPane basicScrollPane = new AttrScrollPane() {
+            @Override
+            protected JPanel createContentPane() {
+                return attriTabPane;
+            }
+        };
+        center.add(basicScrollPane, Inter.getLocText("FR-Designer_Attribute"));
         center.add(eventTabPane, Inter.getLocText("FR-Designer_Event"));
         final String[] tabTitles = new String[]{Inter.getLocText("FR-Designer_Attribute"), Inter.getLocText("FR-Designer_Event")};
 
@@ -100,7 +86,8 @@ public class CellWidgetCardPane extends BasicPane {
 
         UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Basic"), 280, 24, widgetPropertyPane);
 
-        attriTabPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+
+        attriTabPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10));
         attriTabPane.add(uiExpandablePane, BorderLayout.NORTH);
 
         attriCardPane = FRGUIPaneFactory.createCardLayout_S_Pane();

designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java

@@ -58,10 +58,17 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 
 		double f = TableLayout.FILL;
 		double p = TableLayout.PREFERRED;
+		UILabel formatLabel = new UILabel(Inter.getLocText("FR-Engine_Format"));
+		formatLabel.setVerticalAlignment(SwingConstants.TOP);
+		UILabel startDateLabel = new UILabel(Inter.getLocText("FS_Start_Date"));
+		startDateLabel.setVerticalAlignment(SwingConstants.TOP);
+		UILabel endDateLabel = new UILabel(Inter.getLocText("FS_End_Date"));
+		endDateLabel.setVerticalAlignment(SwingConstants.TOP);
+
 		Component[][] components = new Component[][]{
-				new Component[]{new UILabel(Inter.getLocText("FR-Engine_Format")), formatHead},
+				new Component[]{formatLabel, formatHead},
-				new Component[]{new UILabel(Inter.getLocText("FS_Start_Date")), startDv},
+				new Component[]{startDateLabel, startDv},
-				new Component[]{new UILabel(Inter.getLocText("FS_End_Date")), endDv},
+				new Component[]{endDateLabel, endDv},
 				new Component[]{waterMarkDictPane, null},
 				new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type")), returnTypeComboBox }
 		};

designer_base/src/com/fr/design/dialog/AttrScrollPane.java

@@ -0,0 +1,30 @@
+package com.fr.design.dialog;
+
+import javax.swing.JPanel;
+
+/**
+ * Created by kerry on 2017/10/25.
+ */
+public abstract class AttrScrollPane extends BasicScrollPane {
+    private static final int OVER_WIDTH = 10;
+
+    @Override
+    public void populateBean(Object ob) {
+
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+
+    @Override
+    protected int getOverWidth() {
+        return OVER_WIDTH;
+    }
+
+    @Override
+    protected boolean hideBarWidth() {
+        return true;
+    }
+}

designer_base/src/com/fr/design/dialog/BasicScrollPane.java

@@ -171,14 +171,23 @@ public abstract class BasicScrollPane<T> extends BasicBeanPane<T>{
 	protected void setLeftContentPaneBounds(Container parent, UIScrollBar scrollBar, int beginY, int maxheight) {
         int width = parent.getWidth();
         int height = parent.getHeight();
-        if (leftcontentPane.getPreferredSize().height > maxheight) {
+        if (leftcontentPane.getPreferredSize().height > maxheight && scrollBar.isVisible()) {
-            leftcontentPane.setBounds(0, -beginY, width - scrollBar.getWidth() - DET_WIDTH_OVER_HEIGHT, height + beginY);
+            leftcontentPane.setBounds(0, -beginY, width - scrollBar.getWidth() + getOverWidth() - DET_WIDTH_OVER_HEIGHT, height + beginY);
             scrollBar.setBounds(width - scrollBar.getWidth() - 1, 0, scrollBar.getWidth(), height);
         } else {
-            leftcontentPane.setBounds(0, 0, width - DET_WIDTH, height);
+			int hideBarWidth = hideBarWidth() ? scrollBar.getWidth() : 0;
+			leftcontentPane.setBounds(0, 0, width - DET_WIDTH + hideBarWidth, height);
         }
     }
 
+    protected int getOverWidth(){
+		return 0;
+	}
+
+	protected boolean hideBarWidth(){
+    	return false;
+	}
+
     protected boolean isShowScrollBar() {
         return true;
     }

designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe.widget.ui;
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.*;
+import com.fr.design.dialog.AttrScrollPane;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
@@ -112,26 +113,16 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         XCreator innerCreator = getXCreatorDedicated();
 
         final JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        BasicScrollPane basicScrollPane = new BasicScrollPane() {
+        BasicScrollPane basicScrollPane = new AttrScrollPane() {
             @Override
             protected JPanel createContentPane() {
                 return jPanel;
             }
-
-            @Override
-            public void populateBean(Object ob) {
-
-            }
-
-            @Override
-            protected String title4PopupWindow() {
-                return null;
-            }
         };
         this.add(basicScrollPane, BorderLayout.CENTER);
         attriCardPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         jPanel.add(attriCardPane, BorderLayout.CENTER);
-        jPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+        jPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
 
         final boolean isExtraWidget = FormWidgetDefinePaneFactoryBase.isExtraXWidget(innerCreator.toData());
         this.listener = new AttributeChangeListener() {

designer_form/src/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java

@@ -15,6 +15,7 @@ import com.fr.general.Inter;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 import java.awt.Component;
 
 public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
@@ -33,13 +34,15 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
 		text = new UITextField();
 		fontSizePane = new FontSizeComboPane();
 		labelNameTextField = new UITextField();
+		UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
+		widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
 		formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
 		double f = TableLayout.FILL;
 		double p = TableLayout.PREFERRED;
 		Component[][] components = new Component[][]{
 				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
 				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Text")),  text },
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")),  formWidgetValuePane },
+				new Component[]{widgetValueLabel,  formWidgetValuePane },
 				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), fontSizePane},
 		};
 		double[] rowSize = {p, p, p, p, p, p};

designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

@@ -56,6 +56,14 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
     @Override
     protected JPanel setFirstContentPane() {
         waterMarkDictPane = new WaterMarkDictPane();
+        UILabel formatLabel = new UILabel(Inter.getLocText("FR-Engine_Format"));
+        formatLabel.setVerticalAlignment(SwingConstants.TOP);
+        UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
+        widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
+        UILabel startDateLabel = new UILabel(Inter.getLocText("FS_Start_Date"));
+        startDateLabel.setVerticalAlignment(SwingConstants.TOP);
+        UILabel endDateLabel = new UILabel(Inter.getLocText("FS_End_Date"));
+        endDateLabel.setVerticalAlignment(SwingConstants.TOP);
         formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
         returnTypeComboBox = new UIButtonGroup<>(new String[] {Inter.getLocText("Date") ,  Inter.getLocText("String")});
         JPanel formatHead =  createFormatHead();
@@ -65,10 +73,10 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")), formWidgetValuePane},
+                new Component[]{widgetValueLabel, formWidgetValuePane},
-                new Component[]{new UILabel(Inter.getLocText("FR-Engine_Format")), formatHead},
+                new Component[]{formatLabel, formatHead},
-                new Component[]{new UILabel(Inter.getLocText("FS_Start_Date")), startDv},
+                new Component[]{startDateLabel, startDv},
-                new Component[]{new UILabel(Inter.getLocText("FS_End_Date")), endDv},
+                new Component[]{endDateLabel, endDv},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), waterMarkDictPane},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), fontSizePane},
                 new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type")), returnTypeComboBox}

designer_form/src/com/fr/design/widget/ui/designer/DirectWriteEditorDefinePane.java

@@ -28,6 +28,8 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 	@Override
 	protected JPanel setFirstContentPane() {
 		JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+		UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
+		widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
 		formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
 		Component[] removeRepeatPane = new Component[]{createRepeatCheckBox(), null};
 		Component[] dicPane = createDictPane();
@@ -36,7 +38,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 		double p = TableLayout.PREFERRED;
 		Component[][] components = new Component[][]{
 				new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
-				new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")),  formWidgetValuePane },
+				new Component[]{widgetValueLabel,  formWidgetValuePane },
 				dicPane,
 				removeRepeatPane,
 				waterMarkComponent,

designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java

@@ -62,10 +62,12 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
         double[] rowSize = {p, p, p, p, p, p, p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
+        widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
         UILabel fontLabel = new UILabel(Inter.getLocText("FR-Designer_Font-Size"));
         fontLabel.setVerticalAlignment(SwingConstants.TOP);
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")), formWidgetValuePane},
+                new Component[]{widgetValueLabel, formWidgetValuePane},
                 new Component[]{isStyleAlignmentWrapText, null},
                 new Component[]{isPageSetupVertically, null},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Display_Position")), hAlignmentPane},

designer_form/src/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java

@@ -38,12 +38,14 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
     protected JPanel setFirstContentPane() {
         // richer:数字的允许直接编辑没有意义
         waterMarkDictPane = new WaterMarkDictPane();
+        UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
+        widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
         formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")),  formWidgetValuePane},
+                new Component[]{widgetValueLabel,  formWidgetValuePane},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), waterMarkDictPane},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), fontSizePane}
         };

designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java

@@ -61,9 +61,11 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
         formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
+        UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"), SwingConstants.LEFT);
+        widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"), SwingConstants.LEFT),  formWidgetValuePane},
+                new Component[]{widgetValueLabel,  formWidgetValuePane},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark"), SwingConstants.LEFT), waterMarkDictPane},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size"), SwingConstants.LEFT), fontSizePane}
         };

designer_form/src/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java

@@ -35,12 +35,14 @@ public abstract class ButtonGroupDefinePane<T extends ButtonGroup> extends Field
         JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         dictionaryEditor = new AccessibleDictionaryEditor();
         buttonGroupDictPane = new ButtonGroupDictPane();
+        UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value"));
+        widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
         formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")), formWidgetValuePane},
+                new Component[]{widgetValueLabel, formWidgetValuePane},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_DS-Dictionary")), dictionaryEditor},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_FRFont")), fontSizePane},
                 new Component[]{buttonGroupDictPane, null}