Browse Source

Merge pull request #1471 in BA/design from ~YAOH.WU/a_design_0811:release/9.0 to release/9.0

* commit '3cbb7ba376ccc971e8f56f53cf078a0d0201e0b6':
  默认模板启动问题
master
superman 7 years ago
parent
commit
2fa522d920
  1. 7
      designer/src/com/fr/quickeditor/CellQuickEditor.java

7
designer/src/com/fr/quickeditor/CellQuickEditor.java

@ -165,15 +165,14 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
columnRowTextField.setText(columnRow.toString());
cellElement = tc.getEditingElementCase().getTemplateCellElement(cs.getColumn(), cs.getRow());
comboBox.removeActionListener(comboBoxActionListener);
comboBox.removeAllItems();
JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
if (jTemplate != null) {
comboBox.removeActionListener(comboBoxActionListener);
comboBox.removeAllItems();
String[] items = getDefaultComboBoxItems();
for (String item : items) {
comboBox.addItem(item);
}
}
Object comboBoxSelected = getComboBoxSelected();
if (comboBoxSelected != null) {
comboBox.setSelectedItem(((ShortCut) comboBoxSelected).getMenuKeySet().getMenuKeySetName());
@ -195,8 +194,8 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
}
};
comboBox.addActionListener(comboBoxActionListener);
}
refreshDetails();
}
/**

Loading…
Cancel
Save