Browse Source

REPORT-4887 @plough:9.0设计器交互验收问题=>选中悬浮元素时,去除单元格菜单中的无用项

master
plough 7 years ago
parent
commit
35cd80a22a
  1. 6
      designer/src/com/fr/design/actions/cell/CellAttributeTableAction.java
  2. 6
      designer/src/com/fr/design/actions/cell/CellWidgetAttrAction.java
  3. 6
      designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java
  4. 11
      designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

6
designer/src/com/fr/design/actions/cell/CellAttributeTableAction.java

@ -2,6 +2,7 @@ package com.fr.design.actions.cell;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.mainframe.CellElementPropertyPane; import com.fr.design.mainframe.CellElementPropertyPane;
import com.fr.design.mainframe.EastRegionContainerPane;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
@ -20,4 +21,9 @@ public abstract class CellAttributeTableAction extends UpdateAction {
CellElementPropertyPane.getInstance().GoToPane(getID()); CellElementPropertyPane.getInstance().GoToPane(getID());
} }
@Override
public void update() {
super.update();
this.setEnabled(EastRegionContainerPane.getInstance().isCellAttrPaneEnabled());
}
} }

6
designer/src/com/fr/design/actions/cell/CellWidgetAttrAction.java

@ -24,4 +24,10 @@ public class CellWidgetAttrAction extends UpdateAction {
EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS); EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS);
EastRegionContainerPane.getInstance().setWindow2PreferWidth(); EastRegionContainerPane.getInstance().setWindow2PreferWidth();
} }
@Override
public void update() {
super.update();
this.setEnabled(EastRegionContainerPane.getInstance().isWidgetSettingsPaneEnabled());
}
} }

6
designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java

@ -26,4 +26,10 @@ public class ConditionAttributesAction extends UpdateAction {
EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_CONDITION_ATTR); EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_CONDITION_ATTR);
EastRegionContainerPane.getInstance().setWindow2PreferWidth(); EastRegionContainerPane.getInstance().setWindow2PreferWidth();
} }
@Override
public void update() {
super.update();
this.setEnabled(EastRegionContainerPane.getInstance().isConditionAttrPaneEnabled());
}
} }

11
designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

@ -466,6 +466,17 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
} }
} }
public boolean isConditionAttrPaneEnabled() {
return propertyItemMap.get(KEY_CONDITION_ATTR).isEnabled();
}
public boolean isWidgetSettingsPaneEnabled() {
return propertyItemMap.get(KEY_WIDGET_SETTINGS).isEnabled();
}
public boolean isCellAttrPaneEnabled() {
return propertyItemMap.get(KEY_CELL_ATTR).isEnabled();
}
class PropertyItem { class PropertyItem {

Loading…
Cancel
Save