Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev

designer/src/com/fr/design/cell/clipboard/CellElementsClip.java

@@ -17,12 +17,16 @@ import com.fr.report.elementcase.TemplateElementCase;
  * The clip of CellElement.
  */
 public class CellElementsClip implements Cloneable, java.io.Serializable {
+	private int column;
+	private int row;
     private int columnSpan = 0;
     private int rowSpan = 0;
     
     private TemplateCellElement[] clips;
 
-    public CellElementsClip(int columnSpan, int rowSpan, TemplateCellElement[] clips) {
+    public CellElementsClip(int column, int row, int columnSpan, int rowSpan, TemplateCellElement[] clips) {
+		this.column = column;
+		this.row = row;
     	this.columnSpan = columnSpan;
     	this.rowSpan = rowSpan;
     	
@@ -81,10 +85,20 @@ public class CellElementsClip implements Cloneable, java.io.Serializable {
     			column + cellElement.getColumn(), row + cellElement.getRow()		
     		), false);
     	}
-    	
+    	//设置单元格的宽高
+    	pasteWidthAndHeight(ec, column, row, columnSpan, rowSpan);
     	return new CellSelection(column, row, columnSpan, rowSpan);
     }
 
+    public  void pasteWidthAndHeight(TemplateElementCase ec, int column, int row, int columnSpan, int rowSpan){
+			for(int i = 0; i<columnSpan; i++){
+				for(int j = 0; j<rowSpan; j++){
+					ec.setColumnWidth(column + i, ec.getColumnWidth(this.column + i));
+					ec.setRowHeight(row + j, ec.getRowHeight(this.row + j));
+				}
+			}
+	}
+
     public void pasteAtRegion(TemplateElementCase ec, 
     		int startColumn, int startRow, 
     		int column, int row,

designer/src/com/fr/grid/GridUtils.java

@@ -288,7 +288,7 @@ public class GridUtils {
                 }
             }
 
-            elementsTransferable.addObject(new CellElementsClip(
+            elementsTransferable.addObject(new CellElementsClip(cs.getColumn(), cs.getRow(),
                     cs.getColumnSpan(), cs.getRowSpan(), elList.toArray(new TemplateCellElement[elList.size()])
             ));
         }

designer/src/com/fr/grid/selection/CellSelection.java

@@ -237,7 +237,7 @@ public class CellSelection extends Selection {
             list.add((TemplateCellElement) cellElement.deriveCellElement(cellElement.getColumn() - column, cellElement.getRow() - row));
         }
 
-        transferable.addObject(new CellElementsClip(this.columnSpan, this.rowSpan, list.toArray(new TemplateCellElement[list.size()])));
+        transferable.addObject(new CellElementsClip(this.column, this.row, this.columnSpan, this.rowSpan, list.toArray(new TemplateCellElement[list.size()])));
     }
 
     /**