From 5355d7dda4e6378403a8ab291600f370565e8ba7 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Wed, 14 Nov 2018 20:06:54 +0800 Subject: [PATCH] REPORT-12161 & REPORT-10599 --- .../java/com/fr/design/dialog/UIDialog.java | 23 +++++++++------ .../fr/design/javascript/JSContentPane.java | 27 ++++++++++++----- .../design/javascript/JavaScriptImplPane.java | 4 ++- .../fr/design/mainframe/DesignerFrame.java | 11 ++++++- .../com/fr/design/mainframe/JTemplate.java | 2 +- .../mainframe/toolbar/ToolBarMenuDock.java | 29 ++++++++++++++++--- .../design/mainframe/WidgetPropertyPane.java | 19 ++++++++---- .../fr/design/mainframe/ElementCasePane.java | 2 +- 8 files changed, 87 insertions(+), 30 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java index 7380bb58f..193a5ea07 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java @@ -73,7 +73,7 @@ public abstract class UIDialog extends JDialog { } this.setName(pane.title4PopupWindow()); this.setModal(true); - this.pack(); + GUICoreUtils.centerWindow(this); } @@ -90,12 +90,10 @@ public abstract class UIDialog extends JDialog { //取消 addCancelButton(buttonsPane); - this.getRootPane().setDefaultButton(okButton); - return controlPane; } - protected void addCustomButton(JPanel buttonsPane){ + protected void addCustomButton(JPanel buttonsPane) { } @@ -110,6 +108,18 @@ public abstract class UIDialog extends JDialog { doCancel(); } }); + JPanel defaultPane = (JPanel) this.getContentPane(); + InputMap inputMapAncestor = defaultPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = defaultPane.getActionMap(); + + // transfer focus to CurrentEditor + inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "dialogOK"); + actionMap.put("dialogOK", new AbstractAction() { + + public void actionPerformed(ActionEvent evt) { + doOK(); + } + }); } private void addOkButton(JPanel buttonsPane) { @@ -130,7 +140,6 @@ public abstract class UIDialog extends JDialog { * 添加监听器 * * @param l 监听器 - * */ public void addDialogActionListener(DialogActionListener l) { listeners.add(l); @@ -138,7 +147,6 @@ public abstract class UIDialog extends JDialog { /** * 清除所有监听器 - * */ public void clearDialogActionListeners() { listeners.clear(); @@ -146,7 +154,6 @@ public abstract class UIDialog extends JDialog { /** * 确定操作 - * */ public void doOK() { try { @@ -177,7 +184,6 @@ public abstract class UIDialog extends JDialog { /** * 取消操作 - * */ public void doCancel() { @@ -224,7 +230,6 @@ public abstract class UIDialog extends JDialog { /** * 检测结果是否合法 - * */ public abstract void checkValid() throws Exception; diff --git a/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java b/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java index 77e16e312..cd6e01df3 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java @@ -28,6 +28,7 @@ import java.util.ArrayList; public class JSContentPane extends BasicPane { private RSyntaxTextArea contentTextArea; private UILabel funNameLabel; + private AutoCompletion ac; private int titleWidth = 180; @@ -78,14 +79,6 @@ public class JSContentPane extends BasicPane { contentTextArea.setCodeFoldingEnabled(true); contentTextArea.setAntiAliasingEnabled(true); - CompletionProvider provider = createCompletionProvider(); - - AutoCompletion ac = new AutoCompletion(provider); - String shortCuts = DesignerEnvManager.getEnvManager().getAutoCompleteShortcuts(); - - ac.setTriggerKey(convert2KeyStroke(shortCuts)); - ac.install(contentTextArea); - UIScrollPane sp = new UIScrollPane(contentTextArea); this.add(sp, BorderLayout.CENTER); @@ -104,13 +97,31 @@ public class JSContentPane extends BasicPane { } public void populate(String js) { + if (ac == null) { + CompletionProvider provider = createCompletionProvider(); + ac = new AutoCompletion(provider); + String shortCuts = DesignerEnvManager.getEnvManager().getAutoCompleteShortcuts(); + + ac.setTriggerKey(convert2KeyStroke(shortCuts)); + ac.install(contentTextArea); + } + this.contentTextArea.setText(js); } public String update() { + if (ac != null) { + this.ac.uninstall(); + ac = null; + } + return this.contentTextArea.getText(); } + public void reset() { + this.contentTextArea.setText(null); + } + public void setFunctionTitle(String[] args) { funNameLabel.setText(createFunctionTitle(args)); } diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java index 23a33976b..8806d6853 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java @@ -138,6 +138,9 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { public void populateBean(JavaScriptImpl javaScriptImpl) { if (javaScriptImpl == null) { javaScriptImpl = new JavaScriptImpl(); + jsPane.reset(); + }else{ + jsPane.populate(javaScriptImpl.getContent()); } int rowCount = javaScriptImpl.getJSImportSize(); @@ -147,7 +150,6 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { } importedJsPane.populate(value); parameterPane.populate(javaScriptImpl.getParameters()); - jsPane.populate(javaScriptImpl.getContent()); if (itemNameTextField != null) { itemNameTextField.setText(javaScriptImpl.getItemName()); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java index be2695815..7d9a3d749 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java @@ -155,6 +155,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta // 右边的虚线 private DottedLine rightDottedLine; + //用于判断设计器是否打开了 + private boolean designerOpened = false; + private int contentWidth = (int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth()); private int contentHeight = (int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight()); @@ -351,7 +354,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta */ public void addDesignerOpenedListener(DesignerOpenedListener listener) { - designerOpenedListenerList.add(listener); + if (!designerOpened) { + designerOpenedListenerList.add(listener); + } } /** @@ -362,6 +367,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta for (DesignerOpenedListener listener : designerOpenedListenerList) { listener.designerOpened(); } + + designerOpened = true; + //使用完清除监听 + designerOpenedListenerList.clear(); } protected DesktopCardPane getCenterTemplateCardPane() { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index 737b5ba16..d14a066e5 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -780,7 +780,7 @@ public abstract class JTemplate> ((JTemplateActionListener) listeners[i + 1]).templateClosed(this); } } - + this.undoState = null; this.repaint(30); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 8f20583ab..b46719efe 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -148,6 +148,9 @@ public abstract class ToolBarMenuDock { }; private static final String FINEREPORT = "FineReport"; private static final int MENUBAR_HEIGHT = 22; + + private static final List PLUGIN_LISTENERS = new ArrayList<>(); + private MenuDef[] menus; private ToolBarDef toolBarDef; private List shortCutsList; @@ -218,6 +221,8 @@ public abstract class ToolBarMenuDock { } public MenuDef[] menus(final ToolBarMenuDockPlus plus) { + //删除之前创建的插件菜单监听 + clearPluginListeners(); java.util.List menuList = new java.util.ArrayList(); // 添加文件菜单 menuList.add(createFileMenuDef(plus)); @@ -248,6 +253,15 @@ public abstract class ToolBarMenuDock { return menuList.toArray(new MenuDef[menuList.size()]); } + //清空监听 + private static synchronized void clearPluginListeners() { + + for (PluginEventListener listener : PLUGIN_LISTENERS) { + GeneralContext.stopListenPlugin(listener); + } + PLUGIN_LISTENERS.clear(); + } + /** * 获取所有actionmodel * @@ -644,7 +658,7 @@ public abstract class ToolBarMenuDock { } }; - GeneralContext.listenPlugin(PluginEventType.BeforeStop, new PluginEventListener() { + PluginEventListener beforeStop = new PluginEventListener() { @Override public void on(PluginEvent event) { @@ -652,8 +666,9 @@ public abstract class ToolBarMenuDock { Set menuHandlers = runtime.get(MenuHandler.MARK_STRING); removeExtraMenus(menuDef, anchor, action, menuHandlers); } - }, filter); - GeneralContext.listenPlugin(PluginEventType.AfterRun, new PluginEventListener() { + }; + + PluginEventListener afterRun = new PluginEventListener() { @Override public void on(PluginEvent event) { @@ -662,7 +677,13 @@ public abstract class ToolBarMenuDock { Set menuHandlers = runtime.get(MenuHandler.MARK_STRING); addExtraMenus(menuDef, anchor, action, menuHandlers); } - }, filter); + }; + + GeneralContext.listenPlugin(PluginEventType.BeforeStop, beforeStop, filter); + GeneralContext.listenPlugin(PluginEventType.AfterRun, afterRun, filter); + + PLUGIN_LISTENERS.add(afterRun); + PLUGIN_LISTENERS.add(beforeStop); } private void removeExtraMenus(MenuDef menuDef, String anchor, ShortCutMethodAction action, Set set) { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java index d6ee25342..0cf740dbe 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java @@ -28,7 +28,7 @@ import java.util.Set; * 控件属性表绘制 * Modified by fanglei */ -public class WidgetPropertyPane extends FormDockView implements BaseWidgetPropertyPane { +public class WidgetPropertyPane extends FormDockView implements BaseWidgetPropertyPane { private static final int PADDING = 10; private static final int PADDING_M = 12; @@ -108,11 +108,10 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope */ private void initTables() { formWidgetCardPane.populate(); - eventTable.refresh(); + if (mobileExtraPropertyPanes != null) { for (MobileWidgetDefinePane extraPane : mobileExtraPropertyPanes) { extraPane.initPropertyGroups(designer); - extraPane.populate(designer); } } if (widgetPropertyTables != null) { @@ -222,7 +221,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal") }; - final CardLayout tabbedPane = new CardLayout(); + final CardLayout tabbedPane = new CardLayout(); final JPanel center = new JPanel(tabbedPane); center.add(formWidgetCardPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Properties")); center.add(eventTable, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event")); @@ -232,6 +231,16 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope tabsHeaderIconPane = new UIHeadGroup(tabTitles) { @Override public void tabChanged(int index) { + //切换的时候再populate + if (index == 1) { + eventTable.refresh(); + } else if (index == 2) { + if (mobileExtraPropertyPanes != null) { + for (MobileWidgetDefinePane extraPane : mobileExtraPropertyPanes) { + extraPane.populate(designer); + } + } + } tabbedPane.show(center, tabTitles[index]); } }; @@ -292,7 +301,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED || evt.getCreatorEventID() == DesignerEvent.CREATOR_RESIZED) { formWidgetCardPane.populate(); - } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED){ + } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED) { // 防止多次触发 if (lastAffectedCreator != null && lastAffectedCreator == evt.getAffectedCreator()) { return; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java index 8832ec4c3..df9476c71 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java @@ -596,7 +596,7 @@ public abstract class ElementCasePane extends Tar * @return 是则返回true */ public boolean isSelectedOneCell() { - return selection.isSelectedOneCell(this); + return (selection == null) ? false : selection.isSelectedOneCell(this); } /**