Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0

designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java

@@ -64,7 +64,6 @@ public class HistoryTemplateListCache implements CallbackEvent {
      * @param selected 选择的
      */
     public void closeSelectedReport(JTemplate<?, ?> selected) {
-        DesignModuleFactory.clearChartPropertyPane();
         DesignTableDataManager.closeTemplate(selected);
         //直接关闭模板的时候(当且仅当设计器tab上只剩一个模板)退出权限编辑
         if (DesignModeContext.isAuthorityEditing() && historyList.size() <= 1) {
@@ -92,7 +91,6 @@ public class HistoryTemplateListCache implements CallbackEvent {
      * @param selected 选择的
      */
     public void closeVirtualSelectedReport(JTemplate<?, ?> selected) {
-        DesignModuleFactory.clearChartPropertyPane();
         DesignTableDataManager.closeTemplate(selected);
         if (contains(selected) == -1) {
             return;

designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java

@@ -243,14 +243,6 @@ public class DesignModuleFactory {
         return bp;
     }
 
-
-    public static void clearChartPropertyPane() {
-        if (instance.chartPropertyPaneClass != null) {
-            StableUtils.clearInstance(instance.chartPropertyPaneClass);
-        }
-    }
-
-
     public static void registerButtonDetailPaneClass(Class clazz) {
         instance.buttonDetailPaneClass = clazz;
     }

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

@@ -24,15 +24,9 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
      * 创建图表属性表实例.
      */
     private synchronized static ChartPropertyPane getInstance() {
-        //创建新图表时，创建属性表配置面板
+        return new ChartPropertyPane();
-        if (singleton == null) {
-            singleton = new ChartPropertyPane();
-        }
-        return singleton;
     }
 
-    private static ChartPropertyPane singleton;
-
     protected TargetComponentContainer container = new TargetComponentContainer();
 
     protected ChartEditPane chartEditPane;
@@ -160,8 +154,4 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
             chartEditPane.setSupportCellData(supportCellData);
         }
     }
-
-    public synchronized static void clear() {
-        singleton = null;
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/RefreshTooltipContentPaneWithOutSeries.java

@@ -23,7 +23,12 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         super.initFormatPane(parent, showOnPane);
 
-        setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
+        setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane) {
+            @Override
+            protected String getCheckBoxText() {
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pointer_Change_Value");
+            }
+        });
         setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/tooltip/TooltipContentPaneWithOutSeries.java

@@ -134,6 +134,7 @@ public class TooltipContentPaneWithOutSeries extends VanChartTooltipContentPane
 
     protected AttrTooltipContent createAttrTooltip() {
         GaugeValueTooltipContent gaugeValueTooltipContent = new GaugeValueTooltipContent();
+        gaugeValueTooltipContent.setCustom(false);
         gaugeValueTooltipContent.getTargetValueFormat().setEnable(true);
         gaugeValueTooltipContent.getRichTextTargetValueFormat().setEnable(true);
         return gaugeValueTooltipContent;