Browse Source

Pull request #12124: REPORT-89967 控件默认值不对

Merge in DESIGN/design from ~CORAL.CHEN/design:feature/x to feature/x

* commit '406e56b95be8e229a15341f38ea725f6f9f3d3fd':
  REPORT-89967 控件默认值不对
feature/x
Coral.Chen-张晨 2 years ago
parent
commit
5208d2c524
  1. 5
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobilePasswordEditSettingPane.java
  2. 5
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextAreaSettingPane.java
  3. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextEditSettingPane.java

5
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobilePasswordEditSettingPane.java

@ -23,11 +23,6 @@ public class MobilePasswordEditSettingPane extends MobileTextEditSettingPane {
this.add(showPassword, BorderLayout.NORTH);
}
@Override
protected boolean getClearDefaultState() {
return true;
}
@Override
public void populateBean(MobileTextEditAttr ob) {
super.populateBean(ob);

5
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextAreaSettingPane.java

@ -23,6 +23,11 @@ public class MobileTextAreaSettingPane extends MobileTextEditSettingPane {
this.add(showWordCount, BorderLayout.NORTH);
}
@Override
protected boolean getClearDefaultState() {
return false;
}
@Override
public void populateBean(MobileTextEditAttr ob) {
super.populateBean(ob);

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTextEditSettingPane.java

@ -27,7 +27,7 @@ public class MobileTextEditSettingPane extends BasicBeanPane<MobileTextEditAttr>
}
protected boolean getClearDefaultState() {
return false;
return true;
}
protected void initLayout() {
@ -38,7 +38,7 @@ public class MobileTextEditSettingPane extends BasicBeanPane<MobileTextEditAttr>
@Override
public void populateBean(MobileTextEditAttr ob) {
allowOneClickClear.setSelected(ob.isAllowOneClickClear() != null && ob.isAllowOneClickClear());
allowOneClickClear.setSelected(ob.isAllowOneClickClear() == null || ob.isAllowOneClickClear());
}
@Override

Loading…
Cancel
Save