Pull request #6170: REPORT-60644 单元格样式设置调整，ui显示有问题

Merge in DESIGN/design from ~STARRYI/design:REPORT-60644/feature/x to feature/x

* commit '5047480026c1ba253f1bafe09f16fcee8b3a9ae7':
  REPORT-60644 单元格样式设置调整，ui显示有问题

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

@@ -9,7 +9,6 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.theme.edit.ui.LabelUtils;
-import com.fr.design.widget.FRWidgetFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -63,8 +62,7 @@ public class TextFontTippedPane extends AbstractBasicStylePane {
     private JPanel createFormatTipPane() {
         JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
         container.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
-        UILabel formatMigratedTip = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Report_Format_Style_Migrated_Tip"));
-        formatMigratedTip.setForeground(new Color(153, 153, 153));
+        JTextArea formatMigratedTip = LabelUtils.createAutoWrapLabel(Toolkit.i18nText("Fine-Design_Report_Format_Style_Migrated_Tip"), new Color(153, 153, 153));
 
         container.add(formatMigratedTip, BorderLayout.NORTH);
         return container;

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

@@ -58,7 +58,6 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
     private static final int LABEL_DELTA_WIDTH = 8;
     private static final int LABEL_HEIGHT = 15; //标签背景的范围
     private static final int CURRENCY_FLAG_POINT = 6;
-    private static final Border LEFT_BORDER = BorderFactory.createEmptyBorder(0, 30, 0, 0);
 
     private static final Integer[] TYPES = new Integer[]{
             FormatContents.NULL, FormatContents.NUMBER,
@@ -127,13 +126,12 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
         typeComboBox.setPreferredSize(new Dimension(155,20));
         JPanel typePane = new JPanel(new BorderLayout());
         typePane.add(typeComboBox, BorderLayout.CENTER);
-        typePane.setBorder(LEFT_BORDER);
-//        centerPane.setBorder(LEFT_BORDER);
+        typePane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
 
         JPanel option = new JPanel(new BorderLayout());
         option.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Option"), SwingConstants.LEFT), BorderLayout.WEST);
         roundingBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_Base_Option_Half_Up"));
-        roundingBox.setBorder(BorderFactory.createEmptyBorder(0, 40, 0, 0));
+        roundingBox.setBorder(BorderFactory.createEmptyBorder(0, 30, 0, 0));
         roundingBox.addItemListener(new ItemListener() {
             @Override
             public void itemStateChanged(ItemEvent e) {