Browse Source

Merge pull request #1348 in BA/design from ~KERRY/design:release/9.0 to release/9.0

* commit '9b8aff0acd5046837b9acb4621373a4cbf917890':
  代码修改
  REPORT-4947 表单组件隐藏功能没有了
master
superman 7 years ago
parent
commit
ee7761e5e8
  1. 9
      designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java
  2. 1
      designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

9
designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java

@ -66,6 +66,15 @@ public abstract class DedicateLayoutContainer extends XLayoutContainer {
child.toData().setWidgetName(name); child.toData().setWidgetName(name);
} }
/**
* 重置组件的可见性
* @param visible 可见性
*/
public void resetVisible(boolean visible){
super.resetVisible(visible);
XCreator child = getXCreator(XWScaleLayout.INDEX);
child.toData().setVisible(visible);
}
/** /**
* 返回对应属性表的组件scale和title返回其子组件 * 返回对应属性表的组件scale和title返回其子组件
* *

1
designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@ -213,6 +213,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Basic")) && widgetPropertyPane != null) { if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Basic")) && widgetPropertyPane != null) {
widgetPropertyPane.update(widget); widgetPropertyPane.update(widget);
xCreator.resetCreatorName(widget.getWidgetName()); xCreator.resetCreatorName(widget.getWidgetName());
xCreator.resetVisible(widget.isVisible());
designer.getEditListenerTable().fireCreatorModified(xCreator, DesignerEvent.CREATOR_RENAMED); designer.getEditListenerTable().fireCreatorModified(xCreator, DesignerEvent.CREATOR_RENAMED);
return; return;
} }

Loading…
Cancel
Save