Pull request #7860: CHART-22754&CHART-22755&CHART-22757&CHART-22769&CHART-22768 若干bug

Merge in DESIGN/design from ~FANGLEI/design:feature/x to feature/x

* commit '12b78e7e4b4ba708c8000e2180b0fa9ad75f4613':
  CHART-22754&CHART-22755&CHART-22757&CHART-22769&CHART-22768 若干bug

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

@@ -184,7 +184,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
                 BorderLayout.CENTER
         );
 
-        UIExpandablePane expandablePane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Button_Content"), 20, buttonContentPane) {
+        UIExpandablePane expandablePane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Button_And_Rotation_Content"), 20, buttonContentPane) {
             protected void setcontentPanelontentPanelBorder() {
 
             }
@@ -212,6 +212,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
             populateSwitchTitlePane(i, collection);
         }
 
+        showSwitchTitleCard(collection.getChartName(select));
         chartTypesPane.revalidate();
         switchTitlePane.revalidate();
         selectedChart = select;
@@ -228,7 +229,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
                 result = Utils.objectToString(switchTitle);
             }
         } else {
-            result = collection.getChartName(chartIndex);
+            result = Toolkit.i18nText("Fine-Design_Chart_Chart") + (chartIndex + 1);
         }
 
         TinyFormulaPane title = new TinyFormulaPane();
@@ -357,8 +358,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
                 @Override
                 public void mouseClicked(MouseEvent e) {
                     resetChangeChartButtons();
-                    CardLayout cardLayout = (CardLayout) switchTitlePane.getLayout();
+                    showSwitchTitleCard(collection.getChartName(buttonIndex));
-                    cardLayout.show(switchTitlePane, collection.getChartName(buttonIndex));
                     ChangeChartButton.this.setSelected(true);
                     selectedChart = buttonIndex;
                 }
@@ -375,4 +375,9 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
             changeChartButton.setSelected(false);
         }
     }
+
+    private void showSwitchTitleCard(String chartName) {
+        CardLayout cardLayout = (CardLayout) switchTitlePane.getLayout();
+        cardLayout.show(switchTitlePane, chartName);
+    }
 }