From 07a94e3a24641162c20cd125a64ba4265050d011 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Mon, 26 Oct 2020 17:18:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?CHART-15902=20=E5=88=86=E7=B1=BB=E8=BD=B4?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/chart.properties | 1 + .../src/main/resources/com/fr/design/i18n/chart_en.properties | 1 + .../src/main/resources/com/fr/design/i18n/chart_ja_JP.properties | 1 + .../src/main/resources/com/fr/design/i18n/chart_ko_KR.properties | 1 + .../src/main/resources/com/fr/design/i18n/chart_zh.properties | 1 + .../src/main/resources/com/fr/design/i18n/chart_zh_TW.properties | 1 + 6 files changed, 6 insertions(+) diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties index 0018313..08715f8 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties @@ -286,6 +286,7 @@ Fine-Design_Chart_Label_Include= Fine-Design_Chart_Label_Interval= Fine-Design_Chart_Label_Layout= Fine-Design_Chart_Label_OverlapAbbreviate= +Fine-Design_Chart_Label_OverlapMulti_Line= Fine-Design_Chart_Label_OverlapAdjust= Fine-Design_Chart_Label_OverlapHide= Fine-Design_Chart_Label_OverlapInterval= diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties index 8ec28cf..77875e1 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties @@ -286,6 +286,7 @@ Fine-Design_Chart_Label_Include=Label Include Fine-Design_Chart_Label_Interval=Interval Fine-Design_Chart_Label_Layout=Label Layout Fine-Design_Chart_Label_OverlapAbbreviate=Display Abbreviation +Fine-Design_Chart_Label_OverlapMulti_Line=Display Multi Line Fine-Design_Chart_Label_OverlapAdjust=Auto Adjustment Fine-Design_Chart_Label_OverlapHide=Hide Overlapped Labels Fine-Design_Chart_Label_OverlapInterval=Interval Display diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties index 13ca5e3..360c0f1 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties @@ -286,6 +286,7 @@ Fine-Design_Chart_Label_Include=\u30E9\u30D9\u30EB\u306B\u542B\u307E\u308C\u308B Fine-Design_Chart_Label_Interval=\u30E9\u30D9\u30EB\u9593\u9694 Fine-Design_Chart_Label_Layout=\u30E9\u30D9\u30EB\u4F4D\u7F6E Fine-Design_Chart_Label_OverlapAbbreviate=\u7701\u7565\u8868\u73FE +Fine-Design_Chart_Label_OverlapMulti_Line=\u30E9\u30C3\u30D7\u30C7\u30A3\u30B9\u30D7\u30EC\u30A4 Fine-Design_Chart_Label_OverlapAdjust=\u4F4D\u7F6E\u3092\u81EA\u52D5\u8ABF\u6574 Fine-Design_Chart_Label_OverlapHide=\u91CD\u8907\u30E9\u30D9\u30EB\u96A0\u3059 Fine-Design_Chart_Label_OverlapInterval=\u30A4\u30F3\u30BF\u30FC\u30D0\u30EB\u8868\u793A diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties index ada1fb1..04b886d 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties @@ -286,6 +286,7 @@ Fine-Design_Chart_Label_Include=\uB77C\uBCA8 \uD3EC\uD568 Fine-Design_Chart_Label_Interval=\uB77C\uBCA8 \uAC04\uACA9 Fine-Design_Chart_Label_Layout=\uB77C\uBCA8 \uC704\uCE58 Fine-Design_Chart_Label_OverlapAbbreviate=\uC0DD\uC57D \uD45C\uC2DC +Fine-Design_Chart_Label_OverlapMulti_Line=\uB514\uC2A4\uD50C\uB808\uC774 \uB7A9 Fine-Design_Chart_Label_OverlapAdjust=\uC704\uCE58 \uC790\uB3D9 \uC870\uC815 Fine-Design_Chart_Label_OverlapHide=\uC911\uBCF5 \uB77C\uBCA8 \uC228\uAE30\uAE30 Fine-Design_Chart_Label_OverlapInterval=\uAC04\uACA9 \uD45C\uC2DC diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties index 7a03cb6..0265e79 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties @@ -286,6 +286,7 @@ Fine-Design_Chart_Label_Include=\u6807\u7B7E\u5305\u62EC Fine-Design_Chart_Label_Interval=\u6807\u7B7E\u95F4\u9694 Fine-Design_Chart_Label_Layout=\u6807\u7B7E\u4F4D\u7F6E Fine-Design_Chart_Label_OverlapAbbreviate=\u7F29\u7565\u663E\u793A +Fine-Design_Chart_Label_OverlapMulti_Line=\u6362\u884C\u663E\u793A Fine-Design_Chart_Label_OverlapAdjust=\u81EA\u52A8\u8C03\u6574\u4F4D\u7F6E Fine-Design_Chart_Label_OverlapHide=\u9690\u85CF\u91CD\u53E0\u6807\u7B7E Fine-Design_Chart_Label_OverlapInterval=\u95F4\u9694\u663E\u793A diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties index edff558..f610bd6 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties @@ -286,6 +286,7 @@ Fine-Design_Chart_Label_Include=\u6A19\u7C64\u5305\u62EC Fine-Design_Chart_Label_Interval=\u6A19\u7C64\u9593\u9694 Fine-Design_Chart_Label_Layout=\u6A19\u7C64\u4F4D\u7F6E Fine-Design_Chart_Label_OverlapAbbreviate=\u7E2E\u7565\u986F\u793A +Fine-Design_Chart_Label_OverlapMulti_Line=\u63DB\u884C\u986F\u793A Fine-Design_Chart_Label_OverlapAdjust=\u81EA\u52D5\u8ABF\u6574\u4F4D\u7F6E Fine-Design_Chart_Label_OverlapHide=\u96B1\u85CF\u91CD\u758A\u6A19\u7C64 Fine-Design_Chart_Label_OverlapInterval=\u9593\u9694\u986F\u793A From 22f2a2182fa6c76536ab8394002145c1c288386d Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Tue, 27 Oct 2020 15:37:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-26209=20chore:=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96crm=E6=A8=A1=E6=9D=BF->=E4=BB=A3=E7=A0=81=E5=BA=93?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/com/fr/design/i18n/main_en.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties index 1d6db54..4c4b29c 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en.properties @@ -140,8 +140,8 @@ Fine-Design_Basic_Base_sure_remove_item=Are you sure to delete the selected item Fine-Design_Basic_Behind=Behind Fine-Design_Basic_BindColumn_This_Condition_Has_Been_Existed=The Condition Already Exists Fine-Design_Basic_Black_Font=Black Font -Fine-Design_Basic_Build_Tree_Accord_Marked_Filed_Length=Build tree according to tag field's length from selected dataset. -Fine-Design_Basic_Build_Tree_Accord_Parent_Marked_Filed=Build tree according to the parent tag field of the selected dataset. +Fine-Design_Basic_Build_Tree_Accord_Marked_Filed_Length=Build tree according to identity field's length from selected dataset. +Fine-Design_Basic_Build_Tree_Accord_Parent_Marked_Filed=Build tree according to the parent field of the selected dataset. Fine-Design_Basic_Build_Way=Build Way Fine-Design_Basic_Button_Cancel=Cancel Fine-Design_Basic_Button_Icon=Button Icon @@ -648,7 +648,7 @@ Fine-Design_Basic_Open-New_Form_Tip=The form is created by the designer before 7 Fine-Design_Basic_Open-New_Form_Tipu200Bu200B= Fine-Design_Basic_Open_Debug_Window=Open Debug Window Fine-Design_Basic_Oracle_All_Tables=All Tables -Fine-Design_Basic_Original_Marked_Filed=Original Tag Field +Fine-Design_Basic_Original_Marked_Filed=Original Identity Field Fine-Design_Basic_Out_Border=OutBorder Fine-Design_Basic_Page_Setup_Horizontal=Horizontal Fine-Design_Basic_Page_Setup_Horizou200Bu200Bntal= @@ -669,7 +669,7 @@ Fine-Design_Basic_Parameter_Source_Type_Tabledata=Dataset Parameters Fine-Design_Basic_Parameter_String=String Fine-Design_Basic_Parameter_UI_Display=Display Parameter Pane Fine-Design_Basic_Parameters=Parameters -Fine-Design_Basic_Parent_Marked_Field=Parent Tag Field +Fine-Design_Basic_Parent_Marked_Field=Parent Identity Field Fine-Design_Basic_Password=Password Fine-Design_Basic_Performance_First=High Performance Fine-Design_Basic_Phone=Phone @@ -1516,7 +1516,7 @@ Fine-Design_Form_StyleAlignment_Center=Center Fine-Design_Form_StyleAlignment_Left=Left Fine-Design_Form_StyleAlignment_Right=Right Fine-Design_Form_StyleAlignment_Wrap_Text=Wrap Text -Fine-Design_Form_Support_Tag=Displayed as Label +Fine-Design_Form_Support_Tag=Displayed as Tab Fine-Design_Form_Tab_Display_Position=Display Position Fine-Design_Form_Tab_Style_Template=Style Template Fine-Design_Form_Tip_Chart_Adaptivity_Unavailable=Under the reserved layout state, the chart does not support the setting of self-adaptive