Browse Source

Merge pull request #6070 in DESIGN/design from feature/10.0 to feature/big-screen

* commit '227057415e837b1663fb4ba8c6f4501b20e5081e':
  CHART-20937 fix:不新创建editpane但是要重置lastChartCollection 否则不触发保存
feature/big-screen
superman 3 years ago
parent
commit
6fe7f090be
  1. 3
      designer-base/src/main/java/com/fr/design/gui/chart/ChartEditPaneProvider.java
  2. 2
      designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java
  3. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java

3
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 removeChartEditPaneActionListener(ChartEditPaneActionListener l) {
} }
default void resetLastChartCollection() {
}
} }

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

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

4
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); this.listenerList.remove(ChartEditPaneActionListener.class, l);
} }
public void resetLastChartCollection() {
this.lastCollection = null;
}
private void fireAttributeChange(ChartCollection chartCollection) { private void fireAttributeChange(ChartCollection chartCollection) {
// Guaranteed to return a non-null array // Guaranteed to return a non-null array
Object[] listeners = listenerList.getListenerList(); Object[] listeners = listenerList.getListenerList();

Loading…
Cancel
Save