Browse Source

REPORT-3914 调整代码

master
plough 7 years ago
parent
commit
9abea324eb
  1. 7
      designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
  2. 7
      designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java
  3. 7
      designer/src/com/fr/poly/creator/ECBlockEditor.java
  4. 13
      designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

7
designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java

@ -99,12 +99,7 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
EastRegionContainerPane.getInstance().replaceConditionAttrPane(conditionAttributesGroupPane); EastRegionContainerPane.getInstance().replaceConditionAttrPane(conditionAttributesGroupPane);
EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance()); EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance());
if (isSelectedOneCell()) { EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
EastRegionContainerPane.getInstance().enableCellElementPane();
} else { // 如果选中多个单元格,禁用单元格元素 tab
EastRegionContainerPane.getInstance().disableCellElementPane();
EastRegionContainerPane.getInstance().refreshRightPane();
}
} }
EastRegionContainerPane.getInstance().replaceHyperlinkPane(hyperlinkGroupPane); EastRegionContainerPane.getInstance().replaceHyperlinkPane(hyperlinkGroupPane);
EastRegionContainerPane.getInstance().removeParameterPane(); EastRegionContainerPane.getInstance().removeParameterPane();

7
designer/src/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java

@ -46,12 +46,7 @@ public class FormElementCasePaneDelegate extends ElementCasePane<FormElementCase
ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance(); ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
conditionAttributesGroupPane.populate(FormElementCasePaneDelegate.this); conditionAttributesGroupPane.populate(FormElementCasePaneDelegate.this);
if (isSelectedOneCell()) { EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
EastRegionContainerPane.getInstance().enableCellElementPane();
} else { // 如果选中多个单元格,禁用单元格元素 tab
EastRegionContainerPane.getInstance().disableCellElementPane();
EastRegionContainerPane.getInstance().refreshRightPane();
}
} }
}); });
this.addTargetModifiedListener(new TargetModifiedListener() { this.addTargetModifiedListener(new TargetModifiedListener() {

7
designer/src/com/fr/poly/creator/ECBlockEditor.java

@ -158,12 +158,7 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
EastRegionContainerPane.getInstance().replaceCellElementPane(QuickEditorRegion.getInstance()); EastRegionContainerPane.getInstance().replaceCellElementPane(QuickEditorRegion.getInstance());
EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance()); EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance());
if (isSelectedOneCell()) { EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
EastRegionContainerPane.getInstance().enableCellElementPane();
} else { // 如果选中多个单元格,禁用单元格元素 tab
EastRegionContainerPane.getInstance().disableCellElementPane();
EastRegionContainerPane.getInstance().refreshRightPane();
}
} }
EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance()); EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance());

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

@ -153,12 +153,21 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
return defaultPane; return defaultPane;
} }
public void updateCellElementState(boolean isSelectedOneCell) {
if (isSelectedOneCell) {
enableCellElementPane();
} else { // 如果选中多个单元格,禁用单元格元素 tab
disableCellElementPane();
refreshRightPane();
}
}
// 禁用单元格元素tab // 禁用单元格元素tab
public void disableCellElementPane() { private void disableCellElementPane() {
propertyItemMap.get(KEY_CELL_ELEMENT).setEnabled(false); propertyItemMap.get(KEY_CELL_ELEMENT).setEnabled(false);
} }
// 禁用单元格元素tab // 禁用单元格元素tab
public void enableCellElementPane() { private void enableCellElementPane() {
propertyItemMap.get(KEY_CELL_ELEMENT).setEnabled(true); propertyItemMap.get(KEY_CELL_ELEMENT).setEnabled(true);
} }

Loading…
Cancel
Save