|
|
|
@ -10,6 +10,7 @@ import com.fr.design.gui.itoolbar.UIToolbar;
|
|
|
|
|
import com.fr.design.layout.FRGUIPaneFactory; |
|
|
|
|
import com.fr.design.layout.TableLayout; |
|
|
|
|
import com.fr.design.layout.TableLayoutHelper; |
|
|
|
|
import com.fr.design.mainframe.chart.mode.ChartEditContext; |
|
|
|
|
import com.fr.design.utils.gui.GUICoreUtils; |
|
|
|
|
import com.fr.stable.Nameable; |
|
|
|
|
import com.fr.van.chart.designer.TableLayout4VanChartHelper; |
|
|
|
@ -128,7 +129,9 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem
|
|
|
|
|
|
|
|
|
|
public void populate(Nameable[] nameableArray) { |
|
|
|
|
//特殊处理,使用instanceof判断,弹出不同的面板
|
|
|
|
|
if (SwingUtilities.getWindowAncestor(this) instanceof PopupEditDialog) { |
|
|
|
|
//悬浮窗图表弹框 || 场景地图编辑弹框 都是真正的弹框 从if走
|
|
|
|
|
//fvs.chart走super
|
|
|
|
|
if (SwingUtilities.getWindowAncestor(this) instanceof JDialog && !ChartEditContext.duchampMode()) { |
|
|
|
|
popupEditDialog = new HyperDialog(cardPane); |
|
|
|
|
} |
|
|
|
|
super.populate(nameableArray); |
|
|
|
@ -136,7 +139,7 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem
|
|
|
|
|
|
|
|
|
|
protected void popupEditDialog(Point mousePos) { |
|
|
|
|
//特殊处理,处理连续弹窗情况,弹出面板定为方式不同
|
|
|
|
|
if (SwingUtilities.getWindowAncestor(this) instanceof PopupEditDialog) { |
|
|
|
|
if (SwingUtilities.getWindowAncestor(this) instanceof JDialog && !ChartEditContext.duchampMode()) { |
|
|
|
|
GUICoreUtils.centerWindow(popupEditDialog); |
|
|
|
|
popupEditDialog.setVisible(true); |
|
|
|
|
return; |
|
|
|
|