bug fix

designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java

@@ -6,6 +6,7 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel;
 import com.fr.design.mainframe.alphafine.cell.model.NoResultModel;
 import com.fr.design.mainframe.alphafine.component.AlphaFineDialog;
+import com.fr.design.mainframe.alphafine.model.SearchResult;
 import com.fr.design.mainframe.alphafine.search.manager.RecentSearchManager;
 import com.fr.design.mainframe.alphafine.search.manager.RecommendSearchManager;
 import com.fr.general.Inter;
@@ -81,8 +82,10 @@ public class AlphaFineHelper {
     public static List<AlphaCellModel> getFilterResult() {
         List<AlphaCellModel> recentList = RecentSearchManager.getRecentSearchManger().getRecentModelList();
         List<AlphaCellModel> recommendList = RecommendSearchManager.getRecommendSearchManager().getRecommendModelList();
-        recentList.addAll(recommendList);
-        return recentList;
+        SearchResult filterResult = new SearchResult();
+        filterResult.addAll(recentList);
+        filterResult.addAll(recommendList);
+        return filterResult;
     }
 
 

designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@@ -596,6 +596,9 @@ public class AlphaFineDialog extends UIDialog {
                 if (e.getKeyCode() == KeyEvent.VK_DOWN) {
                     searchResultList.requestFocus();
                     searchResultList.setSelectedIndex(searchResultList.getSelectedIndex() + 1);
+                } else if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                    doNavigate();
+                    saveHistory(searchResultList.getSelectedValue());
                 }
             }
 
@@ -730,11 +733,11 @@ public class AlphaFineDialog extends UIDialog {
             para.put("token", CodeUtils.md5Encode(date, "", "MD5"));
             para.put("content", object.toString());
             HttpClient httpClient = new HttpClient(AlphaFineConstants.CLOUD_SERVER_URL, para, true);
-            httpClient.setTimeout(5000);
             httpClient.asGet();
             if (!httpClient.isServerAlive()) {
                 FRLogger.getLogger().error("Failed to sent data to server!");
             }
+            httpClient.setTimeout(5000);
         }