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

* commit '63a687ebad7a8a1f60b4a465cae5c132a9ba9e3c':
  REPORT-11123 【10.0冒烟】表单预览国际化问题，点击没反应

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);
 
     }
 

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

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

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);
     }
 
     /**