From db62955ed57cbad131dbafb89c2d7b93ac57a451 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Fri, 16 Aug 2024 15:16:40 +0800
Subject: [PATCH] =?UTF-8?q?INO-21074=20=E6=A8=A1=E7=89=88web=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/gui/icontainer/UIScrollPane.java  | 2 ++
 .../src/main/java/com/fr/design/webattr/ToolBarDragPane.java  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIScrollPane.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIScrollPane.java
index 55ba64b0e9..613af2ce8e 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIScrollPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIScrollPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.gui.icontainer;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
 
@@ -31,6 +32,7 @@ public class UIScrollPane extends JScrollPane {
         this.getHorizontalScrollBar().setBackground(Color.WHITE);
         this.getVerticalScrollBar().setOpaque(true);
         this.getVerticalScrollBar().setBackground(Color.WHITE);
+        BidiUtils.applyOrientationByLocale(this);
     }
 
     @Override
diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
index 14ab5383ce..db639e93c7 100644
--- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
@@ -50,7 +50,7 @@ public class ToolBarDragPane extends WidgetToolBarPane {
 	private int row = 7;
 	private DefaultTableModel toolbarButtonTableModel;
 	private JTable layoutTable;
-	private UICheckBox isUseToolBarCheckBox = new UICheckBox(BidiUtils.concatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar"), ":")); // 是否使用工具栏
+	private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar") + ":"); // 是否使用工具栏
 	private boolean isEnabled;
 
 	public ToolBarDragPane() {
@@ -296,7 +296,7 @@ public class ToolBarDragPane extends WidgetToolBarPane {
 				this.setText(StringUtils.EMPTY);
 				this.setIcon(null);
 			}
-			return this;
+			return BidiUtils.applyOrientationByLocale(this);
 		}
 	};