Merge pull request #707 in BA/design from ~ZHOUPING/design:dev to dev

* commit '4abace6d53aa2a50138f44b20351cc4cb68b33bc':
  REPORT-1814 表单tab块的改良bug 代码质量，抽出父类
  REPORT-1814 表单tab块的改良bug 轮播bug以及页签拖动的bug

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -525,9 +525,9 @@ FR-Designer_Background_Gradient_Color=Gradient Color
 FR-Designer_Background_Image=Image
 FR-Designer_Background_Clear=Clear
 FR-Designer_Background_Image_Select=Select Picture
-FR-Designer_Tab_carousel=
+FR-Designer_Tab_carousel=tab carousel
-FR-Designer_setCarousel=
+FR-Designer_setCarousel=set carousel
-FR-Designer_carouselInterval=
+FR-Designer_carouselInterval=interval
 FR-Designer_Initial_Background_Tips=Initial background of the button
 FR-Designer_Mouse_Move_Tips=Move the mouse to the button on the background, in the absence of not changing the background
 FR-Designer_Mouse_Click_Tips=The background of the mouse to click the button, in the absence of not changing the background

designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveAction.java

@@ -0,0 +1,80 @@
+package com.fr.design.designer.creator.cardlayout;
+
+import com.fr.design.designer.beans.actions.FormUndoableAction;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.form.ui.CardSwitchButton;
+import com.fr.form.ui.container.cardlayout.WTabFitLayout;
+import com.fr.general.FRLogger;
+
+/**
+ * Created by zhouping on 2017/2/17.
+ */
+public class TabMoveAction extends FormUndoableAction {
+    private XCardSwitchButton xCardSwitchButton;
+
+    public TabMoveAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
+        super(t);
+        this.xCardSwitchButton = xCardSwitchButton;
+    }
+
+    @Override
+    public boolean executeActionReturnUndoRecordNeeded() {
+        XCardSwitchButton xCardSwitchButton = getxCardSwitchButton();
+        XWCardTagLayout xwCardTagLayout = xCardSwitchButton.getTagLayout();
+        XWCardLayout xwCardLayout = xCardSwitchButton.getCardLayout();
+        CardSwitchButton currentButton = (CardSwitchButton) xCardSwitchButton.toData();
+        try {
+            int currentIndex = currentButton.getIndex();
+            int maxIndex = xwCardTagLayout.getComponentCount();
+            XWTabFitLayout xCurrentTab = (XWTabFitLayout) xwCardLayout.getXCreator(currentIndex);
+            WTabFitLayout currentTab = (WTabFitLayout) xCurrentTab.toData();
+            xwCardTagLayout.setSwitchingTab(true);
+
+            changeTabIndex(xwCardTagLayout, xwCardLayout, currentIndex, maxIndex);
+
+            moveTabAction(xwCardTagLayout, currentButton, xCurrentTab, currentTab);
+
+            xwCardTagLayout.setSwitchingTab(false);
+        }catch (Exception e){
+            xwCardTagLayout.setSwitchingTab(false);
+            FRLogger.getLogger().error(e.getMessage());
+            return false;
+        }
+        return true;
+    }
+
+    private void moveTabAction(XWCardTagLayout xwCardTagLayout, CardSwitchButton currentButton, XWTabFitLayout xCurrentTab, WTabFitLayout currentTab) {
+        int move2Index = getTabMoveIndex(currentButton);
+        XWCardLayout xwCardLayout = xCardSwitchButton.getCardLayout();
+        xwCardTagLayout.remove(xCardSwitchButton);
+        xwCardTagLayout.add(xCardSwitchButton, move2Index);
+        xwCardLayout.remove(xCurrentTab);
+        xwCardLayout.add(xCurrentTab, move2Index);
+        currentButton.setIndex(move2Index);
+        currentTab.setIndex(move2Index);
+        currentTab.setTabNameIndex(move2Index);
+        xwCardLayout.toData().setShowIndex(move2Index);
+        xwCardLayout.showCard();
+    }
+
+    //改变Tab的索引号
+    protected void changeTabIndex(XWCardTagLayout xwCardTagLayout, XWCardLayout xwCardLayout, int currentIndex, int maxIndex) {
+    }
+
+    /**
+     * 获取tab移动的目的索引：首位，末尾，下一个，上一个
+     * @param currentButton 当前按钮
+     * @return 索引
+     */
+    protected int getTabMoveIndex(CardSwitchButton currentButton) {
+        return currentButton.getIndex();
+    }
+
+    public XCardSwitchButton getxCardSwitchButton() {
+        return xCardSwitchButton;
+    }
+
+    public void setxCardSwitchButton(XCardSwitchButton xCardSwitchButton) {
+        this.xCardSwitchButton = xCardSwitchButton;
+    }
+}

designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveCustomAction.java

@@ -1,32 +1,17 @@
 package com.fr.design.designer.creator.cardlayout;
 
-import com.fr.base.BaseUtils;
-import com.fr.design.designer.beans.actions.FormUndoableAction;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.general.IOUtils;
 
 /**
  * Created by zhouping on 2017/2/9.
  */
-public class TabMoveCustomAction extends FormUndoableAction {
+public class TabMoveCustomAction extends TabMoveAction {
-    private XCardSwitchButton xCardSwitchButton;
 
     public TabMoveCustomAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
-        super(t);
+        super(t, xCardSwitchButton);
         this.setName("");
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
+        this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/refresh.png"));
-        this.xCardSwitchButton = xCardSwitchButton;
     }
 
-    @Override
-    public boolean executeActionReturnUndoRecordNeeded() {
-        return false;
-    }
-
-    public XCardSwitchButton getxCardSwitchButton() {
-        return xCardSwitchButton;
-    }
-
-    public void setxCardSwitchButton(XCardSwitchButton xCardSwitchButton) {
-        this.xCardSwitchButton = xCardSwitchButton;
-    }
 }

designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java

@@ -1,66 +1,36 @@
 package com.fr.design.designer.creator.cardlayout;
 
-import com.fr.base.BaseUtils;
-import com.fr.design.designer.beans.actions.FormUndoableAction;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
-import com.fr.general.FRLogger;
+import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 
 /**
  * Created by zhouping on 2017/2/9.
  */
-public class TabMoveEndAction extends FormUndoableAction {
+public class TabMoveEndAction extends TabMoveAction {
-    private XCardSwitchButton xCardSwitchButton;
 
     public TabMoveEndAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
-        super(t);
+        super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_End"));
-        this.setSmallIcon(BaseUtils.readIcon("com/fr/design/images/control/rightright.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/rightright.png"));
-        this.xCardSwitchButton = xCardSwitchButton;
     }
 
-    @Override
+    //改变Tab的索引号
-    public boolean executeActionReturnUndoRecordNeeded() {
+    protected void changeTabIndex(XWCardTagLayout xwCardTagLayout, XWCardLayout xwCardLayout, int currentIndex, int maxIndex) {
-        XWCardTagLayout xwCardTagLayout = xCardSwitchButton.getTagLayout();
+        //修改当前tab往后所有tab的索引号
-        XWCardLayout xwCardLayout = xCardSwitchButton.getCardLayout();
+        for (int i = currentIndex + 1; i < maxIndex; i++) {
-        CardSwitchButton currentButton = (CardSwitchButton) xCardSwitchButton.toData();
+            CardSwitchButton tempBtn = (CardSwitchButton) xwCardTagLayout.getXCreator(i).toData();
-        try {
+            tempBtn.setIndex(i - 1);
-            int currentIndex = currentButton.getIndex();
+            WTabFitLayout tempTab = (WTabFitLayout) xwCardLayout.getXCreator(i).toData();
-            int maxIndex = xwCardTagLayout.getComponentCount();
+            tempTab.setIndex(i - 1);
-            XWTabFitLayout xCurrentTab = (XWTabFitLayout) xwCardLayout.getXCreator(currentIndex);
+            tempTab.setTabNameIndex(i - 1);
-            WTabFitLayout currentTab = (WTabFitLayout) xCurrentTab.toData();
-            xwCardTagLayout.setSwitchingTab(true);
-            //修改当前tab往后所有tab的索引号
-            for (int i = currentIndex + 1; i < maxIndex; i++) {
-                CardSwitchButton tempBtn = (CardSwitchButton) xwCardTagLayout.getXCreator(i).toData();
-                tempBtn.setIndex(i - 1);
-                WTabFitLayout tempTab = (WTabFitLayout) xwCardLayout.getXCreator(i).toData();
-                tempTab.setIndex(i - 1);
-                tempTab.setTabNameIndex(i - 1);
-            }
-            xwCardTagLayout.remove(xCardSwitchButton);
-            xwCardTagLayout.add(xCardSwitchButton);
-            xwCardLayout.remove(xCurrentTab);
-            xwCardLayout.add(xCurrentTab);
-            currentButton.setIndex(maxIndex - 1);
-            currentTab.setIndex(maxIndex - 1);
-            currentTab.setTabNameIndex(maxIndex - 1);
-            xwCardTagLayout.setSwitchingTab(false);
-        }catch (Exception e){
-            xwCardTagLayout.setSwitchingTab(false);
-            FRLogger.getLogger().error(e.getMessage());
-            return false;
         }
-        return true;
-    }
-
-    public XCardSwitchButton getxCardSwitchButton() {
-        return xCardSwitchButton;
     }
 
-    public void setxCardSwitchButton(XCardSwitchButton xCardSwitchButton) {
+    @Override
-        this.xCardSwitchButton = xCardSwitchButton;
+    protected int getTabMoveIndex(CardSwitchButton btn) {
+        return getxCardSwitchButton().getTagLayout().getComponentCount() - 1;
     }
 }

designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java

@@ -1,65 +1,36 @@
 package com.fr.design.designer.creator.cardlayout;
 
-import com.fr.base.BaseUtils;
-import com.fr.design.designer.beans.actions.FormUndoableAction;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
-import com.fr.general.FRLogger;
+import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 
 /**
  * Created by zhouping on 2017/2/9.
  */
-public class TabMoveFirstAction extends FormUndoableAction {
+public class TabMoveFirstAction extends TabMoveAction {
-    private XCardSwitchButton xCardSwitchButton;
 
     public TabMoveFirstAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
-        super(t);
+        super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_First"));
-        this.setSmallIcon(BaseUtils.readIcon("com/fr/design/images/control/leftleft.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/leftleft.png"));
-        this.xCardSwitchButton = xCardSwitchButton;
     }
 
     @Override
-    public boolean executeActionReturnUndoRecordNeeded() {
+    protected void changeTabIndex(XWCardTagLayout xwCardTagLayout, XWCardLayout xwCardLayout, int currentIndex, int maxIndex) {
-        XWCardTagLayout xwCardTagLayout = xCardSwitchButton.getTagLayout();
+        //修改当前tab往前所有tab的索引号
-        XWCardLayout xwCardLayout = xCardSwitchButton.getCardLayout();
+        for (int i = currentIndex - 1; i >= 0; i--) {
-        CardSwitchButton currentButton = (CardSwitchButton) xCardSwitchButton.toData();
+            CardSwitchButton tempBtn = (CardSwitchButton) xwCardTagLayout.getXCreator(i).toData();
-        try {
+            tempBtn.setIndex(i + 1);
-            int currentIndex = currentButton.getIndex();
+            WTabFitLayout tempTab = (WTabFitLayout) xwCardLayout.getXCreator(i).toData();
-            XWTabFitLayout xCurrentTab = (XWTabFitLayout) xwCardLayout.getXCreator(currentIndex);
+            tempTab.setIndex(i + 1);
-            WTabFitLayout currentTab = (WTabFitLayout) xCurrentTab.toData();
+            tempTab.setTabNameIndex(i + 1);
-            xwCardTagLayout.setSwitchingTab(true);
-            //修改当前tab往前所有tab的索引号
-            for (int i = currentIndex - 1; i >= 0; i--) {
-                CardSwitchButton tempBtn = (CardSwitchButton) xwCardTagLayout.getXCreator(i).toData();
-                tempBtn.setIndex(i + 1);
-                WTabFitLayout tempTab = (WTabFitLayout) xwCardLayout.getXCreator(i).toData();
-                tempTab.setIndex(i + 1);
-                tempTab.setTabNameIndex(i + 1);
-            }
-            xwCardTagLayout.remove(xCardSwitchButton);
-            xwCardTagLayout.add(xCardSwitchButton, 0);
-            xwCardLayout.remove(xCurrentTab);
-            xwCardLayout.add(xCurrentTab, 0);
-            currentButton.setIndex(0);
-            currentTab.setIndex(0);
-            currentTab.setTabNameIndex(0);
-            xwCardTagLayout.setSwitchingTab(false);
-        }catch (Exception e){
-            xwCardTagLayout.setSwitchingTab(false);
-            FRLogger.getLogger().error(e.getMessage());
-            return false;
         }
-        return true;
     }
 
-    public XCardSwitchButton getxCardSwitchButton() {
+    @Override
-        return xCardSwitchButton;
+    protected int getTabMoveIndex(CardSwitchButton btn) {
-    }
+        return 0;
-
-    public void setxCardSwitchButton(XCardSwitchButton xCardSwitchButton) {
-        this.xCardSwitchButton = xCardSwitchButton;
     }
 }

designer_form/src/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java

@@ -1,64 +1,34 @@
 package com.fr.design.designer.creator.cardlayout;
 
-import com.fr.base.BaseUtils;
-import com.fr.design.designer.beans.actions.FormUndoableAction;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
-import com.fr.general.FRLogger;
+import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 
 /**
  * Created by zhouping on 2017/2/9.
  */
-public class TabMoveNextAction extends FormUndoableAction {
+public class TabMoveNextAction extends TabMoveAction {
-    private XCardSwitchButton xCardSwitchButton;
 
     public TabMoveNextAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
-        super(t);
+        super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_Next"));
-        this.setSmallIcon(BaseUtils.readIcon("com/fr/design/images/control/right.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/right.png"));
-        this.xCardSwitchButton = xCardSwitchButton;
     }
 
     @Override
-    public boolean executeActionReturnUndoRecordNeeded() {
+    protected void changeTabIndex(XWCardTagLayout xwCardTagLayout, XWCardLayout xwCardLayout, int currentIndex, int maxIndex) {
-        XWCardTagLayout xwCardTagLayout = xCardSwitchButton.getTagLayout();
+        //修改下一个tab的索引号
-        XWCardLayout xwCardLayout = xCardSwitchButton.getCardLayout();
+        CardSwitchButton nextBtn = (CardSwitchButton) xwCardTagLayout.getXCreator(currentIndex + 1).toData();
-        CardSwitchButton currentButton = (CardSwitchButton) xCardSwitchButton.toData();
+        nextBtn.setIndex(currentIndex);
-        try {
+        WTabFitLayout nextTab = (WTabFitLayout) xwCardLayout.getXCreator(currentIndex + 1).toData();
-            int currentIndex = currentButton.getIndex();
+        nextTab.setIndex(currentIndex);
-            XWTabFitLayout xCurrentTab = (XWTabFitLayout) xwCardLayout.getXCreator(currentIndex);
+        nextTab.setTabNameIndex(currentIndex);
-            WTabFitLayout currentTab = (WTabFitLayout) xCurrentTab.toData();
-            xwCardTagLayout.setSwitchingTab(true);
-            //修改下一个tab的索引号
-            CardSwitchButton nextBtn = (CardSwitchButton) xwCardTagLayout.getXCreator(currentIndex + 1).toData();
-            nextBtn.setIndex(currentIndex);
-            WTabFitLayout nextTab = (WTabFitLayout) xwCardLayout.getXCreator(currentIndex + 1).toData();
-            nextTab.setIndex(currentIndex);
-            nextTab.setTabNameIndex(currentIndex);
-
-            xwCardTagLayout.remove(xCardSwitchButton);
-            xwCardTagLayout.add(xCardSwitchButton, currentIndex + 1);
-            xwCardLayout.remove(xCurrentTab);
-            xwCardLayout.add(xCurrentTab, currentIndex + 1);
-            currentButton.setIndex(currentIndex + 1);
-            currentTab.setIndex(currentIndex + 1);
-            currentTab.setTabNameIndex(currentIndex + 1);
-            xwCardTagLayout.setSwitchingTab(false);
-        }catch (Exception e){
-            xwCardTagLayout.setSwitchingTab(false);
-            FRLogger.getLogger().error(e.getMessage());
-            return false;
-        }
-        return true;
-    }
-
-    public XCardSwitchButton getxCardSwitchButton() {
-        return xCardSwitchButton;
     }
 
-    public void setxCardSwitchButton(XCardSwitchButton xCardSwitchButton) {
+    @Override
-        this.xCardSwitchButton = xCardSwitchButton;
+    protected int getTabMoveIndex(CardSwitchButton currentButton) {
+        return currentButton.getIndex() + 1;
     }
 }

designer_form/src/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java

@@ -1,64 +1,34 @@
 package com.fr.design.designer.creator.cardlayout;
 
-import com.fr.base.BaseUtils;
-import com.fr.design.designer.beans.actions.FormUndoableAction;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
-import com.fr.general.FRLogger;
+import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 
 /**
  * Created by zhouping on 2017/2/9.
  */
-public class TabMovePrevAction extends FormUndoableAction {
+public class TabMovePrevAction extends TabMoveAction {
-    private XCardSwitchButton xCardSwitchButton;
 
     public TabMovePrevAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
-        super(t);
+        super(t, xCardSwitchButton);
         this.setName(Inter.getLocText("FR-Designer-Move_Tab_Prev"));
-        this.setSmallIcon(BaseUtils.readIcon("com/fr/design/images/control/left.png"));
+        this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/left.png"));
-        this.xCardSwitchButton = xCardSwitchButton;
     }
 
     @Override
-    public boolean executeActionReturnUndoRecordNeeded() {
+    protected void changeTabIndex(XWCardTagLayout xwCardTagLayout, XWCardLayout xwCardLayout, int currentIndex, int maxIndex) {
-        XWCardTagLayout xwCardTagLayout = xCardSwitchButton.getTagLayout();
+        //修改上一个tab的索引号
-        XWCardLayout xwCardLayout = xCardSwitchButton.getCardLayout();
+        CardSwitchButton prevBtn = (CardSwitchButton) xwCardTagLayout.getXCreator(currentIndex - 1).toData();
-        CardSwitchButton currentButton = (CardSwitchButton) xCardSwitchButton.toData();
+        prevBtn.setIndex(currentIndex);
-        try {
+        WTabFitLayout prevTab = (WTabFitLayout) xwCardLayout.getXCreator(currentIndex - 1).toData();
-            int currentIndex = currentButton.getIndex();
+        prevTab.setIndex(currentIndex);
-            XWTabFitLayout xCurrentTab = (XWTabFitLayout) xwCardLayout.getXCreator(currentIndex);
+        prevTab.setTabNameIndex(currentIndex);
-            WTabFitLayout currentTab = (WTabFitLayout) xCurrentTab.toData();
-            xwCardTagLayout.setSwitchingTab(true);
-            //修改上一个tab的索引号
-            CardSwitchButton prevBtn = (CardSwitchButton) xwCardTagLayout.getXCreator(currentIndex - 1).toData();
-            prevBtn.setIndex(currentIndex);
-            WTabFitLayout prevTab = (WTabFitLayout) xwCardLayout.getXCreator(currentIndex - 1).toData();
-            prevTab.setIndex(currentIndex);
-            prevTab.setTabNameIndex(currentIndex);
-
-            xwCardTagLayout.remove(xCardSwitchButton);
-            xwCardTagLayout.add(xCardSwitchButton, currentIndex - 1);
-            xwCardLayout.remove(xCurrentTab);
-            xwCardLayout.add(xCurrentTab, currentIndex - 1);
-            currentButton.setIndex(currentIndex - 1);
-            currentTab.setIndex(currentIndex - 1);
-            currentTab.setTabNameIndex(currentIndex - 1);
-            xwCardTagLayout.setSwitchingTab(false);
-        }catch (Exception e){
-            xwCardTagLayout.setSwitchingTab(false);
-            FRLogger.getLogger().error(e.getMessage());
-            return false;
-        }
-        return true;
-    }
-
-    public XCardSwitchButton getxCardSwitchButton() {
-        return xCardSwitchButton;
     }
 
-    public void setxCardSwitchButton(XCardSwitchButton xCardSwitchButton) {
+    @Override
-        this.xCardSwitchButton = xCardSwitchButton;
+    protected int getTabMoveIndex(CardSwitchButton currentButton) {
+        return currentButton.getIndex() - 1;
     }
 }

designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java

@@ -295,9 +295,9 @@ public class XWCardLayout extends XLayoutContainer {
 	 * 判断当前tab组件是不是嵌套的
 	 * @return 嵌套与否
 	 */
-	private boolean isNested(){
+	private boolean isNested() {
 		XLayoutContainer xLayoutContainer = this.getBackupParent().getBackupParent();
-		return xLayoutContainer != null && xLayoutContainer.acceptType(XWTabFitLayout.class);
+		return xLayoutContainer == null || xLayoutContainer.acceptType(XWTabFitLayout.class);
 	}
 
 	public CRPropertyDescriptor[] getisCarousel() throws IntrospectionException {

designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java

@@ -26,8 +26,11 @@ import java.util.Comparator;
 public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPropertiesGroupModel {
     private LayoutTypeEditor layoutTypeEditor;
     private LayoutTypeRenderer layoutTypeRenderer;
+
     //默认body是0,自适应布局;1,绝对布局.
     private WBodyLayoutType layoutType = WBodyLayoutType.ABSOLUTE;
+    private static final int EACH_ROW_COUNT = 4;
+
     public FRAbsoluteBodyLayoutPropertiesGroupModel(XWAbsoluteBodyLayout xwAbsoluteBodyLayout) {
         super(xwAbsoluteBodyLayout);
     }
@@ -180,9 +183,8 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
     // 把绝对布局中的元素按规则移动到自适应布局中
     // 规则：各元素按顺序放置，其中每行最多4个元素，超出则换行，各元素均分body的高度和宽度
     private void moveComponents2FitLayout(XWFitLayout xwFitLayout) {
-        int eachRowCount = 4;
         Component[] components = xwFitLayout.getComponents();
-        if (components.length <= 1){
+        if (components.length == 0){
             xwFitLayout.updateBoundsWidget();
             return;
         }
@@ -191,17 +193,17 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
         int leftMargin = xwFitLayout.toData().getMargin().getLeft();
         int topMargin = xwFitLayout.toData().getMargin().getTop();
         xwFitLayout.toData().setCompInterval(0);
-        int row = (components.length / eachRowCount) + (components.length % eachRowCount == 0 ? 0 : 1);
+        int row = (components.length / EACH_ROW_COUNT) + (components.length % EACH_ROW_COUNT == 0 ? 0 : 1);
         //最后一行的列数不定
-        int column = components.length % eachRowCount == 0 ? eachRowCount : components.length % eachRowCount;
+        int column = components.length % EACH_ROW_COUNT == 0 ? EACH_ROW_COUNT : components.length % EACH_ROW_COUNT;
-        int componentWidth = layoutWidth / eachRowCount;
+        int componentWidth = layoutWidth / EACH_ROW_COUNT;
         int componentHeight = layoutHeight / row;
         for(int i = 0;i < row - 1;i++){
-            for(int j = 0;j < eachRowCount;j++){
+            for(int j = 0;j < EACH_ROW_COUNT;j++){
-                components[eachRowCount * i + j].setBounds(
+                components[EACH_ROW_COUNT * i + j].setBounds(
                         leftMargin + componentWidth * j,
                         topMargin + componentHeight * i,
-                        j == eachRowCount - 1 ? layoutWidth - componentWidth * (eachRowCount - 1) : componentWidth,
+                        j == EACH_ROW_COUNT - 1 ? layoutWidth - componentWidth * (EACH_ROW_COUNT - 1) : componentWidth,
                         componentHeight
                 );
             }
@@ -210,7 +212,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
         int lastRowWidth = layoutWidth / column;
         int lastRowHeight = layoutHeight - componentHeight * (row - 1);
         for (int i = 0;i < column;i++) {
-            components[eachRowCount * (row - 1) + i].setBounds(
+            components[EACH_ROW_COUNT * (row - 1) + i].setBounds(
                     leftMargin + lastRowWidth * i,
                     topMargin + componentHeight * (row - 1),
                     i == column - 1 ? layoutWidth - lastRowWidth * (column - 1) : lastRowWidth,

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

@@ -11,6 +11,7 @@ import com.fr.design.designer.beans.location.Location;
 import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.beans.models.StateModel;
 import com.fr.design.designer.creator.*;
+import com.fr.design.designer.creator.cardlayout.XCardSwitchButton;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.xpane.ToolTipEditor;
@@ -519,6 +520,10 @@ public class EditingMouseListener extends MouseInputAdapter {
 	public void mouseClicked(MouseEvent e) {
 		XCreator creator = designer.getComponentAt(e);
 
+		if (e.getButton() != MouseEvent.BUTTON1 && !creator.acceptType(XCardSwitchButton.class)) {
+			return;
+		}
+
 		creator = processTopLayoutMouseClick(creator);
 
 		if(creator != null){