Browse Source

Revert "fix: fvs图表配置不保存不生效 #REPORT-94359"

This reverts commit e9383fb4bf.
release/11.0
shine 2 years ago
parent
commit
f7531bd0c7
  1. 7
      designer-base/src/main/java/com/fr/design/gui/chart/BaseChartPropertyPane.java
  2. 10
      designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java

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

@ -3,7 +3,6 @@ package com.fr.design.gui.chart;
import com.fr.base.chart.BaseChartCollection; import com.fr.base.chart.BaseChartCollection;
import com.fr.design.designer.TargetComponent; import com.fr.design.designer.TargetComponent;
import com.fr.design.mainframe.DockingView; import com.fr.design.mainframe.DockingView;
import org.jetbrains.annotations.Nullable;
/** /**
* 图表属性界面 抽象, 用于多工程协作.. * 图表属性界面 抽象, 用于多工程协作..
@ -16,11 +15,7 @@ public abstract class BaseChartPropertyPane extends DockingView {
*/ */
public abstract void setSupportCellData(boolean supportCellData); public abstract void setSupportCellData(boolean supportCellData);
public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane) { public abstract void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane);
populateChartPropertyPane(collection, ePane, null);
}
public abstract void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane, @Nullable Runnable callback);
public abstract ChartEditPaneProvider getChartEditPane(); public abstract ChartEditPaneProvider getChartEditPane();

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

@ -17,7 +17,6 @@ import com.fr.design.gui.chart.ChartEditPaneProvider;
import com.fr.design.gui.frpane.UITitlePanel; import com.fr.design.gui.frpane.UITitlePanel;
import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.mainframe.chart.ChartEditPane;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import org.jetbrains.annotations.Nullable;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.Icon; import javax.swing.Icon;
@ -97,7 +96,7 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
* @param collection 收集图表 * @param collection 收集图表
* @param ePane 面板 * @param ePane 面板
*/ */
public void populateChartPropertyPane(ChartCollection collection, TargetComponent<?> ePane, @Nullable Runnable callback) { public void populateChartPropertyPane(ChartCollection collection, TargetComponent<?> ePane) {
new SwingWorker<Void, Void>() { new SwingWorker<Void, Void>() {
@Override @Override
protected Void doInBackground() throws Exception { protected Void doInBackground() throws Exception {
@ -115,9 +114,6 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
} else { } else {
GUICoreUtils.setEnabled(chartEditPane, false); GUICoreUtils.setEnabled(chartEditPane, false);
} }
if (callback != null) {
callback.run();
}
} }
}.execute(); }.execute();
} }
@ -127,9 +123,9 @@ public class ChartPropertyPane extends BaseChartPropertyPane {
* @param collection 收集图表 * @param collection 收集图表
* @param ePane 面板 * @param ePane 面板
*/ */
public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane, @Nullable Runnable callback) { public void populateChartPropertyPane(BaseChartCollection collection, TargetComponent<?> ePane) {
if (collection instanceof ChartCollection) { if (collection instanceof ChartCollection) {
populateChartPropertyPane((ChartCollection) collection, ePane, callback); populateChartPropertyPane((ChartCollection) collection, ePane);
} }
} }

Loading…
Cancel
Save