diff --git a/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java b/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java
index 32fc44df6..07621fc26 100644
--- a/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java
+++ b/designer_form/src/com/fr/design/designer/properties/WidgetPropertyTable.java
@@ -27,7 +27,6 @@ public class WidgetPropertyTable extends AbstractPropertyTable {
 
 	private FormDesigner designer;
     private static final int LEFT_COLUMN_WIDTH = 97;  // "属性名"列的宽度
-	private static final int RIGHT_COLUMN_WIDTH = 138;  // "属性值"列的宽度
 
 	public WidgetPropertyTable(FormDesigner designer) {
 		super();
@@ -86,16 +85,21 @@ public class WidgetPropertyTable extends AbstractPropertyTable {
 		}
 		TableModel model = new BeanTableModel();
 		setModel(model);
+        this.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
 		TableColumn tc = this.getColumn(this.getColumnName(0));
 		tc.setMinWidth(LEFT_COLUMN_WIDTH);
 		tc.setMaxWidth(LEFT_COLUMN_WIDTH);
-        TableColumn tcRight = this.getColumn(this.getColumnName(1));
-		tcRight.setMinWidth(RIGHT_COLUMN_WIDTH);
-		tcRight.setMaxWidth(RIGHT_COLUMN_WIDTH);
 
 		this.repaint();
 	}
 
+    private void setRightColumnWidth(boolean automode) {
+		int rightColumnWidth = this.getWidth() - LEFT_COLUMN_WIDTH;
+		TableColumn tcRight = this.getColumn(this.getColumnName(1));
+		tcRight.setMinWidth(automode ? 0 : rightColumnWidth);
+		tcRight.setMaxWidth(automode ? this.getWidth() : rightColumnWidth);
+	}
+
 	private void setDesigner(FormDesigner designer) {
 		this.designer = designer;
 	}
@@ -117,6 +121,13 @@ public class WidgetPropertyTable extends AbstractPropertyTable {
 		return null;
 	}
 
+    @Override
+	public void columnMarginChanged(javax.swing.event.ChangeEvent e) {
+		setRightColumnWidth(false);
+		super.columnMarginChanged(e);
+		setRightColumnWidth(true);
+	}
+
     /**
      * 待说明
      */