Merge pull request #748 in BA/design from ~PAUL/design:master to master

* commit '65c89cccdd239e4713ecb52bf2038c43417c6a0d':
  REPORT-1835 sap插件导致管理系统下的定时调度没了
  增加一个句号
  REPORT-2021 tab布局字体、字号无法修改
  同步国际化
  同步在release中的国际化修改
  无JIRA任务，国际化
  无JIRA任务 locale同步到release
  REPORT-1967 国际化
  REPORT-1898 设计器单元格属性表-其他属性 设置显示内容为下载链接显示二进制的时候,下面的文件名输入框输入一个字符就失焦
  pmd
  单元格数据系列值配置

designer/src/com/fr/design/mainframe/CellElementPropertyPane.java

@@ -108,8 +108,10 @@ public class CellElementPropertyPane extends DockingView {
     }
 
     public void reInit(ElementCasePane ePane) {
+        if (titlePane.getParent() == null) {  // 如果处于隐藏状态，则让其显示
             this.add(titlePane, BorderLayout.NORTH);
             this.add(cellElementEditPane, BorderLayout.CENTER);
+        }
         cellElementEditPane.populate(ePane);
     }
 

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

@@ -100,6 +100,7 @@ FR-Designer_FS_Close_Other_Templates=
 FR-Designer_File=
 FR-Designer_Filter_Conditions=
 FR-Designer_Finish-Modify-Share=
+FR-Designer_Fit=
 FR-Designer_Fit-App=
 FR-Designer_Font-Family=
 FR-Designer_Font-Size=
@@ -541,14 +542,14 @@ FR-Designer_Left_Display=Left
 FR-Designer_About_Version=Version
 FR-Designer_About_CopyRight=Copy Right
 FR-Designer_Service_Phone=Service Phone
-FR-Designer_Allow_Blank=Allow Blank
+FR-Designer_Allow_Null=Allow null
 FR-Designer_PageSetup_Page=Page
 FR-Designer_Custom_Job_Description=Description
 FR-Designer_Property=Property
 FR-Designer_ClassName=Class Name
 
 FR-Designer_Polyblock_Edit=Polyblock Edit
-FR-Designer_Function_Description_Area_Text=The class must inherit 'com.fr.script.AbstractFunction'. The compiled class should be copied to\nJ2EE server '{R1}WEB-INF{R2}classes' directory.\nAdd the source code(.java file) into the same folder if need.\nExample: {R3}classes}
+FR-Designer_Function_Description_Area_Text=The class must inherit 'com.fr.script.AbstractFunction'. The compiled class should be copied to\nJ2EE server '{R1}' directory.\nAdd the source code(.java file) into the same folder if need.\nExample: {R2}}
 FR-Designer_PageSetup_Horizontal=Horizontal
 FR-Designer_PageSetup_Vertical=Vertical
 FR-Designer_Gradient_Direction=Gradient Direction
@@ -562,5 +563,13 @@ FR-Designer_Show_As_Download=Display the binary content using download link
 FR-Designer_File_Name_For_Download=File Name For Download
 FR-Designer_No=No
 FR-Designer_Pagination=Page Break
+FR-Designer-Move_Tab_First=move to first
+FR-Designer-Move_Tab_End=move to end
+FR-Designer-Move_Tab_Next=move to next
+FR-Designer-Move_Tab_Prev=move to previous
 FR-Designer_DS_TableData=Data Set
 FR-Designer_Parameter-Formula=Formula
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=Plugin version is too low, and is not compatible with current API. Please contact the developer to update.
+FR-Designer_WidgetOrder=Widget Order
+FR-Designer_Mobile_Form_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the form in the APP.
+FR-Designer_Mobile_Report_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the report in the APP, only to support the paging preview, fill in the preview of the property is invalid.

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

@@ -542,14 +542,14 @@ FR-Designer_Left_Display=Left
 FR-Designer_About_Version=Version
 FR-Designer_About_CopyRight=Copy Right
 FR-Designer_Service_Phone=Service Phone
-FR-Designer_Allow_Blank=Allow Null
+FR-Designer_Allow_Null=Allow null
 FR-Designer_PageSetup_Page=Page
 FR-Designer_Custom_Job_Description=Description
 FR-Designer_Property=Property
 FR-Designer_ClassName=Class Name
 
 FR-Designer_Polyblock_Edit=Aggregation block edition
-FR-Designer_Function_Description_Area_Text=The class must inherit 'com.fr.script.AbstractFunction'. The compiled class files should be copied to\nJ2EE server '{R1}WEB-INF{R2}classes' directory.\nAdd the source code(.java file) into the same folder if need.\nExample: {R3}classes
+FR-Designer_Function_Description_Area_Text=The class must inherit 'com.fr.script.AbstractFunction'. The compiled class should be copied to\nJ2EE server '{R1}' directory.\nAdd the source code(.java file) into the same folder if need.\nExample: {R2}}
 FR-Designer_PageSetup_Horizontal=Horizontal
 FR-Designer_PageSetup_Vertical=Vertical
 FR-Designer_Gradient_Direction=Gradient Direction
@@ -563,5 +563,13 @@ FR-Designer_Show_As_Download=Display the binary content using download link
 FR-Designer_File_Name_For_Download=File Name For Download
 FR-Designer_No=No
 FR-Designer_Pagination=Page Break
+FR-Designer-Move_Tab_First=move to first
+FR-Designer-Move_Tab_End=move to end
+FR-Designer-Move_Tab_Next=move to next
+FR-Designer-Move_Tab_Prev=move to previous
 FR-Designer_DS_TableData=Data Set
 FR-Designer_Parameter-Formula=Formula
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=Plugin version is too low, and is not compatible with current API. Please contact the developer to update.
+FR-Designer_WidgetOrder=Widget Order
+FR-Designer_Mobile_Form_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the form in the APP.
+FR-Designer_Mobile_Report_Analysis_Annotation=annotation\: You can use this attribute to control the analysis of the report in the APP, only to support the paging preview, fill in the preview of the property is invalid.

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

@@ -516,14 +516,14 @@ FR-Designer_Left_Display=\u5DE6\u8868\u793A
 FR-Designer_About_Version=\u30D0\u30FC\u30B8\u30E7\u30F3
 FR-Designer_About_CopyRight=\u8457\u4F5C\u6A29\u6240\u6709
 FR-Designer_Service_Phone=\u30B5\u30FC\u30D3\u30B9\u96FB\u8A71\uFF1A
-FR-Designer_Allow_Blank=\u7A7A\u6B04\u3042\u308A
+FR-Designer_Allow_Null=\u7A7A\u6B04\u3042\u308A
 FR-Designer_PageSetup_Page=\u30DA\u30FC\u30B8
 FR-Designer_Custom_Job_Description=\u8A18\u8FF0
 FR-Designer_Property=\u5C5E\u6027
 FR-Designer_ClassName=\u985E\u540D
 
 FR-Designer_Polyblock_Edit=\u30A2\u30B0\u30EA\u30B2\u30FC\u30B7\u30E7\u30F3\u30D6\u30ED\u30C3\u30AF\u7DE8\u96C6
-FR-Designer_Function_Description_Area_Text=\u3053\u306E\u30AF\u30E9\u30B9\u306F\u7D99\u627F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"com.fr.script.AbstractFunction"\u3002\u3092\u7D99\u627F\u3059\u3079\u304D\u3067\u3059\u3002\u30B3\u30F3\u30D1\u30A4\u30EB\u5F8C\u306E\u985E\u30D5\u30A1\u30A4\u30EB\u3092\nJ2EE\u30B5\u30FC\u30D0\u30FC "{R1}WEB-INF{R2}classes" \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u306B\u30B3\u30D4\u30FC\u3057\u3066\u3001class\u306B\u5BFE\u5FDC\u3059\u308Bjava\u30D5\u30A1\u30A4\u30EB\u3082\u5F53\u76EE\u6B21\u306B\u7F6E\u3044\u3066\u304F\u3060\u3055\u3044\u3002\n\u4F8B\u3048\u3070\uFF1A{R3}classes
+FR-Designer_Function_Description_Area_Text=\u3053\u306E\u30AF\u30E9\u30B9\u306F\u7D99\u627F\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"com.fr.script.AbstractFunction"\u3002\u3092\u7D99\u627F\u3059\u3079\u304D\u3067\u3059\u3002\u30B3\u30F3\u30D1\u30A4\u30EB\u5F8C\u306E\u985E\u30D5\u30A1\u30A4\u30EB\u3092\nJ2EE\u30B5\u30FC\u30D0\u30FC "{R1}" \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3002\u306B\u30B3\u30D4\u30FC\u3057\u3066\u3001class\u306B\u5BFE\u5FDC\u3059\u308Bjava\u30D5\u30A1\u30A4\u30EB\u3082\u5F53\u76EE\u6B21\u306B\u7F6E\u3044\u3066\u304F\u3060\u3055\u3044\u3002\n\u4F8B\u3048\u3070\uFF1A{R2}
 FR-Designer_PageSetup_Horizontal=\u6A2A\u65B9\u5411
 FR-Designer_PageSetup_Vertical=\u7E26\u65B9\u5411
 FR-Designer_Gradient_Direction=\u65B9\u5411\u3092\u5F90\u3005\u306B\u5909\u5316
@@ -537,5 +537,10 @@ FR-Designer_Show_As_Download=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u30EA\u30F3\u3
 FR-Designer_File_Name_For_Download=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u30D5\u30A1\u30A4\u30EB\u540D
 FR-Designer_No=\u3044\u3044\u3048
 FR-Designer_Pagination=\u30DA\u30FC\u30B8\u30F3\u30B0
+FR-Designer-Move_Tab_First=
+FR-Designer-Move_Tab_End=
+FR-Designer-Move_Tab_Next=
+FR-Designer-Move_Tab_Prev=
 FR-Designer_DS_TableData=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
 FR-Designer_Parameter-Formula=\u6570\u5F0F
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=

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

@@ -512,7 +512,7 @@ FR-Designer_Left_Display=\uC67C\uCABD\uBCF4\uC774\uAE30
 FR-Designer_About_Version=\uBC84\uC804
 FR-Designer_About_CopyRight=\uD310\uAD8C\uC18C\uC720
 FR-Designer_Service_Phone=\uC11C\uBE44\uC2A4\uC804\uD654\uFF1A
-FR-Designer_Allow_Blank=\uBE48\uCE78\uD5C8\uC6A9
+FR-Designer_Allow_Null=\uBE48\uCE78\uD5C8\uC6A9
 FR-Designer_PageSetup_Page=\uC6F9\uD398\uC774\uC9C0
 FR-Designer_Custom_Job_Description=\uC124\uBA85
 FR-Designer_Property=\uC18D\uC131
@@ -520,7 +520,7 @@ FR-Designer_ClassName=\uD074\uB798\uC2A4\uB124\uC784
 FR-Designer_Template_Web_Attributes=\uD15C\uD50C\uB9BF \uC6F9 \uC18D\uC131
 
 FR-Designer_Polyblock_Edit=\uCDE8\uD569\uBE14\uB7ED\uD3B8\uC9D1
-FR-Designer_Function_Description_Area_Text=\uD574\uB2F9\uD074\uB798\uC2A4\uB294\uACC4\uC2B9\uD574\uC57C\uD55C\uB2E4."com.fr.script.AbstractFunction".\uCEF4\uD30C\uC77C\uD6C4\uC758\uD074\uB798\uC2A4\uD30C\uC77C\uC744~\uB85C\uBCF5\uC0AC\nJ2EE\uC11C\uBC84 "{R1}WEB-INF{R2}classes" \uB514\uB809\uD130\uB9AC, \uD544\uC694\uC2DC class \uC0C1\uC751\uD558\uB294 java\uC18C\uC2A4\uD30C\uC77C\uB3C4\uD574\uB2F9\uB514\uB809\uD130\uB9AC\uD558\uB2E8\uC5D0\uB450\uC5B4\uD3B8\uC9D1\uBC0F\uCC3E\uC544\uBCF4\uAE30\uB97C\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.\n\uC608: {R3}classes
+FR-Designer_Function_Description_Area_Text=\uD574\uB2F9\uD074\uB798\uC2A4\uB294\uACC4\uC2B9\uD574\uC57C\uD55C\uB2E4."com.fr.script.AbstractFunction".\uCEF4\uD30C\uC77C\uD6C4\uC758\uD074\uB798\uC2A4\uD30C\uC77C\uC744~\uB85C\uBCF5\uC0AC\nJ2EE\uC11C\uBC84 "{R1}" \uB514\uB809\uD130\uB9AC, \uD544\uC694\uC2DC class \uC0C1\uC751\uD558\uB294 java\uC18C\uC2A4\uD30C\uC77C\uB3C4\uD574\uB2F9\uB514\uB809\uD130\uB9AC\uD558\uB2E8\uC5D0\uB450\uC5B4\uD3B8\uC9D1\uBC0F\uCC3E\uC544\uBCF4\uAE30\uB97C\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.\n\uC608: {R2}
 FR-Designer_PageSetup_Horizontal=\uAC00\uB85C
 FR-Designer_PageSetup_Vertical=\uC138\uB85C
 FR-Designer_Gradient_Direction=\uADF8\uB77C\uB370\uC774\uC158 \uBC29\uD5A5
@@ -534,5 +534,10 @@ FR-Designer_Show_As_Download=\uB2E4\uC6B4\uB85C\uB4DC\uB9C1\uD06C\uB85C2\uC9C4\u
 FR-Designer_File_Name_For_Download=\uB2E4\uC6B4\uB85C\uB4DC\uD30C\uC77C\uBA85
 FR-Designer_No=\uC544\uB2C8\uC624
 FR-Designer_Pagination=\uD398\uC774\uC9C0\uB098\uB204\uAE30
+FR-Designer-Move_Tab_First=
+FR-Designer-Move_Tab_End=
+FR-Designer-Move_Tab_Next=
+FR-Designer-Move_Tab_Prev=
 FR-Designer_DS_TableData=\uB370\uC774\uD130\uC138\uD2B8
 FR-Designer_Parameter-Formula=\uC218\uC2DD
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=

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

@@ -546,14 +546,14 @@ FR-Designer_Left_Display=\u5DE6\u5C55\u793A
 FR-Designer_About_Version=\u7248\u672C
 FR-Designer_About_CopyRight=\u7248\u6743\u6240\u6709
 FR-Designer_Service_Phone=\u670D\u52A1\u7535\u8BDD\uFF1A
-FR-Designer_Allow_Blank=\u5141\u8BB8\u4E3A\u7A7A
+FR-Designer_Allow_Null=\u5141\u8BB8\u4E3A\u7A7A
 FR-Designer_PageSetup_Page=\u9875\u9762
 FR-Designer_Custom_Job_Description=\u63CF\u8FF0
 FR-Designer_Property=\u5C5E\u6027
 FR-Designer_ClassName=\u7C7B\u540D
 
 FR-Designer_Polyblock_Edit=\u805A\u5408\u5757\u7F16\u8F91
-FR-Designer_Function_Description_Area_Text=\u8BE5\u7C7B\u5FC5\u987B\u7EE7\u627F"com.fr.script.AbstractFunction"\u3002\u5E94\u5C06\u7F16\u8BD1\u540E\u7684\u7C7B\u6587\u4EF6\u62F7\u8D1D\u5230\nJ2EE\u670D\u52A1\u5668 "{R1}WEB-INF{R2}classes" \u76EE\u5F55\uFF0C\u5982\u679C\u5FC5\u8981\u7684\u8BDD\u5C06class\u5BF9\u5E94\u7684java\u6E90\u6587\u4EF6\u4E5F\u653E\u7F6E\u5230\u8BE5\u76EE\u5F55\u4E0B\u65B9\u4FBF\u7F16\u8F91\u548C\u67E5\u770B\u3002\n\u4F8B\u5982\uFF1A{R3}classes
+FR-Designer_Function_Description_Area_Text=\u8BE5\u7C7B\u5FC5\u987B\u7EE7\u627F"com.fr.script.AbstractFunction"\u3002\u5E94\u5C06\u7F16\u8BD1\u540E\u7684\u7C7B\u6587\u4EF6\u62F7\u8D1D\u5230\nJ2EE\u670D\u52A1\u5668 "{R1}" \u76EE\u5F55\uFF0C\u5982\u679C\u5FC5\u8981\u7684\u8BDD\u5C06class\u5BF9\u5E94\u7684java\u6E90\u6587\u4EF6\u4E5F\u653E\u7F6E\u5230\u8BE5\u76EE\u5F55\u4E0B\u65B9\u4FBF\u7F16\u8F91\u548C\u67E5\u770B\u3002\n\u4F8B\u5982\uFF1A{R2}
 FR-Designer_PageSetup_Horizontal=\u6A2A\u5411
 FR-Designer_PageSetup_Vertical=\u7EB5\u5411
 FR-Designer_Gradient_Direction=\u6E10\u53D8\u65B9\u5411
@@ -567,5 +567,13 @@ FR-Designer_Show_As_Download=\u7528\u4E0B\u8F7D\u94FE\u63A5\u663E\u793A\u4E8C\u8
 FR-Designer_File_Name_For_Download=\u4E0B\u8F7D\u6587\u4EF6\u540D
 FR-Designer_No=\u5426
 FR-Designer_Pagination=\u5206\u9875
+FR-Designer-Move_Tab_First=\u79FB\u52A8\u5230\u9996\u4F4D
+FR-Designer-Move_Tab_End=\u79FB\u52A8\u5230\u672B\u5C3E
+FR-Designer-Move_Tab_Next=\u5F80\u540E\u79FB\u52A8
+FR-Designer-Move_Tab_Prev=\u5F80\u524D\u79FB\u52A8
 FR-Designer_DS_TableData=\u6570\u636E\u96C6
 FR-Designer_Parameter-Formula=\u516C\u5F0F
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=\u63D2\u4EF6\u7248\u672C\u8FC7\u4F4E, \u5B58\u5728API\u4E0D\u517C\u5BB9, \u8BF7\u8054\u7CFB\u5F00\u53D1\u8005\u5347\u7EA7\u63D2\u4EF6
+FR-Designer_WidgetOrder=\u63A7\u4EF6\u987A\u5E8F
+FR-Designer_Mobile_Form_Analysis_Annotation=\u6CE8\u91CA\uFF1A\u53EF\u4EE5\u901A\u8FC7\u8BE5\u5C5E\u6027\u63A7\u5236\u8868\u5355\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\u3002
+FR-Designer_Mobile_Report_Analysis_Annotation=\u6CE8\u91CA: \u53EF\u4EE5\u901A\u8FC7\u8BE5\u5C5E\u6027\u63A7\u5236\u62A5\u8868\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\uFF0C\u53EA\u652F\u6301\u5206\u9875\u9884\u89C8\uFF0C\u586B\u62A5\u9884\u89C8\u65F6\u5C5E\u6027\u65E0\u6548\u3002

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

@@ -534,14 +534,14 @@ FR-Designer_Left_Display=\u5DE6\u986F\u793A
 FR-Designer_About_Version=\u7248\u672C
 FR-Designer_About_CopyRight=\u7248\u6B0A\u6240\u6709
 FR-Designer_Service_Phone=\u670D\u52D9\u96FB\u8A71\uFF1A
-FR-Designer_Allow_Blank=\u5141\u8A31\u70BA\u7A7A\u767D
+FR-Designer_Allow_Null=\u5141\u8A31\u70BA\u7A7A\u767D
 FR-Designer_PageSetup_Page=\u9801\u9762
 FR-Designer_Custom_Job_Description=\u63CF\u8FF0
 FR-Designer_Property=\u5C6C\u6027
 FR-Designer_ClassName=\u985E\u540D
 
 FR-Designer_Polyblock_Edit=\u805A\u5408\u584A\u7DE8\u8F2F
-FR-Designer_Function_Description_Area_Text=\u8A72\u985E\u5FC5\u9808\u7E7C\u627F"com.fr.script.AbstractFunction"\u3002\u61C9\u5C07\u7DE8\u8B6F\u5F8C\u7684\u985E\u6A94\u6848\u62F7\u8C9D\u5230\nJ2EE\u4F3A\u670D\u5668 "{R1}WEB-INF{R2}classes" \u76EE\u9304\uFF0C\u5982\u679C\u5FC5\u8981\u7684\u8A71\u5C07class\u5C0D\u61C9\u7684java\u539F\u59CB\u6A94\u6848\u4E5F\u653E\u7F6E\u5230\u8A72\u76EE\u9304\u4E0B\u65B9\u4FBF\u7DE8\u8F2F\u548C\u67E5\u770B\u3002\n\u4F8B\u5982\uFF1A{R3}classes
+FR-Designer_Function_Description_Area_Text=\u8A72\u985E\u5FC5\u9808\u7E7C\u627F"com.fr.script.AbstractFunction"\u3002\u61C9\u5C07\u7DE8\u8B6F\u5F8C\u7684\u985E\u6A94\u6848\u62F7\u8C9D\u5230\nJ2EE\u4F3A\u670D\u5668 "{R1}" \u76EE\u9304\uFF0C\u5982\u679C\u5FC5\u8981\u7684\u8A71\u5C07class\u5C0D\u61C9\u7684java\u539F\u59CB\u6A94\u6848\u4E5F\u653E\u7F6E\u5230\u8A72\u76EE\u9304\u4E0B\u65B9\u4FBF\u7DE8\u8F2F\u548C\u67E5\u770B\u3002\n\u4F8B\u5982\uFF1A{R2}
 FR-Designer_PageSetup_Horizontal=\u6A2A\u5411
 FR-Designer_PageSetup_Vertical=\u7E31\u5411
 FR-Designer_Gradient_Direction=\u6F38\u8B8A\u65B9\u5411
@@ -555,5 +555,13 @@ FR-Designer_Show_As_Download=\u7528\u4E0B\u8F09\u93C8\u63A5\u986F\u793A\u4E8C\u9
 FR-Designer_File_Name_For_Download=\u4E0B\u8F09\u6A94\u6848\u540D
 FR-Designer_No=\u5426
 FR-Designer_Pagination=\u5206\u9801
+FR-Designer-Move_Tab_First=\u79FB\u52D5\u5230\u9996\u4F4D
+FR-Designer-Move_Tab_End=\u79FB\u52D5\u5230\u672B\u5C3E
+FR-Designer-Move_Tab_Next=\u5F80\u5F8C\u79FB\u52D5
+FR-Designer-Move_Tab_Prev=\u5F80\u524D\u79FB\u52D5
 FR-Designer_DS_TableData=\u8CC7\u6599\u96C6
 FR-Designer_Parameter-Formula=\u516C\u5F0F
+FR-Designer_Plugin_Should_Update_Please_Contact_Developer=\u633F\u4EF6\u7248\u672C\u904E\u4F4E\uFF0C\u5B58\u5728API\u4E0D\u76F8\u5BB9\uFF0C\u8ACB\u806F\u7CFB\u958B\u767C\u8005\u965E\u7D1A\u633F\u4EF6
+FR-Designer_WidgetOrder=\u63A7\u4EF6\u9806\u5E8F
+FR-Designer_Mobile_Form_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u8868\u55AE\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\u3002
+FR-Designer_Mobile_Report_Analysis_Annotation=\u6CE8\u91CB\uFF1A\u53EF\u4EE5\u901A\u904E\u8A72\u5C6C\u6027\u63A7\u5236\u5831\u8868\u5728APP\u4E2D\u7684\u89E3\u6790\u65B9\u5F0F\uFF0C\u53EA\u652F\u6301\u5206\u9801\u9810\u89BD\uFF0C\u586B\u5831\u9810\u89BD\u6642\u5C6C\u6027\u7121\u6548\u3002

designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@@ -29,6 +29,7 @@ import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
+import com.fr.plugin.proxy.PluginProxyCompatibleUtils;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.project.ProjectConstants;
@@ -131,6 +132,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         }
         toolbarDef.addShortCut(delFileAction);
         Set<ShortCut> extraShortCuts = ExtraDesignClassManager.getInstance().getArray(ShortCut.TEMPLATE_TREE);
+        extraShortCuts = PluginProxyCompatibleUtils.toOriObjectHashSet(extraShortCuts);
         for (ShortCut shortCut : extraShortCuts){
             toolbarDef.addShortCut(shortCut);
         }

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java

@@ -3,6 +3,8 @@ package com.fr.design.mainframe.chart.gui.data.report;
 import com.fr.base.Formula;
 import com.fr.base.Utils;
 import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartdata.NormalReportDataDefinition;
+import com.fr.chart.chartdata.SeriesDefinition;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.event.UIObserverListener;
@@ -16,6 +18,7 @@ import com.fr.stable.StableUtils;
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import java.awt.*;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -95,6 +98,20 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane<ChartC
 		return seriesPane.updateBean();
 	}
 
+	protected List getEntryList(NormalReportDataDefinition seriesList) {
+		List list = new ArrayList();
+		for (int i = 0; i < seriesList.size(); i++) {
+			SeriesDefinition seriesEntry = (SeriesDefinition) seriesList.get(i);
+			Object[] nameAndValue = new Object[2];
+			nameAndValue[0] = seriesEntry.getSeriesName();
+			nameAndValue[1] = seriesEntry.getValue();
+			if (nameAndValue[0] != null || nameAndValue[1] != null) {
+				list.add(nameAndValue);
+			}
+		}
+		return list;
+	}
+
 	/**
 	 * 界面标题: 
 	 */

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java

@@ -18,7 +18,6 @@ import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import java.awt.*;
-import java.util.ArrayList;
 import java.util.List;
 
 public class CategoryPlotReportDataContentPane extends AbstractReportDataContentPane {
@@ -113,20 +112,6 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
         filterPane.populateBean(collection);
     }
 
-    private List getEntryList(NormalReportDataDefinition seriesList) {
-        List list = new ArrayList();
-        for (int i = 0; i < seriesList.size(); i++) {
-            SeriesDefinition seriesEntry = (SeriesDefinition) seriesList.get(i);
-            Object[] nameAndValue = new Object[2];
-            nameAndValue[0] = seriesEntry.getSeriesName();
-            nameAndValue[1] = seriesEntry.getValue();
-            if (nameAndValue[0] != null && nameAndValue[1] != null) {
-                list.add(nameAndValue);
-            }
-        }
-        return list;
-    }
-
     public void updateBean(ChartCollection collection) {
         collection.getSelectedChart().setFilterDefinition(new NormalReportDataDefinition());
 

designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java

@@ -10,7 +10,6 @@ import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
 import com.fr.general.Inter;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -25,7 +24,7 @@ public class PiePlotReportDataContentPane extends AbstractReportDataContentPane
 	public PiePlotReportDataContentPane(ChartDataPane parent) {
 		initEveryPane();
 		
-		this.add(new BoldFontTextLabel(Inter.getLocText("Data_Filter")), "0,4,2,4");
+		this.add(new BoldFontTextLabel(Inter.getLocText("FR-Chart-Data_Filter")), "0,4,2,4");
 		this.add(filterPane = new ChartDataFilterPane(new PiePlot(), parent), "0,6,2,4");
 	}
 	
@@ -51,20 +50,6 @@ public class PiePlotReportDataContentPane extends AbstractReportDataContentPane
 		filterPane.populateBean(collection);
 	}
 	
-	private List getEntryList(NormalReportDataDefinition seriesList) {
-		List list = new ArrayList();
-		for(int i = 0; i < seriesList.size(); i++) {
-			SeriesDefinition seriesEntry = (SeriesDefinition)seriesList.get(i);
-			Object[] nameAndValue = new Object[2];
-			nameAndValue[0] = seriesEntry.getSeriesName();
-			nameAndValue[1] = seriesEntry.getValue();
-			if(nameAndValue[0] != null && nameAndValue[1] != null) {
-				list.add(nameAndValue);
-			}
-		}
-		return list;
-    }
-	
 	public void updateBean(ChartCollection collection) {
 		collection.getSelectedChart().setFilterDefinition(new NormalReportDataDefinition());
 		

designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java

@@ -47,7 +47,6 @@ public class XCardSwitchButton extends XButton {
 	//设置的图片类型
 	private static final String COLORBACKGROUNDTYPE = "ColorBackground";
 	private static final String DEFAULTTYPE = "default";
-	private static final String DEFAULT_FONT_NAME = "SimSun";
 
 	//默认颜色
 	public static final Color NORMAL_GRAL = new Color(236,236,236);
@@ -66,7 +65,6 @@ public class XCardSwitchButton extends XButton {
 	private static final int FONT_SIZE_ADJUST = 2;
 
 	private static final int SIDE_OFFSET = 57;
-	private static final int FONT_SIZE = 9;
 
 	private XWCardLayout cardLayout;
 	private XWCardTagLayout tagLayout;
@@ -321,10 +319,7 @@ public class XCardSwitchButton extends XButton {
 
 		// 标题部分
 		WidgetTitle title = style.getTitle();
-		FRFont font = button.getFont();
+		FRFont font = title.getFrFont();
-		if (font == null) {
-			font = FRFont.getInstance(DEFAULT_FONT_NAME, 0, FONT_SIZE);
-		}
 		FRFont newFont = FRFont.getInstance(font.getName(),font.getStyle(),font.getSize() + FONT_SIZE_ADJUST);
 		UILabel label = this.getContentLabel();
 		label.setFont(newFont);
@@ -403,9 +398,6 @@ public class XCardSwitchButton extends XButton {
 			XCardSwitchButton temp = (XCardSwitchButton) this.tagLayout.getComponent(i);
 			CardSwitchButton cardSwitchButton = (CardSwitchButton) temp.toData();
 			FRFont frFont = cardSwitchButton.getFont();
-			if (frFont == null) {
-				frFont = FRFont.getInstance(DEFAULT_FONT_NAME, 0, FONT_SIZE);
-			}
 			UILabel label = temp.getContentLabel();
 			label.setSize(dimension);
 			label.setFont(frFont.applyResolutionNP(ScreenResolution.getScreenResolution()));

designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java

@@ -1,11 +1,5 @@
 package com.fr.design.designer.creator.cardlayout;
 
-import java.awt.*;
-import java.beans.IntrospectionException;
-
-import javax.swing.border.Border;
-
-import com.fr.base.ScreenResolution;
 import com.fr.base.background.ColorBackground;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRTabFitLayoutAdapter;
@@ -16,24 +10,24 @@ import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.fun.WidgetPropertyUIProvider;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormHierarchyTreePane;
 import com.fr.design.mainframe.widget.editors.ButtonTypeEditor;
-import com.fr.design.mainframe.widget.editors.FontEditor;
 import com.fr.design.mainframe.widget.editors.ImgBackgroundEditor;
-import com.fr.design.mainframe.widget.renderer.FontCellRenderer;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.form.ui.container.cardlayout.WTabFitLayout;
 import com.fr.general.Background;
-import com.fr.general.FRFont;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
+import javax.swing.border.Border;
+import java.awt.*;
+import java.beans.IntrospectionException;
+
 
 /**
  * @author focus
@@ -45,14 +39,10 @@ public class XWTabFitLayout extends XWFitLayout {
 	// tab布局在拖拽导致的缩放里（含间隔时），如果拖拽宽高大于组件宽高，会导致调整的时候找不到原来的组件
 	// 这里先将拖拽之前的宽高先做备份
 	private static final Color NORMAL_GRAL = new Color(236,236,236);
-	private static final String DEFAULT_FONT_NAME = "SimSun";
-	public final static Font DEFAULTFT = new Font("Song_TypeFace",0,12);
-	public final static FRFont DEFAULT_FRFT = FRFont.getInstance(DEFAULT_FONT_NAME, 0, 9);
 	private Dimension referDim;
 	private Background initialBackground;
 	private Background overBackground;
 	private Background clickBackground;
-	private FRFont font;
 	private XCardSwitchButton xCardSwitchButton;
 
 	public Dimension getReferDim() {
@@ -87,15 +77,6 @@ public class XWTabFitLayout extends XWFitLayout {
 		this.clickBackground = clickBackground;
 	}
 
-	@Override
-	public FRFont getFont() {
-		return font;
-	}
-
-	public void setFont(FRFont font) {
-		this.font = font;
-	}
-
 	public XCardSwitchButton getxCardSwitchButton() {
 		return xCardSwitchButton;
 	}
@@ -162,21 +143,7 @@ public class XWTabFitLayout extends XWFitLayout {
 								cardSwitchButton.setClickBackground(clickBackground);
 							}
 						}
-				),
+				)
-				//字体
-				creatNonListenerStyle(4).setPropertyChangeListener(
-						new PropertyChangeAdapter() {
-							@Override
-							public void propertyChange() {
-								font = ((WTabFitLayout) data).getFont();
-								CardSwitchButton cardSwitchButton = (CardSwitchButton) xCardSwitchButton.toData();
-								cardSwitchButton.setFont(font);
-								UILabel uiLabel = xCardSwitchButton.getLabel();
-								uiLabel.setFont(font.applyResolutionNP(ScreenResolution.getScreenResolution()));
-								uiLabel.setForeground(font.getForeground());
-								xCardSwitchButton.setLabel(uiLabel);
-							}
-						}),
 		};
 	}
 
@@ -208,9 +175,6 @@ public class XWTabFitLayout extends XWFitLayout {
 						XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass(
 						ImgBackgroundEditor.class).setI18NName(Inter.getLocText("FR-Designer_Background-Click")).putKeyValue(
-						XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
-				new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(Inter.getLocText("FR-Designer_FRFont"))
-						.setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue(
 						XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 		};
 		return crPropertyDescriptors[i];
@@ -235,20 +199,15 @@ public class XWTabFitLayout extends XWFitLayout {
 		if (!isStyle) {
 			this.xCardSwitchButton.setCustomStyle(false);
 			this.xCardSwitchButton.setSelectBackground(bg);
-			this.xCardSwitchButton.getLabel().setFont(DEFAULTFT);
 			cardSwitchButton.setInitialBackground(null);
 			cardSwitchButton.setClickBackground(null);
 			cardSwitchButton.setOverBackground(null);
-			cardSwitchButton.setFont(DEFAULT_FRFT);
 		} else {
 			Background initialBackground = cardSwitchButton.getInitialBackground();
 			bg = initialBackground == null ? bg : initialBackground;
 			this.xCardSwitchButton.setSelectBackground(bg);
 			this.xCardSwitchButton.setCustomStyle(true);
 			cardSwitchButton.setCustomStyle(true);
-			if (font != null) {
-				cardSwitchButton.setFont(font);
-			}
 			if (this.initialBackground != null){
 				this.xCardSwitchButton.setSelectBackground(this.initialBackground);
 				cardSwitchButton.setInitialBackground(this.initialBackground);