超级链接-图表超链-悬浮窗图表

designer-base/src/main/java/com/fr/design/foldablepane/HeaderPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.foldablepane;
 
 import com.fr.base.GraphHelper;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxUtilities;
 
@@ -59,7 +60,8 @@ public class HeaderPane extends JPanel {
                 RenderingHints.VALUE_ANTIALIAS_ON);
         BufferedImage panelImage = createPanelImage();
         g2d.drawImage(panelImage, null, 0, 0);
-        GraphHelper.drawString(g2d, this.title, TITLE_X, headHeight - fontSize / 2 - 1);
+        int x = BidiUtils.rtl() ? headWidth - TITLE_X - g2d.getFontMetrics().stringWidth(title) : TITLE_X;
+        GraphHelper.drawString(g2d, this.title, x, headHeight - fontSize / 2 - 1);
     }
 
     private BufferedImage createPanelImage() {
@@ -75,7 +77,7 @@ public class HeaderPane extends JPanel {
         if (desktopHints != null) {
             g2d.setRenderingHints(desktopHints);
         }
-        int leftWdith = headWidth - LEFT_X;
+        int leftWdith = BidiUtils.rtl() ?  TITLE_X : headWidth - LEFT_X;
         if (this.isShow) {
             image = UIConstants.DRAG_DOWN_SELECTED_SMALL;
             g2d.drawImage(image, leftWdith, LEFT_Y, null);

designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java

@@ -686,7 +686,7 @@ public final class GUICoreUtils {
 					break;
 				case 1:
 					if (components[1] != null) {
-						pane.add(components[1], BorderLayout.EAST);
+						pane.add(components[1], BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
 					}
 					break;
 				case 2:
@@ -696,7 +696,7 @@ public final class GUICoreUtils {
 					break;
 				case 3:
 					if (components[3] != null) {
-						pane.add(components[3], BorderLayout.WEST);
+						pane.add(components[3], BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
 					}
 					break;
 				case CASE_FOUR:

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.chart.series.SeriesCondition.impl;
 
 import com.fr.base.Parameter;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.web.ChartHyperPoplink;
 import com.fr.design.editor.ValueEditorPane;
@@ -72,9 +73,9 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
 		double[] rowSize = { p,p,p,p,p,p};
 
         Component[][] components = new Component[][]{
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title") + ":", SwingConstants.RIGHT), titleField},
+                new Component[]{new BoldFontTextLabel(BidiUtils.reverseConcatenateStrings(getBoldFontTextLabelName("Fine-Design_Form_Widget_Style_Title")), getBoldFontTextLabelHorizontalAlignment()), titleField},
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ":", SwingConstants.RIGHT), widthField},
+                new Component[]{new BoldFontTextLabel(BidiUtils.reverseConcatenateStrings(getBoldFontTextLabelName("Fine-Design_Basic_Designer_Width")), getBoldFontTextLabelHorizontalAlignment()), widthField},
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height") + ":", SwingConstants.RIGHT), heightField},
+                new Component[]{new BoldFontTextLabel(BidiUtils.reverseConcatenateStrings(getBoldFontTextLabelName("Fine-Design_Chart_Height")), getBoldFontTextLabelHorizontalAlignment()), heightField},
         };
 
         widthField.setText(String.valueOf(DEFAULT_V_VALUE));
@@ -90,6 +91,13 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
 
 		return pane;
 	}
+	private int getBoldFontTextLabelHorizontalAlignment() {
+		return BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT;
+	}
+
+	private String getBoldFontTextLabelName(String i18ney) {
+		return BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText(i18ney), ":");
+	}
 
 	public void populateBean(ChartHyperPoplink chartHyperlink) {
 		

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.chart.series.SeriesCondition.impl;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
@@ -51,7 +52,7 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane<ChartHyperPopli
 
         hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
         hyperEditPane.setPreferredSize(new Dimension(EDIT_PANE_WIDTH, (int) hyperEditPane.getPreferredSize().getHeight()));// 固定属性配置面板大小,灵活调整图表显示面板.
-        this.add(hyperEditPane, BorderLayout.WEST);
+        this.add(hyperEditPane, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
         ChartCollection cc = createChartCollection();
 
         chartComponent = new ChartComponent();

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.chart.gui;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.base.AttrChangeConfig;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.charttypes.ChartTypeManager;
@@ -119,9 +120,9 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
         button.add(copyButton);
         button.add(moveForwardButton);
         button.add(moveBackButton);
-        northPane.add(button, BorderLayout.WEST);
+        northPane.add(button, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
-        northPane.add(configButton, BorderLayout.EAST);
+        northPane.add(configButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
-
+        BidiUtils.applyOrientationByLocale(this);
         initConfigCreator();
 
         //   Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK);
@@ -340,7 +341,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
         JPanel pane = null;
         for (int i = 0; i < indexList.size(); i++) {
             if (i % COL_COUNT == 0) {
-                pane = new JPanel(new FlowLayout(FlowLayout.LEFT));
+                pane = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT));
                 northPane.add(pane);
             }
 

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/DatabaseTableDataPane.java

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.chart.gui.data;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.data.impl.NameTableData;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.constants.UIConstants;
@@ -40,7 +41,7 @@ public class DatabaseTableDataPane extends BasicPane{
 
 		this.setLayout(new BorderLayout(0,0));
 		if (label != null) {
-			this.add(label, BorderLayout.WEST);
+			this.add(label, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
 		}
 
 		JPanel pane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0));

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.chart.gui.data;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.design.beans.FurtherBasicBeanPane;
 import com.fr.design.chartx.data.DataLayoutHelper;
@@ -14,6 +15,7 @@ import com.fr.van.chart.designer.AbstractVanChartScrollPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -66,7 +68,7 @@ public class NormalChartDataPane extends DataContentsPane {
 						if (ChartEditContext.supportReportData()) {
                             JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0));
                             northPane.add(jcb, BorderLayout.CENTER);
-                            UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"));
+                            UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT);
                             label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
                             northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null}));
                             if (ChartEditContext.normalMode()) {

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.chart.gui.data;
 
 import com.fr.base.TableData;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartdata.TableDataDefinition;
@@ -18,6 +19,7 @@ import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
+import javax.swing.SwingConstants;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 
@@ -41,7 +43,7 @@ public class TableDataPane extends FurtherBasicBeanPane<ChartCollection>{
 	}
 
 	private void initDataPane() {
-		UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data"));
+		UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT);
 		UIComponentUtils.setLineWrap(label, TABLE_DATA_LABEL_LINE_WRAP_WIDTH);
 		UIComponentUtils.setPreferedWidth(label, ChartDataPane.LABEL_WIDTH);
 

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.chart.gui.data.table;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.ChartCollection;
@@ -42,7 +43,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa
 		categoryCombox = new UIComboBox();
 		JPanel categoryPane = new JPanel(new BorderLayout(4,0));
 		categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground()));
-        UILabel label1 = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Style_Category")) ;
+        UILabel label1 = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Style_Category"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT) ;
         label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT));
         categoryCombox.setPreferredSize(new Dimension(100,20));
 

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.chart.gui.data.table;
 
 import com.fr.base.chart.chartdata.TopDefinitionProvider;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartdata.MoreNameCDDefinition;
@@ -17,6 +18,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -102,7 +104,7 @@ public class SeriesTypeUseComboxPane extends BasicBeanPane<ChartCollection> {
         JPanel northPane = new JPanel(new BorderLayout(4, 0));
 
         //使用系列名/系列值选项面板
-        UILabel seriesLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"));
+        UILabel seriesLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT);
         seriesLabel.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
         JPanel borderLayoutPane = GUICoreUtils.createBorderLayoutPane(new Component[]{content, null, null, seriesLabel, null});
         northPane.add(borderLayoutPane);

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithThemeStyle.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.chart.gui.style;
 
+import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.base.TextAttr;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ilable.UILabel;
@@ -41,7 +42,7 @@ public class ChartTextAttrPaneWithThemeStyle extends ChartTextAttrPane {
         double e = getEdithAreaWidth();
         double p = TableLayout.PREFERRED;
         double[] columnSize = {f, e};
-        UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
+        UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Character"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT);
         JPanel preButtonPane = TableLayout4VanChartHelper.createGapTableLayoutPane(new Component[][]{new Component[]{text, preButton}}, new double[]{p}, columnSize);
         textFontPane = TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), getRowSize(), columnSize);
         panel.add(preButtonPane, BorderLayout.CENTER);

designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.designer.style;
 import com.fr.base.BaseFormula;
 import com.fr.base.BaseUtils;
 import com.fr.base.Utils;
+import com.fr.base.i18n.BidiUtils;
 import com.fr.chart.base.TextAttr;
 import com.fr.chartx.config.info.constant.ConfigType;
 import com.fr.design.formula.DefaultTinyFormulaPane;
@@ -158,7 +159,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
         UIComponentUtils.setLineWrap(useHtml);
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text"), SwingConstants.LEFT), titleContent},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT), titleContent},
                 new Component[]{null, useHtml},
         };
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
@@ -178,7 +179,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
 
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Constraints"), SwingConstants.LEFT), alignmentPane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Constraints"), BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT), alignmentPane},
                 new Component[]{null, customFloatPositionButton}
         };