From ff271147c1f325967b4ce02ac00bebd08d1618f4 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Thu, 26 Jul 2018 10:24:30 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-9958=20=E5=8F=82=E8=80=83=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E6=88=AA=E5=9B=BE=EF=BC=8C=E7=82=B9=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=86=85=E7=BD=AEsql=E5=8F=B3=E8=BE=B9=E6=98=AF?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/gui/frpane/LoadingBasicPane.java  | 17 +++++++++++++----
 .../fr/design/webattr/ReportWriteAttrPane.java  | 12 ++++++++++--
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java
index db89371fd..f29707fd7 100644
--- a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java
@@ -7,10 +7,14 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.LayoutUtils;
-import com.fr.general.Inter;
+import com.fr.locale.InterProviderFactory;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.SwingConstants;
+import javax.swing.SwingWorker;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
 
 /**
  * @author richer
@@ -23,6 +27,10 @@ public abstract class LoadingBasicPane extends BasicPane {
     private JProgressBar progressBar;
     public LoadingBasicPane() {
         initCards();
+        initPane();
+    }
+
+    protected void initPane(){
         new SwingWorker<Integer, Void>() {
 
             @Override
@@ -42,13 +50,14 @@ public abstract class LoadingBasicPane extends BasicPane {
     }
 
 
+
     private void initCards() {
         card = new CardLayout();
         setLayout(card);
         JPanel loadingDisPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         String[] message = {"Loading","Please-Wait"};
         String[] operator = {",","..."};
-        UILabel loadingPane = new UILabel(Inter.getLocText(message,operator) , SwingConstants.CENTER);
+        UILabel loadingPane = new UILabel(InterProviderFactory.getProvider().getLocText(message,operator) , SwingConstants.CENTER);
         loadingDisPane.add(loadingPane, BorderLayout.CENTER);
         progressBar = new JProgressBar();
         progressBar.setIndeterminate(true);
diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java
index 48a62660c..62ce611e4 100644
--- a/designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java
@@ -11,8 +11,11 @@ import com.fr.general.Inter;
 import com.fr.report.worksheet.WorkSheet;
 import com.fr.report.write.ReportWriteAttr;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+
 
 public class ReportWriteAttrPane extends LoadingBasicPane {
 	private SubmitVisitorListPane submiterListPane;
@@ -25,6 +28,11 @@ public class ReportWriteAttrPane extends LoadingBasicPane {
 	}
 	public ReportWriteAttrPane(ElementCasePane ePane){
 		this.ePane = ePane;
+		super.initPane();
+	}
+
+	protected void initPane(){
+
 	}
 
 	@Override