Browse Source

Merge pull request #1316 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit '60fc8c4caba946e6bb9dd0b9d48a44a9d2e71229':
  REPORT-4925 代码规范
  REPORT-4925 [9.0内测] 数据列单元格条件属性,名称变化
master
superman 7 years ago
parent
commit
fc375bffe0
  1. 2
      designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

2
designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

@ -214,6 +214,7 @@ public abstract class UIListControlPane extends UIControlPane {
@Override @Override
public void populate(Nameable[] nameableArray) { public void populate(Nameable[] nameableArray) {
isPopulating = true; // 加一个标识位,避免切换单元格时,触发 saveSettings isPopulating = true; // 加一个标识位,避免切换单元格时,触发 saveSettings
nameableList.getCellEditor().stopCellEditing();
DefaultListModel listModel = (DefaultListModel) this.nameableList.getModel(); DefaultListModel listModel = (DefaultListModel) this.nameableList.getModel();
listModel.removeAllElements(); listModel.removeAllElements();
if (ArrayUtils.isEmpty(nameableArray)) { if (ArrayUtils.isEmpty(nameableArray)) {
@ -582,6 +583,7 @@ public abstract class UIListControlPane extends UIControlPane {
UIListControlPane.this.nameableList.getCellEditor() UIListControlPane.this.nameableList.getCellEditor()
.stopCellEditing(); .stopCellEditing();
} catch (Exception ignored) { } catch (Exception ignored) {
// do nothing
} }
// bug:在选中一个NameObject并删除,会遗留下Name. // bug:在选中一个NameObject并删除,会遗留下Name.
doBeforeRemove(); doBeforeRemove();

Loading…
Cancel
Save