Browse Source

Merge remote-tracking branch 'origin/release/10.0' into release/10.0

feature/big-screen
pengda 4 years ago
parent
commit
df7440bb1a
  1. 4
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java
  2. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java
  3. 5
      designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

4
designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java

@ -18,11 +18,11 @@ import com.fr.plugin.chart.vanchart.VanChart;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import java.util.Set;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.Set;
/** /**
* @author Bjorn * @author Bjorn
@ -64,7 +64,7 @@ public abstract class MapDataSetFieldsPane<T extends ColumnFieldCollectionWithSe
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
VanChartMapPlot plot = chart.getPlot(); VanChartMapPlot plot = chart.getPlot();
if (treeNodeAndItems == null) { if (treeNodeAndItems == null) {
treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType()); treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType(), true);
} }
final MapAreaMatchPane pane = new MapAreaMatchPane(treeNodeAndItems); final MapAreaMatchPane pane = new MapAreaMatchPane(treeNodeAndItems);

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java

@ -71,7 +71,7 @@ public abstract class VanMapTableDataContentPane extends AbstractTableDataConten
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if (treeNodeAndItems == null) { if (treeNodeAndItems == null) {
treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType()); treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType(), true);
} }
final MapAreaMatchPane pane = new MapAreaMatchPane(treeNodeAndItems); final MapAreaMatchPane pane = new MapAreaMatchPane(treeNodeAndItems);

5
designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@ -762,6 +762,11 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
DesignModuleFactory.getFormHierarchyPane().refreshRoot(); DesignModuleFactory.getFormHierarchyPane().refreshRoot();
} }
} else { } else {
// REPORT-43022 即使没有处于编辑参数面板的状态,在经过有关参数面板的撤销后,也需要刷新一下参数面板
if (hasParameterPane()) {
parameterPane.populate(u.getApplyTarget());
setAutoHeightForCenterPane();
}
reportComposite.setSelectedIndex(u.getSelectedReportIndex()); reportComposite.setSelectedIndex(u.getSelectedReportIndex());
u.getSelectedEditingState().revert(); u.getSelectedEditingState().revert();
TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView(); TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView();

Loading…
Cancel
Save