diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java
index c827a17ebe..eff054b068 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java
@@ -3,6 +3,7 @@ package com.fr.design.data.datapane.preview.sql;
 import com.fr.base.Parameter;
 import com.fr.base.ParameterHelper;
 import com.fr.base.ParameterMapNameSpace;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.data.impl.DBTableData;
 import com.fr.data.impl.EscapeSqlHelper;
 import com.fr.data.operator.DataOperator;
@@ -108,7 +109,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
             textBuilder.append("</html>");
             tipLabel.setToolTipText(textBuilder.toString());
             tipPanel.add(tipLabel, BorderLayout.SOUTH);
-            topPanel.add(tipPanel, BorderLayout.EAST);
+            topPanel.add(tipPanel, BorderLayout.LINE_END);
         } else {
             imageLabel = new UILabel(UIManager.getIcon("OptionPane.informationIcon"));
             messagePanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
@@ -117,7 +118,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
         }
         imagePanel.add(imageLabel);
 
-        topPanel.add(imagePanel, BorderLayout.WEST);
+        topPanel.add(imagePanel, BorderLayout.LINE_START);
         topPanel.add(messagePanel, BorderLayout.CENTER);
         topPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10));
 
@@ -148,7 +149,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
         okButton.addActionListener(this);
         bottomPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
         bottomPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-        bottomPanel.add(okButton, BorderLayout.EAST);
+        bottomPanel.add(okButton, BorderLayout.LINE_END);
 
         this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Preview_Performed_Sql"));
         this.setResizable(false);
@@ -162,7 +163,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
                 close();
             }
         });
-
+        BidiUtils.applyOrientationByLocale(this);
         GUICoreUtils.centerWindow(this);
     }