diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
index 88d2625d0..68bb91711 100644
--- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
+++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
@@ -163,7 +163,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * alphafine
      */
     private AlphaFineConfigManager alphaFineConfigManager = AlphaFineConfigManager.getInstance();
-    
+
     /**
      * 阅后即焚的配置项
      */
@@ -1424,7 +1424,9 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * @return
      */
     private Locale checkLocale(Locale locale) {
-        return SupportLocale.getInstance().isSupport(locale) ? locale : Locale.US;
+        // Yvan: REPORT-39341，有一些情况下，获取到的是zh-Hans-CN这种，需要找到项目中最匹配的Locale
+        return SupportLocale.getInstance().isSupport(locale) ?
+                locale : SupportLocale.getInstance().getSuitableLocale(locale);
     }
 
     private void readReportLengthUnit(XMLableReader reader) {
@@ -1578,7 +1580,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             }
         }
     }
-    
+
     private void readSnapChatConfig(XMLableReader reader) {
         reader.readXMLObject(this.snapChatConfig = SnapChatConfig.getInstance());
     }
@@ -1801,14 +1803,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         writeSnapChatConfig(writer);
         writer.end();
     }
-    
+
     private void writeSnapChatConfig(XMLPrintWriter writer) {
-    
+
         if (this.snapChatConfig != null) {
             this.snapChatConfig.writeXML(writer);
         }
     }
-    
+
     private void writeAlphaFineAttr(XMLPrintWriter writer) {
         if (this.alphaFineConfigManager != null) {
             this.alphaFineConfigManager.writeXML(writer);
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 8de3d89f3..fe0276b38 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
@@ -257,8 +257,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         }
     };
 
-    private ProgressDialog progressDialog;
-
     public DesignerFrame(ToolBarMenuDock ad) {
 
         setName(DESIGNER_FRAME_NAME);
@@ -338,7 +336,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         this.setDropTarget(new DropTarget(this, DnDConstants.ACTION_MOVE, new FileDropTargetListener(), true));
         closeMode = UIConstants.CLOSE_OF_AUTHORITY;
         initMenuPane();
-        this.progressDialog = new ProgressDialog(this);
     }
 
     public void resizeFrame() {
@@ -1264,23 +1261,15 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         }
     }
 
+    @Deprecated
     public ProgressDialog getProgressDialog() {
 
-        return progressDialog;
-    }
-
-    public void showProgressDialog() {
-
-        progressDialog.setVisible(true);
-
+        return new ProgressDialog(this);
     }
 
-    /**
-     * 隐藏进度框
-     */
-    public void hideProgressDialog() {
+    @Deprecated
+    public void openProgressDialog() {
 
-        progressDialog.setVisible(false);
     }
 
     /**
@@ -1288,17 +1277,17 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      *
      * @param progress 进度值
      */
+    @Deprecated
     public void updateProgress(int progress) {
 
-        progressDialog.setProgressValue(progress);
     }
 
     /**
      * 释放进度框
      */
+    @Deprecated
     public void disposeProgressDialog() {
 
-        progressDialog.dispose();
     }
 
     /**
@@ -1309,4 +1298,5 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     public boolean isDesignerOpened() {
         return designerOpened;
     }
+
 }
diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java
index 7e95c48d2..f8f7a13ea 100644
--- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java
+++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java
@@ -32,7 +32,7 @@ public class FineEmbedServerMonitor {
      */
     private static final int STEP_HEARTBEAT = 40;
     private static volatile FineEmbedServerMonitor monitor;
-    private static ProgressDialog progressBar = DesignerContext.getDesignerFrame().getProgressDialog();
+    private static ProgressDialog progressDialog = new ProgressDialog(DesignerContext.getDesignerFrame());
     //由于默认值的字体不支持韩文，所以要对韩文单独生成字体
     private FRFont font = null;
     private static final int FONT_RGB = 333334;
@@ -47,7 +47,7 @@ public class FineEmbedServerMonitor {
             @Override
             public void on(Event event, Null aNull) {
                 getInstance().reset();
-                DesignerContext.getDesignerFrame().hideProgressDialog();
+                progressDialog.dispose();
             }
         });
     }
@@ -64,7 +64,7 @@ public class FineEmbedServerMonitor {
     }
 
     public int getProgress() {
-        if (progress == progressBar.getProgressMaximum()) {
+        if (progress == progressDialog.getProgressMaximum()) {
             return progress;
         } else {
             progress += STEP;
@@ -73,7 +73,7 @@ public class FineEmbedServerMonitor {
     }
 
     public void setComplete() {
-        this.progress = progressBar.getProgressMaximum();
+        this.progress = progressDialog.getProgressMaximum();
     }
 
     public void reset() {
@@ -81,7 +81,7 @@ public class FineEmbedServerMonitor {
     }
 
     public boolean isComplete() {
-        return this.progress >= progressBar.getProgressMaximum();
+        return this.progress >= progressDialog.getProgressMaximum();
     }
 
     public void monitor() {
@@ -92,11 +92,12 @@ public class FineEmbedServerMonitor {
             public void run() {
                 if (isComplete()) {
                     scheduler.shutdown();
-                    DesignerContext.getDesignerFrame().hideProgressDialog();
+                    progressDialog.dispose();
                     return;
                 }
-                if (!DesignerContext.getDesignerFrame().getProgressDialog().isVisible()) {
-                    DesignerContext.getDesignerFrame().showProgressDialog();
+                if (!progressDialog.isVisible()) {
+                    progressDialog = new ProgressDialog(DesignerContext.getDesignerFrame());
+                    progressDialog.setVisible(true);
                     //如果为韩文则改变字体
                     LocaleCenter.buildAction(new LocaleAction() {
                         @Override
@@ -105,9 +106,9 @@ public class FineEmbedServerMonitor {
                         }
                     }, SupportLocaleImpl.SUPPORT_KOREA);
                     String text = Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server");
-                    DesignerContext.getDesignerFrame().getProgressDialog().updateLoadingText(text, font);
+                    progressDialog.updateLoadingText(text, font);
                 }
-                DesignerContext.getDesignerFrame().updateProgress(getProgress());
+                progressDialog.setProgressValue(getProgress());
             }
         }, 0, STEP_HEARTBEAT, TimeUnit.MILLISECONDS);