Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into release/10.0

designer-chart/src/main/java/com/fr/extended/chart/UIComboBoxWithNone.java

@@ -2,6 +2,8 @@ package com.fr.extended.chart;
 
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.i18n.Toolkit;
+import com.fr.general.GeneralUtils;
+import com.fr.stable.StringUtils;
 
 import java.util.List;
 
@@ -17,6 +19,11 @@ public class UIComboBoxWithNone extends UIComboBox {
     public UIComboBoxWithNone() {
         super();
         addDefaultItem();
+        setDefaultSelectedItem();
+    }
+
+    protected void setDefaultSelectedItem() {
+        setSelectedItem(StringUtils.EMPTY);
     }
 
     @Override
@@ -43,7 +50,8 @@ public class UIComboBoxWithNone extends UIComboBox {
 
         //找不到的都选中无。中文的无 英文下是none。
         //改正：找不到的且anObject不是null的 全部选中无。
-        if (getSelectedIndex() == -1 && anObject != null) {
+        //改正：找不到的且anObject不是null的且anObject不是空字符串的 全部选中无。
+        if (getSelectedIndex() == -1 && StringUtils.isNotEmpty(GeneralUtils.objectToString(anObject))) {
             super.setSelectedItem(getDefaultLocaleString());
         }
     }

designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java

@@ -160,6 +160,7 @@ public class XCardSwitchButton extends XButton {
 				return;
 			}
 			deleteCard(this, index);
+            selectionModel.setSelectedCreator(designer.getRootComponent());
 			designer.fireTargetModified();
 			LayoutUtils.layoutRootContainer(designer.getRootComponent());
 			FormHierarchyTreePane.getInstance().refreshRoot();