Browse Source

Pull request #15163: REPORT-138355【fr-fbp冒烟】标签富文本更多颜色显示不全

Merge in DESIGN/design from ~RENEKTON/design:fbp/master to fbp/master

* commit 'd7cc5538ba06f46943f3729d122165b247fb3dc7':
  REPORT-138355【fr-fbp冒烟】标签富文本更多颜色显示不全
fbp/master
Renekton-张世豪 2 months ago
parent
commit
f278df2ced
  1. 8
      designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichTextPane.java

8
designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichTextPane.java

@ -13,6 +13,8 @@ import javax.swing.JScrollPane;
import java.awt.BorderLayout;
import java.awt.Dimension;
import static com.fine.theme.utils.FineUIScale.scale;
// 标签提示中的富文本面板,包含字段设置和富文本编辑器
public class VanChartRichTextPane extends BasicBeanPane<AttrTooltipContent> {
@ -48,13 +50,13 @@ public class VanChartRichTextPane extends BasicBeanPane<AttrTooltipContent> {
fieldListContent.add(fieldListPane, BorderLayout.NORTH);
JScrollPane fieldListScrollPane = new JScrollPane(fieldListContent);
fieldListScrollPane.setPreferredSize(new Dimension(FIELD_PANE_W, FIELD_PANE_H));
fieldListScrollPane.setPreferredSize(scale(new Dimension(FIELD_PANE_W, FIELD_PANE_H)));
fieldListScrollPane.setHorizontalScrollBar(null);
fieldListScrollPane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Add_Field")));
// 字段格式和汇总
JScrollPane fieldAttrScrollPane = new JScrollPane(fieldAttrPane);
fieldAttrScrollPane.setPreferredSize(new Dimension(FIELD_PANE_W, FIELD_PANE_H));
fieldAttrScrollPane.setPreferredSize(scale(new Dimension(FIELD_PANE_W, FIELD_PANE_H)));
fieldAttrScrollPane.setBorder(BorderFactory.createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Field_Setting")));
fieldPane.add(fieldListScrollPane);
@ -71,7 +73,7 @@ public class VanChartRichTextPane extends BasicBeanPane<AttrTooltipContent> {
JPanel richEditorPane = new JPanel();
richEditorPane.setLayout(new BorderLayout());
richEditorPane.setPreferredSize(new Dimension(RICH_EDITOR_W, RICH_EDITOR_H));
richEditorPane.setPreferredSize(scale(new Dimension(RICH_EDITOR_W, RICH_EDITOR_H)));
richEditorPane.add(richEditor, BorderLayout.CENTER);
return richEditorPane;

Loading…
Cancel
Save