Merge pull request #14896 in DESIGN/design from fbp/release to fbp/feature

* commit '1e1bd1a580f92c7ab5604e6776cb62873d3512e5':
  调整标签生成步长
  Revert "REPORT-133133 fix:数据连接异常报错场景弹窗处理"
  拖拽条生成标签步长自定义&控件显示增强tab恢复
  REPORT-134818 fix:fbp回归问题：修复参数面板控件属性面板勾选框触发热区过大问题
  无jira 代码质量
  无jira 代码质量
  REPORT-135142 fix:NewUI 图表显示比例调优
  REPORT-133133 & REPORT-134138 fix:数据连接异常报错场景弹窗处理
  REPORT-135235 fix:fbp回归问题：修复自定义悬浮弹窗按钮不灵敏问题
  REPORT-135235 fix:fbp回归问题：调整高级编辑弹窗大小

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

@@ -13,6 +13,8 @@ import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.data.MapCompareUtils;
 import com.fr.design.data.datapane.preview.ConnectionInfoBeanHelper;
 import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.editlock.EditLockUtils;
 import com.fr.design.fun.ConnectionProvider;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
@@ -26,6 +28,7 @@ import com.fr.license.database.DBTypes;
 import com.fr.license.database.DataBaseTypePointManager;
 import com.fr.license.exception.DataBaseNotSupportedException;
 import com.fr.log.FineLoggerFactory;
+import com.fr.report.LockItem;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
@@ -36,6 +39,7 @@ import com.fr.workspace.server.entity.connection.ConnectionBean;
 import com.fr.workspace.server.repository.connection.ConnectionRepository;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 import java.awt.Window;
 import java.util.ArrayList;
@@ -366,8 +370,8 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
         }
     }
 
-
     public static void showDialog(Window parent) {
+        try {
             final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.createConnectionMap(ConnectionRepository.getInstance().getAll());
             final ConnectionManagerPane connectionManagerPane = new ConnectionManagerPane() {
                 @Override
@@ -378,6 +382,12 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
             final BasicDialog connectionListDialog = connectionManagerPane.showLargeWindow(parent, null);
             connectionListDialog.addDialogActionListener(new ConnectionListDialogActionAdapter(connectionManagerPane, connectionListDialog, connectionMap));
             connectionListDialog.setVisible(true);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            FineJOptionPane.showMessageDialog(null, Toolkit.i18nText("Fine-Design_Remote_Data_Error"),
+                    Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
+            EditLockUtils.unlock(LockItem.CONNECTION);
+        }
     }
 
     @Override

designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java

@@ -38,7 +38,7 @@ public class UINumberDragPane extends BasicBeanPane<Double> implements GlobalNam
 	public UINumberDragPane(double minValue, double maxValue, double dierta) {
 		dragBar = new UISlider((int) minValue, (int) maxValue);
 		dragBar.setPaintLabels(true);
-		dragBar.setMajorTickSpacing((int) maxValue - (int) minValue);
+		dragBar.setMajorTickSpacing(minValue < 0 ? (int) maxValue : (int) maxValue - (int) minValue);
 		spinner = createUISpinner(minValue, maxValue, dierta);
 		spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
 		spinner.setValue(dragBar.getValue());

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

@@ -132,7 +132,7 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
                 cell(textField),
                 row(
                         cell(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Option"))).weight(LEFT_WEIGHT),
-                        row(cell(roundingBox)).weight(RIGHT_WEIGHT)
+                        cell(roundingBox).weight(RIGHT_WEIGHT)
                 ),
                 cell(previewLabel)
         ).getComponent());

designer-base/src/main/java/com/fr/design/javascript/JSContentWithDescriptionPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.javascript;
 
+import com.fine.theme.utils.FineUIScale;
 import com.fr.base.svg.IconUtils;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
@@ -140,7 +141,7 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
         //js函数声明面板
         JPanel jsParaPane = createJSParaPane();
 
-        jsParaPane.setPreferredSize(new Dimension(650, 80));
+        jsParaPane.setPreferredSize(FineUIScale.createScaleDimension(650, 80));
         //右上角的搜索提示面板
         JPanel tipsPane = createTipsPane();
 
@@ -153,7 +154,7 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
         UIScrollPane contentTextAreaPanel = createContentTextAreaPanel();
         initContextAreaListener();
 
-        contentTextAreaPanel.setPreferredSize(new Dimension(850, 250));
+        contentTextAreaPanel.setPreferredSize(FineUIScale.createScaleDimension(850, 250));
         //js函数结束标签
         UILabel endBracketsLabel = new UILabel();
         endBracketsLabel.setText("}");
@@ -173,7 +174,7 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
 
         //函数分类和函数说明面板==================================
         JPanel functionNameAndDescriptionPanel = createInterfaceAndDescriptionPanel();
-        functionNameAndDescriptionPanel.setPreferredSize(new Dimension(880, 220));
+        functionNameAndDescriptionPanel.setPreferredSize(FineUIScale.createScaleDimension(880, 220));
 
         this.add(functionNameAndDescriptionPanel, BorderLayout.SOUTH);
     }

designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java

@@ -13,13 +13,11 @@ import com.fr.design.hyperlink.AbstractHyperLinkPane;
 import com.fr.design.javascript.jsapi.JSImplPopulateAction;
 import com.fr.design.javascript.jsapi.JSImplUpdateAction;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.js.JavaScriptImpl;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
-import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
@@ -30,7 +28,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 
-import static com.fine.swing.ui.layout.Layouts.column;
 import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.cell;
 
@@ -76,12 +73,11 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
                 cell(FineUIUtils.wrapComponentWithTitle(importedJsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))).weight(0.5),
                 cell(FineUIUtils.wrapComponentWithTitle(parameterPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))).weight(0.5)
         ).getComponent());
+        topPane.setPreferredSize(new Dimension(super.getPreferredSize().width, 150));
 
         this.setLayout(new BorderLayout());
-        this.add(column(10,
-                cell(topPane).weight(0.5),
-                cell(FineUIUtils.wrapComponentWithTitle(jsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript"))).weight(0.5)
-        ).getComponent());
+        this.add(topPane, BorderLayout.NORTH);
+        this.add(FineUIUtils.wrapComponentWithTitle(jsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript")), BorderLayout.CENTER);
 
         this.reLayoutForChart();
     }

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

@@ -51,8 +51,8 @@ public class ReportThemeProfilePane extends TemplateThemeProfilePane<ReportTheme
             addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Template_Background"), reportBodyStyleSettingPane);
             addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Cell_Style"), createCellStyleSettingPane());
             addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Chart_Style"), createChartStyleSettingPane());
-            initializePane();
             refreshExtraAdvancedPane();
+            initializePane();
         }
 
         @Override

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPane.java

@@ -151,7 +151,7 @@ public class VanChartHtmlLabelPane extends JPanel {
                 new Component[]{isCustomWidth, customWidth},
                 new Component[]{isCustomHeight, customHeight},
         };
-        return FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1, 1});
+        return FineLayoutBuilder.compatibleTableLayout(10, components, new double[]{1.4, 0.6});
     }
 
     private void checkWidth() {

designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java

@@ -32,6 +32,7 @@ import com.fr.van.chart.designer.component.border.VanChartBorderWithRadiusPane;
 
 import javax.swing.Icon;
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
@@ -252,7 +253,7 @@ public class VanChartPlotLegendPane extends BasicPane {
                 customFloatPositionButton.setSelected(true);
                 checkLayoutPaneVisible();
                 checkDisplayStrategyUse();
-
+                SwingUtilities.invokeLater(() -> {
                     if (customFloatPositionPane == null) {
                         customFloatPositionPane = new VanChartFloatPositionPane();
                     }
@@ -267,6 +268,7 @@ public class VanChartPlotLegendPane extends BasicPane {
                         };
                     }
                     uiBubbleFloatPane.show(VanChartPlotLegendPane.this, null);
+                });
             }
         });
     }

designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java

@@ -35,6 +35,7 @@ import com.fr.van.chart.designer.component.background.VanChartBackgroundWithOutS
 
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
@@ -220,7 +221,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
                 alignmentPane.setSelectedIndex(-1);
                 customFloatPositionButton.setSelected(true);
                 checkDisplayStrategyUse();
-
+                SwingUtilities.invokeLater(() -> {
                     if (customFloatPositionPane == null) {
                         customFloatPositionPane = new VanChartFloatPositionPane();
                     }
@@ -235,6 +236,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
                         };
                     }
                     uiBubbleFloatPane.show(VanChartTitlePane.this, null);
+                });
             }
         });
     }

designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java

@@ -3,6 +3,9 @@ package com.fr.design.mainframe.widget.ui;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.form.ui.Widget;
 
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.row;
+
 
 /**
  * Created by kerry on 2017/9/30.
@@ -17,12 +20,12 @@ public class BasicSetVisiblePropertyPane extends FormBasicPropertyPane {
     protected void initComponent() {
         UICheckBox otherOtherConfig = createOtherConfig();
         if(otherOtherConfig != null){
-            corePane.add(otherOtherConfig);
+            corePane.add(row(cell(otherOtherConfig)).getComponent());
         }
         visibleCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Visible"), true);
         visibleCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"));
 
-        corePane.add(visibleCheckBox);
+        corePane.add(row(cell(visibleCheckBox)).getComponent());
     }
 
     public UICheckBox createOtherConfig(){

designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java

@@ -275,9 +275,9 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
                         cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background"))).weight(LEFT_WEIGHT),
                         cell(backgroundPane).weight(RIGHT_WEIGHT)
                 ),
-                cell(displayReport),
-                cell(useParamsTemplate),
-                cell(fireAfterEditor)
+                row(cell(displayReport)),
+                row(cell(useParamsTemplate)),
+                row(cell(fireAfterEditor))
         ).getComponent();
     }
 

designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java

@@ -42,7 +42,7 @@ public class ButtonGroupDictPane extends JPanel {
 				cell(columnLabel).weight(LEFT_WEIGHT), cell(columnSpinner).weight(RIGHT_WEIGHT)
 		).getComponent();
 		this.add(column(VERTICAL_GAP,
-				cell(adaptiveCheckbox),
+				row(cell(adaptiveCheckbox)),
 				cell(columnSettingRow)
 
 		).getComponent());

designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java

@@ -13,6 +13,7 @@ import javax.swing.JPanel;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fr.design.constants.LayoutConstants.VERTICAL_GAP;
 
 public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane<CheckBoxGroup> {
@@ -41,7 +42,7 @@ public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane<CheckBoxGroup
 		checkbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Choose_Type_All"));
 		returnTypePane = new ReturnTypePane();
 		return column(VERTICAL_GAP,
-				cell(checkbox),
+				row(cell(checkbox)),
 				cell(returnTypePane)
 		).getComponent();
 	}

designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java

@@ -13,6 +13,7 @@ import javax.swing.JPanel;
 import java.awt.Component;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.column;
 import static com.fr.design.constants.LayoutConstants.VERTICAL_GAP;
 
@@ -42,7 +43,8 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane<ComboCheckBox>
 		returnTypePane = new ReturnTypePane();
 
 		return column(VERTICAL_GAP,
-				cell(supportTagCheckBox),cell(returnTypePane)
+				row(cell(supportTagCheckBox)),
+				cell(returnTypePane)
 		).getComponent();
 	}
 

designer-form/src/main/java/com/fr/design/widget/ui/designer/CustomWritableRepeatEditorPane.java

@@ -7,6 +7,9 @@ import com.fr.form.ui.CustomWriteAbleRepeatEditor;
 
 import javax.swing.JPanel;
 
+import static com.fine.swing.ui.layout.Layouts.row;
+import static com.fine.swing.ui.layout.Layouts.cell;
+
 /**
  * Author : Shockway
  * Date: 13-9-18
@@ -24,7 +27,7 @@ public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRe
 	public  JPanel setValidatePane(){
 		this.customDataCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Custom_Data"), false);
 		JPanel otherContentPane = super.setValidatePane();
-		otherContentPane.add(customDataCheckBox);
+		otherContentPane.add(row(cell(customDataCheckBox)).getComponent());
 		return otherContentPane;
 	}
 

designer-form/src/main/java/com/fr/design/widget/ui/designer/DirectWriteEditorDefinePane.java

@@ -52,7 +52,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 						cell(dicPane[0]).weight(LEFT_WEIGHT),
 						cell(dicPane[1]).weight(RIGHT_WEIGHT)
 				),
-				cell(repeatCheckBox)
+				row(cell(repeatCheckBox))
 		).getComponent();
 		if (waterMarkComponent[0] != null && waterMarkComponent[1] != null) {
 			panel.add(row(
@@ -115,7 +115,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 	public  JPanel setValidatePane(){
         directWriteCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit"), false);
 		JPanel otherContentPane = column(LayoutConstants.VERTICAL_GAP).getComponent();
-		otherContentPane.add(directWriteCheckBox);
+		otherContentPane.add(row(cell(directWriteCheckBox)).getComponent());
 		return otherContentPane;
 	}
 

designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java

@@ -154,7 +154,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         });
 
         validatePane.add(column(VERTICAL_GAP,
-                cell(allowBlankCheckBox),
+                row(cell(allowBlankCheckBox)),
                 cell(errorTipPane)
         ).getComponent());
 

designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java

@@ -82,8 +82,8 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
 
         return column(VERTICAL_GAP,
                 cell(formWidgetValuePane),
-                cell(isStyleAlignmentWrapText),
-                cell(isPageSetupVertically),
+                row(cell(isStyleAlignmentWrapText)),
+                row(cell(isPageSetupVertically)),
                 row(
                         cell(FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Display_Position_Similar"))).weight(LEFT_WEIGHT),
                         cell(hAlignmentPane).weight(RIGHT_WEIGHT)

designer-realize/src/main/java/com/fr/design/widget/ui/WritableRepeatEditorPane.java

@@ -5,6 +5,8 @@ import com.fr.form.ui.WriteAbleRepeatEditor;
 
 import javax.swing.JPanel;
 
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.column;
 
 public abstract class WritableRepeatEditorPane<E extends WriteAbleRepeatEditor> extends DirectWriteEditorDefinePane<E> {
@@ -19,7 +21,7 @@ public abstract class WritableRepeatEditorPane<E extends WriteAbleRepeatEditor>
 		JPanel contentPane = column(LayoutConstants.VERTICAL_GAP).getComponent();
 		JPanel otherContentPane = this.setThirdContentPane();
 		if (otherContentPane != null) {
-			contentPane.add(otherContentPane);
+			contentPane.add(row(cell(otherContentPane)).getComponent());
 		}
 		return contentPane;
 	}