Merge remote-tracking branch 'origin/dev' into dev

designer/src/com/fr/design/report/ExcelExportPane.java

@@ -4,7 +4,6 @@ package com.fr.design.report;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import com.fr.design.fun.AbstractExportPane;
 import com.fr.design.gui.ilable.UILabel;
 
 import javax.swing.*;

designer/src/com/fr/design/report/ReportExportAttrPane.java

@@ -4,7 +4,6 @@ import javax.swing.*;
 
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.fun.AbstractExportPane;
 import com.fr.design.fun.ExportAttrTabProvider;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.general.Inter;

designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java

@@ -1,5 +1,6 @@
 package com.fr.design.fun;
 
+import com.fr.design.report.AbstractExportPane;
 import com.fr.stable.fun.Level;
 
 import javax.swing.*;

designer_base/src/com/fr/design/report/AbstractExportPane.java

@@ -1,4 +1,4 @@
-package com.fr.design.fun;
+package com.fr.design.report;
 
 import com.fr.design.dialog.BasicPane;
 

designer_form/src/com/fr/design/designer/creator/XElementCase.java

@@ -7,9 +7,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.CoverReportPane;
 import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
-import com.fr.design.mainframe.widget.editors.BooleanEditor;
-import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
-import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
+import com.fr.design.mainframe.widget.editors.*;
 import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
 import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer;
 import com.fr.form.FormElementCaseContainerProvider;
@@ -25,6 +23,8 @@ import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
+import java.util.ArrayList;
+import java.util.List;
 
 public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider{
     private UILabel imageLable;
@@ -54,14 +54,23 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
      * @throws IntrospectionException 异常
      */
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
+		CRPropertyDescriptor[] crp = ((ElementCaseEditor) data).isHeightRestrict() ? revealHeightLimit() : getDefault();
+		FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getPropertyTableEditor();
+		if (processor == null) {
+			return crp;
+		}
+		PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass());
+		return (CRPropertyDescriptor[]) ArrayUtils.addAll(crp, extraEditor);
+	}
 
-        CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{
+	protected List<CRPropertyDescriptor> createNonListenerProperties() throws IntrospectionException {
+		CRPropertyDescriptor[] propertyTableEditor = {
 				new CRPropertyDescriptor("widgetName", this.data.getClass())
 						.setI18NName(Inter.getLocText("Form-Widget_Name")),
 				new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
 						WLayoutBorderStyleEditor.class).setRendererClass(LayoutBorderStyleRenderer.class).setI18NName(
-                        Inter.getLocText("FR-Designer-Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
-                        .setPropertyChangeListener(new PropertyChangeAdapter() {
+						Inter.getLocText("FR-Designer-Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").
+						setPropertyChangeListener(new PropertyChangeAdapter() {
 
 					@Override
 					public void propertyChange() {
@@ -74,17 +83,37 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 				new CRPropertyDescriptor("showToolBar", this.data.getClass()).setEditorClass(BooleanEditor.class)
 						.setI18NName(Inter.getLocText("Form-EC_toolbar"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-
+				new CRPropertyDescriptor("heightRestrict", this.data.getClass()).setEditorClass(InChangeBooleanEditor.class)
+						.setI18NName(Inter.getLocText("Form-EC_heightrestrict"))
+						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 		};
 
-        FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getPropertyTableEditor();
-        if (processor == null){
-            return propertyTableEditor;
+		List<CRPropertyDescriptor> defaultList = new ArrayList<>();
+
+		for (CRPropertyDescriptor propertyDescriptor : propertyTableEditor) {
+			defaultList.add(propertyDescriptor);
 		}
-        PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass());
-        return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor);
+		return defaultList;
 	}
 
+	protected CRPropertyDescriptor[] revealHeightLimit() throws IntrospectionException {
+		CRPropertyDescriptor heightLimitProperty = new CRPropertyDescriptor("heightPercent", this.data.getClass())
+															.setEditorClass(DoubleEditor.class)
+															.setI18NName(Inter.getLocText("Form-EC_heightpercent"))
+															.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
+
+		ArrayList<CRPropertyDescriptor> defaultList = (ArrayList<CRPropertyDescriptor>) createNonListenerProperties();
+		defaultList.add(heightLimitProperty);
+
+		return defaultList.toArray(new CRPropertyDescriptor[defaultList.size()]);
+	}
+
+	protected CRPropertyDescriptor[] getDefault() throws IntrospectionException {
+		ArrayList<CRPropertyDescriptor> defaultList = (ArrayList<CRPropertyDescriptor>) createNonListenerProperties();
+		return defaultList.toArray(new CRPropertyDescriptor[defaultList.size()]);
+	}
+
+
 	@Override
 	protected String getIconName() {
 		return "text_field_16.png";