From b923aea0033f840680075846928e8c7094126c7a Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Tue, 27 Jun 2017 22:23:10 +0800
Subject: [PATCH] =?UTF-8?q?bug=20fix=20=E4=BB=A3=E7=A0=81=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alphafine/cell/model/AlphaCellModel.java       |  4 ++--
 .../mainframe/alphafine/cell/model/MoreModel.java  |  4 ++--
 .../alphafine/cell/model/NoResultModel.java        |  4 ++--
 .../alphafine/cell/render/ContentCellRender.java   | 14 +++++++-------
 .../alphafine/component/AlphaFineDialog.java       |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java
index 064f1b615..1ba4e1a24 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java
@@ -61,8 +61,8 @@ public abstract class AlphaCellModel implements Comparable {
         this.description = description;
     }
 
-    public boolean hasNoResult() {
-        return false;
+    public boolean hasAction() {
+        return true;
     }
 
     public boolean isNeedToSendToServer() {
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 4abda1789..a811e8603 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
@@ -60,8 +60,8 @@ public class MoreModel extends AlphaCellModel {
     }
 
     @Override
-    public boolean hasNoResult() {
-        return true;
+    public boolean hasAction() {
+        return false;
     }
 
     @Override
diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/model/NoResultModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/model/NoResultModel.java
index 4d52a288f..81b19e763 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/cell/model/NoResultModel.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/cell/model/NoResultModel.java
@@ -28,8 +28,8 @@ public class NoResultModel extends AlphaCellModel {
     }
 
     @Override
-    public boolean hasNoResult() {
-        return true;
+    public boolean hasAction() {
+        return false;
     }
 
     @Override
diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java b/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
index 18026d66a..28d70e5b7 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
@@ -26,18 +26,18 @@ public class ContentCellRender implements ListCellRenderer<Object> {
         AlphaCellModel model = (AlphaCellModel) value;
         JPanel panel = new JPanel(new BorderLayout());
         panel.setBackground(null);
-        if (isSelected && !model.hasNoResult()) {
-            panel.setBackground(AlphaFineConstants.BLUE);
-        }
         panel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
         titleLabel.setText("  " + model.getName());
         String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getTypeValue() + ".png";
-        if (model.hasNoResult()) {
-            titleLabel.setIcon(null);
-            titleLabel.setForeground(AlphaFineConstants.MEDIUM_GRAY);
-        } else {
+        if (model.hasAction()) {
+            if (isSelected) {
+                panel.setBackground(AlphaFineConstants.BLUE);
+            }
             titleLabel.setIcon(new ImageIcon(IOUtils.readImage(iconUrl)));
             titleLabel.setForeground(AlphaFineConstants.BLACK);
+        } else {
+            titleLabel.setIcon(null);
+            titleLabel.setForeground(AlphaFineConstants.MEDIUM_GRAY);
         }
         titleLabel.setFont(AlphaFineConstants.MEDIUM_FONT);
         String description = model.getDescription();
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 8459caca8..c88aea15d 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
@@ -829,7 +829,7 @@ public class AlphaFineDialog extends UIDialog {
                 int previousIndex = getSelectedIndex();
                 super.setSelectedIndex(index);
                 AlphaCellModel cellModel = getSelectedValue();
-                if (cellModel != null && cellModel.hasNoResult()) {
+                if (cellModel != null && !cellModel.hasAction()) {
                     if (previousIndex <= getSelectedIndex()) {
                         setSelectedIndex(index + 1);
                     } else {
@@ -869,7 +869,7 @@ public class AlphaFineDialog extends UIDialog {
                 public void mouseClicked(MouseEvent e) {
                     int selectedIndex = getSelectedIndex();
                     AlphaCellModel selectedValue = getSelectedValue();
-                    if (e.getClickCount() == 2 && !selectedValue.hasNoResult()) {
+                    if (e.getClickCount() == 2 && selectedValue.hasAction()) {
                         doNavigate();
                         saveHistory(selectedValue);
                     } else if (e.getClickCount() == 1) {