From 3f4c27053a292c3c7f139fbe4f8876350b7b1755 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Wed, 28 Jun 2017 08:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=AE=E7=9B=98=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/alphafine/cell/model/MoreModel.java | 2 +-
 .../mainframe/alphafine/component/AlphaFineDialog.java   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java
index a811e8603..5da7be486 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java
@@ -24,7 +24,7 @@ public class MoreModel extends AlphaCellModel {
     }
 
     public MoreModel(String name, boolean isLoading) {
-        super(name, null);
+        super(name, null, CellType.MORE);
         this.isLoading = isLoading;
     }
 
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 53cb28979..daab6961f 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
@@ -587,8 +587,9 @@ public class AlphaFineDialog extends UIDialog {
         searchTextField.addKeyListener(new KeyAdapter() {
             @Override
             public void keyPressed(KeyEvent e) {
-                if (e.getKeyCode() == KeyEvent.VK_DOWN || e.getKeyCode() == KeyEvent.VK_UP) {
+                if (e.getKeyCode() == KeyEvent.VK_DOWN && searchTextField.hasFocus()) {
                     searchResultList.requestFocus();
+                    searchResultList.setSelectedIndex(searchResultList.getSelectedIndex() + 1);
                 }
             }
         });
@@ -813,7 +814,7 @@ public class AlphaFineDialog extends UIDialog {
          */
         @Override
         public void setSelectedIndex(int index) {
-            if (index >= 0 && checkSelectedIndex(index)) {
+            if (index > 0 && checkSelectedIndex(index)) {
                 int previousIndex = getSelectedIndex();
                 super.setSelectedIndex(index);
                 AlphaCellModel cellModel = getSelectedValue();
@@ -845,6 +846,10 @@ public class AlphaFineDialog extends UIDialog {
                     if (e.getKeyCode() == KeyEvent.VK_ENTER) {
                         doNavigate();
                         saveHistory(getSelectedValue());
+                    } else if (e.getKeyCode() == KeyEvent.VK_UP) {
+                        if (getSelectedIndex() == 1) {
+                            searchTextField.requestFocus();
+                        }
                     }
                 }
             });