Merge branch 'master' of http://www.finedevelop.com:2015/scm/~kerry/design

designer_chart/src/com/fr/design/mainframe/chart/gui/data/TableDataPane.java

@@ -25,6 +25,10 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	
 	private ChartDataPane parent;
 
+	protected AbstractTableDataContentPane getDataContentPane() {
+		return dataContentPane;
+	}
+
 	public TableDataPane(ChartDataPane parent) {
 		this.parent = parent;
 		initDataPane();
@@ -103,15 +107,18 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	 * @param collection 图表属性的集合
 	 */
 	public void refreshContentPane(ChartCollection collection) {
+		refreshContentPane(getContentPane(collection.getSelectedChart().getPlot()));
+	}
+
+	protected void refreshContentPane(AbstractTableDataContentPane contentPane) {
 		if(dataContentPane != null) {
 			remove(dataContentPane);
 		}
-		dataContentPane = getContentPane(collection.getSelectedChart().getPlot());
+		dataContentPane = contentPane;
 		if(dataContentPane != null) {
 			add(dataContentPane, BorderLayout.CENTER);
 		}
 	}
-
 	/**
 	 * 更新界面属性
 	 */
@@ -120,17 +127,21 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 			return;
 		}
 		TableDataDefinition data = (TableDataDefinition)collection.getSelectedChart().getFilterDefinition();
+		populateDSName(data);
+		if(dataContentPane != null) {
+			dataContentPane.populateBean(collection);
+		}
+	}
+	protected void populateDSName(TableDataDefinition dataDefinition){
+
 		TableData tableData = null;
-		if(data != null) {
-			tableData = data.getTableData();
+		if(dataDefinition != null) {
+			tableData = dataDefinition.getTableData();
 		}
 		onSelectTableData();
 		checkBoxUse();
 		
 		tableDataPane.populateBean(tableData);
-		if(dataContentPane != null) {
-			dataContentPane.populateBean(collection);
-		}
 	}
 
 	/**
@@ -141,6 +152,10 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 			dataContentPane.updateBean(collection);
 		}
 		TopDefinition dataDefinition = (TopDefinition)collection.getSelectedChart().getFilterDefinition();
+		updateDSName(dataDefinition);
+	}
+
+	protected void updateDSName(TopDefinition dataDefinition) {
 		if(dataDefinition instanceof  TableDataDefinition) {
 			TableDataWrapper tableDataWrapper = tableDataPane.getTableDataWrapper();
 			if (dataDefinition != null && tableDataWrapper != null){

designer_form/src/com/fr/design/mainframe/FormSelectionUtils.java

@@ -25,6 +25,7 @@ public class FormSelectionUtils {
     //组件重命名后缀
     private static final String POSTFIX = "_c";
 
+
     private FormSelectionUtils() {
 
     }
@@ -132,29 +133,18 @@ public class FormSelectionUtils {
             XLayoutContainer container = layoutAdapter.getContainer();
             boolean xOut = x < 0 || x + copiedCreator.getWidth() / 2 + xoffset > container.getWidth();
             boolean yOut = y < 0 || y + copiedCreator.getHeight() / 2 + yoffset > container.getHeight();
-            /*
-             * 组件原始位置位于布局的右下角，
-             * 和布局右下边界线紧挨，
-             * 粘贴时组件在原始位置向左错开20像素。
-             * x,y同时越界
-             */
-            if (xOut && yOut) {
-                //向左偏移
-                x = container.getWidth() - copiedCreator.getWidth() / 2 - DELAY_X_Y - xoffset;
+
+            y = yOut ? container.getHeight() - copiedCreator.getHeight() / 2 - yoffset : y;
+            boolean isEdge = (x - DELAY_X_Y == container.getWidth() - copiedCreator.getWidth() / 2 - xoffset);
+            if (xOut) {
+                if (isEdge) {
+                    //向左偏移
+                    x = container.getWidth() - copiedCreator.getWidth() / 2 - DELAY_X_Y - xoffset;
+                }
                 //紧贴下边界
-                y = container.getHeight() - copiedCreator.getHeight() / 2 - yoffset;
-                return new Point(x, y);
-            }
-            /*
-            * 组件原始位置与布局边界距离小于20像素（下边界&右边界同时小于或者任意一个边界小于），
-            * 则粘贴时距离小于20像素一侧直接贴近布局边界，
-            * 距离大于20像素的一侧正常错开。
-            * x,y中只有一个越界
-            */
-            if ((xOut || yOut)) {
-                x = xOut ? container.getWidth() - copiedCreator.getWidth() / 2 - xoffset : x;
-                y = yOut ? container.getHeight() - copiedCreator.getHeight() / 2 - yoffset : y;
-                return new Point(x, y);
+                else {
+                    x = container.getWidth() - copiedCreator.getWidth() / 2 - xoffset;
+                }
             }
         }
         return new Point(x, y);