Browse Source

REPORT-4581 报表块样式-标题样式不起作用

master
kerry 7 years ago
parent
commit
19e798b709
  1. 8
      designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java
  2. 10
      designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

8
designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java

@ -149,4 +149,12 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
return false; return false;
} }
/**
* data属性改变触发其他操作
*
*/
public void firePropertyChange(){
initStyle();
}
} }

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

@ -152,8 +152,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
private void initDefinePane() { private void initDefinePane() {
currentEditorDefinePane = null; currentEditorDefinePane = null;
boolean dedicateLayout = xCreator.acceptType(XWScaleLayout.class) && xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator() || xCreator.acceptType(XWTitleLayout.class); XCreator creator = getXCreatorDedicated();
XCreator creator = dedicateLayout ? (XCreator) xCreator.getComponent(0) : xCreator;
FormWidgetDefinePaneFactoryBase.RN rn = FormWidgetDefinePaneFactoryBase.createWidgetDefinePane(creator, creator.toData(), new Operator() { FormWidgetDefinePaneFactoryBase.RN rn = FormWidgetDefinePaneFactoryBase.createWidgetDefinePane(creator, creator.toData(), new Operator() {
@Override @Override
public void did(DataCreatorUI ui, String cardName) { public void did(DataCreatorUI ui, String cardName) {
@ -168,6 +167,10 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
currentEditorDefinePane = definePane; currentEditorDefinePane = definePane;
} }
private XCreator getXCreatorDedicated(){
boolean dedicateLayout = xCreator.acceptType(XWScaleLayout.class) && xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator() || xCreator.acceptType(XWTitleLayout.class);
return dedicateLayout ? (XCreator) xCreator.getComponent(0) : xCreator;
}
@Override @Override
public String title4PopupWindow() { public String title4PopupWindow() {
@ -217,7 +220,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
} }
public void fireValueChanged() { public void fireValueChanged() {
xCreator.firePropertyChange(); XCreator creator = getXCreatorDedicated();
creator.firePropertyChange();
designer.fireTargetModified(); designer.fireTargetModified();
designer.refreshDesignerUI(); designer.refreshDesignerUI();
} }

Loading…
Cancel
Save