Browse Source

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

* commit 'cf232827fbbe306d0e1e3aef66bf152c2611b005':
  代码修改
  代码修改
  REPORT-4220 [9.0一轮回归]视图树、下拉树控件构建树确定按钮不可用
master
superman 7 years ago
parent
commit
b28b7510cf
  1. 4
      designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java
  2. 4
      designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
  3. 6
      designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java
  4. 4
      designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java

4
designer/src/com/fr/design/widget/ui/TreeComboBoxEditorDefinePane.java

@ -55,14 +55,14 @@ public class TreeComboBoxEditorDefinePane extends CustomWritableRepeatEditorPane
@Override
protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) {
treeSettingPane.setValue(e.getDictionary());
treeSettingPane.setValue(e.getNodeOrDict());
treeRootPane.populate(e.getTreeAttr());
}
@Override
protected TreeComboBoxEditor updateSubCustomWritableRepeatEditorBean() {
TreeComboBoxEditor editor = new TreeComboBoxEditor();
editor.setDictionary((Dictionary)treeSettingPane.getValue());
editor.setNodeOrDict(treeSettingPane.getValue());
editor.setTreeAttr(treeRootPane.update());
return editor;
}

4
designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java

@ -30,7 +30,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
@Override
protected void populateSubFieldEditorBean(TreeEditor e) {
this.accessibleTreeModelEditor.setValue(e.getDictionary());
this.accessibleTreeModelEditor.setValue(e.getNodeOrDict());
treeRootPane.populate(e.getTreeAttr());
if (this.removeRepeatCheckBox != null) {
this.removeRepeatCheckBox.setSelected(e.isRemoveRepeat());
@ -40,7 +40,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
@Override
protected TreeEditor updateSubFieldEditorBean() {
TreeEditor editor = new TreeEditor();
editor.setDictionary((Dictionary) accessibleTreeModelEditor.getValue());
editor.setNodeOrDict(accessibleTreeModelEditor.getValue());
editor.setTreeAttr(treeRootPane.update());
if (this.removeRepeatCheckBox != null) {
editor.setRemoveRepeat(this.removeRepeatCheckBox.isSelected());

6
designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java

@ -45,10 +45,8 @@ public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
public FreeButton updateSubButtonPane() {
FreeButton freeButton = (FreeButton) creator.toData();
backgroundCompPane.update(freeButton);
FRFont frFont = freeButton.getFont();
if(frFont != null){
frFontPane.update(frFont);
}
FRFont frFont = freeButton.getFont() == null ? FRFont.getInstance() : freeButton.getFont();
freeButton.setFont(frFontPane.update(frFont));
return freeButton;
}
}

4
designer_form/src/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java

@ -69,7 +69,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
@Override
protected void populateSubCustomWritableRepeatEditorBean(TreeEditor e) {
accessibleTreeModelEditor.setValue(e.getDictionary());
accessibleTreeModelEditor.setValue(e.getNodeOrDict());
formWidgetValuePane.populate(e);
treeRootPane.populate(e.getTreeAttr());
mutiSelect.setSelected(e.isMultipleSelection());
@ -88,7 +88,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane<TreeEdi
editor.setAjax(loadAsync.isSelected());
editor.setSelectLeafOnly(returnLeaf.isSelected());
editor.setReturnFullPath(returnPath.isSelected());
editor.setDictionary((Dictionary) accessibleTreeModelEditor.getValue());
editor.setNodeOrDict(accessibleTreeModelEditor.getValue());
return editor;
}

Loading…
Cancel
Save