Merge pull request #656 in BA/design from ~PLOUGH/design:release to release

* commit '2c50ee981b85daf7483d335720996447448b0466':
  REPORT-1390 设计器中，在选中“悬浮元素”时，隐藏右侧的“单元格属性表”面板

designer/src/com/fr/design/mainframe/CellElementPropertyPane.java

@@ -102,12 +102,23 @@ public class CellElementPropertyPane extends DockingView {
         return element;
     }
 
+    public void removeAll() {
+        this.remove(titlePane);
+        this.remove(cellElementEditPane);
+    }
+
+    public void reInit(ElementCasePane ePane) {
+        this.add(titlePane, BorderLayout.NORTH);
+        this.add(cellElementEditPane, BorderLayout.CENTER);
+        cellElementEditPane.populate(ePane);
+    }
+
     public void populate(ElementCasePane ePane) {
     	 TemplateElementCase elementCase = ePane.getEditingElementCase();
          if (elementCase == null) {
              return;
          }
-         cellElementEditPane.populate(ePane);
+         ePane.getSelection().populatePropertyPane(ePane);
     }
 
     @Override

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

@@ -18,6 +18,7 @@ import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.imenu.UIMenu;
 import com.fr.design.gui.imenu.UIPopupMenu;
+import com.fr.design.mainframe.CellElementPropertyPane;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.mainframe.ElementCasePane.Clear;
 import com.fr.design.mainframe.JTemplate;
@@ -684,4 +685,9 @@ public class CellSelection extends Selection {
         editor.populate(tc);
         return editor;
     }
+
+    @Override
+    public void populatePropertyPane(ElementCasePane ePane) {
+        CellElementPropertyPane.getInstance().reInit(ePane);
+    }
 }

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

@@ -20,6 +20,7 @@ import com.fr.design.cell.clipboard.CellElementsClip;
 import com.fr.design.cell.clipboard.ElementsTransferable;
 import com.fr.design.cell.clipboard.FloatElementsClip;
 import com.fr.design.designer.TargetComponent;
+import com.fr.design.mainframe.CellElementPropertyPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.design.mainframe.ElementCasePane;
@@ -230,4 +231,9 @@ public class FloatSelection extends Selection {
         editor.populate(tc);
         return editor;
     }
+
+    @Override
+    public void populatePropertyPane(ElementCasePane ePane) {
+        CellElementPropertyPane.getInstance().removeAll();
+    }
 }

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

@@ -88,6 +88,8 @@ public abstract class Selection implements FCloneable, Serializable , Selectable
 	// //////////////////////////Just4CellSelection///////////////////////////////
 	public abstract boolean containsColumnRow(ColumnRow cr);
 
+	public abstract void populatePropertyPane(ElementCasePane ePane);
+	
 
 	@Override
 	public Selection clone() throws CloneNotSupportedException {