From 6300044d73ef3a20096d1e842de65e27c3365be8 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 14 Nov 2017 21:16:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?enter=E9=94=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/alphafine/component/AlphaFineDialog.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index f94c35a9a5..995d2d3366 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -676,7 +676,7 @@ public class AlphaFineDialog extends UIDialog { searchResultList.setSelectedIndex(searchResultList.getSelectedIndex() + 1); } else if (e.getKeyCode() == KeyEvent.VK_UP) { searchResultList.setSelectedIndex(searchResultList.getSelectedIndex() - 1); - } else escAlphaFine(e); + } else escAlphaFineDialog(e); } }); @@ -888,7 +888,7 @@ public class AlphaFineDialog extends UIDialog { * * @param e */ - private void escAlphaFine(KeyEvent e) { + private void escAlphaFineDialog(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { if (StringUtils.isBlank(searchTextField.getText()) || ComparatorUtils.equals(searchTextField.getText(), searchTextField.getPlaceHolder())) { AlphaFineDialog.this.setVisible(false); @@ -896,6 +896,10 @@ public class AlphaFineDialog extends UIDialog { searchTextField.setText(null); removeSearchResult(); } + } else if (e.getKeyCode() == KeyEvent.VK_ENTER) { + if (searchResultList.getModel().getSize() > 1) { + dealWithSearchResult(searchResultList.getSelectedValue()); + } } } @@ -969,7 +973,7 @@ public class AlphaFineDialog extends UIDialog { addKeyListener(new KeyAdapter() { @Override public void keyPressed(KeyEvent e) { - escAlphaFine(e); + escAlphaFineDialog(e); } }); From 18317e45a1c4d2a72e5f92dd4df375b24ceec829 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 14 Nov 2017 21:17:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=81=8D=E5=8E=86=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/actions/UpdateAction.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/UpdateAction.java b/designer_base/src/com/fr/design/actions/UpdateAction.java index 8c458b53f7..b3832e1a0b 100644 --- a/designer_base/src/com/fr/design/actions/UpdateAction.java +++ b/designer_base/src/com/fr/design/actions/UpdateAction.java @@ -504,9 +504,13 @@ public abstract class UpdateAction extends ShortCut implements Action { } else if (component instanceof JComboBox) { for (int i = 0; i < ((JComboBox) component).getItemCount(); i++) { - text.append(((JComboBox) component).getItemAt(i)); - String title = String.valueOf(((JComboBox) component).getItemAt(i)); - handleSearchText(separator, text, pinyin, shortPinyin, title); + Object object = ((JComboBox) component).getItemAt(i); + if (object instanceof String) { + text.append(((JComboBox) component).getItemAt(i)); + String title = String.valueOf(((JComboBox) component).getItemAt(i)); + handleSearchText(separator, text, pinyin, shortPinyin, title); + } + } } else if (component instanceof JTabbedPane) { From cc91454ef65f99e78bd41a27098ef24bb2eac327 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 15 Nov 2017 09:56:05 +0800 Subject: [PATCH 3/7] rt --- designer_base/src/com/fr/design/actions/UpdateAction.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/UpdateAction.java b/designer_base/src/com/fr/design/actions/UpdateAction.java index b3832e1a0b..90f47165ee 100644 --- a/designer_base/src/com/fr/design/actions/UpdateAction.java +++ b/designer_base/src/com/fr/design/actions/UpdateAction.java @@ -506,17 +506,16 @@ public abstract class UpdateAction extends ShortCut implements Action { for (int i = 0; i < ((JComboBox) component).getItemCount(); i++) { Object object = ((JComboBox) component).getItemAt(i); if (object instanceof String) { - text.append(((JComboBox) component).getItemAt(i)); - String title = String.valueOf(((JComboBox) component).getItemAt(i)); + text.append(object); + String title = (String) object; handleSearchText(separator, text, pinyin, shortPinyin, title); } - - } } else if (component instanceof JTabbedPane) { getTabPaneTexts((JTabbedPane) component, separator, text, pinyin, shortPinyin); } } + panel.removeAll(); return String.valueOf(text.append(pinyin).append(shortPinyin)); } From 0e7b04fe832ffd0dbd850b79b55b93cacde9a1a2 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 15 Nov 2017 11:37:04 +0800 Subject: [PATCH 4/7] rt --- designer_base/src/com/fr/design/actions/UpdateAction.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/UpdateAction.java b/designer_base/src/com/fr/design/actions/UpdateAction.java index 90f47165ee..7e1fc2112b 100644 --- a/designer_base/src/com/fr/design/actions/UpdateAction.java +++ b/designer_base/src/com/fr/design/actions/UpdateAction.java @@ -504,10 +504,10 @@ public abstract class UpdateAction extends ShortCut implements Action { } else if (component instanceof JComboBox) { for (int i = 0; i < ((JComboBox) component).getItemCount(); i++) { - Object object = ((JComboBox) component).getItemAt(i); - if (object instanceof String) { - text.append(object); - String title = (String) object; + Object componentName = ((JComboBox) component).getItemAt(i); + if (componentName instanceof String) { + text.append(componentName); + String title = (String) componentName; handleSearchText(separator, text, pinyin, shortPinyin, title); } } From f577a58d192ec2a3d208134c520bc11d03a09b87 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 15 Nov 2017 11:56:06 +0800 Subject: [PATCH 5/7] rt --- designer_base/src/com/fr/design/actions/UpdateAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/actions/UpdateAction.java b/designer_base/src/com/fr/design/actions/UpdateAction.java index 7e1fc2112b..dc2f2fbfd9 100644 --- a/designer_base/src/com/fr/design/actions/UpdateAction.java +++ b/designer_base/src/com/fr/design/actions/UpdateAction.java @@ -505,7 +505,7 @@ public abstract class UpdateAction extends ShortCut implements Action { } else if (component instanceof JComboBox) { for (int i = 0; i < ((JComboBox) component).getItemCount(); i++) { Object componentName = ((JComboBox) component).getItemAt(i); - if (componentName instanceof String) { + if (componentName instanceof String && StringUtils.isNotBlank(String.valueOf(componentName))) { text.append(componentName); String title = (String) componentName; handleSearchText(separator, text, pinyin, shortPinyin, title); From 0303f2807fc410727a7d402d5edb0a0d80c18b3f Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 15 Nov 2017 12:00:24 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E5=90=8D=E9=81=8D?= =?UTF-8?q?=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/actions/UpdateAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/UpdateAction.java b/designer_base/src/com/fr/design/actions/UpdateAction.java index dc2f2fbfd9..a82087a905 100644 --- a/designer_base/src/com/fr/design/actions/UpdateAction.java +++ b/designer_base/src/com/fr/design/actions/UpdateAction.java @@ -506,8 +506,8 @@ public abstract class UpdateAction extends ShortCut implements Action { for (int i = 0; i < ((JComboBox) component).getItemCount(); i++) { Object componentName = ((JComboBox) component).getItemAt(i); if (componentName instanceof String && StringUtils.isNotBlank(String.valueOf(componentName))) { - text.append(componentName); - String title = (String) componentName; + String title = String.valueOf(componentName); + text.append(title); handleSearchText(separator, text, pinyin, shortPinyin, title); } } From 0758690e2de6690209b7c8d6f002c0cff798f9b7 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 15 Nov 2017 12:02:16 +0800 Subject: [PATCH 7/7] rt --- designer_base/src/com/fr/design/actions/UpdateAction.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer_base/src/com/fr/design/actions/UpdateAction.java b/designer_base/src/com/fr/design/actions/UpdateAction.java index a82087a905..ffc2e2a2ea 100644 --- a/designer_base/src/com/fr/design/actions/UpdateAction.java +++ b/designer_base/src/com/fr/design/actions/UpdateAction.java @@ -515,7 +515,6 @@ public abstract class UpdateAction extends ShortCut implements Action { getTabPaneTexts((JTabbedPane) component, separator, text, pinyin, shortPinyin); } } - panel.removeAll(); return String.valueOf(text.append(pinyin).append(shortPinyin)); }