From 39ffd23c8dcbe5eeadc7c827bbac78e2b48c4892 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Thu, 6 Sep 2018 10:26:24 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-11123=20=E3=80=9010.0=E5=86=92=E7=83=9F?=
 =?UTF-8?q?=E3=80=91=E8=A1=A8=E5=8D=95=E9=A2=84=E8=A7=88=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98=EF=BC=8C=E7=82=B9=E5=87=BB=E6=B2=A1?=
 =?UTF-8?q?=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/mainframe/JTemplate.java      | 3 +++
 .../src/main/java/com/fr/design/preview/FormPreview.java      | 3 +--
 .../src/main/java/com/fr/design/preview/MobilePreview.java    | 3 +--
 .../src/main/java/com/fr/design/mainframe/JWorkBook.java      | 4 +---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index 6f9383e4d..b2519271b 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -16,6 +16,7 @@ import com.fr.design.actions.edit.RedoAction;
 import com.fr.design.actions.edit.UndoAction;
 import com.fr.design.actions.file.SaveAsTemplateAction;
 import com.fr.design.actions.file.SaveTemplateAction;
+import com.fr.design.actions.file.WebPreviewUtils;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.dialog.InformationWarnPane;
@@ -1102,6 +1103,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      * @param provider 预览模式
      */
     public void previewMenuActionPerformed(PreviewProvider provider) {
+        setPreviewType(provider);
+        WebPreviewUtils.preview(this, provider);
 
     }
 
diff --git a/designer-base/src/main/java/com/fr/design/preview/FormPreview.java b/designer-base/src/main/java/com/fr/design/preview/FormPreview.java
index d6206a2c0..8522d6773 100644
--- a/designer-base/src/main/java/com/fr/design/preview/FormPreview.java
+++ b/designer-base/src/main/java/com/fr/design/preview/FormPreview.java
@@ -1,7 +1,6 @@
 package com.fr.design.preview;
 
 import com.fr.design.fun.impl.AbstractPreviewProvider;
-import com.fr.locale.InterProviderFactory;
 
 
 /**
@@ -13,7 +12,7 @@ public class FormPreview extends AbstractPreviewProvider {
 
     @Override
     public String nameForPopupItem() {
-        return InterProviderFactory.getProvider().getLocText("Fine-Design_Form_M_Form_Preview");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Form_Preview");
     }
 
     @Override
diff --git a/designer-base/src/main/java/com/fr/design/preview/MobilePreview.java b/designer-base/src/main/java/com/fr/design/preview/MobilePreview.java
index 4ab942501..ca75e39ac 100644
--- a/designer-base/src/main/java/com/fr/design/preview/MobilePreview.java
+++ b/designer-base/src/main/java/com/fr/design/preview/MobilePreview.java
@@ -1,7 +1,6 @@
 package com.fr.design.preview;
 
 import com.fr.design.fun.impl.AbstractPreviewProvider;
-import com.fr.general.Inter;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,7 +15,7 @@ public class MobilePreview extends AbstractPreviewProvider {
 
     @Override
     public String nameForPopupItem() {
-        return Inter.getLocText("Fine-Design_Mobile_Preview");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Preview");
     }
 
     @Override
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
index e60fa5978..bfc01d0bf 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
@@ -10,7 +10,6 @@ import com.fr.design.DesignModelAdapter;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.AllowAuthorityEditAction;
 import com.fr.design.actions.ExitAuthorityEditAction;
-import com.fr.design.actions.file.WebPreviewUtils;
 import com.fr.design.actions.file.export.CSVExportAction;
 import com.fr.design.actions.file.export.EmbeddedExportExportAction;
 import com.fr.design.actions.file.export.ExcelExportAction;
@@ -924,8 +923,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
      */
     @Override
     public void previewMenuActionPerformed(PreviewProvider provider) {
-        setPreviewType(provider);
-        WebPreviewUtils.preview(this, provider);
+       super.previewMenuActionPerformed(provider);
     }
 
     /**