From 5ed311f92a8b4ad89d8ebb1dce4abae4db864b4b Mon Sep 17 00:00:00 2001
From: zack <zack@finereport.com>
Date: Thu, 3 Nov 2016 20:02:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=85=B1=E4=BA=AB=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/FormWidgetDetailPane.java       | 62 +++++++++++--------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java
index 6bcc9a2661..a1fb5f1476 100644
--- a/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java
+++ b/designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java
@@ -1,47 +1,35 @@
 package com.fr.design.mainframe;
 
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import java.util.List;
-
-import javax.swing.*;
-import javax.swing.border.LineBorder;
-import javax.swing.filechooser.FileNameExtensionFilter;
-
 import com.fr.base.BaseUtils;
-import com.fr.design.actions.file.WebPreviewUtils;
-import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.extra.PluginWebBridge;
 import com.fr.design.extra.ShopDialog;
 import com.fr.design.extra.WebManagerPaneFactory;
-import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.file.MutilTempalteTabPane;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.ibutton.UIPreviewButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIPopupMenu;
-import com.fr.design.gui.itoolbar.UILargeToolbar;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.parameter.ParameterPropertyPane;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.share.ShareConstants;
 import com.fr.form.share.ShareLoader;
 import com.fr.form.ui.ElCaseBindInfo;
-import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 
+import javax.swing.*;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.File;
+import java.io.IOException;
+
 /**
  * Created with IntelliJ IDEA.
  * User: zx
@@ -60,6 +48,7 @@ public class FormWidgetDetailPane extends FormDockView{
     private UIButton deleteButton;
     private static final int OFFSET_X = 140;
     private static final int OFFSET_Y = 26;
+    private SwingWorker sw;
 
     public static FormWidgetDetailPane getInstance() {
         if (HOLDER.singleton == null) {
@@ -105,7 +94,19 @@ public class FormWidgetDetailPane extends FormDockView{
         reuWidgetPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         reuWidgetPanel.setBorder(null);
         if (elCaseBindInfoList == null) {
-            elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList();
+            elCaseBindInfoList = new ElCaseBindInfo[0];
+            if (sw != null) {
+                sw.cancel(true);
+            }
+            sw = new SwingWorker() {
+                @Override
+                protected Object doInBackground() throws Exception {
+                    elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList();
+                    refreshDownPanel(false);
+                    return null;
+                }
+            };
+            sw.execute();
         }
         initReuWidgetPanel();
         createRefreshButton();
@@ -178,8 +179,19 @@ public class FormWidgetDetailPane extends FormDockView{
         refreshButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                refreshShareMoudule();
-                refreshDownPanel(false);
+                if (sw != null) {
+                    sw.cancel(true);
+                }
+                sw = new SwingWorker() {
+                    @Override
+                    protected Object doInBackground() throws Exception {
+                        ShareLoader.getLoader().refreshModule();
+                        elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList();
+                        refreshDownPanel(false);
+                        return null;
+                    }
+                };
+                sw.execute();
             }
         });