From 3cbb7ba376ccc971e8f56f53cf078a0d0201e0b6 Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Mon, 20 Nov 2017 13:38:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A8=A1=E6=9D=BF=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/quickeditor/CellQuickEditor.java   | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/designer/src/com/fr/quickeditor/CellQuickEditor.java b/designer/src/com/fr/quickeditor/CellQuickEditor.java
index de1f9d017..a6fc57ca8 100644
--- a/designer/src/com/fr/quickeditor/CellQuickEditor.java
+++ b/designer/src/com/fr/quickeditor/CellQuickEditor.java
@@ -165,38 +165,37 @@ 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());
-        } else {
-            comboBox.setSelectedIndex(1);
-        }
-        currentSelectedIndex = comboBox.getSelectedIndex();
-        comboBoxActionListener = new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                cellInsertActions = ActionFactory.createCellInsertAction(ElementCasePane.class, tc);
-                selectedIndex = comboBox.getSelectedIndex();
-                comboBox.setPopupVisible(false);
-                comboBox.repaint();
-                if (selectedIndex < cellInsertActions.length) {
-                    cellInsertActions[selectedIndex].actionPerformed(e);
-                }
-                comboBox.setSelectedIndex(currentSelectedIndex);
+            Object comboBoxSelected = getComboBoxSelected();
+            if (comboBoxSelected != null) {
+                comboBox.setSelectedItem(((ShortCut) comboBoxSelected).getMenuKeySet().getMenuKeySetName());
+            } else {
+                comboBox.setSelectedIndex(1);
             }
-        };
-        comboBox.addActionListener(comboBoxActionListener);
+            currentSelectedIndex = comboBox.getSelectedIndex();
+            comboBoxActionListener = new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    cellInsertActions = ActionFactory.createCellInsertAction(ElementCasePane.class, tc);
+                    selectedIndex = comboBox.getSelectedIndex();
+                    comboBox.setPopupVisible(false);
+                    comboBox.repaint();
+                    if (selectedIndex < cellInsertActions.length) {
+                        cellInsertActions[selectedIndex].actionPerformed(e);
+                    }
+                    comboBox.setSelectedIndex(currentSelectedIndex);
+                }
+            };
+            comboBox.addActionListener(comboBoxActionListener);
+        }
         refreshDetails();
-
     }
 
     /**