Browse Source

Merge pull request #3216 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '74ef373f8880e55817d480b8cf1fde4d373d1aea':
  CHART-17633 地图gis埋点
  KERNEL-6154 GeneralXMLTools注册问题
bugfix/10.0
superman 4 years ago
parent
commit
06ea3eb577
  1. 3
      designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java
  2. 5
      designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

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

@ -2,9 +2,11 @@ package com.fr.van.chart.map.designer.type;
import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.Plot; import com.fr.chart.chartattr.Plot;
import com.fr.chartx.config.info.constant.ConfigType;
import com.fr.chartx.data.ChartDataDefinitionProvider; import com.fr.chartx.data.ChartDataDefinitionProvider;
import com.fr.chartx.data.MapChartDataDefinition; import com.fr.chartx.data.MapChartDataDefinition;
import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
import com.fr.design.mainframe.chart.info.ChartInfoCollector;
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.attr.plot.VanChartPlot; import com.fr.plugin.chart.attr.plot.VanChartPlot;
@ -100,6 +102,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
if (!isSamePlot() || (typeChanged && isSamePlot())) { if (!isSamePlot() || (typeChanged && isSamePlot())) {
resetAttr(plot); resetAttr(plot);
} }
ChartInfoCollector.getInstance().updateChartConfig(chart, ConfigType.MAP, chart.getBuryingPointMapConfig());
} }
} }
/** /**

5
designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@ -99,6 +99,7 @@ import com.fr.report.cell.cellattr.core.group.DSColumn;
import com.fr.report.cell.painter.BiasTextPainter; import com.fr.report.cell.painter.BiasTextPainter;
import com.fr.report.cell.painter.CellImagePainter; import com.fr.report.cell.painter.CellImagePainter;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import com.fr.stable.EssentialUtils;
import com.fr.stable.ParameterProvider; import com.fr.stable.ParameterProvider;
import com.fr.stable.bridge.StableFactory; import com.fr.stable.bridge.StableFactory;
import com.fr.stable.os.support.OSBasedAction; import com.fr.stable.os.support.OSBasedAction;
@ -191,8 +192,8 @@ public class DesignerActivator extends Activator {
justStartModules4Designer(); justStartModules4Designer();
CalculatorProviderContext.setValueConverter(valueConverter()); CalculatorProviderContext.setValueConverter(valueConverter());
GeneralXMLTools.Object_Tokenizer = startXMLReadObjectTokenizer(); EssentialUtils.Object_Tokenizer = startXMLReadObjectTokenizer();
GeneralXMLTools.Object_XML_Writer_Finder = startObjectXMLWriterFinder(); EssentialUtils.Object_XML_Writer_Finder = startObjectXMLWriterFinder();
addAdapterForPlate(); addAdapterForPlate();
designerRegister(); designerRegister();

Loading…
Cancel
Save