Browse Source

Pull request #8309: CHART-21969 fix: fvs.cpt屏蔽场景地图新建入口

Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0

* commit '6ef8e5c77443e5558a818824743ef509fe46d223':
  CHART-21969 fix: fvs.cpt屏蔽场景地图新建入口
bugfix/11.0
zheng 3 years ago
parent
commit
68a32dd3cd
  1. 2
      designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
  2. 7
      designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
  3. 21
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

2
designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java

@ -111,6 +111,8 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
public static final String TYPE_PANE_DEFAULT_TITLE = "DEFAULT_NAME"; public static final String TYPE_PANE_DEFAULT_TITLE = "DEFAULT_NAME";
public static final String GEO_LAND_CHART_ID = "UGeoLandChart";
public synchronized static ChartTypeInterfaceManager getInstance() { public synchronized static ChartTypeInterfaceManager getInstance() {
return classManager; return classManager;

7
designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java

@ -8,11 +8,13 @@ import com.fr.chart.chartattr.ChartCollection;
import com.fr.chart.charttypes.ChartTypeManager; import com.fr.chart.charttypes.ChartTypeManager;
import com.fr.chartx.attr.ChartProvider; import com.fr.chartx.attr.ChartProvider;
import com.fr.design.ChartTypeInterfaceManager; import com.fr.design.ChartTypeInterfaceManager;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.chart.info.ChartInfoCollector; 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.stable.ArrayUtils;
import com.fr.van.chart.config.DefaultStyleHelper4Van; import com.fr.van.chart.config.DefaultStyleHelper4Van;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
@ -45,6 +47,11 @@ public class ChartTypePane extends ChartCommonWizardPane implements CallbackEven
DefaultListModel defaultListModel = new DefaultListModel(); DefaultListModel defaultListModel = new DefaultListModel();
mainTypeList = new JList(defaultListModel); mainTypeList = new JList(defaultListModel);
if (DesignModeContext.isDuchampMode()
&& ArrayUtils.contains(chartIDs, ChartTypeInterfaceManager.GEO_LAND_CHART_ID)) {
chartIDs = ArrayUtils.removeElement(chartIDs, ChartTypeInterfaceManager.GEO_LAND_CHART_ID);
}
for (int i = 0; i < chartIDs.length; i++) { for (int i = 0; i < chartIDs.length; i++) {
defaultListModel.insertElementAt(ChartTypeInterfaceManager.getInstance().getName(chartIDs[i]), i); defaultListModel.insertElementAt(ChartTypeInterfaceManager.getInstance().getName(chartIDs[i]), i);
} }

21
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@ -19,7 +19,6 @@ import com.fr.design.mainframe.chart.gui.item.FlexibleComboBox;
import com.fr.design.mainframe.chart.gui.item.ItemEventType; import com.fr.design.mainframe.chart.gui.item.ItemEventType;
import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
import com.fr.design.mainframe.chart.mode.ChartEditContext; import com.fr.design.mainframe.chart.mode.ChartEditContext;
import com.fr.design.mainframe.chart.mode.ChartEditMode;
import com.fr.design.module.DesignModuleFactory; import com.fr.design.module.DesignModuleFactory;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
@ -27,11 +26,6 @@ import com.fr.stable.AssistUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.CardLayout; import java.awt.CardLayout;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
@ -40,6 +34,11 @@ import java.awt.event.ItemEvent;
import java.awt.event.ItemListener; import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/** /**
* 图表 属性表, 类型选择 界面. * 图表 属性表, 类型选择 界面.
@ -55,6 +54,7 @@ public class ChartTypePane extends AbstractChartAttrPane {
private ActionListener autoButtonListener; private ActionListener autoButtonListener;
private boolean inForm; private boolean inForm;
@Override @Override
protected JPanel createContentPane() { protected JPanel createContentPane() {
initButtonListener(); initButtonListener();
@ -291,13 +291,20 @@ public class ChartTypePane extends AbstractChartAttrPane {
String plotID = entry.getKey(); String plotID = entry.getKey();
if (ignore || ChartTypeManager.enabledChart(plotID)) { if (ignore || ChartTypeManager.enabledChart(plotID)) {
if (ChartTypeManager.getInstance().isShowInDesigner(plotID)) { if (ChartTypeManager.getInstance().isShowInDesigner(plotID)) {
cards.add(entry.getValue()); if (notGeoLandInDuchampCPT(plotID)) {
cards.add(entry.getValue());
}
} }
} }
} }
} }
public boolean notGeoLandInDuchampCPT(String plotID) {
return !(DesignModeContext.isDuchampMode()
&& ChartTypeInterfaceManager.GEO_LAND_CHART_ID.equals(plotID));
}
private void addOnePlotIDCards(int priority, String plotID) { private void addOnePlotIDCards(int priority, String plotID) {
cards.add(allChartTypePane.get(priority).get(plotID)); cards.add(allChartTypePane.get(priority).get(plotID));
} }

Loading…
Cancel
Save