diff --git a/designer/designer.iml b/designer/designer.iml
index 661dcd939..eca9d8fcd 100644
--- a/designer/designer.iml
+++ b/designer/designer.iml
@@ -1,13 +1,14 @@
-
-
+
+
-
+
-
+
+
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/fun/HyperlinkProvider.java b/designer_base/src/com/fr/design/fun/HyperlinkProvider.java
index e6eccc882..9f0a53cfa 100644
--- a/designer_base/src/com/fr/design/fun/HyperlinkProvider.java
+++ b/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;
/**
diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties
index 40a88a249..28d261ed2 100644
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
@@ -530,3 +530,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
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties
index b427e4501..e5f89932f 100644
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@@ -73,8 +73,8 @@ FR-Designer_Button-Type=Button Type
FR-Designer_CardLayout=TabLayout
FR-Designer_Cell=cell
FR-Designer_Chart_Cell=Chart Hyperlink-Link Cell
-FR-Designer_Chart_Float=Chart Hyperlink-Floating Elements
-FR-Designer_Chart_Float_chart=Chart Hyperlink-Floating-window Chart
+FR-Designer_Chart_Float=Chart Hyperlink-Floating Element
+FR-Designer_Chart_Float_chart=Chart Hyperlink-Floating Chart
FR-Designer_Check-for-Updates=Check for Updates
FR-Designer_Choose-Data-Confusion-Tip=\ Please Choose the field needed to be confused and then preview
FR-Designer_Close=close
@@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=Close other templates
FR-Designer_File=file
FR-Designer_Filter_Conditions=Filter condition
FR-Designer_Finish-Modify-Share=Finish Modification And Share
-FR-Designer_Fit-App=App self-adaption
+FR-Designer_Fit=self-adaption
FR-Designer_Font-Family=Font name
FR-Designer_Font-Size=Font size
FR-Designer_Forbid_Drag_into_Adapt_Pane=Form body cannot be dragged into the object
@@ -118,7 +118,7 @@ FR-Designer_Get-CubeGetting cube=
FR-Designer_Help=Help
FR-Designer_Hide=Hide
FR-Designer_Hyperlink=Hyperlink
-FR-Designer_Hyperlink-Form_link=Current form object
+FR-Designer_Hyperlink-Form_link=Current dashboard object
FR-Designer_IDCard=IDCard
FR-Designer_Icon=Icon
FR-Designer_Index=index
@@ -126,7 +126,7 @@ FR-Designer_Input_Rule=Input Rule
FR-Designer_Language_Default=Default
FR-Designer_Layout=Layout
FR-Designer_Layout-HBox=Horizontal Box Layout
-FR-Designer_Layout-Index=Layout Index
+FR-Designer_Layout-Index=Index
FR-Designer_Layout_Constraints=Layout Constraints
FR-Designer_Length=Length
FR-Designer_Loading_Data=Loading Data
@@ -173,15 +173,15 @@ FR-Designer_Search=Search
FR-Designer_Set=Set
FR-Designer_Share-Template=Share Template
FR-Designer_Simple_general=Simple custom query
-FR-Designer_Song_TypeFace=song typeface
+FR-Designer_Song_TypeFace=Song typeface
FR-Designer_Start-Date=Start Date
FR-Designer_Subscript=Subscript
FR-Designer_Superscript=Superscript
FR-Designer_Support_QQ=Support online
-FR-Designer_Swatch=Swatch
+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
@@ -190,8 +190,8 @@ FR-Designer_Underline=Underline
FR-Designer_Used=Recently Used
FR-Designer_User-defined-MDX=Custom MDX query
FR-Designer_SampleText=SampleText SampleText
-FR-Designer_Vertical-LeftToRight=Vertical Text (Left to Right)
-FR-Designer_Vertical-RightToLeft=Vertical Text (Right To Left)
+FR-Designer_Vertical-LeftToRight=Vertical Text (left to right)
+FR-Designer_Vertical-RightToLeft=Vertical Text (right to left)
FR-Designer_VerticalBoxLayout=Vertical Box Layout
FR-Designer_Visible=Visible
FR-Designer_WLayout-Border-ToolTips=The complete border layout container\uFF0Cis composed of central, eastern, western, northern and southern parts. You can adjust the height of the northern and southern ones and the width of the eastern and western ones.
@@ -358,7 +358,6 @@ FR-Designer_KeyPoint=KeyPoint
FR-Designer_loadedTreeModel=loadedTreeModel
FR-Designer-Failed_to_load_the_plugin=Failed to load the plugin\uFF0Cplease update the plugin\:
FR-Designer-Plugin_Please_Update_Jar=Please Update Jar
-FR-Designer-Invalid_Page_Number=Invalid Page Number
FR-Designer_XMLA_Database=DB
FR-Designer_XMLA_UserName=User name
FR-Designer_XMLA_Password=Password
@@ -414,12 +413,12 @@ FR-Designer_Unit_PT=Pound
FR-Designer-Write_Auto_Stash=auto stash
FR-Designer_Printer_Native_Button=Native Print
FR-Designer_Event_ShowWidgets=Display widgets directly
-FR-Designer_Current_Preview_Rows=Current Number of Preview Rows
+FR-Designer_Current_Preview_Rows=Current Number of Preview Rows
FR-Designer_Data=Data
FR-Designer_Error=Error
FR-Designer_formDesignerModule=Form Designer
FR-Designer-Website_Url=http\://www.finereport.com/en
-FR-Designer-BBSLogin_Download-Unlogin-Tip=
+FR-Designer-BBSLogin_Download-Unlogin-Tip=Login to download
FR-Designer-App_ReLayout=AppRelayout
FR-Designer_Mobile-Attr=Mobile Attr
FR-Designer_Mobile-Vertical=Vertical Screen
@@ -433,42 +432,42 @@ FR-Designer_COMMUNITY_NEED=need
FR-Designer_COMMUNITY_BUG=bug report
FR-Designer_COMMUNITY_SIGN=sign
FR-Designer_COMMUNITY_QUESTIONS=questions
-FR-Designer_Mobile-Zoom=zoom
+FR-Designer_Mobile-Zoom=Zoom
FR-Designer_Mobile-Open=Open
-FR-Designer_Mobile-Warning=
+FR-Designer_Mobile-Warning=Max height cannot exceed 80% of display area
FR-Designer_Button-OK=OK
FR-Designer_Button-Cancel=Cancel
FR-Designer_Write-Save-Formula=Preserve formula when fill
FR-Designer_Export-Save-Formula=Preserve formula when export
-FR-Designer_Form-Fit-Tip=Fit Plugin
-FR-Designer_Form-Frozen-Tip=When Use Form Frozen, Suggest Install
-FR-Designer_Form-Forzen-Speed=To Speed UP.
-FR-Designer_Attention=attention
-FR-Designer_Forbid_Widgets_Intersects=Forbid Widgets Intersects
+FR-Designer_Form-Fit-Tip=Adaptive plug-in
+FR-Designer_Form-Frozen-Tip=When use Frozen, suggest install
+FR-Designer_Form-Forzen-Speed=, use bidirectional and horizontal adaption to improve the speed.
+FR-Designer_Attention=Attention
+FR-Designer_Forbid_Widgets_Intersects=Forbid component overlap
FR-Designer_Widget_Scaling_Mode_Fit=Area-Fit
FR-Designer_Widget_Scaling_Mode_Fixed=Area-Fixed
-FR-Designer-Widget_Area_Scaling=Widget Area Scaling
-FR-Designer-Widget_Scaling_Mode=Widget Scaling Mode
+FR-Designer-Widget_Area_Scaling=Component area scaling
+FR-Designer-Widget_Scaling_Mode=Scaling mode
FR-Designer-QQLogin-Determine=Determine
FR-Designer-QQLogin-Cancel=Cancel
-FR-Designer-Reuse_Manager=Reuse Manager
-FR-Designer_TableData-Default-Para=Default Para
-FR-Designer_Layout_Block_Absolute=Absolute Layout Block
-FR-Designer_Layout_Block_Tab=TabLayout
-FR-Designer_Layout_Block_Blank=Blank Block
-FR-Designer_Attr_Layout=layout
-FR-Designer_Attr_Layout_Type=layout type
-FR-Designer_Attr_Bidirectional_Adaptive=Bidirectional Adaptive
-FR-Designer-Selected_Widget=selected widget
-FR-Designer_LocalWidget=local widget
-FR-Designer_AllCategories=all categories
-FR-Designer_Download_Template=download template
-FR-Designer_Install_Template=install template
-FR-Designer_Delete_Template=delete template
-FR-Designer_Mobile-Refresh=refresh
-FR-Designer_Mobile-ToolBar=toolbar
+FR-Designer-Reuse_Manager=Component management
+FR-Designer_TableData-Default-Para=Default parameter
+FR-Designer_Layout_Block_Absolute=Absolute layout block
+FR-Designer_Layout_Block_Tab=Tab block
+FR-Designer_Layout_Block_Blank=Blank block
+FR-Designer_Attr_Layout=Layout
+FR-Designer_Attr_Layout_Type=Layout type
+FR-Designer_Attr_Bidirectional_Adaptive=Bidirectional adaptive
+FR-Designer-Selected_Widget=Selected widget
+FR-Designer_LocalWidget=Local component library
+FR-Designer_AllCategories=All categories
+FR-Designer_Download_Template=Download components
+FR-Designer_Install_Template=Install components
+FR-Designer_Delete_Template=Delete components
+FR-Designer_Mobile-Refresh=Refresh
+FR-Designer_Mobile-ToolBar=Toolbar
FR-Designer_WLayout-Absolute-ToolTips=Freestyle layout, add control in any position of the layout
-FR-Designer_Reset=reset
+FR-Designer_Reset=Reset
FR-Designer_Add_all=Add all
FR-Designer_Language_Change_Successful=New language setting will be enabled when designer is restarted
FR-Designer_Template_Web_Attributes=Web Attributes
@@ -487,11 +486,6 @@ FR-Designer-DS-Database_Query=DB Query
FR-Designer_Is_Share_DBTableData=Shared data set
FR-Designer_Event=Event
FR-Designer_Properties=Properties
-FR-Designer_Permissions_Edition=Permissions Edition
-FR-Designer_Permission_Edition=Permissions Edition
-FR-Designer_Export_Excel_Page=Page Break
-FR-Designer_Export_Excel_Simple=Original
-FR-Designer_Export_Excel_PageToSheet=One Page Per Sheet
FR-Designer_Export_failed=Export failed
FR-Designer_Exported_successfully=Exported successfully
FR-Designer_Exporting=Exporting
@@ -514,16 +508,16 @@ FR-Designer_Form_Basic_Properties=Basic Property
FR-Designer_DS_Dictionary=Data Dictionary
FR-Designer_Create_Tree=Build Tree
FR-Designer_Set_Callback_Function=Set Callback Function
-FR-Designer_ConfirmDialog_Content=
-FR-Designer_ConfirmDialog_Title=
+FR-Designer_ConfirmDialog_Content=Confirm to delete Tab Control
+FR-Designer_ConfirmDialog_Title=FineReport 8.0
FR-Designer_FormulaPane_Tips=Tips\:You can input B1 to get the data in the second cell of the first row
FR-Designer_FormulaPane_Variables=Variables
FR-Designer_FormulaPane_Formula_Description=Formula Description
FR-Designer_FormulaPane_Function_Detail=Function Detail
FR-Designer_FormulaPane_Search=Search
-FR-Designer_Tab_carousel=
-FR-Designer_setCarousel=
+FR-Designer_Tab_carousel=Tab carousel
+FR-Designer_setCarousel=Start
FR-Designer_carouselInterval=Interval
FR-Designer_ClassName_panel=Class Name
@@ -531,3 +525,37 @@ FR-Designer_Description_panel=Description
FR-Designer_Edit_panel=Edit
FR-Designer_Property_panel=Property
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
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
index 2ab4f557a..9b6ce1989 100644
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
@@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=\u305D\u306E\u4ED6\u30C6\u30F3\u30D7\u30EC\
FR-Designer_File=\u30D5\u30A1\u30A4\u30EB
FR-Designer_Filter_Conditions=\u9078\u5225\u6761\u4EF6
FR-Designer_Finish-Modify-Share=\u4FEE\u6B63\u3092\u5B8C\u4E86\u3057\u3066\u30B7\u30A7\u30A2
-FR-Designer_Fit-App=App\u81EA\u9069\u5FDC
+FR-Designer_Fit=\u81EA\u9069\u5FDC
FR-Designer_Font-Family=\u30D5\u30A9\u30F3\u30C8\u540D\u79F0
FR-Designer_Font-Size=\u30D5\u30A9\u30F3\u30C8\u5927\u5C0F
FR-Designer_Forbid_Drag_into_Adapt_Pane=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u30D5\u30A9\u30FC\u30E0\u672C\u6587\u3092\u30C9\u30E9\u30C3\u30B0\u3059\u308B\u3053\u3068\u306F\u8A31\u3055\u308C\u306A\u3044
@@ -222,7 +222,7 @@ FR-Designer-StyleAlignment_Style_Indentation=\u30A4\u30F3\u30C7\u30F3\u30C8
FR-Designer-StyleAlignment_Style_Spacing=\u9593\u9694\u8DDD\u96E2
FR-Designer-StyleAlignment_Style_Alignment=\u63C3\u3048
FR-Designer-CommitTab_Submit=\u63D0\u51FA\u3059\u308B
-FR-Designer-CommitTab_SureToDelete=Sure to delete
+FR-Designer-CommitTab_SureToDelete=\u524A\u9664\u3057\u307E\u3059\u304B
FR-Designer-CommitTab_Remove=\u524A\u9664
FR-Designer-Collect_Information_free=\u7121\u6599
FR-Designer-Collect_Information_Description=\u8A18\u8FF0
@@ -320,7 +320,7 @@ FR-Designer_Show_Text=\u30DC\u30BF\u30F3\u540D\u524D\u3092\u8868\u793A
FR-Designer_User_Defined_Event=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u4E8B\u4EF6
FR-Designer_Output_PDF=PDF\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8
FR-Designer_Output_Word=Word\u30A2\u30A6\u30C8\u30D7\u30C3\u30C8
-FR-Designer_Image=\u753B\u50CF\uFF08PNG\uFF09
+FR-Designer_Image=\u30A4\u30E1\u30FC\u30B8
FR-Designer_Flash_Print=Flash\u30D7\u30EA\u30F3\u30C8
FR-Designer_PDF_Print=PDF\u30D7\u30EA\u30F3\u30C8
FR-Designer_Applet_Print=\u30A2\u30D7\u30EC\u30C3\u30C8\u5370\u5237
@@ -369,13 +369,13 @@ FR-Designer_LiteCondition_ConditionB-OR=\u30AA\u30A2(OR)
FR-Designer_LiteCondition_Common_Condition=\u666E\u901A\u6761\u4EF6
FR-Designer_LiteCondition_Formula_Condition=\u516C\u5F0F\u6761\u4EF6
FR-Designer_LiteCondition_Define=\u5B9A\u7FA9
-FR-Designer_Select_All=
+FR-Designer_Select_All=\u5168\u9078\u629E
FR-Designer-Plugin_Expire_Dialog_Title=\u671F\u9650\u5207\u308C\u306E\u30D7\u30E9\u30B0\u30A4\u30F3
FR-Designer-Plugin_Expire_Dialog_Text=\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u3001\u8CFC\u5165\u3092\u3059\u308B\u305F\u3081\u306B\u5E06\u30BD\u30D5\u30C8\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30BB\u30F3\u30BF\u30FC\u3092\u884C\u304F\u3001\u6709\u52B9\u671F\u9650\u304C\u5207\u308C\u3066\u3044\u307E\u3059\u3002
FR-Designer-Plugin_Finerest_Addon=\u5E06\u8EDF\u5FDC\u7528\u30BB\u30F3\u30BF\u30FC
FR-Designer_Performance_First=\u6027\u80FD\u512A\u5148
FR-Designer_Total_N_Grade=\u5168\u90E8\u3067\:${N}\u5C64
-FR-Designer_time(s)=
+FR-Designer_time(s)=\u56DE
FR-Designer_General=\u5E38\u7528
FR-Designer_Advanced=\u9AD8\u7D1A
FR-Designer_Oracle=\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB
@@ -407,10 +407,10 @@ FR-Designer_Current_Preview_Rows=\u73FE\u5728\u306E\u30D7\u30EC\u30D3\u30E5\u30F
FR-Designer_Data=\u30C7\u30FC\u30BF
FR-Designer_Error=\u30A8\u30E9\u30FC
FR-Designer-Website_Url=http\://www.finereport.com/jp
-FR-Designer_formDesignerModule=
-FR-Designer-BBSLogin_Login-Title=
-FR-Designer_Get-CubeGetting=
-FR-Designer-BBSLogin_Download-Unlogin-Tip=
+FR-Designer_formDesignerModule=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u30C7\u30B6\u30A4\u30CA\u30FC
+FR-Designer-BBSLogin_Login-Title=BBS\u30ED\u30B0\u30A4\u30F3
+FR-Designer_Get-CubeGetting=cube\u53D6\u5F97
+FR-Designer-BBSLogin_Download-Unlogin-Tip=\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9
FR-Designer-App_ReLayout=\u96FB\u8A71\u518D\u30EC\u30A4\u30A2\u30A6\u30C8
FR-Designer_Mobile-Attr=\u30E2\u30D0\u30A4\u30EB\u7AEF\u672B\u5C5E\u6027
FR-Designer_Mobile-Vertical=\u7E26
@@ -432,44 +432,43 @@ FR-Designer_Attention=\u6CE8\u610F\u3057\u307E\u3059
FR-Designer_Forbid_Widgets_Intersects=\u7981\u6B62\u90E8\u54C1\u3092\u91CD\u306D\u3066
FR-Designer_Widget_Scaling_Mode_Fit=\u9069\u5FDC\u533A\u57DF
FR-Designer_Widget_Scaling_Mode_Fixed=\u56FA\u5B9A\u30B5\u30A4\u30BA
-FR-Designer-Widget_Area_Scaling=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30A8\u30EA\u30A2
+FR-Designer-Widget_Area_Scaling=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30A8\u30EA\u30A2\
FR-Designer-QQLogin-Determine=\u6C7A\u5B9A\u3057\u307E\u3059
FR-Designer-QQLogin-Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
-FR-Designer-Reuse_Manager=
-FR-Designer_Layout_Block_Absolute=
-FR-Designer_Layout_Block_Tab=
-FR-Designer_Layout_Block_Blank=
-FR-Designer_Attr_Layout=
-FR-Designer_Attr_Layout_Type=
-FR-Designer_Attr_Bidirectional_Adaptive=
-FR-Designer_Download_Template=
+FR-Designer-Reuse_Manager=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
+FR-Designer_Layout_Block_Absolute=\u7D76\u5BFE\u30EC\u30A4\u30A2\u30A6\u30C8\u30D6\u30ED\u30C3\u30AF
+FR-Designer_Layout_Block_Tab=Tab\u30D6\u30ED\u30C3\u30AF
+FR-Designer_Layout_Block_Blank=\u7A7A\u767D\u30D6\u30ED\u30C3\u30AF
+FR-Designer_Attr_Layout=\u30EC\u30A4\u30A2\u30A6\u30C8
+FR-Designer_Attr_Layout_Type=\u30EC\u30A4\u30A2\u30A6\u30C8\u65B9\u5F0F
+FR-Designer_Attr_Bidirectional_Adaptive=\u53CC\u65B9\u5411\u81EA\u5DF1\u8ABF\u6574
+FR-Designer_Download_Template=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9
FR-Designer-Widget_Scaling_Mode=\u30B9\u30B1\u30FC\u30EA\u30F3\u30B0\u8AD6\u7406
-FR-Designer_Mobile-Refresh=
-FR-Designer_Mobile-ToolBar=
+FR-Designer_Mobile-Refresh=\u66F4\u65B0
+FR-Designer_Mobile-ToolBar=\u30C4\u30FC\u30EB\u30D0\u30FC
FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u914D\u7F6E\u3067\u3059\u3002\u914D\u7F6E\u5185\u306E\u4EFB\u610F\u306E\u4F4D\u7F6E\u306B\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068
FR-Designer_Add_all=\u3059\u3079\u3066\u8FFD\u52A0
-FR-Designer_Language_Change_Successful=
-FR-Designer_Template_Web_Attributes=
+FR-Designer_Language_Change_Successful=\u65B0\u3057\u3044\u8A00\u8A9E\u306F\u518D\u8D77\u52D5\u5F8C\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002
+FR-Designer_Template_Web_Attributes=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30A6\u30A7\u30D6\u30D7\u30ED\u30D1\u30C6\u30A3
FR-Designer_Basic=\u57FA\u672C
FR-Designer_Printers(Server)=\u30D7\u30EA\u30F3\u30BF\u30FC(\u30B5\u30FC\u30D0)
FR-Designer_Pagination_Setting=\u30DA\u30FC\u30B8\u5225\u30D7\u30EC\u30D3\u30E5\u30FC\u8A2D\u5B9A
-FR-Designer_Write_Setting=\u5831\u544A\u30DA\u30FC\u30B8\u8A2D\u5B9A
+FR-Designer_Write_Setting=\u66F8\u304D\u8FBC\u307F\u30DA\u30FC\u30B8\u8A2D\u5B9A
FR-Designer_Data_Analysis_Settings=\u30C7\u30FC\u30BF\u5206\u6790\u8A2D\u5B9A
FR-Designer_Browser_Background=\u30D6\u30E9\u30A6\u30B6\u80CC\u666F
FR-Designer_Import_Css=Css\u5F15\u7528
FR-Designer_Import_JavaScript=JavaScript\u5F15\u7528
FR-Designer-Datasource-Param_DES= "${abc}"\u3092\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3068\u3057\u3066\u5165\u529B\u3067\u304D\u307E\u3059\u3002\u3053\u3053\u3067abc\u306F\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3002abc\u306F\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u306E\u540D\u524D\u3067\u3059\u3002\u4F8B\u3048\u3070
select * from table where id\=${abc}\u3002
select * from table where id\='${abc}'\u3002(\u3082\u3057id\u306F\u6587\u5B57\u5217\u306A\u3089)\uFFFD
FR-Designer-DS-Database_Query=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30AF\u30A8\u30EA\u30FC
-FR-Designer-LayerPageReport_PageQuery=\u30DA\u30FC\u30B8\u5225\u30AF\u30A8\u30EA
-FR-Designer-LayerPageReport_Define_PageQuerySQL=\u5B9A\u7FA9\u30DA\u30FC\u30B8\u5225\u30AF\u30A8\u30EAsql
+FR-Designer-LayerPageReport_PageQuery=\u6539\u30DA\u30FC\u30B8\u691C\u7D22
+FR-Designer-LayerPageReport_Define_PageQuerySQL=\u6539\u30DA\u30FC\u30B8\u691C\u7D22sql\u3092\u66F8\u304F
FR-Designer_Is_Share_DBTableData=\u5171\u6709\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8
-FR-Designer_Event=
-FR-Designer_Properties=
-FR-Designer_Permissions_Edition=\u6A29\u9650\u7DE8\u96C6
-FR-Designer_Export_Excel_Page=\u6539\u30DA\u30FC\u30B8\u51FA\u529B
-FR-Designer_Export_Excel_Simple=\u305D\u306E\u307E\u307E\u51FA\u529B
-FR-Designer_Export_Excel_PageToSheet=\u6539\u30DA\u30FC\u30B8\uFF06\u30B7\u30FC\u30C8\u5206\u3051
-FR-Designer_Button_OK=\u78BA\u5B9A
+FR-Designer_Event=\u30A4\u30D9\u30F3\u30C8
+FR-Designer_Properties=\u30D7\u30ED\u30D1\u30C6\u30A3
+FR-Designer_Export_failed=\u5C0E\u51FA\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+FR-Designer_Exported_successfully=\u5C0E\u51FA\u6210\u529F
+FR-Designer_Exporting=\u5C0E\u51FA\u3057\u3066\u3044\u307E\u3059
+FR-Designer_Export-PDF=PDF\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8FR-Designer_Button_OK=FR-Designer_Button_OK=\u78BA\u5B9A
FR-Designer_Button_Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
FR-Designer_JavaScript=JavaScript
FR-Designer_JavaScript_Form_Submit=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u66F8\u304D\u8FBC\u307F
@@ -501,3 +500,36 @@ 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_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
diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
index 87d64367c..22f6dd541 100644
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
@@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=\uAE30\uD0C0\uD15C\uD50C\uB9BF\uB2EB\uAE30
FR-Designer_File=\uD30C\uC77C
FR-Designer_Filter_Conditions=\uD544\uD130\uC870\uAC74
FR-Designer_Finish-Modify-Share=\uC218\uC815\uC644\uB8CC\uBC0F\uACF5\uC720
-FR-Designer_Fit-App=App\uC790\uAE30\uC801\uC751
+FR-Designer_Fit=\uC790\uAE30\uC801\uC751
FR-Designer_Font-Family=\uAE00\uAF34\uBA85\uCE6D
FR-Designer_Font-Size=\uAE00\uAF34\uD06C\uAE30
FR-Designer_Forbid_Drag_into_Adapt_Pane=\uD574\uB2F9\uAC1D\uCCB4\uB294\uD3FC\uD14C\uC774\uBE14\uBC14\uB514\uB4DC\uB798\uADF8\uB97C\uD5C8\uC6A9\uD558\uC9C0\uC54A\uC2B5\uB2C8\uB2E4.
@@ -445,7 +445,6 @@ FR-Designer_WLayout-Absolute-ToolTips=\uC790\uC720\uC2DD\uB808\uC774\uC544\uC6C3
FR-Designer_Add_all=\uBAA8\uB450\uCD94\uAC00
FR-Designer_Reset=
FR-Designer_Language_Change_Successful=
-FR-Designer_Template_Web_Attributes=
FR-Designer_Basic=\uAE30\uBCF8
FR-Designer_Printers(Server)=\uD504\uB9B0\uD130(\uC11C\uBC84)
FR-Designer_Pagination_Setting=\uD398\uC774\uC9C0\uB098\uB204\uAE30\uBBF8\uB9AC\uBCF4\uAE30\uC124\uC815
@@ -460,11 +459,11 @@ 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_Properties=
-FR-Designer_Permissions_Edition=\uAD8C\uD55C\uD3B8\uC9D1
-FR-Designer_Export_Excel_Page=\uD398\uC774\uC9C0\uB098\uB204\uAE30\uC5B4\uB0B4\uBCF4\uB0B4\uAE30
-FR-Designer_Export_Excel_Simple=\uC6D0\uB798\uBAA8\uC2B5\uB0B4\uBCF4\uB0B4\uAE30
-FR-Designer_Export_Excel_PageToSheet=\uD398\uC774\uC9C0\uC640 Sheet\uB098\uB204\uC5B4\uB0B4\uBCF4\uB0B4\uAE30
+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\uC2DD
FR-Designer_Button_OK=\uD655\uC778
FR-Designer_Button_Cancel=\uCDE8\uC18C
FR-Designer_JavaScript=
@@ -498,4 +497,40 @@ FR-Designer_ClassName_panel=\uD074\uB798\uC2A4\uB124\uC784
FR-Designer_Description_panel=\uC124\uBA85
FR-Designer_Edit_panel=\uD3B8\uC9D1
FR-Designer_Property_panel=\uC18D\uC131
-FR-Designer_Select_panel=\uC120\uD0DD
\ No newline at end of file
+FR-Designer_Select_panel=\uC120\uD0DD
+<<<<<<< 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
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
index 343588778..b5a5106ce 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=\u5173\u95ED\u5176\u4ED6\u6A21\u677F
FR-Designer_File=\u6587\u4EF6
FR-Designer_Filter_Conditions=\u8FC7\u6EE4\u6761\u4EF6
FR-Designer_Finish-Modify-Share=\u5B8C\u6210\u4FEE\u6539\u5E76\u5206\u4EAB
-FR-Designer_Fit-App=App\u81EA\u9002\u5E94
+FR-Designer_Fit=\u81EA\u9002\u5E94
FR-Designer_Font-Family=\u5B57\u4F53\u540D\u79F0
FR-Designer_Font-Size=\u5B57\u4F53\u5927\u5C0F
FR-Designer_Forbid_Drag_into_Adapt_Pane=\u8BE5\u5BF9\u8C61\u4E0D\u5141\u8BB8\u62D6\u5165\u8868\u5355\u4E3B\u4F53
@@ -358,7 +358,6 @@ FR-Designer_KeyPoint=\u5173\u952E\u8282\u70B9
FR-Designer_loadedTreeModel=\u52A0\u8F7D\u5931\u8D25,\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5
FR-Designer-Failed_to_load_the_plugin=\u65E0\u6CD5\u52A0\u8F7D\u63D2\u4EF6\uFF0C\u8BF7\u66F4\u65B0\u63D2\u4EF6\uFF1A
FR-Designer-Plugin_Please_Update_Jar=\u8BF7\u66F4\u65B0Jar\u5305, \u63D2\u4EF6\u9700\u6C42\u6700\u4F4E\u7248\u672C
-FR-Designer-Invalid_Page_Number=\u65E0\u6548\u9875\u7801
FR-Designer_Get-CubeGetting=\u83B7\u53D6cube
FR-Designer_XMLA_Database=\u6570\u636E\u5E93
FR-Designer_XMLA_UserName=\u7528\u6237\u540D
@@ -491,10 +490,11 @@ FR-Designer-LayerPageReport_Define_PageQuerySQL=\u5B9A\u4E49\u5206\u9875\u67E5\u
FR-Designer_Is_Share_DBTableData=\u5171\u4EAB\u6570\u636E\u96C6
FR-Designer_Event=\u4E8B\u4EF6
FR-Designer_Properties=\u5C5E\u6027
-FR-Designer_Permissions_Edition=\u6743\u9650\u7F16\u8F91
-FR-Designer_Export_Excel_Page=\u5206\u9875\u5BFC\u51FA
-FR-Designer_Export_Excel_Simple=\u539F\u6837\u5BFC\u51FA
-FR-Designer_Export_Excel_PageToSheet=\u5206\u9875\u5206Sheet\u5BFC\u51FA
+FR-Designer_Export_failed=\u5BFC\u51FA\u5931\u8D25
+FR-Designer_Exported_successfully=\u5BFC\u51FA\u6210\u529F
+FR-Designer_Exporting=\u6B63\u5728\u5BFC\u51FA
+FR-Designer_Export-PDF=PDF\u683C\u5F0F
+FR-Designer_Properties_Mobile=\u624B\u673A\u5C5E\u6027
FR-Designer_Button_OK=\u786E\u5B9A
FR-Designer_Button_Cancel=\u53D6\u6D88
FR-Designer_JavaScript=JavaScript\u811A\u672C
@@ -529,3 +529,37 @@ 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_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
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
index 5d1145a2f..369939567 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@@ -100,7 +100,7 @@ FR-Designer_FS_Close_Other_Templates=\u95DC\u9589\u5176\u4ED6\u7BC4\u672C
FR-Designer_File=\u6A94\u6848
FR-Designer_Filter_Conditions=\u904E\u6FFE\u689D\u4EF6
FR-Designer_Finish-Modify-Share=\u5B8C\u6210\u4FEE\u6539\u4E26\u5206\u4EAB
-FR-Designer_Fit-App=App\u81EA\u9069\u61C9
+FR-Designer_Fit=\u81EA\u9069\u61C9
FR-Designer_Font-Family=\u5B57\u9AD4\u540D\u7A31
FR-Designer_Font-Size=\u5B57\u9AD4\u5927\u5C0F
FR-Designer_Forbid_Drag_into_Adapt_Pane=\u8A72\u5C0D\u8C61\u4E0D\u5141\u8A31\u62D6\u5165\u8868\u55AE\u4E3B\u9AD4
@@ -357,7 +357,6 @@ FR-Designer_KeyPoint=\u95DC\u9375\u7BC0\u9EDE
FR-Designer_loadedTreeModel=\u52A0\u8F09\u5931\u6557,\u8ACB\u6AA2\u67E5\u5F8C\u91CD\u8A66
FR-Designer-Failed_to_load_the_plugin=\u7121\u6CD5\u52A0\u8F09\u63D2\u4EF6\uFF0C\u8ACB\u66F4\u65B0\u63D2\u4EF6\uFF1A
FR-Designer-Plugin_Please_Update_Jar=\u8ACB\u66F4\u65B0Jar\u5305, \u63D2\u4EF6\u9700\u6C42\u6700\u4F4E\u7248\u672C
-FR-Designer-Invalid_Page_Number=\u7121\u6548\u9801\u78BC
FR-Designer_Get-CubeGetting=\u7372\u53D6cube
FR-Designer_XMLA_Database=\u8CC7\u6599\u5EAB
FR-Designer_XMLA_UserName=\u5E33\u865F
@@ -452,12 +451,12 @@ FR-Designer-QQLogin-Determine=\u78BA\u5B9A
FR-Designer-QQLogin-Cancel=\u53D6\u6D88
FR-Designer-Reuse_Manager=\u7D44\u4EF6\u7BA1\u7406
FR-Designer_TableData-Default-Para=\u6578\u64DA\u96C6\u9ED8\u8A8D\u53C3\u6578
-FR-Designer_Layout_Block_Absolute=
-FR-Designer_Layout_Block_Tab=
-FR-Designer_Layout_Block_Blank=
-FR-Designer_Attr_Layout=
-FR-Designer_Attr_Layout_Type=
-FR-Designer_Attr_Bidirectional_Adaptive=
+FR-Designer_Layout_Block_Absolute=\u7D55\u5C0D\u756B\u5E03\u584A
+FR-Designer_Layout_Block_Tab=Tab\u584A
+FR-Designer_Layout_Block_Blank=\u7A7A\u767D\u584A
+FR-Designer_Attr_Layout=\u4F48\u5C40
+FR-Designer_Attr_Layout_Type=\u4F48\u5C40\u65B9\u5F0F
+FR-Designer_Attr_Bidirectional_Adaptive=\u96D9\u5411\u81EA\u9069\u61C9
FR-Designer_Mobile-Refresh=\u5237\u65B0
FR-Designer_Mobile-ToolBar=\u5DE5\u5177\u6B04
FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5167\u4EFB\u610F\u4F4D\u7F6E\u65B0\u589E\u63A7\u5236\u9805
@@ -479,41 +478,76 @@ FR-Designer-LayerPageReport_Define_PageQuerySQL=\u5B9A\u7FA9\u5206\u9801\u67E5\u
FR-Designer_Is_Share_DBTableData=\u662F\u5426\u5171\u4EAB\u8CC7\u6599\u96C6
FR-Designer_Properties=\u5C6C\u6027
FR-Designer_Event=\u4E8B\u4EF6
-FR-Designer_Permissions_Edition=\u6B0A\u9650\u7DE8\u8F2F
-FR-Designer_Export_Excel_Page=\u5206\u9801\u532F\u51FA
-FR-Designer_Export_Excel_Simple=\u539F\u6A23\u532F\u51FA
-FR-Designer_Export_Excel_PageToSheet=\u5206\u9801\u5206Sheet\u532F\u51FA
+FR-Designer_Export_failed=\u532F\u51FA\u5931\u6557
+FR-Designer_Exported_successfully=\u532F\u51FA\u6210\u529F
+FR-Designer_Exporting=\u6B63\u5728\u532F\u51FA...
+FR-Designer_Export-PDF=PDF\u683C\u5F0F
+FR-Designer_Properties_Mobile=\u624B\u6A5F\u5C6C\u6027
FR-Designer_Button_OK=\u78BA\u5B9A
FR-Designer_Button_Cancel=\u53D6\u6D88
-FR-Designer_JavaScript=
-FR-Designer_JavaScript_Form_Submit=
-FR-Designer_JavaScript_Commit_to_Database=
-FR-Designer_JavaScript_Custom=
-FR-Designer_RWA_Submit=
-FR-Designer_Event_Name=
-FR-Designer_Event_Type=
-FR-Designer_Event_Name_Type=
-FR-Designer_JavaScript_Set=
-FR-Designer_Attribute=
-FR-Designer_Form_Editing_Listeners=
-FR-Designer_Form_Basic_Properties=
-FR-Designer_DS_Dictionary=
-FR-Designer_Create_Tree=
-FR-Designer_Set_Callback_Function=
-FR-Designer_ConfirmDialog_Content=
-FR-Designer_ConfirmDialog_Title=
+FR-Designer_JavaScript=JavaScript\u8173\u672C
+FR-Designer_JavaScript_Form_Submit=\u8868\u55AE\u63D0\u4EA4
+FR-Designer_JavaScript_Commit_to_Database=\u63D0\u4EA4\u5165\u5EAB
+FR-Designer_JavaScript_Custom=\u81EA\u5B9A\u7FA9
+FR-Designer_RWA_Submit=\u63D0\u4EA4
+FR-Designer_Event_Name=\u4E8B\u4EF6\u540D
+FR-Designer_Event_Type=\u4E8B\u4EF6\u985E\u578B
+FR-Designer_Event_Name_Type=\u4E8B\u4EF6\u540D\u5B57\u548C\u985E\u578B
+FR-Designer_JavaScript_Set=JS\u8A2D\u7F6E
+FR-Designer_Attribute=\u5C6C\u6027
+FR-Designer_Form_Editing_Listeners=\u4E8B\u4EF6\u7DE8\u8F2F
+FR-Designer_Form_Basic_Properties=\u57FA\u672C\u5C6C\u6027
+FR-Designer_DS_Dictionary=\u6578\u64DA\u5B57\u5178
+FR-Designer_Create_Tree=\u69CB\u5EFA\u6A39
+FR-Designer_Set_Callback_Function=\u8A2D\u7F6E\u56DE\u8ABF\u51FD\u6578
+FR-Designer_ConfirmDialog_Content=\u662F\u5426\u78BA\u5B9A\u522A\u9664TAB\u63A7\u4EF6
+FR-Designer_ConfirmDialog_Title=FineReport 8.0
FR-Designer_FormulaPane_Tips=\u63D0\u793A\:\u60A8\u53EF\u4EE5\u901A\u904E\u8F38\u5165B1\u4F86\u5BEB\u5165\u7B2C\u4E00\u5217\u7B2C\u4E8C\u6B04\u7684\u8CC7\u6599\u3002
FR-Designer_FormulaPane_Variables=\u8B8A\u91CF
FR-Designer_FormulaPane_Formula_Description=\u516C\u5F0F\u8AAA\u660E
FR-Designer_FormulaPane_Function_Detail=\u51FD\u6578\u660E\u7D30
FR-Designer_FormulaPane_Search=\u641C\u7D22
-FR-Designer_Tab_carousel=
-FR-Designer_setCarousel=
-FR-Designer_carouselInterval=
+FR-Designer_Tab_carousel=Tab\u8F2A\u64AD
+FR-Designer_setCarousel=\u958B\u555F\u8F2A\u64AD
+FR-Designer_carouselInterval=\u8F2A\u64AD\u9593\u9694
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_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
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java
index fa9489794..b2928d3a8 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java
@@ -160,7 +160,7 @@ public class StockPlotTableDataContentPane extends AbstractTableDataContentPane
openLabel.setText(stockLabel.getOpenLabel());
highLabel.setText(stockLabel.getHighLabel());
lowLabel.setText(stockLabel.getLowLabel());
- closeLabel.setText(stockLabel.getLowLabel());
+ closeLabel.setText(stockLabel.getCloseLabel());
combineCustomEditValue(axisBox, stock.getCateTime());
combineCustomEditValue(volumeBox, stock.getVolumnString());
diff --git a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java
index b290bcccf..eb4b31154 100644
--- a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java
+++ b/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,