Merge pull request #2790 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '4536b54659daa7dd4c3af118bd43d385416b1b43':
  REPORT-41858 被选中的按钮不显示
  CHART-16548 调整轴标签显示方式组件宽度
  REPORT-42639 远程对接平台密码-没有远程权限，点击切换目录，弹窗内容不应该有‘修改密码’

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -193,7 +193,9 @@ public class EnvChangeEntrance {
                                                                      UIManager.getIcon("OptionPane.errorIcon")));
         } else {
             strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
-                                                                     new MessageWithLink(result.getText(), Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord"), info.getUrl() + RemoteWorkspaceURL.SYSTEM_LOGIN_PATH),
+                                                                     result.isVerifyResult()
+                                                                             ? new MessageWithLink(result.getText(), Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord"), info.getUrl() + RemoteWorkspaceURL.SYSTEM_LOGIN_PATH)
+                                                                             : result.getText(),
                                                                      Toolkit.i18nText("Fine-Design_Basic_Error"),
                                                                      ERROR_MESSAGE,
                                                                      UIManager.getIcon("OptionPane.errorIcon")));

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleBlock.java

@@ -96,6 +96,7 @@ public class PredefinedStyleBlock extends JPanel {
     private void initPane(boolean supportEdit) {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         PredefinedStylePreviewPane content = new PredefinedStylePreviewPane(0.387, 0.384);
+        content.setParent(this);
         content.setPreferredSize(new Dimension(200, 180));
         UILabel label = new UILabel(previewObject.getStyleName());
         label.setToolTipText(previewObject.getStyleName());

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/PredefinedStylePreviewPane.java

@@ -39,6 +39,8 @@ public class PredefinedStylePreviewPane extends StyleSettingPreviewPane implemen
     private int COLUMN_CHART_WIDTH = 517;
     private int COLUMN_CHART_HEIGHT = 300;
 
+    private JPanel parent;
+
     public PredefinedStylePreviewPane() {
         this(1.0, 1.0);
     }
@@ -53,6 +55,10 @@ public class PredefinedStylePreviewPane extends StyleSettingPreviewPane implemen
         this.add(this.elementCasePreview);
     }
 
+    public void setParent(JPanel parent) {
+        this.parent = parent;
+    }
+
     private JPanel initChartPreViewPane() {
         columnChartPane = new ChartPreStylePreView(initVanColumnChart());
         columnChartPane.setPreferredSize(new Dimension(COLUMN_CHART_WIDTH, COLUMN_CHART_HEIGHT));
@@ -142,6 +148,10 @@ public class PredefinedStylePreviewPane extends StyleSettingPreviewPane implemen
 
     @Override
     public void callback() {
-        this.repaint();
+        if (parent != null) {
+            parent.repaint();
+        } else {
+            this.repaint();
+        }
     }
 }

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

@@ -229,7 +229,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         showLabel = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Use_Show"), Toolkit.i18nText("Fine-Design_Chart_Hidden")});
 
         labelDisplayComboBox = new AxisLabelDisplayComboBox();
-        labelDisplayPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show"), labelDisplayComboBox);
+        labelDisplayPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show"), labelDisplayComboBox, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
         labelDisplayPane.setVisible(showLabelDisplay());
 
         labelTextAttrPane = getChartTextAttrPane();