ct

designer_form/src/com/fr/design/designer/beans/ConnectorCreator.java

@@ -1,12 +1,13 @@
 package com.fr.design.designer.beans;
 
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
+import java.awt.Point;
-import com.fr.form.ui.container.WLayout;
+import java.awt.Rectangle;
-
-import java.awt.*;
 import java.util.ArrayList;
 import java.util.PriorityQueue;
 
+import com.fr.form.ui.container.WLayout;
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
+
 public class ConnectorCreator {
 	
 	public static final int UNIT = 10;

designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java

@@ -16,12 +16,14 @@ import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.designer.properties.FRFitLayoutConstraints;
 import com.fr.design.designer.properties.FRFitLayoutPropertiesGroupModel;
+import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.mainframe.JForm;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.form.ui.LayoutBorderStyle;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.WLayout;
 import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 import com.fr.general.ComparatorUtils;
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 
 import java.awt.*;
 import java.util.ArrayList;
@@ -1011,7 +1013,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
                 setAdjustedSize(tabLayout, offset, isHor);
                 for (int m = 0; m < tabLayout.getComponentCount(); m++) {
                     XCreator childCreator = tabLayout.getXCreator(m);
-                    BoundsWidget wgt = tabLayout.toData().getBoundsWidget(childCreator.toData());
+                    BoundsWidget wgt = (BoundsWidget) tabLayout.toData().getBoundsWidget(childCreator.toData());
                     wgt.setBounds(tabLayout.getComponent(m).getBounds());
                 }
                 adjustCreatorsSize(percent, tabLayout, isHor);

designer_form/src/com/fr/design/designer/beans/location/Inner.java

@@ -9,8 +9,8 @@ import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelection;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.form.ui.container.WAbsoluteLayout;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.stable.ArrayUtils;
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 
 import java.awt.*;
 import java.awt.Rectangle;

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

@@ -10,9 +10,11 @@ import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.fun.impl.AbstractFormElementCaseEditorProvider;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.*;
-import com.fr.design.mainframe.widget.editors.ElementCaseToolBarEditor;
+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.renderer.LayoutBorderStyleRenderer;
+import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer;
 import com.fr.form.FormElementCaseContainerProvider;
 import com.fr.form.FormElementCaseProvider;
 import com.fr.form.FormProvider;
@@ -86,7 +88,8 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 
 					@Override
 					public void propertyChange() {
-						makeVisible(toData().isVisible());}
+						makeVisible(toData().isVisible());
+					}
 				}),
 				new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
 						WLayoutBorderStyleEditor.class).setI18NName(
@@ -97,12 +100,11 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 					public void propertyChange() {
 						initStyle();
 					}
-
 				}),
 				new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
 						.setI18NName(Inter.getLocText("FR-Layout_Padding"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-				new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class)
+				new CRPropertyDescriptor("showToolBar", this.data.getClass()).setEditorClass(BooleanEditor.class)
 						.setI18NName(Inter.getLocText("Form-EC_toolbar"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 		};

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

@@ -3,6 +3,14 @@
  */
 package com.fr.design.designer.creator;
 
+import java.awt.*;
+import java.awt.event.ContainerEvent;
+import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
+import java.beans.IntrospectionException;
+import java.util.ArrayList;
+import java.util.HashMap;
+
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.ComponentAdapter;
 import com.fr.design.designer.beans.LayoutAdapter;
@@ -12,26 +20,16 @@ import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.form.layout.FRAbsoluteLayout;
 import com.fr.design.icon.IconPathConstants;
-import com.fr.design.mainframe.EditingMouseListener;
+import com.fr.design.mainframe.*;
-import com.fr.design.mainframe.FormArea;
-import com.fr.design.mainframe.FormDesigner;
 import com.fr.form.ui.Connector;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteLayout;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.WLayout;
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.general.FRScreen;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 
-import java.awt.*;
-import java.awt.event.ContainerEvent;
-import java.awt.event.MouseEvent;
-import java.awt.image.BufferedImage;
-import java.beans.IntrospectionException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
 /**
  * @author richer
  * @since 6.5.3
@@ -46,19 +44,19 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	//由于屏幕分辨率不同，界面上的容器大小可能不是默认的100%，此时拖入组件时，保存的大小按照100%时的计算
 	protected double containerPercent = 1.0;
 	
-    private HashMap<Connector, XConnector> xConnectorMap;
+	private HashMap<Connector,XConnector> xConnectorMap;
 	
 	public XWAbsoluteLayout() {
-        this(new WAbsoluteLayout(), new Dimension());
+		this(new WAbsoluteLayout(),new Dimension());
 	}
 
 	public XWAbsoluteLayout(WAbsoluteLayout widget) {
-        this(widget, new Dimension());
+		this(widget,new Dimension());
 	}
 
 	public XWAbsoluteLayout(WAbsoluteLayout widget, Dimension initSize) {
 		super(widget, initSize);
-        this.xConnectorMap = new HashMap<Connector, XConnector>();
+		this.xConnectorMap =  new HashMap<Connector,XConnector>();
 		Connector connector;
 		for (int i = 0; i < widget.connectorCount(); i++) {
 			connector = widget.getConnectorIndex(i);
@@ -79,18 +77,17 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	}
 
 	//根据屏幕大小来确定显示的百分比, 1440*900默认100%, 1366*768缩放90%
-    private void initPercent(WAbsoluteLayout widget) {
+	private void initPercent(WAbsoluteLayout widget){
 		Toolkit toolkit = Toolkit.getDefaultToolkit();
 		Dimension scrnsize = toolkit.getScreenSize();
 		double screenValue = FRScreen.getByDimension(scrnsize).getValue();
-        if (screenValue != FormArea.DEFAULT_SLIDER) {
+		if(screenValue != FormArea.DEFAULT_SLIDER){
 			this.setContainerPercent(screenValue / FormArea.DEFAULT_SLIDER);
 		}
 	}
 
 	/**
 	 * 返回容器大小的百分比
-     *
 	 * @return the containerPercent
 	 */
 	public double getContainerPercent() {
@@ -99,18 +96,16 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
 	/**
 	 * 设置容器大小的百分比
-     *
 	 * @param containerPercent the containerPercent to set
 	 */
 	public void setContainerPercent(double containerPercent) {
 		this.containerPercent = containerPercent;
-        minWidth = (int) (XWAbsoluteLayout.MIN_WIDTH * containerPercent);
+		minWidth = (int) (XWAbsoluteLayout.MIN_WIDTH*containerPercent);
-        minHeight = (int) (XWAbsoluteLayout.MIN_HEIGHT * containerPercent);
+		minHeight = (int) (XWAbsoluteLayout.MIN_HEIGHT*containerPercent);
 	}
 
 	/**
 	 * 返回界面处根据百分比调整后的最小宽度
-     *
 	 * @return 最小宽度
 	 */
 	public int getActualMinWidth() {
@@ -119,7 +114,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
 	/**
 	 * 返回界面处根据百分比调整后的最小高度
-     *
 	 * @return 最小高度
 	 */
 	public int getActualMinHeight() {
@@ -128,14 +122,13 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
 	/**
 	 * 返回界面处根据百分比调整后的间隔大小（且为偶数）
-     *
 	 * @return 间隔
 	 */
 	public int getAcualInterval() {
 		// adapter那边交叉三等分、删除都要判断是否对齐，所以间隔转为偶数
-        int interval = (int) (toData().getCompInterval() * containerPercent);
+		int interval = (int) (toData().getCompInterval()*containerPercent);
-        int val = interval / 2;
+		int val = interval/2;
-        return val * 2;
+		return val*2;
 	}
 
 	/**
@@ -145,10 +138,10 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 		if (containerPercent == 1.0) {
 			return rec;
 		}
-        rec.x = (int) (rec.x / containerPercent);
+		rec.x = (int) (rec.x/containerPercent);
-        rec.y = (int) (rec.y / containerPercent);
+		rec.y = (int) (rec.y/containerPercent);
-        rec.width = (int) (rec.width / containerPercent);
+		rec.width = (int) (rec.width/containerPercent);
-        rec.height = (int) (rec.height / containerPercent);
+		rec.height = (int) (rec.height/containerPercent);
 		return rec;
 	}
 
@@ -158,29 +151,28 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	public void updateBoundsWidget(XCreator xCreator) {
 		WAbsoluteLayout layout = this.toData();
 		if (xCreator.hasTitleStyle()) {
-            xCreator = (XLayoutContainer) xCreator.getParent();
+			xCreator = (XLayoutContainer)xCreator.getParent();
 		}
-        if (xCreator.acceptType(XWAbsoluteLayout.class)) {
+		if (xCreator.acceptType(XWAbsoluteLayout.class)){
 			((XWAbsoluteLayout) xCreator).updateBoundsWidget();
 		}
 		// 如果子组件时tab布局，则tab布局内部的组件的wiget也要更新，否则保存后重新打开大小不对
 		ArrayList<?> childrenList = xCreator.getTargetChildrenList();
-        if (!childrenList.isEmpty()) {
+		if(!childrenList.isEmpty()){
-            for (int i = 0; i < childrenList.size(); i++) {
+			for(int i=0; i<childrenList.size(); i++){
 				XWTabFitLayout tabLayout = (XWTabFitLayout) childrenList.get(i);
 				tabLayout.updateBoundsWidget();
 			}
 		}
-        BoundsWidget boundsWidget = (BoundsWidget) layout.getBoundsWidget(xCreator.toData());
+        BoundsWidget boundsWidget = (BoundsWidget) layout.getBoundsWidget(xCreator.toData());		Rectangle rectangle = dealWidgetBound(xCreator.getBounds());
-        Rectangle rectangle = dealWidgetBound(xCreator.getBounds());
 	}
 
-    private Rectangle calculateBound(Rectangle rec, double pw, double ph) {
+	private Rectangle calculateBound(Rectangle rec, double pw, double ph){
-        Rectangle calRec = new Rectangle(0, 0, 0, 0);
+		Rectangle calRec = new Rectangle(0,0,0,0);
-        calRec.x = (int) (rec.x / pw);
+		calRec.x = (int)(rec.x / pw);
-        calRec.y = (int) (rec.y / ph);
+		calRec.y = (int)(rec.y / ph);
-        calRec.width = (int) (rec.width / pw);
+		calRec.width = (int)(rec.width / pw);
-        calRec.height = (int) (rec.height / ph);
+		calRec.height = (int)(rec.height / ph);
 		return calRec;
 	}
 
@@ -194,7 +186,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 		if (backupBound != null && layout.getCompState() == WAbsoluteLayout.STATE_FIT) {
 			double percentW = ((double) backupBound.width / (double) currentBound.width);
 			double percentH = ((double) backupBound.height / (double) currentBound.height);
-            for (int index = 0, n = this.getComponentCount(); index < n; index++) {
+			for (int index = 0, n = this.getComponentCount(); index < n; index++){
 				XCreator creator = (XCreator) this.getComponent(index);
 				BoundsWidget wgt = (BoundsWidget) layout.getBoundsWidget(creator.toData());
 				// 用当前的显示大小计算后调正具体位置
@@ -203,7 +195,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 				wgt.setBounds(rec);
 				creator.setBounds(rec);
 				//绝对布局嵌套，要更新内部的绝对布局
-                if (creator.acceptType(XWAbsoluteLayout.class)) {
+				if (creator.acceptType(XWAbsoluteLayout.class)){
 					creator.setBackupBound(wgtBound);
 					((XWAbsoluteLayout) creator).updateBoundsWidget();
 				}
@@ -215,7 +207,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	 * 更新子组件的Bound
 	 * 这边主要用于绝对布局子组件在适应区域选项时
 	 * 涉及到的不同分辨率下缩放
-     *
 	 * @param minHeight 最小高度
 	 */
 	@Override
@@ -225,10 +216,10 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 			for (int i = 0; i < this.getComponentCount(); i++) {
 				XCreator creator = getXCreator(i);
 				Rectangle rec = new Rectangle(creator.getBounds());
-                rec.x = (int) (rec.x / prevContainerPercent * containerPercent);
+				rec.x = (int)(rec.x / prevContainerPercent * containerPercent);
-                rec.y = (int) (rec.y / prevContainerPercent * containerPercent);
+				rec.y = (int)(rec.y / prevContainerPercent * containerPercent);
-                rec.height = (int) (rec.height / prevContainerPercent * containerPercent);
+				rec.height = (int)(rec.height / prevContainerPercent * containerPercent);
-                rec.width = (int) (rec.width / prevContainerPercent * containerPercent);
+				rec.width = (int)(rec.width / prevContainerPercent * containerPercent);
 				BoundsWidget wgt = (BoundsWidget) toData().getBoundsWidget(creator.toData());
 				wgt.setBounds(rec);
 				creator.setBounds(rec);
@@ -240,7 +231,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
 	/**
 	 * 增加对齐线
-     *
 	 * @param connector 对齐线
 	 */
 	public void addConnector(Connector connector) {
@@ -254,7 +244,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	
 	/**
 	 * 去除对齐线
-     *
 	 * @param connector 对齐线
 	 */
 	public void removeConnector(Connector connector) {
@@ -264,7 +253,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	
 	/**
 	 * 返回对应的widget容器
-     *
 	 * @return 返回WAbsoluteLayout
 	 */
 	@Override
@@ -279,7 +267,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
 	/**
 	 * 返回默认的容器name
-     *
 	 * @return 返回绝对布局容器名
 	 */
 	@Override
@@ -321,10 +308,10 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 		WAbsoluteLayout abs = toData();
 		this.removeAll();
 		for (int i = 0, count = abs.getWidgetCount(); i < count; i++) {
-            BoundsWidget bw = (BoundsWidget) abs.getWidget(i);
+			BoundsWidget bw = (BoundsWidget)abs.getWidget(i);
 			if (bw != null) {
 				Rectangle bounds = bw.getBounds();
-                XWidgetCreator comp = (XWidgetCreator) XCreatorUtils.createXCreator(bw.getWidget());
+				XWidgetCreator comp = (XWidgetCreator)XCreatorUtils.createXCreator(bw.getWidget());
 				if (!comp.acceptType(XWParameterLayout.class)) {
 					comp.setDirections(Direction.ALL);		
 				}
@@ -337,7 +324,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	
 	/**
 	 * 当前组件zorder位置替换新的控件
-     *
 	 * @param widget 控件
 	 * @param  oldcreator 旧组件
 	 * @return 组件
@@ -356,7 +342,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
 	 /**
      * 组件增加
-     *
      * @param e 容器事件
      */
 	@Override
@@ -374,7 +359,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	
 	 /**
      * 在设计界面中有组件移除的时候，需要通知WLayout容器重新paint
-     *
      * @param e 容器事件
      */
     @Override
@@ -402,21 +386,21 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	@Override
 	public XLayoutContainer getTopLayout() {
 		XLayoutContainer xTopLayout = XCreatorUtils.getParentXLayoutContainer(this).getTopLayout();
-        if (xTopLayout != null && !xTopLayout.isEditable()) {
+		if (xTopLayout != null && !xTopLayout.isEditable()){
 			return xTopLayout;
-        } else {
+		}
+		else{
 			return this;
 		}
 	}
 
 	/**
 	 *  得到属性名
-     *
 	 * @return 属性名
 	 * @throws java.beans.IntrospectionException
 	 */
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
-        return new CRPropertyDescriptor[]{
+		return  new CRPropertyDescriptor[] {
 				new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(
 						Inter.getLocText("FR-Designer_Form-Widget_Name"))
 		};
@@ -464,7 +448,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	 * @param editingMouseListener 鼠标点击，位置处理器
 	 * @param e 鼠标点击事件
 	 */
-    public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e) {
+	public void respondClick(EditingMouseListener editingMouseListener,MouseEvent e){
 		FormDesigner designer = editingMouseListener.getDesigner();
 		SelectionModel selectionModel = editingMouseListener.getSelectionModel();
 		boolean isEditing = isEditable() || designer.getCursor().getType() == Cursor.HAND_CURSOR || e.getClickCount() == 2;
@@ -484,7 +468,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	/**
 	 * body大小手动调整的时候
 	 * 按照比例调整组件的宽度
-     *
 	 * @param percent 比例
 	 */
 	@Override
@@ -501,7 +484,6 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 	/**
 	 * body大小手动调整的时候
 	 * 按照比例调整组件的高度
-     *
 	 * @param percent 比例
 	 */
 	@Override

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

@@ -1,5 +1,14 @@
 package com.fr.design.designer.creator;
 
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.event.ContainerEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRFitLayoutAdapter;
 import com.fr.design.designer.beans.location.Direction;
@@ -11,19 +20,14 @@ import com.fr.design.mainframe.FormArea;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.PaddingMargin;
 import com.fr.form.ui.Widget;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.WBodyLayoutType;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.form.ui.container.WLayout;
 import com.fr.general.FRScreen;
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
+import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 
-import java.awt.*;
-import java.awt.event.ContainerEvent;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * @author jim
  * @date 2014-6-23
@@ -347,7 +351,7 @@ public class XWFitLayout extends XLayoutContainer {
 		}
 		for (int i=0, size=comps.size(); i<size; i++) {
 			XCreator creator = (XCreator) comps.get(i);
-			BoundsWidget widget = toData().getBoundsWidget(creator.toData());
+			BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(creator.toData());
 			Rectangle rec = widget.getBounds();
 			Rectangle backRec = widget.getBackupBounds();
 			if (backRec.x<x) {
@@ -411,7 +415,7 @@ public class XWFitLayout extends XLayoutContainer {
 	protected void modifyEdgemostCreator(boolean isHor) {
 		for (int i=0, size=this.getComponentCount(); i<size; i++) {
 			XCreator creator = (XCreator) this.getComponent(i);
-			BoundsWidget widget = toData().getBoundsWidget(creator.toData());
+			BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(creator.toData());
 			Rectangle rec = widget.getBackupBounds();
 			if (isHor && notHasRightCreator(rec)) {
 				creator.setSize(creator.getWidth()+needAddWidth, creator.getHeight());
@@ -476,7 +480,7 @@ public class XWFitLayout extends XLayoutContainer {
 		}
 		for (int i=0, size=comps.size(); i<size; i++) {
 			XCreator creator = (XCreator) comps.get(i);
-			BoundsWidget widget = toData().getBoundsWidget(creator.toData());
+			BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(creator.toData());
 			Rectangle rec = widget.getBounds();
 			Rectangle backRec = widget.getBackupBounds();
 			if (backRec.y < y) {
@@ -515,7 +519,7 @@ public class XWFitLayout extends XLayoutContainer {
 		for (int i=0; i<size; i++) {
 			Component comp = this.getComponent(i);
 			XCreator creator = (XCreator) comp;
-			BoundsWidget widget = toData().getBoundsWidget(creator.toData());
+			BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(creator.toData());
 			Rectangle rec = widget.getBackupBounds();
 			//rec.x小于x，右侧大于x
 			boolean isLowX = rec.x<x && x<rec.x+rec.width;
@@ -531,7 +535,7 @@ public class XWFitLayout extends XLayoutContainer {
 		for (int i=0,size=this.getComponentCount(); i<size; i++) {
 			Component comp = this.getComponent(i);
 			XCreator creator = (XCreator) comp;
-			BoundsWidget widget = toData().getBoundsWidget(creator.toData());
+			BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(creator.toData());
 			Rectangle rec = widget.getBackupBounds();
 			boolean isLowY = rec.y<y && y<rec.y+rec.height;
 			if (isLowY || rec.y==y) {
@@ -570,7 +574,7 @@ public class XWFitLayout extends XLayoutContainer {
 	public XCreator getCreatorAt(int x, int y) {
 		for (int i=0,size=this.getComponentCount(); i<size; i++) {
 			XCreator creator = (XCreator) this.getComponent(i);
-			BoundsWidget widget = toData().getBoundsWidget(creator.toData());
+			BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(creator.toData());
 			Rectangle rec = widget.getBackupBounds();
 			boolean isCurrent = rec.x<=x && x<rec.x+rec.width && rec.y<=y && y<rec.y+rec.height;
 			if (isCurrent) {
@@ -587,7 +591,7 @@ public class XWFitLayout extends XLayoutContainer {
 		for (int i=0, size=this.getComponentCount(); i<size; i++) {
 			Component comp = this.getComponent(i);
 			XCreator creator = (XCreator) comp;
-			BoundsWidget widget = toData().getBoundsWidget(creator.toData());
+			BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(creator.toData());
 			widget.setBackupBounds(widget.getBounds());
 		}
 	}
@@ -732,7 +736,7 @@ public class XWFitLayout extends XLayoutContainer {
     	int containerHeight = 0;
     	for (int index=0, n=this.getComponentCount(); index<n; index++) {
     		XCreator creator = (XCreator) this.getComponent(index);
-    		BoundsWidget wgt = layout.getBoundsWidget(creator.toData());
+    		BoundsWidget wgt = (BoundsWidget) layout.getBoundsWidget(creator.toData());
     		// 用当前的显示大小计算后调正具体位置
     		Rectangle wgtBound = dealWidgetBound(creator.getBounds());
     		Rectangle rec = recalculateWidgetBounds(wgtBound, hors, veris);
@@ -755,6 +759,7 @@ public class XWFitLayout extends XLayoutContainer {
 			//如果子组件是绝对布局，则内部的widget也要更新
 			if (creator.acceptType(XWAbsoluteLayout.class)){
 				((XWAbsoluteLayout) creator).updateBoundsWidget();
+				creator.setBackupBound(creator.getBounds());
 			}
     	}
     	layout.setContainerHeight(containerHeight);
@@ -810,7 +815,7 @@ public class XWFitLayout extends XLayoutContainer {
         WFitLayout wlayout = this.toData();
         XWidgetCreator xwc = ((XWidgetCreator) e.getChild());
         Widget wgt = xwc.toData();
-        BoundsWidget bw = wlayout.getBoundsWidget(wgt);
+        BoundsWidget bw = (BoundsWidget) wlayout.getBoundsWidget(wgt);
         wlayout.removeWidget(bw);
         updateBoundsWidget();
 		((FRFitLayoutAdapter)getLayoutAdapter()).updateCreatorBackBound();
@@ -988,7 +993,7 @@ public class XWFitLayout extends XLayoutContainer {
     	int val = toData().getCompInterval()/2;
     	for (int i=0, len=this.getComponentCount(); i<len; i++) {
     		XCreator creator = (XCreator) this.getComponent(i);
-			BoundsWidget widget = toData().getBoundsWidget(creator.toData());
+			BoundsWidget widget = (BoundsWidget) toData().getBoundsWidget(creator.toData());
 			Rectangle rec = widget.getBounds();
     		Dimension d = new Dimension(this.getBackupBound().width, this.getBackupBound().height);
     		Rectangle bound = dealBound(rec, d, val, percent);

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

@@ -3,15 +3,16 @@
  */
 package com.fr.design.designer.creator;
 
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import java.awt.event.ContainerEvent;
+
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRScaleLayoutAdapter;
 import com.fr.design.form.layout.FRScaleLayout;
 import com.fr.form.ui.Widget;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.WScaleLayout;
-
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
-import java.awt.*;
-import java.awt.event.ContainerEvent;
 
 /**
  * 自适应布局中添加组件时，部分控件如数字文本下拉等需要保持控件默认高度21， 用此容器来实现

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

@@ -11,8 +11,8 @@ import com.fr.form.ui.Label;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.WidgetTitle;
 import com.fr.form.ui.container.WTitleLayout;
-import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.general.ComparatorUtils;
+import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 
 import java.awt.*;
 import java.awt.event.ContainerEvent;