Browse Source

Merge pull request #762 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0

* commit '31bc99688418df40b86692582bd3cbabbe557fa3':
  CHART-3791 从其他图表切换至地图,重置地图数据配置
bugfix/10.0
Wim.Zhai 6 years ago
parent
commit
e6befa1ac4
  1. 5
      designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
  2. 7
      designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java

5
designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java

@ -109,6 +109,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{
resetTitleAttr(chart); resetTitleAttr(chart);
//重置监控刷新选项 //重置监控刷新选项
resetRefreshMoreLabelAttr((VanChart)chart); resetRefreshMoreLabelAttr((VanChart)chart);
resetFilterDefinition(chart);
} }
@ -118,6 +119,10 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{
chart.setTitle(vanChartPlot.getDefaultTitle()); chart.setTitle(vanChartPlot.getDefaultTitle());
} }
//重置数据配置
protected void resetFilterDefinition(Chart chart){
}
//重置监控刷新面板 //重置监控刷新面板
protected void resetRefreshMoreLabelAttr(VanChart chart){ protected void resetRefreshMoreLabelAttr(VanChart chart){

7
designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java

@ -6,10 +6,10 @@ import com.fr.chart.chartattr.Plot;
import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.base.VanChartTools;
import com.fr.plugin.chart.map.MapIndependentVanChart; import com.fr.plugin.chart.map.MapIndependentVanChart;
import com.fr.plugin.chart.map.VanChartMapPlot; import com.fr.plugin.chart.map.VanChartMapPlot;
import com.fr.plugin.chart.map.data.VanMapDefinition;
import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper; import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
import com.fr.van.chart.designer.type.AbstractVanChartTypePane; import com.fr.van.chart.designer.type.AbstractVanChartTypePane;
@ -129,6 +129,11 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
} }
@Override
protected void resetFilterDefinition(Chart chart) {
chart.setFilterDefinition(new VanMapDefinition());
}
protected void resetAttr(Plot plot) { protected void resetAttr(Plot plot) {
sourceChoosePane.resetComponentValue((VanChartMapPlot) plot); sourceChoosePane.resetComponentValue((VanChartMapPlot) plot);
} }

Loading…
Cancel
Save