Merge branch 'release' of http://www.finedevelop.com:2015/scm/ba/design into release

designer_base/src/com/fr/env/RemoteEnv.java

@@ -22,6 +22,7 @@ import com.fr.file.CacheManager;
 import com.fr.file.DatasourceManager;
 import com.fr.file.DatasourceManagerProvider;
 import com.fr.file.filetree.FileNode;
+import com.fr.form.share.ShareConstants;
 import com.fr.general.*;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
@@ -2105,4 +2106,47 @@ public class RemoteEnv implements Env {
     public void checkAndRegisterLic(FileNode node, Plugin plugin) throws Exception {
 
     }
+
+    @Override
+    public File[] loadREUFile() throws Exception {
+        File target = new File(CacheManager.getProviderInstance().getCacheDirectory(),
+                "fr_share");
+        StableUtils.deleteFile(target);
+        StableUtils.mkdirs(target);
+        File cacheDir = null;
+        File zip = null;
+        try {
+            HashMap<String, String> para = new HashMap<String, String>();
+            para.put("op", "fr_remote_design");
+            para.put("cmd", "design_read_reufile");
+            para.put("current_uid", this.createUserID());
+            para.put("currentUsername", this.getUser());
+
+            HttpClient client = createHttpMethod(para);
+            InputStream input = client.getResponseStream();
+            zip = new File(StableUtils.pathJoin(CacheManager.getProviderInstance().getCacheDirectory().getAbsolutePath()), "share.zip");
+            cacheDir = new File(StableUtils.pathJoin(CacheManager.getProviderInstance().getCacheDirectory().getAbsolutePath()), ShareConstants.DIR_SHARE_CACHE);
+            StableUtils.deleteFile(cacheDir);
+            StableUtils.mkdirs(cacheDir);
+            StableUtils.makesureFileExist(zip);
+            FileOutputStream out = new FileOutputStream(zip);
+            IOUtils.copyBinaryTo(input, out);
+            out.flush();
+            out.close();
+            IOUtils.unzip(zip, cacheDir.getAbsolutePath(), EncodeConstants.ENCODING_GBK);//先解压到临时目录
+            if (cacheDir.exists() && cacheDir.isDirectory()) {
+                return cacheDir.listFiles(new FilenameFilter() {
+                    public boolean accept(File file, String s) {
+                        return s.endsWith("reu");
+                    }
+                });
+            }
+
+        } catch (Exception e) {
+            FRContext.getLogger().error(e.getMessage());
+        } finally {
+            StableUtils.deleteFile(zip);
+        }
+        return new File[0];
+    }
 }

designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -300,8 +300,12 @@ public class ChartTypePane extends AbstractChartAttrPane{
 	 */
 	public void populate(ChartCollection collection) {
 		Chart chart = collection.getSelectedChart();
+		this.remove(leftContentPane);
+		initContentPane();
+		this.removeAttributeChangeListener();
 		buttonPane.populateBean(collection);
 		chartTypePane.populateBean(chart);
+		this.initAllListeners();
 	}
 
 	/**

designer_form/src/com/fr/design/mainframe/FormWidgetDetailPane.java

@@ -2,11 +2,6 @@ package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
-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.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -16,7 +11,6 @@ import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.layout.FRGUIPaneFactory;
 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.FRLogger;
@@ -105,7 +99,6 @@ public class FormWidgetDetailPane extends FormDockView{
         reuWidgetPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         reuWidgetPanel.setBorder(null);
         if (elCaseBindInfoList == null) {
-            elCaseBindInfoList = new ElCaseBindInfo[0];
             if (sw != null) {
                 sw.cancel(true);
             }
@@ -235,7 +228,7 @@ public class FormWidgetDetailPane extends FormDockView{
                     protected Object doInBackground() throws Exception {
                         ShareLoader.getLoader().refreshModule();
                         elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList();
-                        comboBox.setSelectedIndex(0);
+                        refreshComboxData();
                         refreshDownPanel(false);
                         return null;
                     }
@@ -247,6 +240,11 @@ public class FormWidgetDetailPane extends FormDockView{
 
     }
 
+    private void refreshComboxData() {
+        comboBox.setSelectedIndex(0);
+        comboBox.setModel(new DefaultComboBoxModel(getFormCategories()));
+    }
+
     /**
      * 创建下载模板的按钮
      */
@@ -335,7 +333,7 @@ public class FormWidgetDetailPane extends FormDockView{
                     JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_Removed_Successful"));
                     refreshDownPanel(false);
                     replaceButtonPanel(false);
-                    comboBox.setSelectedIndex(0);
+                    refreshComboxData();
                 } else {
                     JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_Removed_Failed"));
                 }
@@ -366,7 +364,7 @@ public class FormWidgetDetailPane extends FormDockView{
             refreshShareMoudule();
             elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList();
             refreshDownPanel(false);
-            comboBox.setSelectedIndex(0);
+            refreshComboxData();
             JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_OK"));
         } catch (IOException e) {
             JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_Error"));

designer_form/src/com/fr/design/mainframe/ShareWidgetPane.java

@@ -1,8 +1,8 @@
 package com.fr.design.mainframe;
 
 
-
 import com.fr.form.ui.ElCaseBindInfo;
+
 import javax.swing.*;
 import java.awt.*;
 
@@ -14,15 +14,15 @@ public class ShareWidgetPane extends JPanel {
 
     public ShareWidgetPane(ElCaseBindInfo[] elCaseBindInfoList, boolean isEdit) {
         this.setBorder(BorderFactory.createEmptyBorder(10, 3, 0, 0));// 设置面板的边框 ，距离上、左、下、右 的距离
-        int rowCount = (elCaseBindInfoList.length + 1) / 2;
+        if (elCaseBindInfoList != null) {
-        this.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 10));
+            int rowCount = (elCaseBindInfoList.length + 1) / 2;
-        for (ElCaseBindInfo rbModuleInfo : elCaseBindInfoList) {
+            this.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 10));
-            ShareWidgetButton widgetButton = new ShareWidgetButton(rbModuleInfo);
+            for (ElCaseBindInfo rbModuleInfo : elCaseBindInfoList) {
-            widgetButton.setElementCaseEdit(isEdit);
+                ShareWidgetButton widgetButton = new ShareWidgetButton(rbModuleInfo);
-            this.add(widgetButton);
+                widgetButton.setElementCaseEdit(isEdit);
+                this.add(widgetButton);
+            }
+            this.setPreferredSize(new Dimension(240, rowCount * 80));
         }
-        this.setPreferredSize(new Dimension(240, rowCount * 80));
-
     }
-
 }