Merge pull request #6071 in DESIGN/design from feature/10.0 to feature/x

* commit '227057415e837b1663fb4ba8c6f4501b20e5081e':
  CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存

designer-base/src/main/java/com/fr/design/gui/chart/ChartEditPaneProvider.java

@@ -16,4 +16,7 @@ public interface ChartEditPaneProvider {
     default void removeChartEditPaneActionListener(ChartEditPaneActionListener l) {
     }
 
+    default void resetLastChartCollection() {
+    }
+
 }

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

@@ -55,6 +55,8 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
             chartEditPane.setContainer(container);
             currentID = plotID;
             resetChartEditPane();
+        } else {
+            chartEditPane.resetLastChartCollection();
         }
     }
 

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

@@ -118,6 +118,10 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
         this.listenerList.remove(ChartEditPaneActionListener.class, l);
     }
 
+    public void resetLastChartCollection() {
+        this.lastCollection = null;
+    }
+
     private void fireAttributeChange(ChartCollection chartCollection) {
         // Guaranteed to return a non-null array
         Object[] listeners = listenerList.getListenerList();