Browse Source

插入-富文本

persist/11.0-arabic
obo 6 months ago
parent
commit
dd0bbf70a4
  1. 3
      designer-realize/src/main/java/com/fr/design/cell/editor/RichTextToolBar.java
  2. 2
      designer-realize/src/main/java/com/fr/design/report/RichTextPane.java

3
designer-realize/src/main/java/com/fr/design/cell/editor/RichTextToolBar.java

@ -7,6 +7,7 @@ import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.base.Utils; import com.fr.base.Utils;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.form.util.FontTransformUtil; import com.fr.design.form.util.FontTransformUtil;
@ -146,7 +147,7 @@ public class RichTextToolBar extends BasicPane {
} }
private void addToToolBar() { private void addToToolBar() {
this.setLayout(new FlowLayout(FlowLayout.LEFT)); this.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT));
this.add(fontNameComboBox); this.add(fontNameComboBox);
this.add(fontSizeComboBox); this.add(fontSizeComboBox);

2
designer-realize/src/main/java/com/fr/design/report/RichTextPane.java

@ -2,6 +2,7 @@ package com.fr.design.report;
import com.fr.base.BaseFormula; import com.fr.base.BaseFormula;
import com.fr.base.Style; import com.fr.base.Style;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.cell.editor.RichTextToolBar; import com.fr.design.cell.editor.RichTextToolBar;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.icontainer.UIScrollPane;
@ -59,6 +60,7 @@ public class RichTextPane extends BasicPane {
southPane.add(new UIScrollPane(textPane)); southPane.add(new UIScrollPane(textPane));
this.add(southPane, BorderLayout.CENTER); this.add(southPane, BorderLayout.CENTER);
this.add(northPane, BorderLayout.NORTH); this.add(northPane, BorderLayout.NORTH);
BidiUtils.applyOrientationByLocale(this);
} }
@Override @Override

Loading…
Cancel
Save