Merge branch 'release' of http://www.finedevelop.com:2015/scm/~zheng/design into release

.gitignore

@@ -3,7 +3,5 @@ designer_base/bin
 designer_chart/bin
 designer_form/bin
 *.iml
-designer_base/src/com/fr/design/locale/.idea/
-
 
 

designer_base/src/com/fr/design/fun/HyperlinkProvider.java

@@ -10,7 +10,7 @@ import com.fr.stable.fun.mark.Mutable;
 public interface HyperlinkProvider extends Mutable {
     String XML_TAG = "HyperlinkProvider";
 
-    int CURRENT_LEVEL = 1;
+    int CURRENT_LEVEL = 2;
 
 
     /**

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

@@ -525,3 +525,37 @@ FR-Designer_Description_panel=Description
 FR-Designer_Edit_panel=Edit
 FR-Designer_Property_panel=Property
 FR-Designer_Select_panel=Select
+
+FR-Designer_LayoutTable_Column_Width=160
+FR-Designer_Set_BG_Of_Current_Row=Set BG of the row being edited
+FR-Designer_Unload_Check=Prompt users when leave  without submitting
+FR-Designer_ReportColumns_Columns_Optional=
+FR-Designer_Row_Icon_File_Name=row.png
+FR-Designer_Center_Display=Center
+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_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_PageSetup_Horizontal=Horizontal
+FR-Designer_PageSetup_Vertical=Vertical
+FR-Designer_Gradient_Direction=Gradient Direction
+FR-Designer_Drag_To_Select_Gradient=\\ Drag the button below to choose gradient area, click it to choose color
+FR-Designer_Display_Value=Display Value
+FR-Designer_Actual_Value=Actual Value
+FR-Designer_CellWrite_ToolTip=Tool Tip of Cell
+FR-Designer_Show_Content=Show content
+FR-Designer_Auto_Adjust_Size=Auto adjust
+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_DS_TableData=Data Set
+FR-Designer_Parameter-Formula=Formula

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

@@ -181,7 +181,7 @@ FR-Designer_Support_QQ=Support online
 FR-Designer_Swatch=Sample
 FR-Designer_Tab_title=Tab title
 FR-Designer_TableData=Data set
-FR-Designer_Thank_guest=Special Thanks
+FR-Designer_Thank_guest=Special thanks to
 FR-Designer_Thanks-To=Thanks
 FR-Designer_Title=Title
 FR-Designer_Total=Total
@@ -524,4 +524,38 @@ FR-Designer_ClassName_panel=Class Name
 FR-Designer_Description_panel=Description
 FR-Designer_Edit_panel=Edit
 FR-Designer_Property_panel=Property
-FR-Designer_Select_panel=Sel
+FR-Designer_Select_panel=Sel
+
+FR-Designer_LayoutTable_Column_Width=250
+FR-Designer_Set_BG_Of_Current_Row=Set BG of the row being edited
+FR-Designer_Unload_Check=Prompt users when leave without submitting
+FR-Designer_ReportColumns_Columns_Optional=\u3000
+FR-Designer_Row_Icon_File_Name=row_en.png
+FR-Designer_Center_Display=Center
+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_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_PageSetup_Horizontal=Horizontal
+FR-Designer_PageSetup_Vertical=Vertical
+FR-Designer_Gradient_Direction=Gradient Direction
+FR-Designer_Drag_To_Select_Gradient=\\ Drag the button below to choose gradient area, click it to choose color
+FR-Designer_Display_Value=Display Value
+FR-Designer_Actual_Value=Actual Value
+FR-Designer_CellWrite_ToolTip=Tool Tip of Cell
+FR-Designer_Show_Content=Show content
+FR-Designer_Auto_Adjust_Size=Auto adjust
+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_DS_TableData=Data Set
+FR-Designer_Parameter-Formula=Formula

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

@@ -499,4 +499,37 @@ FR-Designer_ClassName_panel=\u985E\u540D
 FR-Designer_Description_panel=\u8A18\u8FF0
 FR-Designer_Edit_panel=\u7DE8\u96C6
 FR-Designer_Property_panel=\u5C5E\u6027
-FR-Designer_Select_panel=\u9078\u629E
+FR-Designer_Select_panel=\u9078\u629E
+FR-Designer_LayoutTable_Column_Width=160
+FR-Designer_Set_BG_Of_Current_Row=\u5831\u544A\u30AB\u30EC\u30F3\u30C8\u7DE8\u96C6\u884C\u80CC\u666F\u8A2D\u5B9A
+FR-Designer_Unload_Check=\u63D0\u51FA\u305B\u305A\u306B\u30D2\u30F3\u30C8
+FR-Designer_ReportColumns_Columns_Optional=\u6BB5\u7D44\u307F
+FR-Designer_Row_Icon_File_Name=row.png
+FR-Designer_Center_Display=\u4E2D\u592E\u63C3\u3048\u8868\u793A
+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_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_PageSetup_Horizontal=\u6A2A\u65B9\u5411
+FR-Designer_PageSetup_Vertical=\u7E26\u65B9\u5411
+FR-Designer_Gradient_Direction=\u65B9\u5411\u3092\u5F90\u3005\u306B\u5909\u5316
+FR-Designer_Drag_To_Select_Gradient=\\ \u4E0B\u65B9\u306E\u30DC\u30BF\u30F3\u3092\u30D7\u30EB\u30C0\u30A6\u30F3\u3057\u3066\u6F38\u6B21\u5909\u5316\u30A8\u30EA\u30A2\u3092\u9078\u629E\u3057\u3001\u30AF\u30EA\u30C3\u30AF\u3057
+FR-Designer_Display_Value=\u8868\u793A\u5024
+FR-Designer_Actual_Value=\u5B9F\u969B\u5024
+FR-Designer_CellWrite_ToolTip=\u30BB\u30EB\u30D2\u30F3\u30C8
+FR-Designer_Show_Content=\u5185\u5BB9\u8868\u793A
+FR-Designer_Auto_Adjust_Size=\u81EA\u52D5\u8ABF\u6574
+FR-Designer_Show_As_Download=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u30EA\u30F3\u30AF\u3067\uFF12\u9032\u6CD5\u306E\u5185\u5BB9\u3092\u8868\u793A
+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_DS_TableData=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
+FR-Designer_Parameter-Formula=\u6570\u5F0F

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

@@ -458,14 +458,14 @@ FR-Designer-DS-Database_Query=\uB370\uC774\uD130\uBCA0\uC774\uC2A4\uCC3E\uC544\u
 FR-Designer_Is_Share_DBTableData=\uB370\uC774\uD130\uC138\uD2B8\uACF5\uC720
 FR-Designer-LayerPageReport_PageQuery=\uD398\uC774\uC9C0\uB098\uB204\uAE30\uCC3E\uC544\uBCF4\uAE30
 FR-Designer-LayerPageReport_Define_PageQuerySQL=\uC815\uC758\uD398\uC774\uC9C0\uB098\uB204\uAE30\uCC3E\uC544\uBCF4\uAE30sql
-FR-Designer_Event=\
+FR-Designer_Event=
 FR-Designer_Properties=\uFFFD
 FR-Designer_Export_failed=\uB0B4\uBCF4\uB0B4\uAE30\uC2E4\uD328
 FR-Designer_Exported_successfully=\uB0B4\uBCF4\uB0B4\uAE30\uC131\uACF5
 FR-Designer_Exporting=\uB0B4\uBCF4\uB0B4\uAE30\uC911
-FR-Designer_Export-PDF=PDF\uC11C\uC2DDFR-Designer_Properties=\uFFFD
-FR-Designer_Button_OK=\uD655\uC778FR-Designer_Button_Cancel=\uCDE8\uC18C
-\uFFFD
+FR-Designer_Export-PDF=PDF\uC11C\uC2DD
+FR-Designer_Button_OK=\uD655\uC778
+FR-Designer_Button_Cancel=\uCDE8\uC18C
 FR-Designer_JavaScript=
 FR-Designer_JavaScript_Form_Submit=
 FR-Designer_JavaScript_Commit_to_Database=
@@ -498,4 +498,39 @@ FR-Designer_Description_panel=\uC124\uBA85
 FR-Designer_Edit_panel=\uD3B8\uC9D1
 FR-Designer_Property_panel=\uC18D\uC131
 FR-Designer_Select_panel=\uC120\uD0DD
-FR-Designer_Template_Web_Attributes=\uD15C\uD50C\uB9BF \uC6F9 \uC18D\uC131
+<<<<<<< HEAD
+
+FR-Designer_LayoutTable_Column_Width=160
+FR-Designer_Set_BG_Of_Current_Row=\uAE30\uC785\uD604\uC7AC\uD3B8\uC9D1\uD589\uBC30\uACBD\uC124\uC815
+FR-Designer_Unload_Check=\uBBF8\uC81C\uCD9C\uB098\uAC14\uC74C\uC54C\uB9BC
+FR-Designer_ReportColumns_Columns_Optional=\uC140\uB098\uB204\uAE30
+FR-Designer_Row_Icon_File_Name=row.png
+FR-Designer_Center_Display=\uAC00\uC6B4\uB370\uC815\uB82C\uBCF4\uC774\uAE30
+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_PageSetup_Page=\uC6F9\uD398\uC774\uC9C0
+FR-Designer_Custom_Job_Description=\uC124\uBA85
+FR-Designer_Property=\uC18D\uC131
+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_PageSetup_Horizontal=\uAC00\uB85C
+FR-Designer_PageSetup_Vertical=\uC138\uB85C
+FR-Designer_Gradient_Direction=\uADF8\uB77C\uB370\uC774\uC158 \uBC29\uD5A5
+FR-Designer_Drag_To_Select_Gradient=\\\uD558\uB2E8\uD0A4\uB97C\uB4DC\uB798\uADF8\uD558\uC5EC\uADF8\uB77C\uB370\uC774\uC158\uC601\uC5ED\uC744\uC120\uD0DD\uD558\uACE0\uD0A4\uB97C\uD074\uB9AD\uD558\uC5EC\uD574\uB2F9\uC0C9\uC120\uD0DD
+FR-Designer_Display_Value=\uAC12\uBCF4\uC774\uAE30
+FR-Designer_Actual_Value=\uC2E4\uC81C\uAC12
+FR-Designer_CellWrite_ToolTip=\uB0B4\uC6A9\uC54C\uB9BC
+FR-Designer_Show_Content=\uB0B4\uC6A9\uBCF4\uC774\uAE30
+FR-Designer_Auto_Adjust_Size=\uC790\uB3D9\uC870\uC815
+FR-Designer_Show_As_Download=\uB2E4\uC6B4\uB85C\uB4DC\uB9C1\uD06C\uB85C2\uC9C4\uBC95\uB0B4\uC6A9\uBCF4\uC774\uAE30
+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_DS_TableData=\uB370\uC774\uD130\uC138\uD2B8
+FR-Designer_Parameter-Formula=\uC218\uC2DD

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

@@ -528,4 +528,38 @@ FR-Designer_ClassName_panel=\u7C7B\u540D
 FR-Designer_Description_panel=\u63CF\u8FF0
 FR-Designer_Edit_panel=\u7F16\u8F91
 FR-Designer_Property_panel=\u5C5E\u6027
-FR-Designer_Select_panel=\u9009\u62E9
+FR-Designer_Select_panel=\u9009\u62E9
+
+FR-Designer_LayoutTable_Column_Width=160
+FR-Designer_Set_BG_Of_Current_Row=\u586B\u62A5\u5F53\u524D\u7F16\u8F91\u884C\u80CC\u666F\u8BBE\u7F6E
+FR-Designer_Unload_Check=\u672A\u63D0\u4EA4\u79BB\u5F00\u63D0\u793A
+FR-Designer_ReportColumns_Columns_Optional=\u5206\u680F
+FR-Designer_Row_Icon_File_Name=row.png
+FR-Designer_Center_Display=\u5C45\u4E2D\u5C55\u793A
+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_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_PageSetup_Horizontal=\u6A2A\u5411
+FR-Designer_PageSetup_Vertical=\u7EB5\u5411
+FR-Designer_Gradient_Direction=\u6E10\u53D8\u65B9\u5411
+FR-Designer_Drag_To_Select_Gradient=\\ \u62D6\u52A8\u4E0B\u65B9\u6309\u94AE\u9009\u62E9\u6E10\u53D8\u533A\u57DF\uFF0C\u5355\u51FB\u6309\u94AE\u9009\u62E9\u5BF9\u5E94\u989C\u8272
+FR-Designer_Display_Value=\u663E\u793A\u503C
+FR-Designer_Actual_Value=\u5B9E\u9645\u503C
+FR-Designer_CellWrite_ToolTip=\u5185\u5BB9\u63D0\u793A
+FR-Designer_Show_Content=\u663E\u793A\u5185\u5BB9
+FR-Designer_Auto_Adjust_Size=\u81EA\u52A8\u8C03\u6574
+FR-Designer_Show_As_Download=\u7528\u4E0B\u8F7D\u94FE\u63A5\u663E\u793A\u4E8C\u8FDB\u5236\u5185\u5BB9
+FR-Designer_File_Name_For_Download=\u4E0B\u8F7D\u6587\u4EF6\u540D
+FR-Designer_No=\u5426
+FR-Designer_Pagination=\u5206\u9875
+FR-Designer_DS_TableData=\u6570\u636E\u96C6
+FR-Designer_Parameter-Formula=\u516C\u5F0F

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

@@ -516,4 +516,38 @@ FR-Designer_ClassName_panel=\u985E\u540D
 FR-Designer_Description_panel=\u63CF\u8FF0
 FR-Designer_Edit_panel=\u7DE8\u8F2F
 FR-Designer_Property_panel=\u5C6C\u6027
-FR-Designer_Select_panel=\u9078\u64C7
+FR-Designer_Select_panel=\u9078\u64C7
+
+FR-Designer_LayoutTable_Column_Width=160
+FR-Designer_Set_BG_Of_Current_Row=\u586B\u5831\u7576\u524D\u7DE8\u8F2F\u5217\u80CC\u666F\u8A2D\u5B9A
+FR-Designer_Unload_Check=\u672A\u63D0\u4EA4\u96E2\u958B\u63D0\u793A
+FR-Designer_ReportColumns_Columns_Optional=\u5831\u8868\u6B04\u4F4D
+FR-Designer_Row_Icon_File_Name=row.png
+FR-Designer_Center_Display=\u7F6E\u4E2D\u986F\u793A
+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_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_PageSetup_Horizontal=\u6A2A\u5411
+FR-Designer_PageSetup_Vertical=\u7E31\u5411
+FR-Designer_Gradient_Direction=\u6F38\u8B8A\u65B9\u5411
+FR-Designer_Drag_To_Select_Gradient=\\ \u62D6\u52D5\u4E0B\u767C\u90A3\u500B\u6309\u9215\u61F8\u8457\u5340\u57DF\uFF0C\u55AE\u64CA\u6309\u9215\u9078\u64C7\u984F\u8272
+FR-Designer_Display_Value=\u986F\u793A\u503C
+FR-Designer_Actual_Value=\u5BE6\u969B\u503C
+FR-Designer_CellWrite_ToolTip=\u5167\u5BB9\u63D0\u793A
+FR-Designer_Show_Content=\u986F\u793A\u5167\u5BB9
+FR-Designer_Auto_Adjust_Size=\u81EA\u52D5\u8ABF\u6574
+FR-Designer_Show_As_Download=\u7528\u4E0B\u8F09\u93C8\u63A5\u986F\u793A\u4E8C\u9032\u5236\u5167\u5BB9
+FR-Designer_File_Name_For_Download=\u4E0B\u8F09\u6A94\u6848\u540D
+FR-Designer_No=\u5426
+FR-Designer_Pagination=\u5206\u9801
+FR-Designer_DS_TableData=\u8CC7\u6599\u96C6
+FR-Designer_Parameter-Formula=\u516C\u5F0F

designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java

@@ -26,8 +26,11 @@ import java.util.Comparator;
 public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPropertiesGroupModel {
     private LayoutTypeEditor layoutTypeEditor;
     private LayoutTypeRenderer layoutTypeRenderer;
+
     //默认body是0,自适应布局;1,绝对布局.
     private WBodyLayoutType layoutType = WBodyLayoutType.ABSOLUTE;
+    private static final int EACH_ROW_COUNT = 4;
+
     public FRAbsoluteBodyLayoutPropertiesGroupModel(XWAbsoluteBodyLayout xwAbsoluteBodyLayout) {
         super(xwAbsoluteBodyLayout);
     }
@@ -180,9 +183,8 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
     // 把绝对布局中的元素按规则移动到自适应布局中
     // 规则：各元素按顺序放置，其中每行最多4个元素，超出则换行，各元素均分body的高度和宽度
     private void moveComponents2FitLayout(XWFitLayout xwFitLayout) {
-        int eachRowCount = 4;
         Component[] components = xwFitLayout.getComponents();
-        if (components.length <= 1){
+        if (components.length == 0){
             xwFitLayout.updateBoundsWidget();
             return;
         }
@@ -191,17 +193,17 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
         int leftMargin = xwFitLayout.toData().getMargin().getLeft();
         int topMargin = xwFitLayout.toData().getMargin().getTop();
         xwFitLayout.toData().setCompInterval(0);
-        int row = (components.length / eachRowCount) + (components.length % eachRowCount == 0 ? 0 : 1);
+        int row = (components.length / EACH_ROW_COUNT) + (components.length % EACH_ROW_COUNT == 0 ? 0 : 1);
         //最后一行的列数不定
-        int column = components.length % eachRowCount == 0 ? eachRowCount : components.length % eachRowCount;
-        int componentWidth = layoutWidth / eachRowCount;
+        int column = components.length % EACH_ROW_COUNT == 0 ? EACH_ROW_COUNT : components.length % EACH_ROW_COUNT;
+        int componentWidth = layoutWidth / EACH_ROW_COUNT;
         int componentHeight = layoutHeight / row;
         for(int i = 0;i < row - 1;i++){
-            for(int j = 0;j < eachRowCount;j++){
-                components[eachRowCount * i + j].setBounds(
+            for(int j = 0;j < EACH_ROW_COUNT;j++){
+                components[EACH_ROW_COUNT * i + j].setBounds(
                         leftMargin + componentWidth * j,
                         topMargin + componentHeight * i,
-                        j == eachRowCount - 1 ? layoutWidth - componentWidth * (eachRowCount - 1) : componentWidth,
+                        j == EACH_ROW_COUNT - 1 ? layoutWidth - componentWidth * (EACH_ROW_COUNT - 1) : componentWidth,
                         componentHeight
                 );
             }
@@ -210,7 +212,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
         int lastRowWidth = layoutWidth / column;
         int lastRowHeight = layoutHeight - componentHeight * (row - 1);
         for (int i = 0;i < column;i++) {
-            components[eachRowCount * (row - 1) + i].setBounds(
+            components[EACH_ROW_COUNT * (row - 1) + i].setBounds(
                     leftMargin + lastRowWidth * i,
                     topMargin + componentHeight * (row - 1),
                     i == column - 1 ? layoutWidth - lastRowWidth * (column - 1) : lastRowWidth,