From c8af274aff9a8a38399150cadceeb66a44a15973 Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Tue, 8 Dec 2020 13:58:17 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-42240=20=E3=80=9010.0.13=E3=80=91?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=87=8C=E5=8A=9F=E8=83=BD=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=EF=BC=88=E8=A1=A8=E5=8D=95=E3=80=81=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=89=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/EastRegionContainerPane.java    | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
index 8c59f23f58..a95b924005 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -98,23 +98,29 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private PropertyItem selectedItem;  // 当前被选中的属性配置项
 
     public enum PropertyMode {
-        REPORT("report"),  // 报表
-        REPORT_PARA("reportPara"),  // 报表参数面板
-        REPORT_FLOAT("reportFloat"),  // 报表悬浮元素
-        FORM("form"),  // 表单
-        FORM_REPORT("formReport"),  // 表单报表块
-        POLY("poly"),  // 聚合报表
-        POLY_REPORT("polyReport"),  // 聚合报表-报表块
-        POLY_CHART("polyChart"),  // 聚合报表-图表块
-        AUTHORITY_EDITION("authorityEdition"),  // 权限编辑
-        AUTHORITY_EDITION_DISABLED ("authorityEditionDisabled"); // 权限编辑
+        REPORT,  // 报表
+        REPORT_PARA,  // 报表参数面板
+        REPORT_FLOAT,  // 报表悬浮元素
+        FORM(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings")),  // 表单
+        FORM_REPORT,  // 表单报表块
+        POLY,  // 聚合报表
+        POLY_REPORT,  // 聚合报表-报表块
+        POLY_CHART,  // 聚合报表-图表块
+        AUTHORITY_EDITION,  // 权限编辑
+        AUTHORITY_EDITION_DISABLED; // 权限编辑
 
-        private String value;
-        PropertyMode(String value) {
-            this.value = value;
+        private String title;
+
+        PropertyMode() {
+            this.title = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Settings");
         }
-        public String getValue() {
-            return this.value;
+
+        PropertyMode(String title) {
+            this.title = title;
+        }
+
+        public String getTitle() {
+            return this.title;
         }
     }
 
@@ -748,11 +754,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         public void updateTitle() {
             try {
                 if (StringUtils.equals(KEY_WIDGET_SETTINGS, name)) {
-                    if (currentMode == PropertyMode.FORM) {
-                        title = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Component_Settings");
-                    } else {
-                        title = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Settings");
-                    }
+                    title = currentMode.getTitle();
                     button.setToolTipText(title);
                     UILabel uiLabel = (UILabel) ((BorderLayout) popupToolPane.contentPane.getLayout()).getLayoutComponent(BorderLayout.WEST);
                     uiLabel.setText(title);