From 5c71e21ec27dc3b20e706ece93893da271f11b72 Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Tue, 29 Aug 2017 11:02:43 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-2897=209.0=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=B0=83=E6=95=B4=E5=8F=B3=E5=87=BB?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=A1=BA=E5=BA=8F=EF=BC=8C=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/actions/cell/CellAttributeAction.java   | 5 +++--
 .../src/com/fr/design/actions/edit/HyperlinkAction.java   | 2 +-
 designer/src/com/fr/grid/selection/CellSelection.java     | 8 ++++----
 designer_base/src/com/fr/design/menu/KeySetUtils.java     | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/designer/src/com/fr/design/actions/cell/CellAttributeAction.java b/designer/src/com/fr/design/actions/cell/CellAttributeAction.java
index 949d72de0c..e2455a1599 100644
--- a/designer/src/com/fr/design/actions/cell/CellAttributeAction.java
+++ b/designer/src/com/fr/design/actions/cell/CellAttributeAction.java
@@ -1,5 +1,6 @@
 package com.fr.design.actions.cell;
 
+import com.fr.base.BaseUtils;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.general.Inter;
 
@@ -9,9 +10,9 @@ import com.fr.general.Inter;
 public class CellAttributeAction extends CellAttributeTableAction {
 	public CellAttributeAction() {
         this.setMenuKeySet(KeySetUtils.CELL_OTHER_ATTR);
-        this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
+        this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		// this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/cellAttr.png"));
+		 this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/cellAttr.png"));
 	}
 
 	@Override
diff --git a/designer/src/com/fr/design/actions/edit/HyperlinkAction.java b/designer/src/com/fr/design/actions/edit/HyperlinkAction.java
index 2fcc46901f..38fc9bece5 100644
--- a/designer/src/com/fr/design/actions/edit/HyperlinkAction.java
+++ b/designer/src/com/fr/design/actions/edit/HyperlinkAction.java
@@ -17,7 +17,7 @@ public class HyperlinkAction extends UpdateAction {
 
     public HyperlinkAction() {
         this.setMenuKeySet(KeySetUtils.HYPER_LINK);
-        this.setName(getMenuKeySet().getMenuKeySetName() + "...");
+        this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/hyperLink.png"));
     }
diff --git a/designer/src/com/fr/grid/selection/CellSelection.java b/designer/src/com/fr/grid/selection/CellSelection.java
index 890affae32..ea3234e85f 100644
--- a/designer/src/com/fr/grid/selection/CellSelection.java
+++ b/designer/src/com/fr/grid/selection/CellSelection.java
@@ -434,9 +434,10 @@ public class CellSelection extends Selection {
             popup.add(new CleanAuthorityAction(ePane).createMenuItem());
             return popup;
         }
-        popup.add(DeprecatedActionManager.getCellMenu(ePane).createJMenu());
         popup.add(new EditCellAction(ePane).createMenuItem());
+        popup.add(DeprecatedActionManager.getCellMenu(ePane).createJMenu());
         // richer:add global style menu
+        popup.add(new CellExpandAttrAction().createMenuItem());
         if (!ConfigManager.getProviderInstance().hasStyle()) {
             UIMenu styleMenu = new UIMenu(KeySetUtils.GLOBAL_STYLE.getMenuName());
             styleMenu.setIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/cell.png"));
@@ -455,13 +456,12 @@ public class CellSelection extends Selection {
         } else {
             popup.add(new StyleAction().createMenuItem());
         }
+        popup.add(DeprecatedActionManager.getPresentMenu(ePane).createJMenu());
+        popup.add(new CellAttributeAction().createMenuItem());
         JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
         if (jTemplate.isJWorkBook()){ //表单中报表块编辑屏蔽掉  控件设置
             popup.add(new CellWidgetAttrAction().createMenuItem());
         }
-        popup.add(new CellExpandAttrAction().createMenuItem());
-        popup.add(DeprecatedActionManager.getPresentMenu(ePane).createJMenu());
-        popup.add(new CellAttributeAction().createMenuItem());
         popup.add(new ConditionAttributesAction().createMenuItem());
         popup.add(new HyperlinkAction().createMenuItem());
         // cut, copy and paste
diff --git a/designer_base/src/com/fr/design/menu/KeySetUtils.java b/designer_base/src/com/fr/design/menu/KeySetUtils.java
index 401da7fb99..01022433e6 100644
--- a/designer_base/src/com/fr/design/menu/KeySetUtils.java
+++ b/designer_base/src/com/fr/design/menu/KeySetUtils.java
@@ -756,7 +756,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return Inter.getLocText("ExpandD-Cell_Expand_Attributes");
+            return Inter.getLocText("FR-Designer_Expand");
         }
 
         @Override
@@ -978,7 +978,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return Inter.getLocText("M_Format_A-Cell_Attributes");
+            return Inter.getLocText("FR-Designer_Other");
         }
 
         @Override