Browse Source

CHART-12820 地图边界丢失 && CHART-13035 钻取地图下拉匹配样式修改

feature/big-screen
白岳 5 years ago
parent
commit
b5acdf4ac5
  1. 5
      designer-chart/src/main/java/com/fr/design/chartx/component/MatchAreaTable.java
  2. 4
      designer-chart/src/main/java/com/fr/design/chartx/component/TableTreeComboBox.java
  3. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java

5
designer-chart/src/main/java/com/fr/design/chartx/component/MatchAreaTable.java

@ -4,6 +4,7 @@ import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
import com.fr.general.GeneralUtils;
import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
import com.fr.stable.StringUtils;
import javax.swing.AbstractCellEditor;
import javax.swing.JTable;
@ -113,7 +114,9 @@ public class MatchAreaTable extends JTable {
}
private void initComboBox(Object value, boolean editor) {
comboBox = new TableTreeComboBox(new JTree(root));
//地图不显示第一层,钻取地图显示第一层。
boolean showRoot = root.getUserObject() !=null && StringUtils.isNotEmpty(root.getUserObject().toString());
comboBox = new TableTreeComboBox(new JTree(root),showRoot);
comboBox.setEditable(true);
comboBox.setSelectedItem(value);

4
designer-chart/src/main/java/com/fr/design/chartx/component/TableTreeComboBox.java

@ -32,8 +32,8 @@ public class TableTreeComboBox extends FRTreeComboBox {
private JTextField textField;
public TableTreeComboBox(JTree tree) {
super(tree, null);
public TableTreeComboBox(JTree tree, boolean showRoot) {
super(tree, null, showRoot, false);
textField = (JTextField) (this.getEditor().getEditorComponent());
textField.addKeyListener(treeKeyListener);
tree.setCellRenderer(tableNameTreeRenderer);

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java

@ -67,6 +67,10 @@ public class MapPlotPane extends AbstractDeprecatedChartTypePane {
return new String[0];
}
public void reLayout(String chartID) {
}
/**
* 界面标题
* @return 界面标题

Loading…
Cancel
Save