Browse Source

Merge pull request #4295 in DESIGN/design from feature/10.0 to feature/x

* commit '585d6221b5c60916c38a6844d105964b11e089bf':
  REPORT-52087 单元格元素数据列中首次修改字符不会生效
  REPORT-52087 单元格元素数据列中首次修改字符不会生效
  REPORT-52087 单元格元素数据列中首次修改字符不会生效
research/11.0
superman 4 years ago
parent
commit
1410b42deb
  1. 8
      designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java

8
designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java

@ -62,6 +62,12 @@ public abstract class LazyComboBox extends UIComboBox implements PopupMenuListen
this.setModel(new DefaultComboBoxModel<>(new Object[]{anObject})); this.setModel(new DefaultComboBoxModel<>(new Object[]{anObject}));
super.setSelectedItem(anObject); super.setSelectedItem(anObject);
} }
}
private void setSelectedItemWithDocumentChange(Object anObject) {
initialSelected = anObject;
super.setSelectedItem(anObject);
} }
@Override @Override
@ -183,7 +189,7 @@ public abstract class LazyComboBox extends UIComboBox implements PopupMenuListen
} }
filtering = true; filtering = true;
String xx = textField.getText(); String xx = textField.getText();
LazyComboBox.this.setSelectedItem(xx); LazyComboBox.this.setSelectedItemWithDocumentChange(xx);
this.item = textField.getText(); this.item = textField.getText();
setPopupVisible(true); setPopupVisible(true);

Loading…
Cancel
Save