diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index bec8df3b70..ea02476682 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -95,8 +95,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta private List designerOpenedListenerList = new ArrayList<>(); - private boolean isDesignerOpened = false; // 加一个标记。可以通过它来判断设计器是否初始化完成 - private ToolBarMenuDock ad; private DesktopCardPane centerTemplateCardPane; @@ -303,17 +301,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta for (DesignerOpenedListener listener : designerOpenedListenerList) { listener.designerOpened(); } - isDesignerOpened = true; - } - - /** - * 判断设计器是否初始化完成 - */ - public boolean isDesignerOpened() { - return isDesignerOpened; } - protected DesktopCardPane getCenterTemplateCardPane() { return centerTemplateCardPane; } diff --git a/designer_form/src/com/fr/design/designer/beans/actions/FormWidgetEditAction.java b/designer_form/src/com/fr/design/designer/beans/actions/FormWidgetEditAction.java index 88e102a126..2e30ef1d01 100644 --- a/designer_form/src/com/fr/design/designer/beans/actions/FormWidgetEditAction.java +++ b/designer_form/src/com/fr/design/designer/beans/actions/FormWidgetEditAction.java @@ -13,7 +13,12 @@ import java.awt.event.ActionEvent; public abstract class FormWidgetEditAction extends TemplateComponentAction { - private UpdateBehavior updateBehavior; + private UpdateBehavior updateBehavior = new UpdateBehavior() { + @Override + public void doUpdate(FormWidgetEditAction action) { + action.setEnabled(true); + } + }; protected FormWidgetEditAction(FormDesigner t) { super(t); @@ -21,11 +26,7 @@ public abstract class FormWidgetEditAction extends TemplateComponentAction