Browse Source

REPORT-85754 fix:扩展图表场景设置-js-高级编辑界面不应该置底

release/11.0
Carlson 2 years ago
parent
commit
72f18c340d
  1. 9
      designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java
  2. 6
      designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
  3. 6
      designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

9
designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java

@ -31,6 +31,7 @@ import java.awt.BorderLayout;
import java.awt.Cursor; import java.awt.Cursor;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.FontMetrics; import java.awt.FontMetrics;
import java.awt.Window;
import java.awt.event.FocusEvent; import java.awt.event.FocusEvent;
import java.awt.event.FocusListener; import java.awt.event.FocusListener;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
@ -54,6 +55,7 @@ public class JSContentPane extends BasicPane {
private JSImplUpdateAction jsImplUpdateAction; private JSImplUpdateAction jsImplUpdateAction;
private JSImplPopulateAction jsImplPopulateAction; private JSImplPopulateAction jsImplPopulateAction;
private boolean modal; private boolean modal;
private Window parentWindow;
BasicDialog advancedEditorDialog ; BasicDialog advancedEditorDialog ;
public JSContentPane(){} public JSContentPane(){}
@ -122,6 +124,9 @@ public class JSContentPane extends BasicPane {
super.doCancel(); super.doCancel();
} }
},new Dimension(900,800)); },new Dimension(900,800));
if (parentWindow != null) {
parentWindow.setVisible(false);
}
advancedEditorDialog.setModal(modal); advancedEditorDialog.setModal(modal);
advancedEditorDialog.setResizable(true); advancedEditorDialog.setResizable(true);
advancedEditorDialog.pack(); advancedEditorDialog.pack();
@ -133,6 +138,10 @@ public class JSContentPane extends BasicPane {
labelPane.add(advancedEditorLabel,BorderLayout.EAST); labelPane.add(advancedEditorLabel,BorderLayout.EAST);
} }
public void setParentWindow(Window parentWindow) {
this.parentWindow = parentWindow;
}
protected UIScrollPane createContentTextAreaPanel(){ protected UIScrollPane createContentTextAreaPanel(){
contentTextArea = new RSyntaxTextArea(); contentTextArea = new RSyntaxTextArea();
contentTextArea.setCloseCurlyBraces(true); contentTextArea.setCloseCurlyBraces(true);

6
designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java

@ -29,6 +29,7 @@ import javax.swing.JPanel;
import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener; import javax.swing.event.TableModelListener;
import java.awt.Window;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -49,6 +50,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
public JavaScriptImplPane(HashMap hyperLinkEditorMap, boolean needRenamePane) { public JavaScriptImplPane(HashMap hyperLinkEditorMap, boolean needRenamePane) {
super(hyperLinkEditorMap, needRenamePane); super(hyperLinkEditorMap, needRenamePane);
this.defaultArgs = new String[0]; this.defaultArgs = new String[0];
this.modal = true;
initComponents(); initComponents();
} }
@ -149,7 +151,9 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
return importedJsPane; return importedJsPane;
} }
public void setParentWindow4ContentPane(Window parentWindow) {
jsPane.setParentWindow(parentWindow);
}
/** /**
* 参数改变 * 参数改变

6
designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

@ -77,7 +77,11 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
Constructor<? extends BasicBeanPane> constructor = null; Constructor<? extends BasicBeanPane> constructor = null;
try { try {
constructor = creator.getUpdatePane().getConstructor(HashMap.class, boolean.class); constructor = creator.getUpdatePane().getConstructor(HashMap.class, boolean.class);
return constructor.newInstance(getHyperLinkEditorMap(), false); BasicBeanPane pane = constructor.newInstance(getHyperLinkEditorMap(), false);
if (pane instanceof JavaScriptImplPane) {
((JavaScriptImplPane) pane).setParentWindow4ContentPane(getPopupEditDialog());
}
return pane;
} catch (InstantiationException | IllegalAccessException | InvocationTargetException e) { } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);

Loading…
Cancel
Save