Pull request #14570: REPORT-130723 - 单元格元素-图表-样式-图例-布局图标和弹窗UI

Merge in DESIGN/design from ~RENEKTON/design:newui to newui

* commit '43a6f35aabad58fdff0222fd6b3fd282f703d8f1':
  vcs问题待产品确认再修改
  边框问题
  高dpi缩放，控件不可见修复
  vcs版本管理关闭其他所有模板时保存模板时版本不更新问题修改
  图例自定义位置弹窗缩放，关闭其他模板保存版本未更新问题，左右面板分割位置缩放

designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.gui.controlpane;
 
+import com.fine.theme.utils.FineUIScale;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.design.border.FineBorderFactory;
@@ -29,7 +30,7 @@ import java.util.stream.Stream;
  * Time: 15:07
  */
 abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, ShortCutListenerProvider {
-    private static final int SHORT_WIDTH = 30; //每加一个short Divider位置加30
+    private static final int SHORT_WIDTH = FineUIScale.scale(30); //每加一个short Divider位置加30
     private static final String SELECT = "SELECT";
     private static final String EDIT = "EDIT";
     JPanel controlUpdatePane;

designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java

@@ -555,7 +555,7 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li
                     super.paint(g);
                 }
             };
-            label.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, FineUIUtils.getUIColor("fill.hover", "fill.hover")));
+            label.setBorder(BorderFactory.createMatteBorder(0, 0, FineUIScale.scale(1), 0, FineUIUtils.getUIColor("fill.hover", "fill.hover")));
             label.setForeground(UIManager.getColor("List.wrapper.text.fontColor"));
             label.setFont(label.getFont().deriveFont(11F));
             label.setPreferredSize(new Dimension(this.getPreferredSize().width, FineUIScale.scale(24)));

designer-base/src/main/java/com/fr/design/gui/controlpane/UINameableListCellRenderer.java

@@ -1,6 +1,7 @@
 package com.fr.design.gui.controlpane;
 
 import com.fine.theme.icon.LazyIcon;
+import com.fine.theme.utils.FineUIScale;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.stable.Nameable;
@@ -43,7 +44,7 @@ public class UINameableListCellRenderer extends
     private void initComponents() {
         editButton = new UILabel() {
             public Dimension getPreferredSize() {
-                return new Dimension(BUTTON_WIDTH, BUTTON_HEIGHT);
+                return FineUIScale.scale(new Dimension(BUTTON_WIDTH, BUTTON_HEIGHT));
             }
         };
         editButton.setIcon(isNewStyle ? LIST_EDIT_ICON : CPT_ICON);

designer-base/src/main/java/com/fr/design/gui/icombobox/ColorSchemeComboBox.java

@@ -1,5 +1,6 @@
 package com.fr.design.gui.icombobox;
 
+import com.fine.theme.utils.FineUIScale;
 import com.fr.base.ChartColorMatching;
 import com.fr.base.ChartPreStyleConfig;
 import com.fr.base.theme.TemplateTheme;
@@ -232,7 +233,7 @@ public class ColorSchemeComboBox extends UIComboBox {
         @Override
         public Dimension getPreferredSize() {
             Dimension preferredSize = super.getPreferredSize();
-            preferredSize.setSize(super.getPreferredSize().getWidth(), HEIGHT);
+            preferredSize.setSize(super.getPreferredSize().getWidth(), FineUIScale.scale(HEIGHT));
             return preferredSize;
         }
 

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/chart/ChartFontPane.java

@@ -1,6 +1,6 @@
 package com.fr.design.mainframe.theme.edit.chart;
 
-import com.fr.base.BaseUtils;
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.FRContext;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.dialog.BasicPane;
@@ -54,8 +54,8 @@ public class ChartFontPane extends BasicPane {
     private void initState() {
         fontNameComboBox = new UIComboBox(DesignUtils.getAvailableFontFamilyNames4Report());
         fontSizeComboBox = new UIComboBox(FONT_SIZES);
-        bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
-        italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
+        bold = new UIToggleButton(new LazyIcon("bold"));
+        italic = new UIToggleButton(new LazyIcon("italic"));
         fontColor = getColorButton();
     }
 
@@ -65,11 +65,10 @@ public class ChartFontPane extends BasicPane {
 
     protected void initComponents() {
         Component[] components = new Component[]{
-                fontColor, italic, bold
+                fontSizeComboBox, fontColor, italic, bold
         };
-        JPanel buttonPane = new JPanel(new BorderLayout());
-        buttonPane.add(fontSizeComboBox, BorderLayout.CENTER);
-        buttonPane.add(GUICoreUtils.createFlowPane(components, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST);
+        JPanel buttonPane = new JPanel();
+        buttonPane.add(GUICoreUtils.createFlowPane(components, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE));
 
         this.setLayout(new BorderLayout());
         this.add(getContentPane(buttonPane), BorderLayout.CENTER);
@@ -90,7 +89,7 @@ public class ChartFontPane extends BasicPane {
                 new Component[]{null, buttonPane}
         };
 
-        return TableLayoutHelper.createGapTableLayoutPane(components, rows, columnSize, 5, LayoutConstants.VGAP_LARGE);
+        return TableLayoutHelper.createGapTableLayoutPane(components, rows, columnSize, 5, 0);
     }
 
     public String getUILabelText() {

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.chart.series.SeriesCondition.impl;
 
+import com.fine.theme.utils.FineUIScale;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
@@ -30,7 +31,7 @@ import java.util.HashMap;
  */
 public class ChartHyperPoplinkPane extends AbstractHyperLinkPane<ChartHyperPoplink> {
     private static final long serialVersionUID = 2469115951510144738L;
-    private static final int EDIT_PANE_WIDTH = 248;
+    private static final int EDIT_PANE_WIDTH = FineUIScale.scale(248);
     private UITextField itemNameTextField;
     private ChartHyperEditPane hyperEditPane;
     private ChartComponent chartComponent;
@@ -55,7 +56,7 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane<ChartHyperPopli
         ChartCollection cc = createChartCollection();
 
         chartComponent = new ChartComponent();
-        chartComponent.setPreferredSize(new Dimension((int) this.getPreferredSize().getWidth() - EDIT_PANE_WIDTH, 170));// 在单元格弹出时 需要调整保证属性表的大小.
+        chartComponent.setPreferredSize(new Dimension((int) this.getPreferredSize().getWidth() - EDIT_PANE_WIDTH, FineUIScale.scale(170)));// 在单元格弹出时 需要调整保证属性表的大小.
         chartComponent.setSupportEdit(false);
         chartComponent.populate(cc);
 

designer-chart/src/main/java/com/fr/design/gui/xcombox/MarkerComboBox.java

@@ -3,6 +3,7 @@
  */
 package com.fr.design.gui.xcombox;
 
+import com.fine.theme.utils.FineUIScale;
 import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
 import com.fr.base.ScreenResolution;
@@ -107,7 +108,7 @@ public class MarkerComboBox extends UIComboBox {
         }
 
         public Dimension getPreferredSize() {
-            return new Dimension(36, 16);
+            return FineUIScale.scale(new Dimension(36, 16));
         }
 
         public Dimension getMinimumSize() {

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

@@ -51,8 +51,8 @@ import static com.fine.swing.ui.layout.Layouts.row;
 public class VanChartPlotLegendPane extends BasicPane {
     private static final long serialVersionUID = 1614283200308877353L;
 
-    private static final int WIDTH = 165;
-    private static final int HEIGHT = 100;
+    private static final int WIDTH = FineUIScale.scale(165);
+    private static final int HEIGHT = FineUIScale.scale(100);
     private static final int GAP = 20;
 
     private Plot plot;

designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java

@@ -9,6 +9,7 @@ import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.widget.CellWidgetCardPane;
+import com.fr.design.widget.EastCellWidgetCardPane;
 import com.fr.design.widget.WidgetManageCardPane;
 import com.fr.design.widget.WidgetPane;
 import com.fr.form.ui.*;
@@ -47,7 +48,7 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
                 final WidgetPane widgetPane = new WidgetPane() {
                     @Override
                     protected CellWidgetCardPane initWidgetCardPane(ElementCasePane pane) {
-                        return new WidgetManageCardPane(pane);
+                        return new EastCellWidgetCardPane(pane);
                     }
                 };
                 widgetPane.populate(widget);

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

@@ -104,7 +104,7 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
     }
 
     protected CellWidgetCardPane initWidgetCardPane(ElementCasePane pane) {
-        return eastRegion ? new EastCellWidgetCardPane(pane) : new CellWidgetCardPane(pane);
+        return new EastCellWidgetCardPane(pane);
     }
 
     protected JPanel createContentPane() {