Merge branch 'release/9.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design into release/9.0

designer_base/src/com/fr/design/gui/imenu/UIHeadMenu.java

@@ -268,7 +268,13 @@ public class UIHeadMenu extends UIMenu {
         return (popupMenu == null) ? new Component[0] : popupMenu.getComponents();
     }
 
-
+    /**
+     * 得到子元素
+     * @return  子元素
+     */
+    public MenuElement[] getSubElements() {
+        return popupMenu == null ? new MenuElement[0] : new MenuElement[]{popupMenu};
+    }
 
 
 }

designer_base/src/com/fr/design/gui/imenu/UIMenu.java

@@ -284,4 +284,11 @@ public class UIMenu extends JMenu {
 		return (popupMenu == null) ? new Component[0] : popupMenu.getComponents();
 	}
 
+	/**
+	 * 得到子元素
+	 * @return  子元素
+	 */
+	public MenuElement[] getSubElements() {
+		return popupMenu == null ? new MenuElement[0] : new MenuElement[]{popupMenu};
+	}
 }

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

@@ -371,7 +371,7 @@ public class FormParaWidgetPane extends JPanel {
 
             designer.addParaComponent();
             JPanel pane = FormWidgetDetailPane.getInstance(designer);
-            EastRegionContainerPane.getInstance().replaceDownPane(pane);
+            EastRegionContainerPane.getInstance().replaceWidgetLibPane(pane);
             this.setEnabled(false);
 
             designer.addDesignerEditListener(new paraButtonDesignerAdapter(this));

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

@@ -248,9 +248,11 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
 
             @Override
             public void fireCreatorModified(DesignerEvent evt) {
-                if (evt.getCreatorEventID() == DesignerEvent.CREATOR_CUTED
-                        || evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {
+                if (evt.getCreatorEventID() == DesignerEvent.CREATOR_CUTED) {
                     setPropertyPaneChange(formDesign.getRootComponent());
+                } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {
+                    // 在 delete 之前，会先 select 父组件。这里直接传入 lastAffectedCreator 就好了
+                    setPropertyPaneChange(lastAffectedCreator);
                 } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED) {
                     lastAffectedCreator = evt.getAffectedCreator();
                     setPropertyPaneChange(lastAffectedCreator);