REPORT-6691 修改设计器中部分商务信息

designer_base/src/com/fr/design/actions/help/AboutPane.java

@@ -68,28 +68,36 @@ public class AboutPane extends JPanel {
                         Inter.getLocText("FR-Designer-Basic_Activation_Key_Copy_OK")
                 }));
 
-        if (shouldShowPhoneAndQQ()) {
+        addPhoneAndQQPane(contentPane);
-            if (ComparatorUtils.equals(ProductConstants.APP_NAME, FINEREPORT)) {
+
-                boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("FR-Designer_Service_Phone") + ProductConstants.COMPARE_TELEPHONE);
+        // 官网
-                contentPane.add(boxCenterAlignmentPane);
+        JPanel urlActionPane = getURLActionPane(Inter.getLocText("FR-Designer_Official_Website"), SiteCenter.getInstance().acquireUrlByKind("website." + FRContext.getLocale(), ProductConstants.WEBSITE_URL));
-            }
-            boxCenterAlignmentPane = new BoxCenterAligmentPane("QQ:" + SiteCenter.getInstance().acquireUrlByKind("help.qq"));
-            contentPane.add(boxCenterAlignmentPane);
-        }
 
-        BoxCenterAligmentPane actionLabel = getURLActionLabel(SiteCenter.getInstance().acquireUrlByKind("website." + FRContext.getLocale(), ProductConstants.WEBSITE_URL));
+        // 支持邮箱
-        BoxCenterAligmentPane emailLabel = getEmailActionLabel(SiteCenter.getInstance().acquireUrlByKind("support.email", ProductConstants.SUPPORT_EMAIL));
+        String defaultEmail = SiteCenter.getInstance().acquireUrlByKind("support.email", ProductConstants.SUPPORT_EMAIL);
+        JPanel emailPane = getEmailActionPane(Inter.getLocText("FR-Designer_Support_Email"),SiteCenter.getInstance().acquireUrlByKind("support.email." + FRContext.getLocale(), defaultEmail));
 
-        contentPane.add(actionLabel);
+        contentPane.add(urlActionPane);
-        contentPane.add(emailLabel);
+        contentPane.add(emailPane);
         if (shouldShowThanks()) {
             addThankPane(contentPane);
         }
     }
 
-    // 是否显示服务电话和 qq
+    private void addPhoneAndQQPane(JPanel contentPane) {
-    private boolean shouldShowPhoneAndQQ() {
+        BoxCenterAligmentPane boxCenterAlignmentPane;
-        return !FRContext.getLocale().equals(Locale.US);
+        // 英文版不显示服务电话和QQ
+        if (FRContext.getLocale().equals(Locale.US)) {
+            return;
+        }
+        boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("FR-Designer_Service_Phone") + SiteCenter.getInstance().acquireUrlByKind("service.phone." + FRContext.getLocale(), ProductConstants.COMPARE_TELEPHONE));
+        contentPane.add(boxCenterAlignmentPane);
+        // 繁体版不显示QQ
+        if (FRContext.getLocale().equals(Locale.TAIWAN)) {
+            return;
+        }
+        boxCenterAlignmentPane = new BoxCenterAligmentPane("QQ: " + SiteCenter.getInstance().acquireUrlByKind("help.qq"));
+        contentPane.add(boxCenterAlignmentPane);
     }
 
     // 是否显示鸣谢面板
@@ -133,7 +141,7 @@ public class AboutPane extends JPanel {
                 StringUtils.BLANK, ProductConstants.RELEASE_VERSION, BUILD_PREFIX);
     }
 
-    private BoxCenterAligmentPane getEmailActionLabel(final String mailTo) {
+    private JPanel getEmailActionPane(final String desc, final String mailTo){
         ActionLabel emailLabel = new ActionLabel(mailTo);
 
         emailLabel.addActionListener(new ActionListener() {
@@ -147,10 +155,13 @@ public class AboutPane extends JPanel {
             }
         });
 
-        return new BoxCenterAligmentPane(emailLabel);
+        JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        panel.add(new UILabel(desc));
+        panel.add(emailLabel);
+        return panel;
     }
 
-    private BoxCenterAligmentPane getURLActionLabel(final String url) {
+    private JPanel getURLActionPane(final String desc, final String url){
         ActionLabel actionLabel = new ActionLabel(url);
         actionLabel.addActionListener(new ActionListener() {
             @Override
@@ -163,7 +174,11 @@ public class AboutPane extends JPanel {
             }
         });
 
-        return new BoxCenterAligmentPane(actionLabel);
+        JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        panel.add(new UILabel(desc));
+        panel.add(actionLabel);
+
+        return panel;
     }
 
     class UserLabel extends BoldFontTextLabel {

designer_base/src/com/fr/design/locale/designer.properties

@@ -2183,3 +2183,5 @@ FR-Designer_Zoom_In_Logic=zoom in logic
 FR-Designer_Zoom_Out_Logic=zoom out logic
 FR-Designer_Chart_Adaptivity=chart adaptivity
 FR-Designer_Tip_Chart_Adaptivity_Unavailable=Hint: since the mobile relayout option is not checked, chart adaptivity settings are not available
+FR-Designer_Official_Website=Official Website:
+FR-Designer_Support_Email=Email:

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -2182,3 +2182,5 @@ FR-Designer_Zoom_In_Logic=zoom in logic
 FR-Designer_Zoom_Out_Logic=zoom out logic
 FR-Designer_Chart_Adaptivity=chart adaptivity
 FR-Designer_Tip_Chart_Adaptivity_Unavailable=Hint: since the mobile relayout option is not checked, chart adaptivity settings are not available
+FR-Designer_Official_Website=Official Website:
+FR-Designer_Support_Email=Email:

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -2180,3 +2180,5 @@ FR-Designer_Zoom_In_Logic=
 FR-Designer_Zoom_Out_Logic=
 FR-Designer_Chart_Adaptivity=
 FR-Designer_Tip_Chart_Adaptivity_Unavailable=
+FR-Designer_Official_Website=
+FR-Designer_Support_Email=

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -2181,3 +2181,5 @@ FR-Designer_Zoom_In_Logic=
 FR-Designer_Zoom_Out_Logic=
 FR-Designer_Chart_Adaptivity=
 FR-Designer_Tip_Chart_Adaptivity_Unavailable=
+FR-Designer_Official_Website=
+FR-Designer_Support_Email=

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -2183,3 +2183,5 @@ FR-Designer_Zoom_In_Logic=\u653E\u5927\u903B\u8F91
 FR-Designer_Zoom_Out_Logic=\u7F29\u5C0F\u903B\u8F91
 FR-Designer_Chart_Adaptivity=\u56FE\u8868\u81EA\u9002\u5E94
 FR-Designer_Tip_Chart_Adaptivity_Unavailable=\u63D0\u793A\uFF1Abody\u672A\u52FE\u9009\u624B\u673A\u91CD\u5E03\u5C40\u72B6\u6001\u4E0B\uFF0C\u4E0D\u652F\u6301\u56FE\u8868\u81EA\u9002\u5E94
+FR-Designer_Official_Website=\u5B98\u65B9\u7F51\u7AD9\uFF1A
+FR-Designer_Support_Email=\u652F\u6301\u90AE\u7BB1\uFF1A

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -2182,3 +2182,5 @@ FR-Designer_Zoom_In_Logic=\u653E\u5927\u908F\u8F2F
 FR-Designer_Zoom_Out_Logic=\u7E2E\u5C0F\u908F\u8F2F
 FR-Designer_Chart_Adaptivity=\u5716\u8868\u81EA\u6211\u8ABF\u6574
 FR-Designer_Tip_Chart_Adaptivity_Unavailable=\u63D0\u793A\uFF1Abody\u672A\u52FE\u9078\u624B\u6A5F\u91CD\u4F48\u5C40\u72C0\u614B\u4E0B\uFF0C\u4E0D\u652F\u6301\u5716\u8868\u81EA\u6211\u8ABF\u6574
+FR-Designer_Official_Website=\u5B98\u65B9\u7DB2\u7AD9\uFF1A
+FR-Designer_Support_Email=\u652F\u6301\u90F5\u7BB1\uFF1A