Merge pull request #852 in DESIGN/design from ~XIAOXIA/design:feature/10.0 to feature/10.0

* commit '662f95bb59a2a2d439853c916b3a157ef8c48d04':
  REPORT-16547

designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java

@@ -30,7 +30,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         // 判断是否切换设计器状态到禁止拷贝剪切
         if (jt.getTarget().getAttrMark(DesignBanCopyAttrMark.XML_TAG) != null) {
             DesignModeContext.switchTo(DesignerMode.BAN_COPY_AND_CUT);
-        } else {
+        } else if (!DesignModeContext.isVcsMode()){
             DesignModeContext.switchTo(DesignerMode.NORMAL);
         }
         DesignerFrameFileDealerPane.getInstance().setCurrentEditingTemplate(jt);

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -112,7 +112,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         // 判断是否切换设计器状态到禁止拷贝剪切
         if (t.getAttrMark(DesignBanCopyAttrMark.XML_TAG) != null) {
             DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.BAN_COPY_AND_CUT);
-        } else {
+        } else if (!DesignModeContext.isVcsMode()) {
             DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.NORMAL);
         }
         this.template = t;