Merge pull request #348 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0

* commit 'bb9f5b673186e409fedc8e2a51cfcd484ae25490':
  REPORT-10429 更新jar后，访问tab模板报错

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

@@ -24,6 +24,7 @@ import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetHelpDialog;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.form.event.Listener;
+import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
@@ -168,8 +169,14 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 				//新tab默认都有标题
 				borderStyle.setType(LayoutBorderStyle.TITLE);
 			}
-			cardLayout.setWidgetName(XWCardLayout.DEFAULT_NAME + tabpaneName.replaceAll(XWCardTagLayout.DEFAULT_NAME, ""));
+			String newCardLayoutName = XWCardLayout.DEFAULT_NAME + tabpaneName.replaceAll(XWCardTagLayout.DEFAULT_NAME, "");
-			wCardTitleLayout.setCardName(cardLayout.getWidgetName());
+			cardLayout.setWidgetName(newCardLayoutName);
+			//修改cardswitchbutton所绑定的cardlayoutname
+			for (int i = 0, len = wCardTagLayout.getWidgetCount(); i < len; i++) {
+				CardSwitchButton button = wCardTagLayout.getSwitchButton(i);
+				button.setCardLayoutName(newCardLayoutName);
+			}
+			wCardTitleLayout.setCardName(newCardLayoutName);
 			wCardTagLayout.setNewTab(true);
 			//这边需要设置成默认值兼容之前的title高度(不知道为啥之前的title的高度会改变)
 			if(this.toData().getNorthSize() != 0){