conflict

designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@@ -15,6 +15,7 @@ import com.fr.design.menu.SeparatorDef;
 import com.fr.design.utils.DesignUtils;
 import com.fr.license.exception.RegistEditionException;
 import com.fr.log.FineLoggerFactory;
+import com.fr.start.server.ServerTray;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
 import com.fr.workspace.Workspace;
@@ -110,6 +111,10 @@ public class SwitchExistEnv extends MenuDef {
                         DesignUtils.refreshDesignerFrame();
                         HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
                         fireDSChanged();
+                        if (WorkContext.getCurrent().isLocal()) {
+                            //初始化一下serverTray
+                            ServerTray.init();
+                        }
                     }
                 });
             } catch (AuthException exception) {

designer-base/src/main/java/com/fr/start/server/ServerTray.java

@@ -173,8 +173,7 @@ public class ServerTray {
     }
 
     public static void init() {
-        
+        if (INSTANCE == null)
-        INSTANCE = new ServerTray();
+            INSTANCE = new ServerTray();
-        
     }
 }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java

@@ -81,7 +81,7 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	 * @return 返回标题.
 	 */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tabledata");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TableData");
 	}
 
 

designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java

@@ -54,7 +54,7 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
         Arrays.fill(rowSize, p);
 
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
 
 
         this.setLayout(new BorderLayout());

designer-realize/src/main/java/com/fr/start/Designer.java

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.RestartHelper;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.file.WebPreviewUtils;
 import com.fr.design.actions.file.newReport.NewPolyReportAction;
@@ -102,6 +103,7 @@ public class Designer extends BaseDesigner {
             DesignUtils.clientSend(args);
             return;
         }
+        RestartHelper.deleteRecordFilesWhenStart();
 
         preloadResource();
 

designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java

@@ -23,7 +23,6 @@ public class PreStartActivator extends Activator {
     @Override
     public void start() {
 
-        RestartHelper.deleteRecordFilesWhenStart();
         CloudCenter.getInstance();
         if (checkMultiStart()) {
             return;