Browse Source

Pull request #5393: REPORT-56926&REPORT-57238 解决因为修复这两个问题引起的新问题

Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0

* commit '768b74b87b32dfeff62658b2f5307c76a7f537b0':
  REPORT-56926&REPORT-57238 解决因为修复这两个问题引起的新问题
feature/10.0
fanglei 3 years ago
parent
commit
cd2e849824
  1. 2
      designer-form/src/main/java/com/fr/design/mainframe/MultiSelectionArrangement.java
  2. 8
      designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormMultiWidgetCardPane.java

2
designer-form/src/main/java/com/fr/design/mainframe/MultiSelectionArrangement.java

@ -76,6 +76,7 @@ public class MultiSelectionArrangement {
// 水平分布,手动,传入一个间距,排列selectedCreators // 水平分布,手动,传入一个间距,排列selectedCreators
public void horizontalManualDistribution(int gap) { public void horizontalManualDistribution(int gap) {
sortHorizontal();
reSizeRecByHorizontal(gap); reSizeRecByHorizontal(gap);
horizontalDistribution(gap); horizontalDistribution(gap);
} }
@ -150,6 +151,7 @@ public class MultiSelectionArrangement {
} }
public void verticalManualDistribution(int gap) { public void verticalManualDistribution(int gap) {
sortVertical();
reSizeRecByVertical(gap); reSizeRecByVertical(gap);
verticalDistribution(gap); verticalDistribution(gap);
} }

8
designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormMultiWidgetCardPane.java

@ -158,7 +158,13 @@ public class FormMultiWidgetCardPane extends FormWidgetCardPane {
} }
private UINumberField createIntNumberField(boolean isVertical, String tipText) { private UINumberField createIntNumberField(boolean isVertical, String tipText) {
final UINumberField numberField = new UINumberField(); final UINumberField numberField = new UINumberField() {
private static final long serialVersionUID = -448512934137620557L;
public boolean shouldResponseChangeListener() {
return false;
}
};
numberField.setPlaceholder(tipText); numberField.setPlaceholder(tipText);
numberField.addFocusListener(new FocusAdapter() { numberField.addFocusListener(new FocusAdapter() {
@Override @Override

Loading…
Cancel
Save