diff --git a/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
index d7f858b65f..628adfec64 100644
--- a/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
+++ b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
@@ -159,7 +159,7 @@ public class WebViewDlgHelper {
     }
 
     public static void createLoginDialog() {
-        if (StableUtils.getMajorJavaVersion() == VERSION_8) {
+        if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
             File file = new File(StableUtils.pathJoin(installHome, "scripts"));
             if (!file.exists()) {
                 confirmDownLoadShopJS();
@@ -172,7 +172,7 @@ public class WebViewDlgHelper {
 
 
     public static void createLoginDialog(Window parent) {
-        if (StableUtils.getMajorJavaVersion() == VERSION_8) {
+        if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
             File file = new File(StableUtils.pathJoin(installHome, "scripts"));
             if (!file.exists()) {
                 confirmDownLoadShopJS();
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
index 42365dcc57..8de3d89f32 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@@ -748,9 +748,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param al   组件名称
      */
     public void checkCombineUp(boolean flag, ArrayList<String> al) {
-
+        //Yvan: 检查当前是否为WORK_SHEET状态，因为只有WORK_SHEET中含有格式刷组件，此时是不需要进行checkComponentsByNames的
+        if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getMenuState() == DesignState.WORK_SHEET) {
+            return;
+        }
         combineUp.checkComponentsByNames(flag, al);
-
     }
 
     /**
diff --git a/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java b/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java
index 46377b1adf..352aa80e54 100644
--- a/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java
+++ b/designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java
@@ -1,5 +1,6 @@
 package com.fr.design.form.util;
 
+import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.JTemplate;
@@ -17,7 +18,7 @@ public class FormDesignerUtils {
      * @return
      */
     public static boolean isAppRelayout(FormDesigner designer) {
-        if (!designer.getRootComponent().acceptType(WFitLayout.class)) {
+        if (!designer.getRootComponent().acceptType(XWFitLayout.class)) {
             return false;
         }
         return ((WFitLayout) designer.getRootComponent().toData()).isAppRelayout();
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java
index 6e423e1729..4d168557f6 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java
@@ -199,7 +199,7 @@ public class UserInfoLabel extends UILabel {
         this.addMouseListener(userInfoAdapter);
         this.setHorizontalAlignment(SwingConstants.CENTER);
 
-        if (StableUtils.getMajorJavaVersion() == VERSION_8) {
+        if (StableUtils.getMajorJavaVersion() >= VERSION_8) {
             LoginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
             PluginWebBridge.getHelper().setUILabel(UserInfoLabel.this);
         }