Merge pull request #7439 in DESIGN/design from final/11.0 to release/11.0

* commit '7376cf947930a4455e9737906c431259f29698dc':
  REPORT-65371 【主题边框】附件截图，滚动条显示有问题
  REPORT-65343 FR11-新自适应开发者调试-新建模板，直接点击开发者调试进行模板保存和预览，此时虽然弹出保存路径弹窗，但对话框弹窗还没有点击的时候模板web就打开了且报错，因为模板没保存成功；设计器端可以看到模板被关闭了
  REPORT-65365 【主题边框】多次切换单元格样式后切换自定义，边框线有问题
  REPORT-65358 【主题边框】单元格样式双线显示有问题
  REPORT-65307 二轮冒烟测试-远程模板锁定优化-国际化问题-弹窗显示不全

designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java

@@ -19,9 +19,7 @@ import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Rectangle;
 import java.awt.RenderingHints;
-import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.util.List;
 
@@ -154,16 +152,16 @@ public class CellStylePreviewPane extends JPanel {
         float adjustRight = 0;
         float adjustBottom = 0;
         if (column == 0) {
-            adjustLeft = GraphHelper.getLineStyleSize(style.getBorderLeft()) / 2.0F + computeOffset4DoubleStyleBorder(style);
+            adjustLeft = computeHalfSize4StyledBorder(style.getBorderLeft());
         }
         if (row == 0) {
-            adjustTop = GraphHelper.getLineStyleSize(style.getBorderTop()) / 2.0F + computeOffset4DoubleStyleBorder(style);
+            adjustTop = computeHalfSize4StyledBorder(style.getBorderTop());
         }
         if (column == columnSpan - 1) {
-            adjustRight = -GraphHelper.getLineStyleSize(style.getBorderRight()) / 2.0F - computeOffset4DoubleStyleBorder(style);
+            adjustRight = -computeHalfSize4StyledBorder(style.getBorderRight());
         }
         if (row == rowSpan - 1) {
-            adjustBottom = -GraphHelper.getLineStyleSize(style.getBorderBottom()) / 2.0F - computeOffset4DoubleStyleBorder(style);
+            adjustBottom = -computeHalfSize4StyledBorder(style.getBorderBottom());
         }
 
         g2d.translate(adjustLeft, adjustTop);
@@ -171,15 +169,16 @@ public class CellStylePreviewPane extends JPanel {
         g2d.translate(-adjustLeft, -adjustTop);
     }
 
-    private float computeOffset4DoubleStyleBorder(Style style) {
-        float offset = 0F;
-        if (style.getBorderLeft() == Constants.LINE_DOUBLE) {
-            offset += GraphHelper.getLineStyleSize(Constants.LINE_THIN) / 2.0F;
-        } else if (style.getBorderLeft() == Constants.LINE_DOUBLE_DOT) {
-            offset += GraphHelper.getLineStyleSize(Constants.LINE_DOT) / 2.0F;
+    private float computeHalfSize4StyledBorder(int border) {
+        float size = GraphHelper.getLineStyleSize(border) / 2.0F;
+
+        if (border == Constants.LINE_DOUBLE) {
+            size += GraphHelper.getLineStyleSize(Constants.LINE_THIN) / 2.0F;
+        } else if (border == Constants.LINE_DOUBLE_DOT) {
+            size += GraphHelper.getLineStyleSize(Constants.LINE_DOT) / 2.0F;
         }
 
-        return offset;
+        return size;
     }
 
     @Override

designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java

@@ -4,7 +4,6 @@ package com.fr.design.gui.style;
  * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved.
  */
 
-import com.fr.base.BaseUtils;
 import com.fr.base.CellBorderStyle;
 import com.fr.base.Style;
 import com.fr.design.constants.LayoutConstants;
@@ -17,8 +16,8 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.style.color.NewColorSelectBox;
-import com.fr.general.IOUtils;
 import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
+import com.fr.general.IOUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreConstants;
 
@@ -206,6 +205,8 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
     }
 
     public void populateLineStyleAndColor(CellBorderStyle cellBorderStyle, boolean onlyInspectTop) {
+        resetLineStyleAndColorSetting();
+
         if (cellBorderStyle.getTopStyle() != Constants.LINE_NONE) {
             this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getTopStyle());
             this.currentLineColorPane.setSelectObject(cellBorderStyle.getTopColor());
@@ -225,9 +226,6 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
             } else if (cellBorderStyle.getHorizontalStyle() != Constants.LINE_NONE) {
                 this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getHorizontalStyle());
                 this.currentLineColorPane.setSelectObject(cellBorderStyle.getHorizontalColor());
-            } else {
-                this.currentLineCombo.setSelectedLineStyle(Constants.LINE_NONE);
-                this.currentLineColorPane.setSelectObject(Color.BLACK);
             }
         }
 
@@ -236,6 +234,11 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
         }
     }
 
+    private void resetLineStyleAndColorSetting() {
+        this.currentLineCombo.setSelectedLineStyle(Constants.LINE_NONE);
+        this.currentLineColorPane.setSelectObject(null);
+    }
+
     @Override
     public Style update(Style style) {
 

designer-base/src/main/java/com/fr/design/lock/LockInfoDialog.java

@@ -3,6 +3,7 @@ package com.fr.design.lock;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
@@ -44,7 +45,7 @@ public class LockInfoDialog extends JDialog {
         panel.add(createControlPane(), BorderLayout.SOUTH);
         this.getContentPane().add(panel);
         this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Title_Hint"));
-        this.setSize(400, 160);
+        this.setSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.lock.LockInfoDialog"));
         this.setResizable(false);
         this.setModal(true);
         GUICoreUtils.centerWindow(this);

designer-base/src/main/java/com/fr/design/mainframe/ForbiddenPane.java

@@ -2,6 +2,7 @@ package com.fr.design.mainframe;
 
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.guide.base.GuideView;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -105,7 +106,7 @@ public class ForbiddenPane extends JPanel {
                 super.paintComponent(g2d);
             }
         };
-        refreshButton.setPreferredSize(new Dimension(68, 24));
+        refreshButton.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.ForbiddenPane.refreshButton"));
         refreshButton.setForeground(Color.WHITE);
         refreshButton.setBorderPainted(false);
         refreshButton.setContentAreaFilled(false);

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java

@@ -198,7 +198,7 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
         @Override
         protected void layoutContentPane() {
             super.layoutContentPane();
-            leftcontentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+            leftcontentPane.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 5, original));
         }
     }
 }

designer-base/src/main/java/com/fr/design/worker/save/CallbackSaveWorker.java

@@ -63,6 +63,15 @@ public class CallbackSaveWorker extends SaveWorker {
         }
     }
 
+    public void addSuccessCallbackBeforeLast(Runnable successRunnable) {
+        if (successRunnableList == null) {
+            successRunnableList = new LinkedList<>();
+        }
+        if (successRunnable != null) {
+            successRunnableList.add(successRunnableList.size() - 1, successRunnable);
+        }
+    }
+
     public void addFailCallback(Runnable failRunnable) {
         if (failRunnableList == null) {
             failRunnableList = new LinkedList<>();

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

@@ -12,4 +12,6 @@ com.fr.design.web.pane.text.field=450*20
 com.fr.design.actions.server.dialog=800*630
 com.fr.design.report.fit.templatePane.dialog=800*400
 com.fr.design.report.fit.firstColumn=120*20
-com.fr.design.report.fit.column=160*20
+com.fr.design.report.fit.column=160*20
+com.fr.design.lock.LockInfoDialog=500*180
+com.fr.design.mainframe.ForbiddenPane.refreshButton=75*24

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

@@ -11,4 +11,6 @@ com.fr.design.web.pane.text.field=400*20
 com.fr.design.actions.server.dialog=700*630
 com.fr.design.report.fit.templatePane.dialog=600*400
 com.fr.design.report.fit.firstColumn=170*20
-com.fr.design.report.fit.column=100*20
+com.fr.design.report.fit.column=100*20
+com.fr.design.lock.LockInfoDialog=500*180
+com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24

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

@@ -11,4 +11,6 @@ com.fr.design.web.pane.text.field=450*20
 com.fr.design.actions.server.dialog=700*630
 com.fr.design.report.fit.templatePane.dialog=600*400
 com.fr.design.report.fit.firstColumn=130*20
-com.fr.design.report.fit.column=100*20
+com.fr.design.report.fit.column=100*20
+com.fr.design.lock.LockInfoDialog=500*180
+com.fr.design.mainframe.ForbiddenPane.refreshButton=80*24

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

@@ -12,4 +12,6 @@ com.fr.design.web.pane.text.field=450*20
 com.fr.design.actions.server.dialog=700*630
 com.fr.design.report.fit.templatePane.dialog=600*400
 com.fr.design.report.fit.firstColumn=80*20
-com.fr.design.report.fit.column=100*20
+com.fr.design.report.fit.column=100*20
+com.fr.design.lock.LockInfoDialog=400*160
+com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24

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

@@ -11,4 +11,6 @@ com.fr.design.web.pane.text.field=450*20
 com.fr.design.actions.server.dialog=700*630
 com.fr.design.report.fit.templatePane.dialog=600*400
 com.fr.design.report.fit.firstColumn=80*20
-com.fr.design.report.fit.column=100*20
+com.fr.design.report.fit.column=100*20
+com.fr.design.lock.LockInfoDialog=400*160
+com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24

designer-form/src/main/java/com/fr/design/preview/DeveloperPreview.java

@@ -6,10 +6,13 @@ import com.fr.design.fun.impl.AbstractPreviewProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.JForm;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.design.worker.WorkerManager;
+import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.general.web.ParameterConstants;
 
 import java.util.HashMap;
 import java.util.Map;
+import javax.swing.SwingWorker;
 
 /**
  * Created by kerry on 2020-04-23
@@ -44,6 +47,22 @@ public class DeveloperPreview extends AbstractPreviewProvider {
     @Override
     public void onClick(JTemplate<?, ?> jt) {
         super.onClick(jt);
+        SwingWorker worker = WorkerManager.getInstance().getWorker(jt.getRuntimeId());
+        if (worker instanceof CallbackSaveWorker) {
+            CallbackSaveWorker callbackSaveWorker = (CallbackSaveWorker) worker;
+            callbackSaveWorker.addSuccessCallbackBeforeLast(new Runnable() {
+                @Override
+                public void run() {
+                    onPreview(jt);
+                }
+            });
+        } else if (jt.getEditingFILE().isEnvFile()) {
+            // 已经保存在当前工作目录了
+            onPreview(jt);
+        }
+    }
+
+    private void onPreview(JTemplate<?, ?> jt) {
         MutilTempalteTabPane.getInstance().closeCurrentTpl();
         jt.generateForBiddenTemplate();
     }