Merge remote-tracking branch 'origin/release/11.0' into release/11.0

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java

@@ -9,6 +9,7 @@ import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.iscrollbar.UIScrollBar;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -23,6 +24,7 @@ import com.fr.form.ui.mobile.radiogroup.ImageMobileStyle;
 import com.fr.general.FRFont;
 
 import javax.swing.*;
+import javax.swing.border.EmptyBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
@@ -83,6 +85,14 @@ public class ImageCustomDefinePane extends MobileStyleCustomDefinePane {
             protected JPanel createContentPane() {
                 return scrollPanel;
             }
+
+            @Override
+            protected void setLeftContentPaneBounds(Container parent, UIScrollBar scrollBar, int beginY, int maxheight) {
+                int width = parent.getWidth();
+                int height = parent.getHeight();
+                leftcontentPane.setBounds(0, -beginY, width - scrollBar.getWidth() + getOverWidth(), leftcontentPane.getPreferredSize().height);
+                scrollBar.setBounds(width - scrollBar.getWidth(), 0, scrollBar.getWidth(), height);
+            }
         };
         this.add(basicScrollPane);
     }
@@ -157,9 +167,10 @@ public class ImageCustomDefinePane extends MobileStyleCustomDefinePane {
     private void initButtonAlignPane() {
         UILabel buttonAlignLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment"));
         buttonAlignCombo = new UIComboBox(new String[]{
-                Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split"),
                 Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"),
+                Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split"),
         });
+        buttonAlignCombo.setSelectedIndex(1);
         buttonAlignCombo.setPreferredSize(new Dimension(DesignerUtils.LARGE_COMBO_WIDTH, 20));
         buttonAlignPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{buttonAlignLabel, buttonAlignCombo}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_SMALL);
     }
@@ -271,18 +282,22 @@ public class ImageCustomDefinePane extends MobileStyleCustomDefinePane {
 
         UILabel initialLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Icon_Init"));
         UILabel selectedLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Icon_Select"));
+        initialLabel.setVerticalAlignment(SwingConstants.TOP);
+        initialLabel.setBorder(new EmptyBorder(5, 0, 0, 0));
+        selectedLabel.setVerticalAlignment(SwingConstants.TOP);
+        selectedLabel.setBorder(new EmptyBorder(5, 0, 0, 0));
         initInitialIconConfigPane();
         initSelectedIconConfigPane();
         JPanel container = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 5);
 
-        JPanel initialPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        JPanel initialPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        initialPane.add(initialLabel);
+        initialPane.add(initialLabel, BorderLayout.WEST);
-        initialPane.add(initialIconConfigPane);
+        initialPane.add(initialIconConfigPane, BorderLayout.CENTER);
         container.add(initialPane);
 
-        JPanel selectedPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        JPanel selectedPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        selectedPane.add(selectedLabel);
+        selectedPane.add(selectedLabel, BorderLayout.WEST);
-        selectedPane.add(selectedIconConfigPane);
+        selectedPane.add(selectedIconConfigPane, BorderLayout.CENTER);
         container.add(selectedPane);
 
         centerPane.add(container);

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/UnitedCustomDefinePane.java

@@ -143,9 +143,10 @@ public class UnitedCustomDefinePane extends MobileStyleCustomDefinePane {
         JPanel hPaddingSpinnerPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{leftSpinnerPanel, rightSpinnerPanel}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, LayoutConstants.VGAP_SMALL);
         // 按钮排布下拉框
         buttonAlignCombo = new UIComboBox(new String[]{
-                Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split"),
                 Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Nature"),
+                Toolkit.i18nText("Fine-Plugin-RadioGroup_Alignment_Split")
         });
+        buttonAlignCombo.setSelectedIndex(1);
         buttonAlignCombo.setPreferredSize(new Dimension(DesignerUtils.NORMAL_COMBO_WIDTH, 20));
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p, p, p};

designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

@@ -6,6 +6,7 @@ import com.fr.chart.web.ChartHyperPoplink;
 import com.fr.chart.web.ChartHyperRelateCellLink;
 import com.fr.chart.web.ChartHyperRelateFloatLink;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.javascript.ChartEmailPane;
 import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperPoplinkPane;
@@ -24,7 +25,6 @@ import com.fr.design.javascript.JavaScriptImplPane;
 import com.fr.design.javascript.ParameterJavaScriptPane;
 import com.fr.design.mainframe.BaseJForm;
 import com.fr.design.mainframe.JTemplate;
-import com.fr.design.mainframe.chart.mode.ChartEditContext;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
@@ -149,7 +149,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
     }
 
     private void refreshNameableCreator() {
-        if (ChartEditContext.duchampMode()) {
+        if (DesignModeContext.isDuchampMode()) {
             return;
         }
         HashMap paneMap = getHyperlinkMap();