Merge pull request #9863 in DESIGN/design from bugfix/11.0 to feature/x

* commit '24dc80e8528399bd58f6d0d6de243b53998e9d20':
  REPORT-73510 服务器配置-工具栏背景色 渐变色、图案处的颜色选择器修改为 无主题色的面板
  REPORT-73419 调整水印弹窗尺寸
  REPORT-78995 开启空报表,双击模板直接打开设计器,未打开对应模板
  REPORT-64340 删除无效日志

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionManagerPane.java

@@ -4,6 +4,7 @@ import com.fr.design.gui.frpane.LoadingBasicPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.file.ConnectionConfig;
 
+
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.util.HashMap;

designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentSender.java

@@ -17,13 +17,7 @@ public class ComponentSender {
     private static final String CLOUD_REUSE_URL = "https://cloud.fanruan.com/api/monitor/record_of_reusePlugin/single";
     
     public static boolean send() {
-    
-        long start = System.currentTimeMillis();
-    
         String content = ComponentCollector.getInstance().generateTotalInfo();
-    
-        long end = System.currentTimeMillis();
-        FineLoggerFactory.getLogger().error("cal time cost {} ms", end - start);
         return sendInfo(CLOUD_REUSE_URL, content);
     }
     

designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

@@ -47,7 +47,7 @@ import java.awt.FlowLayout;
  * Created by plough on 2018/5/15.
  */
 public class WatermarkPane extends BasicPane {
-    private static final int MAX_WIDTH = 160;
+    private static final int MAX_WIDTH = 216;
 
     // 水印预览面板
     private WatermarkPreviewPane watermarkPreviewPane;

designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

@@ -72,7 +72,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     }
 
     public NewColorSelectPane(boolean isSupportTransparent) {
-        this(isSupportTransparent, true);
+        this(isSupportTransparent, !DesignerContext.getDesignerFrame().isServerConfig());
     }
 
     /**

designer-base/src/main/java/com/fr/start/BaseDesigner.java

@@ -50,6 +50,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
 
     private final String[] args;
 
+    //判断是否是通过打开指定模板来启动设计器，如果是则置false
+    private Boolean openFlag = true;
+
     public BaseDesigner(String[] args) {
 
         this.args = args;
@@ -126,6 +129,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
             FILE file = null;
             if (args != null && args.length > 0) {
                 file = DesignerStartupUtil.convertArgs2FILE(args);
+                setOpenFlag(false);
             } else {
                 file = getLastOpenFile();
             }
@@ -197,8 +201,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         //启动时打开指定文件的接口
         DesignerStartOpenFileProcessor processor = ExtraDesignClassManager.getInstance().getSingle(DesignerStartOpenFileProcessor.XML_TAG);
         // 如果插件没有，且又开启了启动时打开空文件，则使用启动时打开空文件
-        if (processor == null && DesignerEnvManager.getEnvManager().isStartWithEmptyFile()) {
+        if (processor == null && DesignerEnvManager.getEnvManager().isStartWithEmptyFile() && isOpenAppoint()) {
             processor = DesignerStartWithEmptyFile.getInstance();
+            setOpenFlag(true);
         }
         if (processor != null) {
             FILE f = processor.fileToShow();
@@ -264,6 +269,14 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         }
     }
 
+    public Boolean isOpenAppoint() {
+        return openFlag;
+    }
+
+    public void setOpenFlag(Boolean openFlag) {
+        this.openFlag = openFlag;
+    }
+
     // 收集用户信息码
     protected void collectUserInformation() {
 

designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties

@@ -21,3 +21,4 @@ com.fr.design.ds.column.sort.pane=250*180
 com.fr.design.sort.expand.header.pane=95*10
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
+com.fr.design.report.WatermarkSettingPane=720*600

designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties

@@ -20,3 +20,4 @@ com.fr.design.ds.column.sort.pane=250*165
 com.fr.design.sort.expand.header.pane=95*10
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
+com.fr.design.report.WatermarkSettingPane=720*600

designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@@ -20,3 +20,4 @@ com.fr.design.ds.column.sort.pane=250*180
 com.fr.design.sort.expand.header.pane=95*10
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
+com.fr.design.report.WatermarkSettingPane=720*600

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties

@@ -22,3 +22,4 @@ com.fr.design.ds.column.sort.pane=220*150
 com.fr.design.sort.expand.header.pane=108*10
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
+com.fr.design.report.WatermarkSettingPane=720*600

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties

@@ -20,3 +20,4 @@ com.fr.design.ds.column.sort.pane=220*150
 com.fr.design.sort.expand.header.pane=108*10
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
+com.fr.design.report.WatermarkSettingPane=720*600

designer-realize/src/main/java/com/fr/design/cell/editor/TextCellEditor.java

@@ -136,7 +136,6 @@ public class TextCellEditor extends AbstractCellEditor {
             style = cellElement.getStyle();
         }
         this.ajustTextStyle(grid, style, value, resolution);
-
         return this.textField;
     }
 

designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java

@@ -118,7 +118,6 @@ public class GridMouseAdapter implements MouseListener, MouseWheelListener, Mous
         if (!evt.isShiftDown() && ePane.getSelection() instanceof CellSelection) {
             tempOldSelectedCell = GridUtils.getAdjustEventColumnRow_withresolution(ePane, oldEvtX, oldEvtY, resolution);
         }
-
     }
 
     /**