From 937f8ffef10de163d27fe06c55dc16ac9c189bb3 Mon Sep 17 00:00:00 2001 From: hades Date: Mon, 27 Apr 2020 15:52:16 +0800 Subject: [PATCH 01/25] =?UTF-8?q?REPORT-26837=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_en_US.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_ja_JP.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_ko_KR.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_zh_CN.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_zh_TW.properties | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties index c35c1f6..88bf187 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties @@ -2422,4 +2422,5 @@ Fine-Design_Update_Info_Information=prompt message Fine-Design_Form_Functional_When_Unactivated=Widget is selectable Fine-Designer_PC_Fit_Attr=Browser adaptive attr Fine-Designer_PC_Element_Case_Fit_Attr=Browser ElementCase adaptive attr -Fine-Design_Report_Mobile_Attr_Allow_Zoom=Allow double click/two finger zoom \ No newline at end of file +Fine-Design_Report_Mobile_Attr_Allow_Zoom=Allow double click/two finger zoom +Fine-Design_Basic_DataSet_Rename_Warning=Dataset name is illegal, please do not name it as {}! \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties index 411c5af..2ec74df 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties @@ -2433,4 +2433,5 @@ Fine-Design_Update_Info_Information=Please save the existing work content, the u Fine-Designer_PC_Fit_Attr=PC Adaptive Attr Fine-Designer_PC_Element_Case_Fit_Attr=PC element adaptive attr Fine-Design_Form_Functional_When_Unactivated=Widget is selectable -Fine-Design_Report_Mobile_Attr_Allow_Zoom=Allow double-click/two-finger zoom \ No newline at end of file +Fine-Design_Report_Mobile_Attr_Allow_Zoom=Allow double-click/two-finger zoom +Fine-Design_Basic_DataSet_Rename_Warning=Dataset name is illegal, please do not name it as {}! \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties index 8630bd2..5d2a257 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties @@ -2419,4 +2419,5 @@ Fine-Design_Basic_Remote_Design_Choose_Custom=\u30C7\u30B6\u30A4\u30F3\u5F79\u52 Fine-Design_Update_Info_Information=\u65E2\u5B58\u306E\u4F5C\u696D\u5185\u5BB9\u3092\u4FDD\u5B58\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u66F4\u65B0\u3059\u308B\u304B\u3069\u3046\u304B\u306B\u304B\u304B\u308F\u3089\u305A\u3001\u66F4\u65B0\u304C\u5B8C\u4E86\u3059\u308B\u3068\u30C7\u30B6\u30A4\u30CA\u30FC\u304C\u81EA\u52D5\u7684\u306B\u518D\u8D77\u52D5\u3057\u307E\u3059 Fine-Design_Form_Functional_When_Unactivated=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8 Fine-Designer_PC_Element_Case_Fit_Attr=PC\u5074\u306E\u30EC\u30DD\u30FC\u30C8\u30D6\u30ED\u30C3\u30AF\u306E\u9069\u5FDC\u30D7\u30ED\u30D1\u30C6\u30A3 -Fine-Design_Report_Mobile_Attr_Allow_Zoom=\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF/ 2\u672C\u6307\u30BA\u30FC\u30E0\u3092\u8A31\u53EF \ No newline at end of file +Fine-Design_Report_Mobile_Attr_Allow_Zoom=\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF/ 2\u672C\u6307\u30BA\u30FC\u30E0\u3092\u8A31\u53EF +Fine-Design_Basic_DataSet_Rename_Warning= \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties index 6638302..ac81de2 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties @@ -2411,4 +2411,5 @@ Fine-Design_Update_Info_Information= Fine-Design_Form_Functional_When_Unactivated= Fine-Designer_PC_Fit_Attr= Fine-Designer_PC_Element_Case_Fit_Attr= -Fine-Design_Report_Mobile_Attr_Allow_Zoom=\uC5F0\uC18D \uD074\uB9AD/\uC190\uAC00\uB77D \uC90C \uD5C8\uC6A9 \ No newline at end of file +Fine-Design_Report_Mobile_Attr_Allow_Zoom=\uC5F0\uC18D \uD074\uB9AD/\uC190\uAC00\uB77D \uC90C \uD5C8\uC6A9 +Fine-Design_Basic_DataSet_Rename_Warning= \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties index c984a16..2de92b6 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties @@ -2421,4 +2421,5 @@ Fine-Design_Update_Info_Information=\u8BF7\u4FDD\u5B58\u73B0\u6709\u5DE5\u4F5C\u Fine-Design_Form_Functional_When_Unactivated=\u7EC4\u4EF6\u53EF\u9009\u4E2D Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9002\u5E94\u5C5E\u6027 Fine-Designer_PC_Element_Case_Fit_Attr=PC\u7AEF\u62A5\u8868\u5757\u81EA\u9002\u5E94\u5C5E\u6027 -Fine-Design_Report_Mobile_Attr_Allow_Zoom=\u5141\u8BB8\u53CC\u51FB/\u53CC\u6307\u7F29\u653E \ No newline at end of file +Fine-Design_Report_Mobile_Attr_Allow_Zoom=\u5141\u8BB8\u53CC\u51FB/\u53CC\u6307\u7F29\u653E +Fine-Design_Basic_DataSet_Rename_Warning=\u6570\u636E\u96C6\u540D\u79F0\u4E0D\u5408\u6CD5\uFF0C\u8BF7\u52FF\u547D\u540D\u4E3A{}\uFF01 \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties index be24136..8d1cc29 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties @@ -2440,4 +2440,5 @@ Fine-Design_Update_Info_Information=\u8ACB\u4FDD\u5B58\u73FE\u6709\u5DE5\u4F5C\u Fine-Design_Form_Functional_When_Unactivated=\u7D44\u4EF6\u53EF\u9078\u4E2D Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9069\u61C9\u5C6C\u6027 Fine-Designer_PC_Element_Case_Fit_Attr=PC\u7AEF\u5831\u8868\u584A\u81EA\u9069\u61C9\u5C6C\u6027 -Fine-Design_Report_Mobile_Attr_Allow_Zoom=\u5141\u8A31\u96D9\u64CA/\u96D9\u6307\u7E2E\u653E \ No newline at end of file +Fine-Design_Report_Mobile_Attr_Allow_Zoom=\u5141\u8A31\u96D9\u64CA/\u96D9\u6307\u7E2E\u653E +Fine-Design_Basic_DataSet_Rename_Warning=\u6578\u64DA\u96C6\u540D\u7A31\u4E0D\u5408\u6CD5\uFF0C\u8ACB\u52FF\u547D\u540D\u70BA{}\uFF01 \ No newline at end of file From 3f3d82d818cbd2a1abce408d9d9d1089edc9f983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Fri, 17 Jul 2020 13:42:41 +0800 Subject: [PATCH 02/25] =?UTF-8?q?CHART-14663=20=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/chart.properties | 3 ++- .../src/main/resources/com/fr/design/i18n/chart_en.properties | 3 ++- .../main/resources/com/fr/design/i18n/chart_ja_JP.properties | 3 ++- .../main/resources/com/fr/design/i18n/chart_ko_KR.properties | 3 ++- .../src/main/resources/com/fr/design/i18n/chart_zh.properties | 3 ++- .../main/resources/com/fr/design/i18n/chart_zh_TW.properties | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) 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 5736318..ebfa970 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 @@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar= Fine-Engine_Chart_New_Scatter= Fine-Engine_Chart_New_Structure= Fine-Engine_Chart_New_TreeMap= -Fine-Engine_Chart_WordCloud_New= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New= +Fine-Design_Chart_Match_Default_Color_Scheme= \ No newline at end of file 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 59b9c38..870d486 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 @@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar=Radar Chart Fine-Engine_Chart_New_Scatter=Scatter Plot Fine-Engine_Chart_New_Structure=Structure Chart Fine-Engine_Chart_New_TreeMap=Rctangular Tree Map -Fine-Engine_Chart_WordCloud_New=Word Cloud \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=Word Cloud +Fine-Design_Chart_Match_Default_Color_Scheme= \ No newline at end of file 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 15efade..0f5e168 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 @@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar=\u30EC\u30FC\u30C0\u30FC\u30C1\u30E3\u30FC(\u65B0\u6 Fine-Engine_Chart_New_Scatter=\u6563\u5E03\u56F3(\u65B0\u6A5F\u80FD) Fine-Engine_Chart_New_Structure=\u6A39\u5F62\u56F3(\u65B0\u6A5F\u80FD) Fine-Engine_Chart_New_TreeMap=\u30C4\u30EA\u30FC\u30DE\u30C3\u30D7(\u65B0\u6A5F\u80FD) -Fine-Engine_Chart_WordCloud_New=\u30EF\u30FC\u30C9\u30AF\u30E9\u30A6\u30C9(\u65B0\u6A5F\u80FD) \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u30EF\u30FC\u30C9\u30AF\u30E9\u30A6\u30C9(\u65B0\u6A5F\u80FD) +Fine-Design_Chart_Match_Default_Color_Scheme= \ No newline at end of file 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 a7a49a7..404af9f 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 @@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar=\uB808\uC774\uB354 Fine-Engine_Chart_New_Scatter=\uC0B0\uCC45 \uC880 \uADF8\uB798\uD504 Fine-Engine_Chart_New_Structure=\uAD6C\uC870\uB3C4(new) Fine-Engine_Chart_New_TreeMap=\uC0AC\uAC01\uD615 \uB098\uBB34 \uADF8\uB9BC -Fine-Engine_Chart_WordCloud_New=Word Cloud \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=Word Cloud +Fine-Design_Chart_Match_Default_Color_Scheme= \ No newline at end of file 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 d2657ad..993477c 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 @@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar=\u96F7\u8FBE\u56FE Fine-Engine_Chart_New_Scatter=\u6563\u70B9\u56FE Fine-Engine_Chart_New_Structure=\u6846\u67B6\u56FE Fine-Engine_Chart_New_TreeMap=\u77E9\u5F62\u6811\u56FE -Fine-Engine_Chart_WordCloud_New=\u8BCD\u4E91 \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u8BCD\u4E91 +Fine-Design_Chart_Match_Default_Color_Scheme=\u9ED8\u8BA4\u914D\u8272\u65B9\u6848 \ No newline at end of file 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 1ee09d1..da3e054 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 @@ -699,4 +699,5 @@ Fine-Engine_Chart_New_Radar=\u96F7\u9054\u5716 Fine-Engine_Chart_New_Scatter=\u6563\u9EDE\u5716 Fine-Engine_Chart_New_Structure=\u6846\u67B6\u5716 Fine-Engine_Chart_New_TreeMap=\u77E9\u5F62\u6A39\u5716 -Fine-Engine_Chart_WordCloud_New=\u6587\u5B57\u96F2 \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u6587\u5B57\u96F2 +Fine-Design_Chart_Match_Default_Color_Scheme= \ No newline at end of file From dd694b7f3056843076856f951066ca7861047dd0 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Sat, 18 Jul 2020 13:35:18 +0800 Subject: [PATCH 03/25] =?UTF-8?q?CHART-11549=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E7=AE=B1=E5=9E=8B=E5=9B=BE=E7=95=8C=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 ebfa970..b490d42 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 @@ -404,6 +404,7 @@ Fine-Design_Chart_New_Area= Fine-Design_Chart_New_Bar= Fine-Design_Chart_New_Bubble= Fine-Design_Chart_New_Column= +Fine-Design_Chart_New_Box= Fine-Design_Chart_New_Column_Area= Fine-Design_Chart_New_Column_Line= Fine-Design_Chart_New_Combine= 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 870d486..01cb0b3 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 @@ -404,6 +404,7 @@ Fine-Design_Chart_New_Area=Area Chart Fine-Design_Chart_New_Bar=Bar Chart Fine-Design_Chart_New_Bubble=Bubble Chart Fine-Design_Chart_New_Column=Column Chart +Fine-Design_Chart_New_Box=Box chart Fine-Design_Chart_New_Column_Area=Column-Area Chart Fine-Design_Chart_New_Column_Line=Column-Line Chart Fine-Design_Chart_New_Combine=Combination Chart 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 0f5e168..33815ad 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 @@ -404,6 +404,7 @@ Fine-Design_Chart_New_Area=\u9762\u30B0\u30E9\u30D5(\u65B0\u6A5F\u80FD) Fine-Design_Chart_New_Bar=\u6A2A\u68D2\u30B0\u30E9\u30D5(\u65B0\u6A5F\u80FD) Fine-Design_Chart_New_Bubble=\u30D0\u30D6\u30EB\u30C1\u30E3\u30FC\u30C8(\u65B0\u6A5F\u80FD) Fine-Design_Chart_New_Column=\u7E26\u68D2\u30B0\u30E9\u30D5(\u65B0\u6A5F\u80FD) +Fine-Design_Chart_New_Box=\u30DC\u30C3\u30AF\u30B9\u30D7\u30ED\u30C3\u30C8 Fine-Design_Chart_New_Column_Area=\u7E26\u68D2\u30B0\u30E9\u30D5-\u9762\u30B0\u30E9\u30D5 Fine-Design_Chart_New_Column_Line=\u7E26\u68D2\u30B0\u30E9\u30D5-\u6298\u308C\u7DDA\u30B0\u30E9\u30D5 Fine-Design_Chart_New_Combine=\u7D44\u307F\u5408\u308F\u305B\u30B0\u30E9\u30D5(\u65B0\u6A5F\u80FD) 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 404af9f..e83411c 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 @@ -404,6 +404,7 @@ Fine-Design_Chart_New_Area=\uC9C0\uC5ED \uCC28\uD2B8 Fine-Design_Chart_New_Bar=\uBC14 \uCC28\uD2B8 Fine-Design_Chart_New_Bubble=\uBC84\uBE14 \uCC28\uD2B8 Fine-Design_Chart_New_Column=\uB9C9\uB300 \uCC28\uD2B8 +Fine-Design_Chart_New_Box=\uBC15\uC2A4 \uD50C\uB86F Fine-Design_Chart_New_Column_Area=\uB9C9\uB300 - \uC601\uC5ED \uCC28\uD2B8 Fine-Design_Chart_New_Column_Line=\uB9C9\uB300 - \uB77C\uC778 \uCC28\uD2B8 Fine-Design_Chart_New_Combine=\uCF65\uBC14\uC778 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 993477c..b479f13 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 @@ -404,6 +404,7 @@ Fine-Design_Chart_New_Area=\u9762\u79EF\u56FE Fine-Design_Chart_New_Bar=\u6761\u5F62\u56FE Fine-Design_Chart_New_Bubble=\u6C14\u6CE1\u56FE Fine-Design_Chart_New_Column=\u67F1\u5F62\u56FE +Fine-Design_Chart_New_Box=\u7BB1\u578B\u56FE Fine-Design_Chart_New_Column_Area=\u67F1\u5F62\u56FE-\u9762\u79EF\u56FE Fine-Design_Chart_New_Column_Line=\u67F1\u5F62\u56FE-\u6298\u7EBF\u56FE Fine-Design_Chart_New_Combine=\u7EC4\u5408\u56FE 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 da3e054..b023208 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 @@ -404,6 +404,7 @@ Fine-Design_Chart_New_Area=\u9762\u7A4D\u5716 Fine-Design_Chart_New_Bar=\u689D\u5F62\u5716 Fine-Design_Chart_New_Bubble=\u6C23\u6CE1\u5716 Fine-Design_Chart_New_Column=\u67F1\u5F62\u5716 +Fine-Design_Chart_New_Box=\u7BB1\u578B\u5716 Fine-Design_Chart_New_Column_Area=\u67F1\u5F62\u5716-\u9762\u7A4D\u5716 Fine-Design_Chart_New_Column_Line=\u67F1\u5F62\u5716-\u6298\u7DDA\u5716 Fine-Design_Chart_New_Combine=\u7D44\u5408\u5716 From 043fe5c6c48a2331468ecca85a413834c9c8b8ee Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Sun, 19 Jul 2020 15:58:44 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E5=A1=AB=E5=85=85=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=95=B0=E6=8D=AE=E7=95=8C=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 | 3 +++ .../src/main/resources/com/fr/design/i18n/chart_en.properties | 3 +++ .../main/resources/com/fr/design/i18n/chart_ja_JP.properties | 3 +++ .../main/resources/com/fr/design/i18n/chart_ko_KR.properties | 3 +++ .../src/main/resources/com/fr/design/i18n/chart_zh.properties | 3 +++ .../main/resources/com/fr/design/i18n/chart_zh_TW.properties | 3 +++ 6 files changed, 18 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 b490d42..4acd64c 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 @@ -153,6 +153,7 @@ Fine-Design_Chart_Data_Function_Percent= Fine-Design_Chart_Data_Label_Inside= Fine-Design_Chart_Data_Label_OutSide= Fine-Design_Chart_Data_Max= +Fine-Design_Chart_Data_Median= Fine-Design_Chart_Data_Min= Fine-Design_Chart_Data_Not_Show_Cate= Fine-Design_Chart_Data_Not_Show_Series= @@ -517,6 +518,8 @@ Fine-Design_Chart_Series_Name_From= Fine-Design_Chart_Series_New_Line= Fine-Design_Chart_Series_Setting= Fine-Design_Chart_Series_Single_Data= +Fine-Design_Chart_Detailed_Data= +Fine-Design_Chart_Result_Data= Fine-Design_Chart_Series_Value= Fine-Design_Chart_Server_PreStyle= Fine-Design_Chart_Set_Data_Sheet= 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 01cb0b3..9a36736 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 @@ -153,6 +153,7 @@ Fine-Design_Chart_Data_Function_Percent=Proportion Fine-Design_Chart_Data_Label_Inside=Datalabel Inside Fine-Design_Chart_Data_Label_OutSide=Datalabel Outside Fine-Design_Chart_Data_Max=Maximum +Fine-Design_Chart_Data_Median=Median Fine-Design_Chart_Data_Min=Minimum Fine-Design_Chart_Data_Not_Show_Cate=No Display If Category Is Empty Fine-Design_Chart_Data_Not_Show_Series=No Display If Series Is Empty @@ -517,6 +518,8 @@ Fine-Design_Chart_Series_Name_From=Series Name From Fine-Design_Chart_Series_New_Line=Series New Line Fine-Design_Chart_Series_Setting=Series Setting Fine-Design_Chart_Series_Single_Data=Single Series Data +Fine-Design_Chart_Detailed_Data=Detailed data +Fine-Design_Chart_Result_Data=Result data Fine-Design_Chart_Series_Value=Value Fine-Design_Chart_Server_PreStyle=Predefined Chart Colors Fine-Design_Chart_Set_Data_Sheet=Set Data Table 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 33815ad..086541b 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 @@ -153,6 +153,7 @@ Fine-Design_Chart_Data_Function_Percent=\u5272\u5408 Fine-Design_Chart_Data_Label_Inside=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5185 Fine-Design_Chart_Data_Label_OutSide=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u5024 +Fine-Design_Chart_Data_Median=\u4E2D\u592E\u5024 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 @@ -517,6 +518,8 @@ Fine-Design_Chart_Series_Name_From=\u7CFB\u5217\u540D\u3092\u4F7F\u7528 Fine-Design_Chart_Series_New_Line=\u7CFB\u5217\u6539\u884C Fine-Design_Chart_Series_Setting=\u7CFB\u5217\u8A2D\u5B9A Fine-Design_Chart_Series_Single_Data=\u5358\u4E00\u7CFB\u5217\u30C7\u30FC\u30BF +Fine-Design_Chart_Detailed_Data=\u8A73\u7D30\u30C7\u30FC\u30BF +Fine-Design_Chart_Result_Data=\u7D50\u679C\u30C7\u30FC\u30BF Fine-Design_Chart_Series_Value=\u7CFB\u5217\u5024 Fine-Design_Chart_Server_PreStyle=\u30B0\u30E9\u30D5\u4E8B\u524D\u5B9A\u7FA9\u914D\u8272 Fine-Design_Chart_Set_Data_Sheet=\u30C7\u30FC\u30BF\u30C6\u30FC\u30D6\u30EB\u8A2D\u5B9A 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 e83411c..5bc47a2 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 @@ -153,6 +153,7 @@ Fine-Design_Chart_Data_Function_Percent=\uC810\uC720\uC728 Fine-Design_Chart_Data_Label_Inside=\uB77C\uBCA8 \uC548\uCABD Fine-Design_Chart_Data_Label_OutSide=\uB77C\uBCA8 \uBC14\uAE65\uCABD Fine-Design_Chart_Data_Max=\uCD5C\uB300\uAC12 +Fine-Design_Chart_Data_Median=\uC911\uC559\uAC12 Fine-Design_Chart_Data_Min=\uCD5C\uC18C\uAC12 Fine-Design_Chart_Data_Not_Show_Cate=\uCE74\uD14C\uACE0\uB9AC\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Not_Show_Series=\uC2DC\uB9AC\uC988\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C @@ -517,6 +518,8 @@ Fine-Design_Chart_Series_Name_From=\uC2DC\uB9AC\uC988 \uC774\uB984 \uC0AC\uC6A9 Fine-Design_Chart_Series_New_Line=\uC2DC\uB9AC\uC988 \uD589\uC804\uD658 Fine-Design_Chart_Series_Setting=\uC2DC\uB9AC\uC988 \uC124\uC815 Fine-Design_Chart_Series_Single_Data=\uC2F1\uAE00 \uC2DC\uB9AC\uC988 \uB370\uC774\uD130 +Fine-Design_Chart_Detailed_Data=\uC0C1\uC138 \uB370\uC774\uD130 +Fine-Design_Chart_Result_Data=\uACB0\uACFC \uB370\uC774\uD130 Fine-Design_Chart_Series_Value=\uAC12 Fine-Design_Chart_Server_PreStyle=\uCC28\uD2B8 \uC0AC\uC804\uC815\uC758\uCEEC\uB7EC Fine-Design_Chart_Set_Data_Sheet=\uB370\uC774\uD130 \uD14C\uC774\uBE14 \uC124\uC815 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 b479f13..2a04c5f 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 @@ -153,6 +153,7 @@ Fine-Design_Chart_Data_Function_Percent=\u5360\u6BD4 Fine-Design_Chart_Data_Label_Inside=\u6570\u636E\u6807\u7B7E\u5185 Fine-Design_Chart_Data_Label_OutSide=\u6570\u636E\u6807\u7B7E\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C +Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6570 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u503C Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u7C7B\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u5206\u7C7B Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u7CFB\u5217 @@ -517,6 +518,8 @@ Fine-Design_Chart_Series_Name_From=\u7CFB\u5217\u540D\u4F7F\u7528 Fine-Design_Chart_Series_New_Line=\u7CFB\u5217\u6362\u884C Fine-Design_Chart_Series_Setting=\u7CFB\u5217\u8BBE\u7F6E Fine-Design_Chart_Series_Single_Data=\u5355\u4E2A\u7CFB\u5217\u6570\u636E +Fine-Design_Chart_Detailed_Data=\u660E\u7EC6\u6570\u636E +Fine-Design_Chart_Result_Data=\u7ED3\u679C\u6570\u636E Fine-Design_Chart_Series_Value=\u503C Fine-Design_Chart_Server_PreStyle=\u56FE\u8868\u9884\u5B9A\u4E49\u914D\u8272 Fine-Design_Chart_Set_Data_Sheet=\u8BBE\u7F6E\u6570\u636E\u8868 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 b023208..29ccb0f 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 @@ -153,6 +153,7 @@ Fine-Design_Chart_Data_Function_Percent=\u4F54\u6BD4 Fine-Design_Chart_Data_Label_Inside=\u8CC7\u6599\u6A19\u7C64\u5167 Fine-Design_Chart_Data_Label_OutSide=\u8CC7\u6599\u6A19\u7C64\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C +Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6578 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u70BA\u7A7A\u6642\uFF0C\u4E0D\u986F\u793A\u8A72\u5206\u985E Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u70BA\u7A7A\u6642,\u4E0D\u986F\u793A\u8A72\u7CFB\u5217 @@ -517,6 +518,8 @@ Fine-Design_Chart_Series_Name_From=\u7CFB\u5217\u540D\u4F7F\u7528 Fine-Design_Chart_Series_New_Line=\u7CFB\u5217\u63DB\u5217 Fine-Design_Chart_Series_Setting=\u7CFB\u5217\u8A2D\u5B9A Fine-Design_Chart_Series_Single_Data=\u55AE\u500B\u7CFB\u5217\u8CC7\u6599 +Fine-Design_Chart_Detailed_Data=\u660E\u7D30\u6578\u64DA +Fine-Design_Chart_Result_Data=\u7D50\u679C\u6578\u64DA Fine-Design_Chart_Series_Value=\u503C Fine-Design_Chart_Server_PreStyle=\u5716\u8868\u9810\u5B9A\u7FA9\u914D\u8272 Fine-Design_Chart_Set_Data_Sheet=\u8A2D\u5B9A\u8CC7\u6599\u8868 From 4b41c8604b1f292924c3a0f7895dc4a674f6b812 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Mon, 20 Jul 2020 09:51:52 +0800 Subject: [PATCH 05/25] =?UTF-8?q?REPORT-26209=20=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 --- .../src/main/resources/com/fr/design/i18n/chart.properties | 4 ++-- .../src/main/resources/com/fr/design/i18n/chart_en.properties | 4 ++-- .../main/resources/com/fr/design/i18n/chart_ja_JP.properties | 4 ++-- .../main/resources/com/fr/design/i18n/chart_ko_KR.properties | 4 ++-- .../src/main/resources/com/fr/design/i18n/chart_zh.properties | 4 ++-- .../main/resources/com/fr/design/i18n/chart_zh_TW.properties | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) 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 ebfa970..d29257d 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 @@ -371,6 +371,7 @@ Fine-Design_Chart_Marker_Time= Fine-Design_Chart_Marker_Type= Fine-Design_Chart_Match_Color= Fine-Design_Chart_Match_Color_Scheme= +Fine-Design_Chart_Match_Default_Color_Scheme= Fine-Design_Chart_Match_To= Fine-Design_Chart_Math_Exponent= Fine-Design_Chart_Math_Linear= @@ -699,5 +700,4 @@ Fine-Engine_Chart_New_Radar= Fine-Engine_Chart_New_Scatter= Fine-Engine_Chart_New_Structure= Fine-Engine_Chart_New_TreeMap= -Fine-Engine_Chart_WordCloud_New= -Fine-Design_Chart_Match_Default_Color_Scheme= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New= \ No newline at end of file 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 870d486..1d5467d 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 @@ -371,6 +371,7 @@ Fine-Design_Chart_Marker_Time=Milestone Time Fine-Design_Chart_Marker_Type=Marker Type Fine-Design_Chart_Match_Color=Match Color Fine-Design_Chart_Match_Color_Scheme=Color Scheme +Fine-Design_Chart_Match_Default_Color_Scheme= Fine-Design_Chart_Match_To=Match to Fine-Design_Chart_Math_Exponent=Exponential Fitting Fine-Design_Chart_Math_Linear=Linear Fitting @@ -699,5 +700,4 @@ Fine-Engine_Chart_New_Radar=Radar Chart Fine-Engine_Chart_New_Scatter=Scatter Plot Fine-Engine_Chart_New_Structure=Structure Chart Fine-Engine_Chart_New_TreeMap=Rctangular Tree Map -Fine-Engine_Chart_WordCloud_New=Word Cloud -Fine-Design_Chart_Match_Default_Color_Scheme= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=Word Cloud \ No newline at end of file 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 0f5e168..0a1b25e 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 @@ -371,6 +371,7 @@ Fine-Design_Chart_Marker_Time=\u30DE\u30FC\u30AB\u30FC\u65E5\u6642 Fine-Design_Chart_Marker_Type=\u30DE\u30FC\u30AB\u30FC\u7A2E\u985E Fine-Design_Chart_Match_Color=\u914D\u8272 Fine-Design_Chart_Match_Color_Scheme=\u914D\u8272\u8A08\u753B +Fine-Design_Chart_Match_Default_Color_Scheme= Fine-Design_Chart_Match_To=\u30DE\u30C3\u30C1\u30F3\u30B0\u3000\u30C4\u30FC Fine-Design_Chart_Math_Exponent=\u6307\u6570\u8FD1\u4F3C Fine-Design_Chart_Math_Linear=\u7DDA\u578B\u8FD1\u4F3C @@ -699,5 +700,4 @@ Fine-Engine_Chart_New_Radar=\u30EC\u30FC\u30C0\u30FC\u30C1\u30E3\u30FC(\u65B0\u6 Fine-Engine_Chart_New_Scatter=\u6563\u5E03\u56F3(\u65B0\u6A5F\u80FD) Fine-Engine_Chart_New_Structure=\u6A39\u5F62\u56F3(\u65B0\u6A5F\u80FD) Fine-Engine_Chart_New_TreeMap=\u30C4\u30EA\u30FC\u30DE\u30C3\u30D7(\u65B0\u6A5F\u80FD) -Fine-Engine_Chart_WordCloud_New=\u30EF\u30FC\u30C9\u30AF\u30E9\u30A6\u30C9(\u65B0\u6A5F\u80FD) -Fine-Design_Chart_Match_Default_Color_Scheme= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u30EF\u30FC\u30C9\u30AF\u30E9\u30A6\u30C9(\u65B0\u6A5F\u80FD) \ No newline at end of file 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 404af9f..5b6102e 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 @@ -371,6 +371,7 @@ Fine-Design_Chart_Marker_Time=\uC911\uC694\uD55C \uB2E8\uACC4 Fine-Design_Chart_Marker_Type=\uD0DC\uADF8 \uC720\uD615 Fine-Design_Chart_Match_Color=\uBC30\uC0C9 Fine-Design_Chart_Match_Color_Scheme=\uBC30\uC0C9 \uBC29\uC548 +Fine-Design_Chart_Match_Default_Color_Scheme= Fine-Design_Chart_Match_To=\uC5D0 \uB9DE\uCD94\uAE30 Fine-Design_Chart_Math_Exponent=\uC9C0\uC218 \uD53C\uD305 Fine-Design_Chart_Math_Linear=\uC120\uD615 \uD53C\uD305 @@ -699,5 +700,4 @@ Fine-Engine_Chart_New_Radar=\uB808\uC774\uB354 Fine-Engine_Chart_New_Scatter=\uC0B0\uCC45 \uC880 \uADF8\uB798\uD504 Fine-Engine_Chart_New_Structure=\uAD6C\uC870\uB3C4(new) Fine-Engine_Chart_New_TreeMap=\uC0AC\uAC01\uD615 \uB098\uBB34 \uADF8\uB9BC -Fine-Engine_Chart_WordCloud_New=Word Cloud -Fine-Design_Chart_Match_Default_Color_Scheme= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=Word Cloud \ No newline at end of file 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 993477c..489d2e0 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 @@ -371,6 +371,7 @@ Fine-Design_Chart_Marker_Time=\u91CC\u7A0B\u7891\u65F6\u95F4 Fine-Design_Chart_Marker_Type=\u6807\u8BB0\u7C7B\u578B Fine-Design_Chart_Match_Color=\u914D\u8272 Fine-Design_Chart_Match_Color_Scheme=\u914D\u8272\u65B9\u6848 +Fine-Design_Chart_Match_Default_Color_Scheme=\u9ED8\u8BA4\u914D\u8272\u65B9\u6848 Fine-Design_Chart_Match_To=\u5339\u914D\u5230 Fine-Design_Chart_Math_Exponent=\u6307\u6570\u62DF\u5408 Fine-Design_Chart_Math_Linear=\u7EBF\u6027\u62DF\u5408 @@ -699,5 +700,4 @@ Fine-Engine_Chart_New_Radar=\u96F7\u8FBE\u56FE Fine-Engine_Chart_New_Scatter=\u6563\u70B9\u56FE Fine-Engine_Chart_New_Structure=\u6846\u67B6\u56FE Fine-Engine_Chart_New_TreeMap=\u77E9\u5F62\u6811\u56FE -Fine-Engine_Chart_WordCloud_New=\u8BCD\u4E91 -Fine-Design_Chart_Match_Default_Color_Scheme=\u9ED8\u8BA4\u914D\u8272\u65B9\u6848 \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u8BCD\u4E91 \ No newline at end of file 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 da3e054..507bff2 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 @@ -371,6 +371,7 @@ Fine-Design_Chart_Marker_Time=\u91CC\u7A0B\u7891\u6642\u9593 Fine-Design_Chart_Marker_Type=\u6A19\u8A18\u985E\u578B Fine-Design_Chart_Match_Color=\u914D\u8272 Fine-Design_Chart_Match_Color_Scheme=\u914D\u8272\u65B9\u6848 +Fine-Design_Chart_Match_Default_Color_Scheme= Fine-Design_Chart_Match_To=\u5339\u914D\u5230 Fine-Design_Chart_Math_Exponent=\u6307\u6578\u64EC\u5408 Fine-Design_Chart_Math_Linear=\u7DDA\u6027\u64EC\u5408 @@ -699,5 +700,4 @@ Fine-Engine_Chart_New_Radar=\u96F7\u9054\u5716 Fine-Engine_Chart_New_Scatter=\u6563\u9EDE\u5716 Fine-Engine_Chart_New_Structure=\u6846\u67B6\u5716 Fine-Engine_Chart_New_TreeMap=\u77E9\u5F62\u6A39\u5716 -Fine-Engine_Chart_WordCloud_New=\u6587\u5B57\u96F2 -Fine-Design_Chart_Match_Default_Color_Scheme= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u6587\u5B57\u96F2 \ No newline at end of file From 120f6e82b97d153f81f2427cd659533eb2bba19c Mon Sep 17 00:00:00 2001 From: "Yuan.Wang" <1536296691@qq.com> Date: Mon, 20 Jul 2020 17:11:42 +0800 Subject: [PATCH 06/25] =?UTF-8?q?REPORT-35307=20=E5=B0=86=E5=8E=9F?= =?UTF-8?q?=E6=9C=AC=E7=9A=84=E3=80=8C=E6=A0=A1=E9=AA=8C=E5=87=BA=E9=94=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=8D=EF=BC=8C=E6=94=B9=E4=B8=BA=E3=80=8C?= =?UTF-8?q?=E4=B8=8D=E6=BB=A1=E8=B6=B3=E6=A0=A1=E9=AA=8C=E5=85=AC=E5=BC=8F?= =?UTF-8?q?=E5=88=99=E6=8F=90=E7=A4=BA=E3=80=8D=E5=B9=B6=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main_en.properties | 2 +- .../src/main/resources/com/fr/design/i18n/main_ja_JP.properties | 2 +- .../src/main/resources/com/fr/design/i18n/main_ko_KR.properties | 2 +- .../src/main/resources/com/fr/design/i18n/main_zh.properties | 2 +- .../src/main/resources/com/fr/design/i18n/main_zh_TW.properties | 2 +- 5 files 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 ae7f587..a9c766a 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 @@ -2013,7 +2013,7 @@ Fine-Design_Report_Format=Format Fine-Design_Report_Formula=Formula Fine-Design_Report_Formula_Group=Formula Group Fine-Design_Report_Formula_Verify=Validation Formula -Fine-Design_Report_Formula_Verify_Warn_Text=Validation Error Information +Fine-Design_Report_Formula_Verify_Warn_Text=Prompt if the rule unsatisfied Fine-Design_Report_Frozen_N.O.=Freeze No. Fine-Design_Report_GROUPING_MODE=Ordinary Grouping Fine-Design_Report_Ge=Entries diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties index 0eb3e7e..84a9998 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties @@ -2013,7 +2013,7 @@ Fine-Design_Report_Format=\u5F62\u5F0F Fine-Design_Report_Formula=\u6570\u5F0F Fine-Design_Report_Formula_Group=\u6570\u5F0F\u30B0\u30EB\u30FC\u30D7\u5206\u3051 Fine-Design_Report_Formula_Verify=\u6570\u5F0F\u691C\u8A3C -Fine-Design_Report_Formula_Verify_Warn_Text=\u30A8\u30E9\u30FC\u60C5\u5831\u691C\u8A3C +Fine-Design_Report_Formula_Verify_Warn_Text=\u691C\u8A3C\u3092\u6E80\u305F\u3055\u306A\u3044\u5834\u5408\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A Fine-Design_Report_Frozen_N.O.=\u56FA\u5B9A\u7B2C Fine-Design_Report_GROUPING_MODE=\u4E00\u822C\u30B0\u30EB\u30FC\u30D7\u5206\u3051 Fine-Design_Report_Ge=\u500B diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties index c7de508..3b61052 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties @@ -2013,7 +2013,7 @@ Fine-Design_Report_Format=\uC591\uC2DD Fine-Design_Report_Formula=\uC218\uC2DD Fine-Design_Report_Formula_Group=\uC218\uC2DD\uADF8\uB8E8\uD551 Fine-Design_Report_Formula_Verify=\uAC80\uC99D\uACF5\uC2DD -Fine-Design_Report_Formula_Verify_Warn_Text=\uC5D0\uB7EC \uC815\uBCF4 +Fine-Design_Report_Formula_Verify_Warn_Text=\uAC80\uC99D \uACF5\uC2DD\uC744 \uCDA9\uC871\uD558\uC9C0 \uC54A\uC73C\uBA74 \uC81C\uC2DC\uD569\uB2C8\uB2E4 Fine-Design_Report_Frozen_N.O.=\uB3D9\uACB0 no. Fine-Design_Report_GROUPING_MODE=\uC77C\uBC18\uADF8\uB8E8\uD551 Fine-Design_Report_Ge=\uAC1C diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties index d052c6b..0ac86a5 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties @@ -2013,7 +2013,7 @@ Fine-Design_Report_Format=\u683C\u5F0F Fine-Design_Report_Formula=\u516C\u5F0F Fine-Design_Report_Formula_Group=\u516C\u5F0F\u5206\u7EC4 Fine-Design_Report_Formula_Verify=\u6821\u9A8C\u516C\u5F0F -Fine-Design_Report_Formula_Verify_Warn_Text=\u6821\u9A8C\u51FA\u9519\u4FE1\u606F +Fine-Design_Report_Formula_Verify_Warn_Text=\u4E0D\u6EE1\u8DB3\u6821\u9A8C\u516C\u5F0F\u5219\u63D0\u793A Fine-Design_Report_Frozen_N.O.=\u51BB\u7ED3\u7B2C Fine-Design_Report_GROUPING_MODE=\u666E\u901A\u5206\u7EC4 Fine-Design_Report_Ge=\u4E2A diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties index 45b4f0c..bf036a2 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties @@ -2013,7 +2013,7 @@ Fine-Design_Report_Format=\u683C\u5F0F Fine-Design_Report_Formula=\u516C\u5F0F Fine-Design_Report_Formula_Group=\u516C\u5F0F\u5206\u7D44 Fine-Design_Report_Formula_Verify=\u6821\u9A57\u516C\u5F0F -Fine-Design_Report_Formula_Verify_Warn_Text=\u6821\u9A57\u51FA\u932F\u8CC7\u8A0A +Fine-Design_Report_Formula_Verify_Warn_Text=\u4E0D\u6EFF\u8DB3\u6821\u9A57\u516C\u5F0F\u5247\u63D0\u793A Fine-Design_Report_Frozen_N.O.=\u51CD\u7D50\u7B2C Fine-Design_Report_GROUPING_MODE=\u666E\u901A\u5206\u7D44 Fine-Design_Report_Ge=\u500B From ab0c29b1b8dd7fd9bbedfa7a8e4fec7347f358b7 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Tue, 21 Jul 2020 20:06:42 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/chart.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/chart_en.properties | 2 ++ .../main/resources/com/fr/design/i18n/chart_ja_JP.properties | 2 ++ .../main/resources/com/fr/design/i18n/chart_ko_KR.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/chart_zh.properties | 2 ++ .../main/resources/com/fr/design/i18n/chart_zh_TW.properties | 2 ++ 6 files changed, 12 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 4acd64c..0c4a774 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 @@ -155,6 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide= Fine-Design_Chart_Data_Max= Fine-Design_Chart_Data_Median= Fine-Design_Chart_Data_Min= +Fine-Design_Chart_Data_Q3= +Fine-Design_Chart_Data_Q1= Fine-Design_Chart_Data_Not_Show_Cate= Fine-Design_Chart_Data_Not_Show_Series= Fine-Design_Chart_Data_Point_Tooltip= 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 9a36736..3ee6d67 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 @@ -155,6 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=Datalabel Outside Fine-Design_Chart_Data_Max=Maximum Fine-Design_Chart_Data_Median=Median Fine-Design_Chart_Data_Min=Minimum +Fine-Design_Chart_Data_Q3=Upper quartile +Fine-Design_Chart_Data_Q1=Lower quartile Fine-Design_Chart_Data_Not_Show_Cate=No Display If Category Is Empty Fine-Design_Chart_Data_Not_Show_Series=No Display If Series Is Empty Fine-Design_Chart_Data_Point_Tooltip=Data Point Tips 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 086541b..b5743aa 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 @@ -155,6 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u5024 Fine-Design_Chart_Data_Median=\u4E2D\u592E\u5024 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 +Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D +Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Point_Tooltip=\u30C7\u30FC\u30BF\u30DD\u30A4\u30F3\u30C8\u306E\u30D2\u30F3\u30C8 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 5bc47a2..a139e09 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 @@ -155,6 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\uB77C\uBCA8 \uBC14\uAE65\uCABD Fine-Design_Chart_Data_Max=\uCD5C\uB300\uAC12 Fine-Design_Chart_Data_Median=\uC911\uC559\uAC12 Fine-Design_Chart_Data_Min=\uCD5C\uC18C\uAC12 +Fine-Design_Chart_Data_Q3=\uC704 \uC0AC \uBD84\uC704 +Fine-Design_Chart_Data_Q1=\uB0AE\uC740 \uC0AC \uBD84\uC704\uC218 Fine-Design_Chart_Data_Not_Show_Cate=\uCE74\uD14C\uACE0\uB9AC\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Not_Show_Series=\uC2DC\uB9AC\uC988\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Point_Tooltip=\uB370\uC774\uD130 \uD234\uD301 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 2a04c5f..133275a 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 @@ -155,6 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\u6570\u636E\u6807\u7B7E\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6570 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u503C +Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6570 +Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6570 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u7C7B\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u5206\u7C7B Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u7CFB\u5217 Fine-Design_Chart_Data_Point_Tooltip=\u6570\u636E\u70B9\u63D0\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 29ccb0f..002637d 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 @@ -155,6 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\u8CC7\u6599\u6A19\u7C64\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6578 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 +Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6578 +Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6578 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u70BA\u7A7A\u6642\uFF0C\u4E0D\u986F\u793A\u8A72\u5206\u985E Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u70BA\u7A7A\u6642,\u4E0D\u986F\u793A\u8A72\u7CFB\u5217 Fine-Design_Chart_Data_Point_Tooltip=\u8CC7\u6599\u9EDE\u63D0\u793A From aa39b1fa120d3dc791d6e0f55b18487639dda388 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Thu, 23 Jul 2020 18:04:45 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E7=B3=BB=E5=88=97=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=82=B9=E6=8F=90=E7=A4=BA=E7=95=8C=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 0c4a774..1c3c5cb 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 @@ -152,6 +152,7 @@ Fine-Design_Chart_Data_Filter= Fine-Design_Chart_Data_Function_Percent= Fine-Design_Chart_Data_Label_Inside= Fine-Design_Chart_Data_Label_OutSide= +Fine-Design_Chart_Data_Number= Fine-Design_Chart_Data_Max= Fine-Design_Chart_Data_Median= Fine-Design_Chart_Data_Min= 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 3ee6d67..0237505 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 @@ -152,6 +152,7 @@ Fine-Design_Chart_Data_Filter=Data Filter Fine-Design_Chart_Data_Function_Percent=Proportion Fine-Design_Chart_Data_Label_Inside=Datalabel Inside Fine-Design_Chart_Data_Label_OutSide=Datalabel Outside +Fine-Design_Chart_Data_Number=Number of data Fine-Design_Chart_Data_Max=Maximum Fine-Design_Chart_Data_Median=Median Fine-Design_Chart_Data_Min=Minimum 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 b5743aa..85ae7d9 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 @@ -152,6 +152,7 @@ Fine-Design_Chart_Data_Filter=\u30C7\u30FC\u30BF\u30D5\u30A3\u30EB\u30BF Fine-Design_Chart_Data_Function_Percent=\u5272\u5408 Fine-Design_Chart_Data_Label_Inside=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5185 Fine-Design_Chart_Data_Label_OutSide=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5916 +Fine-Design_Chart_Data_Number=\u30C7\u30FC\u30BF\u6570 Fine-Design_Chart_Data_Max=\u6700\u5927\u5024 Fine-Design_Chart_Data_Median=\u4E2D\u592E\u5024 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 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 a139e09..38071f8 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 @@ -152,6 +152,7 @@ Fine-Design_Chart_Data_Filter=\uB370\uC774\uD130 \uD544\uD130 Fine-Design_Chart_Data_Function_Percent=\uC810\uC720\uC728 Fine-Design_Chart_Data_Label_Inside=\uB77C\uBCA8 \uC548\uCABD Fine-Design_Chart_Data_Label_OutSide=\uB77C\uBCA8 \uBC14\uAE65\uCABD +Fine-Design_Chart_Data_Number=\uB370\uC774\uD130 \uC218 Fine-Design_Chart_Data_Max=\uCD5C\uB300\uAC12 Fine-Design_Chart_Data_Median=\uC911\uC559\uAC12 Fine-Design_Chart_Data_Min=\uCD5C\uC18C\uAC12 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 133275a..00154f1 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 @@ -152,6 +152,7 @@ Fine-Design_Chart_Data_Filter=\u6570\u636E\u7B5B\u9009 Fine-Design_Chart_Data_Function_Percent=\u5360\u6BD4 Fine-Design_Chart_Data_Label_Inside=\u6570\u636E\u6807\u7B7E\u5185 Fine-Design_Chart_Data_Label_OutSide=\u6570\u636E\u6807\u7B7E\u5916 +Fine-Design_Chart_Data_Number=\u6570\u636E\u4E2A\u6570 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6570 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u503C 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 002637d..40faf8f 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 @@ -152,6 +152,7 @@ Fine-Design_Chart_Data_Filter=\u8CC7\u6599\u7BE9\u9078 Fine-Design_Chart_Data_Function_Percent=\u4F54\u6BD4 Fine-Design_Chart_Data_Label_Inside=\u8CC7\u6599\u6A19\u7C64\u5167 Fine-Design_Chart_Data_Label_OutSide=\u8CC7\u6599\u6A19\u7C64\u5916 +Fine-Design_Chart_Data_Number=\u6578\u64DA\u500B\u6578 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6578 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 From 84de2345e8bfb65ebef8bf1d316d492daa65b2b6 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Fri, 24 Jul 2020 09:48:28 +0800 Subject: [PATCH 09/25] =?UTF-8?q?REPORT-26209=20=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/chart.properties | 10 +++++----- .../resources/com/fr/design/i18n/chart_en.properties | 12 ++++++------ .../com/fr/design/i18n/chart_ja_JP.properties | 10 +++++----- .../com/fr/design/i18n/chart_ko_KR.properties | 10 +++++----- .../resources/com/fr/design/i18n/chart_zh.properties | 10 +++++----- .../com/fr/design/i18n/chart_zh_TW.properties | 10 +++++----- .../resources/com/fr/design/i18n/main_en.properties | 4 ++-- 7 files changed, 33 insertions(+), 33 deletions(-) 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 c9681e9..7657da2 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 @@ -155,11 +155,11 @@ Fine-Design_Chart_Data_Label_OutSide= Fine-Design_Chart_Data_Max= Fine-Design_Chart_Data_Median= Fine-Design_Chart_Data_Min= -Fine-Design_Chart_Data_Q3= -Fine-Design_Chart_Data_Q1= Fine-Design_Chart_Data_Not_Show_Cate= Fine-Design_Chart_Data_Not_Show_Series= Fine-Design_Chart_Data_Point_Tooltip= +Fine-Design_Chart_Data_Q1= +Fine-Design_Chart_Data_Q3= Fine-Design_Chart_Data_Range_Configuration= Fine-Design_Chart_Data_Sheet= Fine-Design_Chart_Data_Source= @@ -175,6 +175,7 @@ Fine-Design_Chart_Delete_Map= Fine-Design_Chart_Delimiter_Symbol= Fine-Design_Chart_Deploy= Fine-Design_Chart_Descriptor= +Fine-Design_Chart_Detailed_Data= Fine-Design_Chart_DifferArc_Pie= Fine-Design_Chart_Direction_Horizontal= Fine-Design_Chart_Direction_Vertical= @@ -406,9 +407,9 @@ Fine-Design_Chart_Needle= Fine-Design_Chart_Needle_Max_Range= Fine-Design_Chart_New_Area= Fine-Design_Chart_New_Bar= +Fine-Design_Chart_New_Box= Fine-Design_Chart_New_Bubble= Fine-Design_Chart_New_Column= -Fine-Design_Chart_New_Box= Fine-Design_Chart_New_Column_Area= Fine-Design_Chart_New_Column_Line= Fine-Design_Chart_New_Combine= @@ -492,6 +493,7 @@ Fine-Design_Chart_Region_Field= Fine-Design_Chart_Region_Map= Fine-Design_Chart_Region_Value= Fine-Design_Chart_Respectively_Specified= +Fine-Design_Chart_Result_Data= Fine-Design_Chart_Reversal= Fine-Design_Chart_Right_Boundary= Fine-Design_Chart_Right_Top= @@ -521,8 +523,6 @@ Fine-Design_Chart_Series_Name_From= Fine-Design_Chart_Series_New_Line= Fine-Design_Chart_Series_Setting= Fine-Design_Chart_Series_Single_Data= -Fine-Design_Chart_Detailed_Data= -Fine-Design_Chart_Result_Data= Fine-Design_Chart_Series_Value= Fine-Design_Chart_Server_PreStyle= Fine-Design_Chart_Set_Data_Sheet= 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 5076f87..caccd1f 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 @@ -155,11 +155,11 @@ Fine-Design_Chart_Data_Label_OutSide=Datalabel Outside Fine-Design_Chart_Data_Max=Maximum Fine-Design_Chart_Data_Median=Median Fine-Design_Chart_Data_Min=Minimum -Fine-Design_Chart_Data_Q3=Upper quartile -Fine-Design_Chart_Data_Q1=Lower quartile Fine-Design_Chart_Data_Not_Show_Cate=No Display If Category Is Empty Fine-Design_Chart_Data_Not_Show_Series=No Display If Series Is Empty Fine-Design_Chart_Data_Point_Tooltip=Data Point Tips +Fine-Design_Chart_Data_Q1=Lower quartile +Fine-Design_Chart_Data_Q3=Upper quartile Fine-Design_Chart_Data_Range_Configuration=Data Range Configuration Fine-Design_Chart_Data_Sheet=Data Table Fine-Design_Chart_Data_Source=Data Source @@ -175,6 +175,7 @@ Fine-Design_Chart_Delete_Map=Delete Map Fine-Design_Chart_Delimiter_Symbol=Delimiter Fine-Design_Chart_Deploy=Configuration Fine-Design_Chart_Descriptor=Description +Fine-Design_Chart_Detailed_Data=Detailed data Fine-Design_Chart_DifferArc_Pie=Rose Chart(Different Radians) Fine-Design_Chart_Direction_Horizontal=Horizontal Fine-Design_Chart_Direction_Vertical=Vertical @@ -374,7 +375,7 @@ Fine-Design_Chart_Marker_Time=Milestone Time Fine-Design_Chart_Marker_Type=Marker Type Fine-Design_Chart_Match_Color=Match Color Fine-Design_Chart_Match_Color_Scheme=Color Scheme -Fine-Design_Chart_Match_Default_Color_Scheme= +Fine-Design_Chart_Match_Default_Color_Scheme=Default color combination solution Fine-Design_Chart_Match_To=Match to Fine-Design_Chart_Math_Exponent=Exponential Fitting Fine-Design_Chart_Math_Linear=Linear Fitting @@ -406,9 +407,9 @@ Fine-Design_Chart_Needle=Pointer Fine-Design_Chart_Needle_Max_Range=Pointer Active Range Fine-Design_Chart_New_Area=Area Chart Fine-Design_Chart_New_Bar=Bar Chart +Fine-Design_Chart_New_Box=Box chart Fine-Design_Chart_New_Bubble=Bubble Chart Fine-Design_Chart_New_Column=Column Chart -Fine-Design_Chart_New_Box=Box chart Fine-Design_Chart_New_Column_Area=Column-Area Chart Fine-Design_Chart_New_Column_Line=Column-Line Chart Fine-Design_Chart_New_Combine=Combination Chart @@ -492,6 +493,7 @@ Fine-Design_Chart_Region_Field=Area Field Fine-Design_Chart_Region_Map=Area Map Fine-Design_Chart_Region_Value=Area Value Fine-Design_Chart_Respectively_Specified=Specified Separately +Fine-Design_Chart_Result_Data=Result data Fine-Design_Chart_Reversal=Reversal Fine-Design_Chart_Right_Boundary=Right Boundary Fine-Design_Chart_Right_Top=Upper Right @@ -521,8 +523,6 @@ Fine-Design_Chart_Series_Name_From=Series Name From Fine-Design_Chart_Series_New_Line=Series New Line Fine-Design_Chart_Series_Setting=Series Setting Fine-Design_Chart_Series_Single_Data=Single Series Data -Fine-Design_Chart_Detailed_Data=Detailed data -Fine-Design_Chart_Result_Data=Result data Fine-Design_Chart_Series_Value=Value Fine-Design_Chart_Server_PreStyle=Predefined Chart Colors Fine-Design_Chart_Set_Data_Sheet=Set Data Table 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 4b693d9..29c79ef 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 @@ -155,11 +155,11 @@ Fine-Design_Chart_Data_Label_OutSide=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u5024 Fine-Design_Chart_Data_Median=\u4E2D\u592E\u5024 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 -Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D -Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Point_Tooltip=\u30C7\u30FC\u30BF\u30DD\u30A4\u30F3\u30C8\u306E\u30D2\u30F3\u30C8 +Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D +Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D Fine-Design_Chart_Data_Range_Configuration=\u30C7\u30FC\u30BF\u7BC4\u56F2\u306E\u8A2D\u5B9A Fine-Design_Chart_Data_Sheet=\u30C7\u30FC\u30BF\u30B7\u30FC\u30C8 Fine-Design_Chart_Data_Source=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9 @@ -175,6 +175,7 @@ Fine-Design_Chart_Delete_Map=\u5730\u56F3\u3092\u524A\u9664 Fine-Design_Chart_Delimiter_Symbol=\u533A\u5207\u308A\u6587\u5B57 Fine-Design_Chart_Deploy=\u8A2D\u5B9A Fine-Design_Chart_Descriptor=\u8AAC\u660E +Fine-Design_Chart_Detailed_Data=\u8A73\u7D30\u30C7\u30FC\u30BF Fine-Design_Chart_DifferArc_Pie=\u975E\u7B49\u5F27\u30ED\u30FC\u30BA\u30B0\u30E9\u30D5 Fine-Design_Chart_Direction_Horizontal=\u6A2A\u65B9\u5411 Fine-Design_Chart_Direction_Vertical=\u7E26\u65B9\u5411 @@ -406,9 +407,9 @@ Fine-Design_Chart_Needle=\u30DD\u30A4\u30F3\u30BF Fine-Design_Chart_Needle_Max_Range=\u30DD\u30A4\u30F3\u30BF\u53EF\u52D5\u57DF Fine-Design_Chart_New_Area=\u9762\u30B0\u30E9\u30D5(\u65B0\u6A5F\u80FD) Fine-Design_Chart_New_Bar=\u6A2A\u68D2\u30B0\u30E9\u30D5(\u65B0\u6A5F\u80FD) +Fine-Design_Chart_New_Box=\u30DC\u30C3\u30AF\u30B9\u30D7\u30ED\u30C3\u30C8 Fine-Design_Chart_New_Bubble=\u30D0\u30D6\u30EB\u30C1\u30E3\u30FC\u30C8(\u65B0\u6A5F\u80FD) Fine-Design_Chart_New_Column=\u7E26\u68D2\u30B0\u30E9\u30D5(\u65B0\u6A5F\u80FD) -Fine-Design_Chart_New_Box=\u30DC\u30C3\u30AF\u30B9\u30D7\u30ED\u30C3\u30C8 Fine-Design_Chart_New_Column_Area=\u7E26\u68D2\u30B0\u30E9\u30D5-\u9762\u30B0\u30E9\u30D5 Fine-Design_Chart_New_Column_Line=\u7E26\u68D2\u30B0\u30E9\u30D5-\u6298\u308C\u7DDA\u30B0\u30E9\u30D5 Fine-Design_Chart_New_Combine=\u7D44\u307F\u5408\u308F\u305B\u30B0\u30E9\u30D5(\u65B0\u6A5F\u80FD) @@ -492,6 +493,7 @@ Fine-Design_Chart_Region_Field=\u30A8\u30EA\u30A2\u30D5\u30A3\u30FC\u30EB\u30C9 Fine-Design_Chart_Region_Map=\u30A8\u30EA\u30A2\u5730\u56F3 Fine-Design_Chart_Region_Value=\u30A8\u30EA\u30A2\u306E\u5024 Fine-Design_Chart_Respectively_Specified=\u500B\u5225\u6307\u5B9A +Fine-Design_Chart_Result_Data=\u7D50\u679C\u30C7\u30FC\u30BF Fine-Design_Chart_Reversal=\u53CD\u8EE2 Fine-Design_Chart_Right_Boundary=\u53F3\u5883\u754C Fine-Design_Chart_Right_Top=\u53F3\u4E0A @@ -521,8 +523,6 @@ Fine-Design_Chart_Series_Name_From=\u7CFB\u5217\u540D\u3092\u4F7F\u7528 Fine-Design_Chart_Series_New_Line=\u7CFB\u5217\u6539\u884C Fine-Design_Chart_Series_Setting=\u7CFB\u5217\u8A2D\u5B9A Fine-Design_Chart_Series_Single_Data=\u5358\u4E00\u7CFB\u5217\u30C7\u30FC\u30BF -Fine-Design_Chart_Detailed_Data=\u8A73\u7D30\u30C7\u30FC\u30BF -Fine-Design_Chart_Result_Data=\u7D50\u679C\u30C7\u30FC\u30BF Fine-Design_Chart_Series_Value=\u7CFB\u5217\u5024 Fine-Design_Chart_Server_PreStyle=\u30B0\u30E9\u30D5\u4E8B\u524D\u5B9A\u7FA9\u914D\u8272 Fine-Design_Chart_Set_Data_Sheet=\u30C7\u30FC\u30BF\u30C6\u30FC\u30D6\u30EB\u8A2D\u5B9A 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 115b6af..cfdd078 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 @@ -155,11 +155,11 @@ Fine-Design_Chart_Data_Label_OutSide=\uB77C\uBCA8 \uBC14\uAE65\uCABD Fine-Design_Chart_Data_Max=\uCD5C\uB300\uAC12 Fine-Design_Chart_Data_Median=\uC911\uC559\uAC12 Fine-Design_Chart_Data_Min=\uCD5C\uC18C\uAC12 -Fine-Design_Chart_Data_Q3=\uC704 \uC0AC \uBD84\uC704 -Fine-Design_Chart_Data_Q1=\uB0AE\uC740 \uC0AC \uBD84\uC704\uC218 Fine-Design_Chart_Data_Not_Show_Cate=\uCE74\uD14C\uACE0\uB9AC\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Not_Show_Series=\uC2DC\uB9AC\uC988\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Point_Tooltip=\uB370\uC774\uD130 \uD234\uD301 +Fine-Design_Chart_Data_Q1=\uB0AE\uC740 \uC0AC \uBD84\uC704\uC218 +Fine-Design_Chart_Data_Q3=\uC704 \uC0AC \uBD84\uC704 Fine-Design_Chart_Data_Range_Configuration=\uB370\uC774\uD130 \uAD6C\uAC04 \uC138\uD305 Fine-Design_Chart_Data_Sheet=\uB370\uC774\uD130 \uD14C\uC774\uBE14 Fine-Design_Chart_Data_Source=\uB370\uC774\uD130\uCD9C\uCC98 @@ -175,6 +175,7 @@ Fine-Design_Chart_Delete_Map=\uB9F5 \uC9C0\uC6B0\uAE30 Fine-Design_Chart_Delimiter_Symbol=\uAD6C\uBD84\uBB38\uC790 Fine-Design_Chart_Deploy=\uC124\uC815 Fine-Design_Chart_Descriptor=\uC124\uBA85 +Fine-Design_Chart_Detailed_Data=\uC0C1\uC138 \uB370\uC774\uD130 Fine-Design_Chart_DifferArc_Pie=\uB85C\uC988 \uCC28\uD2B8 (\uB2E4\uB978 \uB77C\uB514\uC548) Fine-Design_Chart_Direction_Horizontal=\uAC00\uB85C\uBC29\uD5A5 Fine-Design_Chart_Direction_Vertical=\uC138\uB85C\uBC29\uD5A5 @@ -406,9 +407,9 @@ Fine-Design_Chart_Needle=\uD3EC\uC778\uD130 Fine-Design_Chart_Needle_Max_Range=\uD3EC\uC778\uD130 \uD65C\uB3D9\uBC94\uC704 Fine-Design_Chart_New_Area=\uC9C0\uC5ED \uCC28\uD2B8 Fine-Design_Chart_New_Bar=\uBC14 \uCC28\uD2B8 +Fine-Design_Chart_New_Box=\uBC15\uC2A4 \uD50C\uB86F Fine-Design_Chart_New_Bubble=\uBC84\uBE14 \uCC28\uD2B8 Fine-Design_Chart_New_Column=\uB9C9\uB300 \uCC28\uD2B8 -Fine-Design_Chart_New_Box=\uBC15\uC2A4 \uD50C\uB86F Fine-Design_Chart_New_Column_Area=\uB9C9\uB300 - \uC601\uC5ED \uCC28\uD2B8 Fine-Design_Chart_New_Column_Line=\uB9C9\uB300 - \uB77C\uC778 \uCC28\uD2B8 Fine-Design_Chart_New_Combine=\uCF65\uBC14\uC778 @@ -492,6 +493,7 @@ Fine-Design_Chart_Region_Field=\uAD6C\uC5ED\uD544\uB4DC Fine-Design_Chart_Region_Map=\uAD6C\uC5ED\uC9C0\uB3C4 Fine-Design_Chart_Region_Value=\uAD6C\uC5ED\uAC12 Fine-Design_Chart_Respectively_Specified=\uAC01\uBCBD \uACC4\uC0B0 +Fine-Design_Chart_Result_Data=\uACB0\uACFC \uB370\uC774\uD130 Fine-Design_Chart_Reversal=\uD68C\uC804 Fine-Design_Chart_Right_Boundary=\uC624\uB978\uCABD \uBCC0\uB450\uB9AC Fine-Design_Chart_Right_Top=\uC624\uB978\uCABD\uC704 @@ -521,8 +523,6 @@ Fine-Design_Chart_Series_Name_From=\uC2DC\uB9AC\uC988 \uC774\uB984 \uC0AC\uC6A9 Fine-Design_Chart_Series_New_Line=\uC2DC\uB9AC\uC988 \uD589\uC804\uD658 Fine-Design_Chart_Series_Setting=\uC2DC\uB9AC\uC988 \uC124\uC815 Fine-Design_Chart_Series_Single_Data=\uC2F1\uAE00 \uC2DC\uB9AC\uC988 \uB370\uC774\uD130 -Fine-Design_Chart_Detailed_Data=\uC0C1\uC138 \uB370\uC774\uD130 -Fine-Design_Chart_Result_Data=\uACB0\uACFC \uB370\uC774\uD130 Fine-Design_Chart_Series_Value=\uAC12 Fine-Design_Chart_Server_PreStyle=\uCC28\uD2B8 \uC0AC\uC804\uC815\uC758\uCEEC\uB7EC Fine-Design_Chart_Set_Data_Sheet=\uB370\uC774\uD130 \uD14C\uC774\uBE14 \uC124\uC815 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 128e287..fce7018 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 @@ -155,11 +155,11 @@ Fine-Design_Chart_Data_Label_OutSide=\u6570\u636E\u6807\u7B7E\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6570 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u503C -Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6570 -Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6570 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u7C7B\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u5206\u7C7B Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u7CFB\u5217 Fine-Design_Chart_Data_Point_Tooltip=\u6570\u636E\u70B9\u63D0\u793A +Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6570 +Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6570 Fine-Design_Chart_Data_Range_Configuration=\u6570\u636E\u533A\u95F4\u914D\u7F6E Fine-Design_Chart_Data_Sheet=\u6570\u636E\u8868 Fine-Design_Chart_Data_Source=\u6570\u636E\u6765\u6E90 @@ -175,6 +175,7 @@ Fine-Design_Chart_Delete_Map=\u5220\u9664\u5730\u56FE Fine-Design_Chart_Delimiter_Symbol=\u5206\u9694\u7B26 Fine-Design_Chart_Deploy=\u914D\u7F6E Fine-Design_Chart_Descriptor=\u63CF\u8FF0 +Fine-Design_Chart_Detailed_Data=\u660E\u7EC6\u6570\u636E Fine-Design_Chart_DifferArc_Pie=\u4E0D\u7B49\u5F27\u5EA6\u73AB\u7470\u56FE Fine-Design_Chart_Direction_Horizontal=\u6A2A\u5411 Fine-Design_Chart_Direction_Vertical=\u7EB5\u5411 @@ -406,9 +407,9 @@ Fine-Design_Chart_Needle=\u6307\u9488 Fine-Design_Chart_Needle_Max_Range=\u6307\u9488\u6D3B\u52A8\u8303\u56F4 Fine-Design_Chart_New_Area=\u9762\u79EF\u56FE Fine-Design_Chart_New_Bar=\u6761\u5F62\u56FE +Fine-Design_Chart_New_Box=\u7BB1\u578B\u56FE Fine-Design_Chart_New_Bubble=\u6C14\u6CE1\u56FE Fine-Design_Chart_New_Column=\u67F1\u5F62\u56FE -Fine-Design_Chart_New_Box=\u7BB1\u578B\u56FE Fine-Design_Chart_New_Column_Area=\u67F1\u5F62\u56FE-\u9762\u79EF\u56FE Fine-Design_Chart_New_Column_Line=\u67F1\u5F62\u56FE-\u6298\u7EBF\u56FE Fine-Design_Chart_New_Combine=\u7EC4\u5408\u56FE @@ -492,6 +493,7 @@ Fine-Design_Chart_Region_Field=\u533A\u57DF\u5B57\u6BB5 Fine-Design_Chart_Region_Map=\u533A\u57DF\u5730\u56FE Fine-Design_Chart_Region_Value=\u533A\u57DF\u503C Fine-Design_Chart_Respectively_Specified=\u5206\u522B\u6307\u5B9A +Fine-Design_Chart_Result_Data=\u7ED3\u679C\u6570\u636E Fine-Design_Chart_Reversal=\u7FFB\u8F6C Fine-Design_Chart_Right_Boundary=\u53F3\u8FB9\u754C Fine-Design_Chart_Right_Top=\u53F3\u4E0A @@ -521,8 +523,6 @@ Fine-Design_Chart_Series_Name_From=\u7CFB\u5217\u540D\u4F7F\u7528 Fine-Design_Chart_Series_New_Line=\u7CFB\u5217\u6362\u884C Fine-Design_Chart_Series_Setting=\u7CFB\u5217\u8BBE\u7F6E Fine-Design_Chart_Series_Single_Data=\u5355\u4E2A\u7CFB\u5217\u6570\u636E -Fine-Design_Chart_Detailed_Data=\u660E\u7EC6\u6570\u636E -Fine-Design_Chart_Result_Data=\u7ED3\u679C\u6570\u636E Fine-Design_Chart_Series_Value=\u503C Fine-Design_Chart_Server_PreStyle=\u56FE\u8868\u9884\u5B9A\u4E49\u914D\u8272 Fine-Design_Chart_Set_Data_Sheet=\u8BBE\u7F6E\u6570\u636E\u8868 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 55672f9..ef5829e 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 @@ -155,11 +155,11 @@ Fine-Design_Chart_Data_Label_OutSide=\u8CC7\u6599\u6A19\u7C64\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6578 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 -Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6578 -Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6578 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u70BA\u7A7A\u6642\uFF0C\u4E0D\u986F\u793A\u8A72\u5206\u985E Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u70BA\u7A7A\u6642,\u4E0D\u986F\u793A\u8A72\u7CFB\u5217 Fine-Design_Chart_Data_Point_Tooltip=\u8CC7\u6599\u9EDE\u63D0\u793A +Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6578 +Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6578 Fine-Design_Chart_Data_Range_Configuration=\u8CC7\u6599\u5340\u9593\u8A2D\u5B9A Fine-Design_Chart_Data_Sheet=\u8CC7\u6599\u8868 Fine-Design_Chart_Data_Source=\u8CC7\u6599\u4F86\u6E90 @@ -175,6 +175,7 @@ Fine-Design_Chart_Delete_Map=\u522A\u9664\u5730\u5716 Fine-Design_Chart_Delimiter_Symbol=\u5206\u9694\u7B26 Fine-Design_Chart_Deploy=\u8A2D\u5B9A Fine-Design_Chart_Descriptor=\u63CF\u8FF0 +Fine-Design_Chart_Detailed_Data=\u660E\u7D30\u6578\u64DA Fine-Design_Chart_DifferArc_Pie=\u4E0D\u7B49\u5F27\u5EA6\u73AB\u7470\u5716 Fine-Design_Chart_Direction_Horizontal=\u6A6B\u5411 Fine-Design_Chart_Direction_Vertical=\u7E31\u5411 @@ -406,9 +407,9 @@ Fine-Design_Chart_Needle=\u6307\u91DD Fine-Design_Chart_Needle_Max_Range=\u6307\u91DD\u6D3B\u52D5\u7BC4\u570D Fine-Design_Chart_New_Area=\u9762\u7A4D\u5716 Fine-Design_Chart_New_Bar=\u689D\u5F62\u5716 +Fine-Design_Chart_New_Box=\u7BB1\u578B\u5716 Fine-Design_Chart_New_Bubble=\u6C23\u6CE1\u5716 Fine-Design_Chart_New_Column=\u67F1\u5F62\u5716 -Fine-Design_Chart_New_Box=\u7BB1\u578B\u5716 Fine-Design_Chart_New_Column_Area=\u67F1\u5F62\u5716-\u9762\u7A4D\u5716 Fine-Design_Chart_New_Column_Line=\u67F1\u5F62\u5716-\u6298\u7DDA\u5716 Fine-Design_Chart_New_Combine=\u7D44\u5408\u5716 @@ -492,6 +493,7 @@ Fine-Design_Chart_Region_Field=\u5340\u57DF\u6B04\u4F4D Fine-Design_Chart_Region_Map=\u5340\u57DF\u5730\u5716 Fine-Design_Chart_Region_Value=\u5340\u57DF\u503C Fine-Design_Chart_Respectively_Specified=\u5206\u5225\u6307\u5B9A +Fine-Design_Chart_Result_Data=\u7D50\u679C\u6578\u64DA Fine-Design_Chart_Reversal=\u7FFB\u8F49 Fine-Design_Chart_Right_Boundary=\u53F3\u908A\u754C Fine-Design_Chart_Right_Top=\u53F3\u4E0A @@ -521,8 +523,6 @@ Fine-Design_Chart_Series_Name_From=\u7CFB\u5217\u540D\u4F7F\u7528 Fine-Design_Chart_Series_New_Line=\u7CFB\u5217\u63DB\u5217 Fine-Design_Chart_Series_Setting=\u7CFB\u5217\u8A2D\u5B9A Fine-Design_Chart_Series_Single_Data=\u55AE\u500B\u7CFB\u5217\u8CC7\u6599 -Fine-Design_Chart_Detailed_Data=\u660E\u7D30\u6578\u64DA -Fine-Design_Chart_Result_Data=\u7D50\u679C\u6578\u64DA Fine-Design_Chart_Series_Value=\u503C Fine-Design_Chart_Server_PreStyle=\u5716\u8868\u9810\u5B9A\u7FA9\u914D\u8272 Fine-Design_Chart_Set_Data_Sheet=\u8A2D\u5B9A\u8CC7\u6599\u8868 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 b2c6530..95f9229 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 @@ -245,7 +245,7 @@ Fine-Design_Basic_DS_Class_TableData=Class Dataset Fine-Design_Basic_DS_Column=Data Column Fine-Design_Basic_DS_Database_Query=DB Query Fine-Design_Basic_DS_Dictionary=Data Dictionary -Fine-Design_Basic_DS_Embedded_TableData=Built-in Dataset +Fine-Design_Basic_DS_Embedded_TableData=Embedded Fine-Design_Basic_DS_Multi_Dimensional_Database=Multi-dimensional Database(MDD) Fine-Design_Basic_DS_Relation_TableData=Relation or Linked Dataset Fine-Design_Basic_DS_Report_TableData=Template Dataset @@ -2390,7 +2390,7 @@ Fine-Design_Report_Unit_INCH=INCH Fine-Design_Report_Unit_MM=MM Fine-Design_Report_Unit_PT=Pound Fine-Design_Report_Unit_PT_Duplicate=Pound -Fine-Design_Report_Unload_Check=Prompt users when leave without submitting +Fine-Design_Report_Unload_Check=Unsubmitted leave warning Fine-Design_Report_Up_Parent=Upper Parent Cell Fine-Design_Report_Upload_Mode=Upload Mode Fine-Design_Report_Url_Location=ABS Path From c901feea1425dae32dccbe8d9ba2f2de057139e5 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Mon, 27 Jul 2020 15:00:19 +0800 Subject: [PATCH 10/25] =?UTF-8?q?REPORT-26209=20=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 --- .../src/main/resources/com/fr/design/i18n/chart.properties | 2 +- .../src/main/resources/com/fr/design/i18n/chart_en.properties | 2 +- .../main/resources/com/fr/design/i18n/chart_ja_JP.properties | 4 ++-- .../main/resources/com/fr/design/i18n/chart_ko_KR.properties | 2 +- .../src/main/resources/com/fr/design/i18n/chart_zh.properties | 2 +- .../main/resources/com/fr/design/i18n/chart_zh_TW.properties | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) 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 26bc197..9a3f1f0 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 @@ -152,12 +152,12 @@ Fine-Design_Chart_Data_Filter= Fine-Design_Chart_Data_Function_Percent= Fine-Design_Chart_Data_Label_Inside= Fine-Design_Chart_Data_Label_OutSide= -Fine-Design_Chart_Data_Number= Fine-Design_Chart_Data_Max= Fine-Design_Chart_Data_Median= Fine-Design_Chart_Data_Min= Fine-Design_Chart_Data_Not_Show_Cate= Fine-Design_Chart_Data_Not_Show_Series= +Fine-Design_Chart_Data_Number= Fine-Design_Chart_Data_Point_Tooltip= Fine-Design_Chart_Data_Q1= Fine-Design_Chart_Data_Q3= 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 0274b27..20b61ea 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 @@ -152,12 +152,12 @@ Fine-Design_Chart_Data_Filter=Data Filter Fine-Design_Chart_Data_Function_Percent=Proportion Fine-Design_Chart_Data_Label_Inside=Datalabel Inside Fine-Design_Chart_Data_Label_OutSide=Datalabel Outside -Fine-Design_Chart_Data_Number=Number of data Fine-Design_Chart_Data_Max=Maximum Fine-Design_Chart_Data_Median=Median Fine-Design_Chart_Data_Min=Minimum Fine-Design_Chart_Data_Not_Show_Cate=No Display If Category Is Empty Fine-Design_Chart_Data_Not_Show_Series=No Display If Series Is Empty +Fine-Design_Chart_Data_Number=Number of data Fine-Design_Chart_Data_Point_Tooltip=Data Point Tips Fine-Design_Chart_Data_Q1=Lower quartile Fine-Design_Chart_Data_Q3=Upper quartile 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 a842495..ad3a906 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 @@ -152,12 +152,12 @@ Fine-Design_Chart_Data_Filter=\u30C7\u30FC\u30BF\u30D5\u30A3\u30EB\u30BF Fine-Design_Chart_Data_Function_Percent=\u5272\u5408 Fine-Design_Chart_Data_Label_Inside=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5185 Fine-Design_Chart_Data_Label_OutSide=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5916 -Fine-Design_Chart_Data_Number=\u30C7\u30FC\u30BF\u6570 Fine-Design_Chart_Data_Max=\u6700\u5927\u5024 Fine-Design_Chart_Data_Median=\u4E2D\u592E\u5024 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 +Fine-Design_Chart_Data_Number=\u30C7\u30FC\u30BF\u6570 Fine-Design_Chart_Data_Point_Tooltip=\u30C7\u30FC\u30BF\u30DD\u30A4\u30F3\u30C8\u306E\u30D2\u30F3\u30C8 Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D @@ -376,7 +376,7 @@ Fine-Design_Chart_Marker_Time=\u30DE\u30FC\u30AB\u30FC\u65E5\u6642 Fine-Design_Chart_Marker_Type=\u30DE\u30FC\u30AB\u30FC\u7A2E\u985E Fine-Design_Chart_Match_Color=\u914D\u8272 Fine-Design_Chart_Match_Color_Scheme=\u914D\u8272\u8A08\u753B -Fine-Design_Chart_Match_Default_Color_Scheme= +Fine-Design_Chart_Match_Default_Color_Scheme=\u65E2\u5B9A\u914D\u8272\u8A08\u753B Fine-Design_Chart_Match_To=\u30DE\u30C3\u30C1\u30F3\u30B0\u3000\u30C4\u30FC Fine-Design_Chart_Math_Exponent=\u6307\u6570\u8FD1\u4F3C Fine-Design_Chart_Math_Linear=\u7DDA\u578B\u8FD1\u4F3C 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 a005087..5900263 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 @@ -152,12 +152,12 @@ Fine-Design_Chart_Data_Filter=\uB370\uC774\uD130 \uD544\uD130 Fine-Design_Chart_Data_Function_Percent=\uC810\uC720\uC728 Fine-Design_Chart_Data_Label_Inside=\uB77C\uBCA8 \uC548\uCABD Fine-Design_Chart_Data_Label_OutSide=\uB77C\uBCA8 \uBC14\uAE65\uCABD -Fine-Design_Chart_Data_Number=\uB370\uC774\uD130 \uC218 Fine-Design_Chart_Data_Max=\uCD5C\uB300\uAC12 Fine-Design_Chart_Data_Median=\uC911\uC559\uAC12 Fine-Design_Chart_Data_Min=\uCD5C\uC18C\uAC12 Fine-Design_Chart_Data_Not_Show_Cate=\uCE74\uD14C\uACE0\uB9AC\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Not_Show_Series=\uC2DC\uB9AC\uC988\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C +Fine-Design_Chart_Data_Number=\uB370\uC774\uD130 \uC218 Fine-Design_Chart_Data_Point_Tooltip=\uB370\uC774\uD130 \uD234\uD301 Fine-Design_Chart_Data_Q1=\uB0AE\uC740 \uC0AC \uBD84\uC704\uC218 Fine-Design_Chart_Data_Q3=\uC704 \uC0AC \uBD84\uC704 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 f2b949f..0d8674f 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 @@ -152,12 +152,12 @@ Fine-Design_Chart_Data_Filter=\u6570\u636E\u7B5B\u9009 Fine-Design_Chart_Data_Function_Percent=\u5360\u6BD4 Fine-Design_Chart_Data_Label_Inside=\u6570\u636E\u6807\u7B7E\u5185 Fine-Design_Chart_Data_Label_OutSide=\u6570\u636E\u6807\u7B7E\u5916 -Fine-Design_Chart_Data_Number=\u6570\u636E\u4E2A\u6570 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6570 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u503C Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u7C7B\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u5206\u7C7B Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u7CFB\u5217 +Fine-Design_Chart_Data_Number=\u6570\u636E\u4E2A\u6570 Fine-Design_Chart_Data_Point_Tooltip=\u6570\u636E\u70B9\u63D0\u793A Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6570 Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6570 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 f041ff0..481bfaf 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 @@ -152,12 +152,12 @@ Fine-Design_Chart_Data_Filter=\u8CC7\u6599\u7BE9\u9078 Fine-Design_Chart_Data_Function_Percent=\u4F54\u6BD4 Fine-Design_Chart_Data_Label_Inside=\u8CC7\u6599\u6A19\u7C64\u5167 Fine-Design_Chart_Data_Label_OutSide=\u8CC7\u6599\u6A19\u7C64\u5916 -Fine-Design_Chart_Data_Number=\u6578\u64DA\u500B\u6578 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6578 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u70BA\u7A7A\u6642\uFF0C\u4E0D\u986F\u793A\u8A72\u5206\u985E Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u70BA\u7A7A\u6642,\u4E0D\u986F\u793A\u8A72\u7CFB\u5217 +Fine-Design_Chart_Data_Number=\u6578\u64DA\u500B\u6578 Fine-Design_Chart_Data_Point_Tooltip=\u8CC7\u6599\u9EDE\u63D0\u793A Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6578 Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6578 From 4b2309740bdaa948467e0dc3a2d1ac67aea5e922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Tue, 28 Jul 2020 15:42:02 +0800 Subject: [PATCH 11/25] =?UTF-8?q?CHART-9760=20=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main.properties | 3 ++- .../src/main/resources/com/fr/design/i18n/main_en.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_ja_JP.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_ko_KR.properties | 3 ++- .../src/main/resources/com/fr/design/i18n/main_zh.properties | 3 ++- .../main/resources/com/fr/design/i18n/main_zh_TW.properties | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties index 27ed111..b2b9372 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties @@ -2571,4 +2571,5 @@ Fine-Designer_PC_Fit_Attr= Fine-Engine_Fit-Impl= Fine_Design_Basic_Engine_Event_After_Delete= Fine_Design_Basic_M_Data_Analysis= -Fine_Design_Chart_Year= \ No newline at end of file +Fine_Design_Chart_Year= +Fine-Design_Chart_Field_Value= \ No newline at end of file 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 95f9229..1be1cc8 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 @@ -2571,4 +2571,5 @@ Fine-Designer_PC_Fit_Attr=PC Adaptive Attr Fine-Engine_Fit-Impl=Adaptive Plugin Fine_Design_Basic_Engine_Event_After_Delete=Delete After Row Fine_Design_Basic_M_Data_Analysis=Data Analysis Preview -Fine_Design_Chart_Year=Year \ No newline at end of file +Fine_Design_Chart_Year=Year +Fine-Design_Chart_Field_Value= \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties index cd19d08..2130ea8 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties @@ -2571,4 +2571,5 @@ Fine-Designer_PC_Fit_Attr=PC\u5074\u306E\u9069\u5FDC\u30D7\u30ED\u30D1\u30C6\u30 Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u30D7\u30E9\u30B0\u30A4\u30F3 Fine_Design_Basic_Engine_Event_After_Delete=\u884C\u524A\u9664\u5F8C Fine_Design_Basic_M_Data_Analysis=\u30C7\u30FC\u30BF\u5206\u6790 -Fine_Design_Chart_Year=\u5E74 \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 +Fine-Design_Chart_Field_Value= \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties index 524e80d..c265fcf 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties @@ -2571,4 +2571,5 @@ Fine-Designer_PC_Fit_Attr=PC Adaptive Attr Fine-Engine_Fit-Impl=\uC790\uCCB4 \uC801\uC751 \uD50C\uB7EC\uADF8\uC778 Fine_Design_Basic_Engine_Event_After_Delete=\uD589\uC0AD\uC81C\uD6C4 Fine_Design_Basic_M_Data_Analysis=\uB370\uC774\uD130\uBD84\uC11D -Fine_Design_Chart_Year=\uB144 \ No newline at end of file +Fine_Design_Chart_Year=\uB144 +Fine-Design_Chart_Field_Value= \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties index 30199a1..765cabc 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties @@ -2571,4 +2571,5 @@ Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9002\u5E94\u5C5E\u6027 Fine-Engine_Fit-Impl=\u81EA\u9002\u5E94\u63D2\u4EF6 Fine_Design_Basic_Engine_Event_After_Delete=\u5220\u9664\u884C\u540E Fine_Design_Basic_M_Data_Analysis=\u6570\u636E\u5206\u6790 -Fine_Design_Chart_Year=\u5E74 \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 +Fine-Design_Chart_Field_Value=\u5B57\u6BB5\u503C \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties index 63beeea..0da9a1f 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties @@ -2571,4 +2571,5 @@ Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9069\u61C9\u5C6C\u6027 Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u63D2\u4EF6 Fine_Design_Basic_Engine_Event_After_Delete=\u522A\u9664\u5217\u5F8C Fine_Design_Basic_M_Data_Analysis=\u8CC7\u6599\u5206\u6790 -Fine_Design_Chart_Year=\u5E74 \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 +Fine-Design_Chart_Field_Value= \ No newline at end of file From dd3ef3cd1dc03afb96ccefa6fdd1a800d53c66f4 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Thu, 30 Jul 2020 10:13:48 +0800 Subject: [PATCH 12/25] =?UTF-8?q?REPORT-26209=20=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/chart_ko_KR.properties | 2 +- .../src/main/resources/com/fr/design/i18n/main.properties | 4 ++-- .../main/resources/com/fr/design/i18n/main_en.properties | 8 ++++---- .../resources/com/fr/design/i18n/main_ja_JP.properties | 4 ++-- .../resources/com/fr/design/i18n/main_ko_KR.properties | 4 ++-- .../main/resources/com/fr/design/i18n/main_zh.properties | 4 ++-- .../resources/com/fr/design/i18n/main_zh_TW.properties | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) 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 5900263..8d13dc1 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 @@ -376,7 +376,7 @@ Fine-Design_Chart_Marker_Time=\uC911\uC694\uD55C \uB2E8\uACC4 Fine-Design_Chart_Marker_Type=\uD0DC\uADF8 \uC720\uD615 Fine-Design_Chart_Match_Color=\uBC30\uC0C9 Fine-Design_Chart_Match_Color_Scheme=\uBC30\uC0C9 \uBC29\uC548 -Fine-Design_Chart_Match_Default_Color_Scheme= +Fine-Design_Chart_Match_Default_Color_Scheme=\uAE30\uBCF8 \uBC30\uC0C9 \uBC29\uC548 Fine-Design_Chart_Match_To=\uC5D0 \uB9DE\uCD94\uAE30 Fine-Design_Chart_Math_Exponent=\uC9C0\uC218 \uD53C\uD305 Fine-Design_Chart_Math_Linear=\uC120\uD615 \uD53C\uD305 diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties index b2b9372..c64cc12 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data= Fine-Design_Chart_Enable_Auto_Refresh= Fine-Design_Chart_Enable_Field_Name= Fine-Design_Chart_Enable_Field_Value= +Fine-Design_Chart_Field_Value= Fine-Design_Chart_Float= Fine-Design_Chart_Float_Chart= Fine-Design_Chart_Format= @@ -2571,5 +2572,4 @@ Fine-Designer_PC_Fit_Attr= Fine-Engine_Fit-Impl= Fine_Design_Basic_Engine_Event_After_Delete= Fine_Design_Basic_M_Data_Analysis= -Fine_Design_Chart_Year= -Fine-Design_Chart_Field_Value= \ No newline at end of file +Fine_Design_Chart_Year= \ No newline at end of file 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 1be1cc8..ffa3b07 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 @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data=Empty Data Hint Fine-Design_Chart_Enable_Auto_Refresh=Enable Auto Refresh Fine-Design_Chart_Enable_Field_Name=Enable Field Name Fine-Design_Chart_Enable_Field_Value=Enable Field Value +Fine-Design_Chart_Field_Value= Fine-Design_Chart_Float=Chart Hyperlink-Floating Element Fine-Design_Chart_Float_Chart=Chart Hyperlink-Floating Chart Fine-Design_Chart_Format=Format @@ -1718,7 +1719,7 @@ Fine-Design_Report_AlphaFine_Relation_Item=Related Questions Fine-Design_Report_AlphaFine_ShowAll=Display All Fine-Design_Report_AlphaFine_ShowLess=Collapse Fine-Design_Report_Alpha_Hot_No_Item=There is no hot issues in this topic. -Fine-Design_Report_Append_Delete_Row_Message=Warning! Please set extended attributes of the specified cell. +Fine-Design_Report_Append_Delete_Row_Message=Note: The specified cell must have the expansion attribute Fine-Design_Report_Are_You_Sure_To_Delete_The_Data=Are you sure to delete the selected data Fine-Design_Report_At_Least_One_Visual_Worksheet=A workbook must contain at least one visible worksheet. If you want to delete it, please insert a new worksheet first. Fine-Design_Report_Attention=Attention @@ -2318,7 +2319,7 @@ Fine-Design_Report_SpecifiedG_Leave_In_Their_Own_Groups=Leave in their own group Fine-Design_Report_SpecifiedG_Put_All_Others_Together=Merger All Others Fine-Design_Report_SpecifiedG_Specified_Group=Custom Group Fine-Design_Report_Specify=Specify -Fine-Design_Report_Specify_Cell=Specify Cell +Fine-Design_Report_Specify_Cell=Specified Cell Fine-Design_Report_StyleFormat_Date=Date Fine-Design_Report_StyleFormat_Sample=Sample Fine-Design_Report_StyleFormat_Time=Time @@ -2571,5 +2572,4 @@ Fine-Designer_PC_Fit_Attr=PC Adaptive Attr Fine-Engine_Fit-Impl=Adaptive Plugin Fine_Design_Basic_Engine_Event_After_Delete=Delete After Row Fine_Design_Basic_M_Data_Analysis=Data Analysis Preview -Fine_Design_Chart_Year=Year -Fine-Design_Chart_Field_Value= \ No newline at end of file +Fine_Design_Chart_Year=Year \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties index 2130ea8..eed0da5 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data=\u30B0\u30E9\u30D5\u7A7A\u767D\u30C7\u30FC\u30BF\u3 Fine-Design_Chart_Enable_Auto_Refresh=\u81EA\u52D5\u66F4\u65B0 Fine-Design_Chart_Enable_Field_Name=\u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u4F7F\u7528 Fine-Design_Chart_Enable_Field_Value=\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u4F7F\u7528 +Fine-Design_Chart_Field_Value= Fine-Design_Chart_Float=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF-\u30D5\u30ED\u30FC\u30C6\u30A3\u30F3\u30B0\u8981\u7D20\u9023\u52D5 Fine-Design_Chart_Float_Chart=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF-\u30D5\u30ED\u30FC\u30C6\u30A3\u30F3\u30B0\u30B0\u30E9\u30D5 Fine-Design_Chart_Format=\u66F8\u5F0F @@ -2571,5 +2572,4 @@ Fine-Designer_PC_Fit_Attr=PC\u5074\u306E\u9069\u5FDC\u30D7\u30ED\u30D1\u30C6\u30 Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u30D7\u30E9\u30B0\u30A4\u30F3 Fine_Design_Basic_Engine_Event_After_Delete=\u884C\u524A\u9664\u5F8C Fine_Design_Basic_M_Data_Analysis=\u30C7\u30FC\u30BF\u5206\u6790 -Fine_Design_Chart_Year=\u5E74 -Fine-Design_Chart_Field_Value= \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties index c265fcf..e8da3e3 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data=\uCC28\uD2B8 \uBE48 \uB370\uC774\uD130 \uC54C\uB9BC Fine-Design_Chart_Enable_Auto_Refresh=\uC790\uB3D9 \uC0C8\uB85C\uACE0\uCE68 Fine-Design_Chart_Enable_Field_Name=\uD544\uB4DC\uBA85\uC0AC\uC6A9 Fine-Design_Chart_Enable_Field_Value=\uD544\uB4DC\uAC12\uC0AC\uC6A9 +Fine-Design_Chart_Field_Value= Fine-Design_Chart_Float=\uCC28\uD2B8-\uD50C\uB85C\uD2B8 \uC694\uC18C \uB9C1\uD0A4\uC9C0 Fine-Design_Chart_Float_Chart=\uCC28\uD2B8-\uD50C\uB85C\uD2B8 \uCC28\uD2B8 \uB9C1\uD0A4\uC9C0 Fine-Design_Chart_Format=\uD3EC\uBA67 @@ -2571,5 +2572,4 @@ Fine-Designer_PC_Fit_Attr=PC Adaptive Attr Fine-Engine_Fit-Impl=\uC790\uCCB4 \uC801\uC751 \uD50C\uB7EC\uADF8\uC778 Fine_Design_Basic_Engine_Event_After_Delete=\uD589\uC0AD\uC81C\uD6C4 Fine_Design_Basic_M_Data_Analysis=\uB370\uC774\uD130\uBD84\uC11D -Fine_Design_Chart_Year=\uB144 -Fine-Design_Chart_Field_Value= \ No newline at end of file +Fine_Design_Chart_Year=\uB144 \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties index 765cabc..c193df2 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data=\u56FE\u8868\u7A7A\u6570\u636E\u63D0\u793A Fine-Design_Chart_Enable_Auto_Refresh=\u81EA\u52A8\u5237\u65B0 Fine-Design_Chart_Enable_Field_Name=\u4F7F\u7528\u5B57\u6BB5\u540D Fine-Design_Chart_Enable_Field_Value=\u4F7F\u7528\u5B57\u6BB5\u503C +Fine-Design_Chart_Field_Value=\u5B57\u6BB5\u503C Fine-Design_Chart_Float=\u56FE\u8868\u8D85\u94FE-\u8054\u52A8\u60AC\u6D6E\u5143\u7D20 Fine-Design_Chart_Float_Chart=\u56FE\u8868\u8D85\u94FE-\u60AC\u6D6E\u7A97\u56FE\u8868 Fine-Design_Chart_Format=\u683C\u5F0F @@ -2571,5 +2572,4 @@ Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9002\u5E94\u5C5E\u6027 Fine-Engine_Fit-Impl=\u81EA\u9002\u5E94\u63D2\u4EF6 Fine_Design_Basic_Engine_Event_After_Delete=\u5220\u9664\u884C\u540E Fine_Design_Basic_M_Data_Analysis=\u6570\u636E\u5206\u6790 -Fine_Design_Chart_Year=\u5E74 -Fine-Design_Chart_Field_Value=\u5B57\u6BB5\u503C \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties index 0da9a1f..9306bb1 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties @@ -1216,6 +1216,7 @@ Fine-Design_Chart_Empty_Data=\u5716\u8868\u7A7A\u8CC7\u6599\u63D0\u793A Fine-Design_Chart_Enable_Auto_Refresh=\u81EA\u52D5\u91CD\u65B0\u6574\u7406 Fine-Design_Chart_Enable_Field_Name=\u4F7F\u7528\u6B04\u4F4D\u540D Fine-Design_Chart_Enable_Field_Value=\u4F7F\u7528\u6B04\u4F4D\u503C +Fine-Design_Chart_Field_Value= Fine-Design_Chart_Float=\u5716\u8868\u8D85\u9023\u7D50-\u806F\u52D5\u61F8\u6D6E\u5143\u7D20 Fine-Design_Chart_Float_Chart=\u5716\u8868\u8D85\u9023\u7D50-\u61F8\u6D6E\u7A97\u5716\u8868 Fine-Design_Chart_Format=\u683C\u5F0F @@ -2571,5 +2572,4 @@ Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9069\u61C9\u5C6C\u6027 Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u63D2\u4EF6 Fine_Design_Basic_Engine_Event_After_Delete=\u522A\u9664\u5217\u5F8C Fine_Design_Basic_M_Data_Analysis=\u8CC7\u6599\u5206\u6790 -Fine_Design_Chart_Year=\u5E74 -Fine-Design_Chart_Field_Value= \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 \ No newline at end of file From ab76ced20e3dab765774778c1e0d66bd2f636d02 Mon Sep 17 00:00:00 2001 From: "Yuan.Wang" <1536296691@qq.com> Date: Thu, 30 Jul 2020 15:01:18 +0800 Subject: [PATCH 13/25] =?UTF-8?q?REPORT-35463=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E2=80=9CBUG=E9=9C=80=E6=B1=82=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E6=8A=80=E6=9C=AF=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E2=80=9D=E7=9A=84KEY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/main_en.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/main_ja_JP.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/main_ko_KR.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/main_zh.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/main_zh_TW.properties | 2 ++ 6 files changed, 12 insertions(+) diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties index 27ed111..1fda8b6 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully= Fine-Design_Basic_Commuinity_Center= Fine-Design_Basic_Commuinity_Demand= Fine-Design_Basic_Commuinity_Need= +Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution= Fine-Design_Basic_Community= Fine-Design_Basic_Community_Bbs= 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 95f9229..7d5ce54 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 @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully=Successfully Saved Fine-Design_Basic_Commuinity_Center=Center Fine-Design_Basic_Commuinity_Demand=Customize Demand Fine-Design_Basic_Commuinity_Need=Demand Feedback +Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=Tech Solutions Fine-Design_Basic_Community=Community Fine-Design_Basic_Community_Bbs=Community Home diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties index cd19d08..4e02e73 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully=\u4FDD\u5B58\u3057\u307E\u3057\u305F Fine-Design_Basic_Commuinity_Center=\u30A4\u30D9\u30F3\u30C8\u30BB\u30F3\u30BF\u30FC Fine-Design_Basic_Commuinity_Demand=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u30B5\u30FC\u30D3\u30B9 Fine-Design_Basic_Commuinity_Need=\u30CB\u30FC\u30BA\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF +\u3001Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=\u6280\u8853\u30BD\u30EA\u30E5\u30FC\u30B7\u30E7\u30F3 Fine-Design_Basic_Community=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3 Fine-Design_Basic_Community_Bbs=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3\u306E\u30C8\u30C3\u30D7\u30DA\u30FC\u30B8 diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties index 524e80d..c3db9be 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully=\uC800\uC7A5\uC131\uACF5 Fine-Design_Basic_Commuinity_Center=\uCEE4\uBBA4\uB2C8\uD2F0 \uC13C\uD130 Fine-Design_Basic_Commuinity_Demand=\uCEE4\uC2A4\uD140 \uC218\uC694 Fine-Design_Basic_Commuinity_Need=\uC218\uC694 \uD53C\uB4DC\uBC31 +Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=\uC194\uB8E8\uC158 Fine-Design_Basic_Community=\uCEE4\uBBA4\uB2C8\uD2F0 Fine-Design_Basic_Community_Bbs=\uCEE4\uBBA4\uB2C8\uD2F0 \uD648 diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties index 30199a1..12c49d1 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully=Save successfully Fine-Design_Basic_Commuinity_Center=\u6D3B\u52A8\u4E2D\u5FC3 Fine-Design_Basic_Commuinity_Demand=\u9700\u6C42\u5B9A\u5236 Fine-Design_Basic_Commuinity_Need=\u9700\u6C42\u53CD\u9988 +Fine-Design_Basic_Community_TechSupport=\u6280\u672F\u652F\u6301 +Fine-Design_Basic_Community_BugAndNeed=BUG\u9700\u6C42\u53CD\u9988 Fine-Design_Basic_Commuinity_Solution=\u6280\u672F\u65B9\u6848 Fine-Design_Basic_Community=\u793E\u533A Fine-Design_Basic_Community_Bbs=\u793E\u533A\u9996\u9875 diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties index 63beeea..96f5e5a 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties @@ -184,6 +184,8 @@ Fine-Design_Basic_Common_Save_Successfully=Save successfully Fine-Design_Basic_Commuinity_Center=\u6D3B\u52D5\u4E2D\u5FC3 Fine-Design_Basic_Commuinity_Demand=\u9700\u6C42\u5B9A\u88FD Fine-Design_Basic_Commuinity_Need=\u9700\u6C42\u53CD\u994B +Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=\u6280\u8853\u65B9\u6848 Fine-Design_Basic_Community=\u793E\u5340 Fine-Design_Basic_Community_Bbs=\u793E\u5340\u9996\u9801 From 9afbe61c001e917bc22d7a1e67da49b1e7ea6d5d Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 30 Jul 2020 16:33:45 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- build.gradle | 56 ++++++++ globalConfigHook.gradle | 29 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 172 +++++++++++++++++++++++ gradlew.bat | 84 +++++++++++ settings.gradle | 12 ++ 8 files changed, 361 insertions(+), 1 deletion(-) create mode 100644 build.gradle create mode 100644 globalConfigHook.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index 85184fb..18971dc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ .idea/ .DS_Store .classpath -.project \ No newline at end of file +.project +.gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..46da3f0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,56 @@ +import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel + +plugins { + id 'java' + id 'java-library' + id 'com.fr.common' version '1.0-SNAPSHOT' +} + +ext { + frVersion = "" + outputPath = "build" + ignoreTestFailureSetting = true + languageLevelSetting = 1.8 +} + + +applyGlobalConfigPathIfExist() + +if (versions.frVersion) { + frVersion = versions.frVersion +} +def frDevVersion = "DEV" + frVersion + +dependencies { + compile project(':design-i18n-report') + compile project(':design-i18n-chart') +} + +allprojects { + apply plugin: 'java' + apply plugin: 'java-library' + apply plugin: 'idea' + + group 'com.fr.design' + version frDevVersion + sourceCompatibility = languageLevelSetting + targetCompatibility = languageLevelSetting + + tasks.withType(JavaCompile) { + options.encoding = "UTF-8" + } + + repositories { + mavenLocal() + } + + idea { + module { + inheritOutputDirs = false + outputDir = file(outputPath +"/classes") + testOutputDir = file(outputPath +"/test-classes") + languageLevel = new IdeaLanguageLevel(sourceCompatibility) + targetBytecodeVersion = targetCompatibility + } + } +} diff --git a/globalConfigHook.gradle b/globalConfigHook.gradle new file mode 100644 index 0000000..c625d05 --- /dev/null +++ b/globalConfigHook.gradle @@ -0,0 +1,29 @@ +def getRootGradle() { + def currentGradle = gradle + while (currentGradle.parent) { + currentGradle = currentGradle.parent + } + return currentGradle +} + +def findHookIncludedBuild() { + def rootGradle = getRootGradle() + def hookProject = rootGradle.getIncludedBuilds() + .find({ build -> build.name == 'hook' }) + return hookProject +} + +def findGlobalConfig() { + def hookProject = findHookIncludedBuild() + if (hookProject) { + def path = hookProject.projectDir.parent + '/globalConfig.gradle' + if (file(path).exists()) { + return path + } + } +} + +def globalConfigPath = findGlobalConfig() +if (globalConfigPath) { + apply from: globalConfigPath +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..fbb3fa0 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 22 15:17:12 CST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..af6708f --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6d57edc --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e66b9f6 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,12 @@ +pluginManagement { + repositories { + maven { + url 'http://mvn.finedevelop.com/repository/maven-public/' + } + gradlePluginPortal() + } +} + +rootProject.name = 'design-i18n' + +include 'design-i18n-report','design-i18n-chart' From aaa112990679048c14fd4a9a12849f820b17da2d Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Mon, 3 Aug 2020 09:51:39 +0800 Subject: [PATCH 15/25] =?UTF-8?q?REPORT-26209=20=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 --- .../src/main/resources/com/fr/design/i18n/main.properties | 7 ++++--- .../main/resources/com/fr/design/i18n/main_en.properties | 7 ++++--- .../resources/com/fr/design/i18n/main_ja_JP.properties | 7 ++++--- .../resources/com/fr/design/i18n/main_ko_KR.properties | 7 ++++--- .../main/resources/com/fr/design/i18n/main_zh.properties | 7 ++++--- .../resources/com/fr/design/i18n/main_zh_TW.properties | 7 ++++--- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties index 8365108..4f697f8 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties @@ -184,14 +184,14 @@ Fine-Design_Basic_Common_Save_Successfully= Fine-Design_Basic_Commuinity_Center= Fine-Design_Basic_Commuinity_Demand= Fine-Design_Basic_Commuinity_Need= -Fine-Design_Basic_Community_TechSupport= -Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution= Fine-Design_Basic_Community= Fine-Design_Basic_Community_Bbs= Fine-Design_Basic_Community_Bug= +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Community_FaceBook_Fans= Fine-Design_Basic_Community_Questions= +Fine-Design_Basic_Community_TechSupport= Fine-Design_Basic_Community_Update= Fine-Design_Basic_Community_Video= Fine-Design_Basic_Community_sign= @@ -2574,4 +2574,5 @@ Fine-Designer_PC_Fit_Attr= Fine-Engine_Fit-Impl= Fine_Design_Basic_Engine_Event_After_Delete= Fine_Design_Basic_M_Data_Analysis= -Fine_Design_Chart_Year= \ No newline at end of file +Fine_Design_Chart_Year= +、Fine-Design_Basic_Community_TechSupport= \ No newline at end of file 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 6871d33..23b1c8f 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 @@ -184,14 +184,14 @@ Fine-Design_Basic_Common_Save_Successfully=Successfully Saved Fine-Design_Basic_Commuinity_Center=Center Fine-Design_Basic_Commuinity_Demand=Customize Demand Fine-Design_Basic_Commuinity_Need=Demand Feedback -Fine-Design_Basic_Community_TechSupport= -Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=Tech Solutions Fine-Design_Basic_Community=Community Fine-Design_Basic_Community_Bbs=Community Home Fine-Design_Basic_Community_Bug=Bug Feedback +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Community_FaceBook_Fans=FineReport Facebook Fans Fine-Design_Basic_Community_Questions=Problems +Fine-Design_Basic_Community_TechSupport= Fine-Design_Basic_Community_Update=Update Fine-Design_Basic_Community_Video=Learning Path Fine-Design_Basic_Community_sign=Engineer Certification @@ -2574,4 +2574,5 @@ Fine-Designer_PC_Fit_Attr=PC Adaptive Attr Fine-Engine_Fit-Impl=Adaptive Plugin Fine_Design_Basic_Engine_Event_After_Delete=Delete After Row Fine_Design_Basic_M_Data_Analysis=Data Analysis Preview -Fine_Design_Chart_Year=Year \ No newline at end of file +Fine_Design_Chart_Year=Year +、Fine-Design_Basic_Community_TechSupport= \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties index 809b81a..9d8bc73 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties @@ -184,14 +184,14 @@ Fine-Design_Basic_Common_Save_Successfully=\u4FDD\u5B58\u3057\u307E\u3057\u305F Fine-Design_Basic_Commuinity_Center=\u30A4\u30D9\u30F3\u30C8\u30BB\u30F3\u30BF\u30FC Fine-Design_Basic_Commuinity_Demand=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u30B5\u30FC\u30D3\u30B9 Fine-Design_Basic_Commuinity_Need=\u30CB\u30FC\u30BA\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF -\u3001Fine-Design_Basic_Community_TechSupport= -Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=\u6280\u8853\u30BD\u30EA\u30E5\u30FC\u30B7\u30E7\u30F3 Fine-Design_Basic_Community=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3 Fine-Design_Basic_Community_Bbs=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3\u306E\u30C8\u30C3\u30D7\u30DA\u30FC\u30B8 Fine-Design_Basic_Community_Bug=BUG\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Community_FaceBook_Fans=FineReport\u30D5\u30A7\u30A4\u30B9\u30D6\u30C3\u30AF\u30D5\u30A1\u30F3\u30BA Fine-Design_Basic_Community_Questions=\u304A\u554F\u3044\u5408\u308F\u305B +Fine-Design_Basic_Community_TechSupport= Fine-Design_Basic_Community_Update=\u88FD\u54C1\u66F4\u65B0 Fine-Design_Basic_Community_Video=\u30C8\u30EC\u30FC\u30CB\u30F3\u30B0\u30D3\u30C7\u30AA Fine-Design_Basic_Community_sign=\u5E33\u7968\u30A8\u30F3\u30B8\u30CB\u30A2\u306E\u8A8D\u8A3C @@ -2574,4 +2574,5 @@ Fine-Designer_PC_Fit_Attr=PC\u5074\u306E\u9069\u5FDC\u30D7\u30ED\u30D1\u30C6\u30 Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u30D7\u30E9\u30B0\u30A4\u30F3 Fine_Design_Basic_Engine_Event_After_Delete=\u884C\u524A\u9664\u5F8C Fine_Design_Basic_M_Data_Analysis=\u30C7\u30FC\u30BF\u5206\u6790 -Fine_Design_Chart_Year=\u5E74 \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 +、Fine-Design_Basic_Community_TechSupport= \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties index 4898720..d25d092 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties @@ -184,14 +184,14 @@ Fine-Design_Basic_Common_Save_Successfully=\uC800\uC7A5\uC131\uACF5 Fine-Design_Basic_Commuinity_Center=\uCEE4\uBBA4\uB2C8\uD2F0 \uC13C\uD130 Fine-Design_Basic_Commuinity_Demand=\uCEE4\uC2A4\uD140 \uC218\uC694 Fine-Design_Basic_Commuinity_Need=\uC218\uC694 \uD53C\uB4DC\uBC31 -Fine-Design_Basic_Community_TechSupport= -Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=\uC194\uB8E8\uC158 Fine-Design_Basic_Community=\uCEE4\uBBA4\uB2C8\uD2F0 Fine-Design_Basic_Community_Bbs=\uCEE4\uBBA4\uB2C8\uD2F0 \uD648 Fine-Design_Basic_Community_Bug=BUG \uD53C\uB4DC\uBC31 +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Community_FaceBook_Fans=FineReport \uD398\uC774\uC2A4\uBD81 \uD32C Fine-Design_Basic_Community_Questions=\uC9C8\uBB38 +Fine-Design_Basic_Community_TechSupport= Fine-Design_Basic_Community_Update=\uC81C\uD488 \uC5C5\uB370\uC774\uD2B8 Fine-Design_Basic_Community_Video=\uAD50\uC721 \uBE44\uB514\uC624 Fine-Design_Basic_Community_sign=\uB9AC\uD3EC\uD2B8 \uC5D4\uC9C0\uB2C8\uC5B4 \uC778\uC99D @@ -2574,4 +2574,5 @@ Fine-Designer_PC_Fit_Attr=PC Adaptive Attr Fine-Engine_Fit-Impl=\uC790\uCCB4 \uC801\uC751 \uD50C\uB7EC\uADF8\uC778 Fine_Design_Basic_Engine_Event_After_Delete=\uD589\uC0AD\uC81C\uD6C4 Fine_Design_Basic_M_Data_Analysis=\uB370\uC774\uD130\uBD84\uC11D -Fine_Design_Chart_Year=\uB144 \ No newline at end of file +Fine_Design_Chart_Year=\uB144 +、Fine-Design_Basic_Community_TechSupport= \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties index 7938a82..fd8254a 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh.properties @@ -184,14 +184,14 @@ Fine-Design_Basic_Common_Save_Successfully=Save successfully Fine-Design_Basic_Commuinity_Center=\u6D3B\u52A8\u4E2D\u5FC3 Fine-Design_Basic_Commuinity_Demand=\u9700\u6C42\u5B9A\u5236 Fine-Design_Basic_Commuinity_Need=\u9700\u6C42\u53CD\u9988 -Fine-Design_Basic_Community_TechSupport=\u6280\u672F\u652F\u6301 -Fine-Design_Basic_Community_BugAndNeed=BUG\u9700\u6C42\u53CD\u9988 Fine-Design_Basic_Commuinity_Solution=\u6280\u672F\u65B9\u6848 Fine-Design_Basic_Community=\u793E\u533A Fine-Design_Basic_Community_Bbs=\u793E\u533A\u9996\u9875 Fine-Design_Basic_Community_Bug=BUG\u53CD\u9988 +Fine-Design_Basic_Community_BugAndNeed=BUG\u9700\u6C42\u53CD\u9988 Fine-Design_Basic_Community_FaceBook_Fans=FineReport\u8138\u4E66\u7C89\u4E1D\u5708 Fine-Design_Basic_Community_Questions=\u95EE\u9898\u6C42\u52A9 +Fine-Design_Basic_Community_TechSupport=\u6280\u672F\u652F\u6301 Fine-Design_Basic_Community_Update=\u4EA7\u54C1\u66F4\u65B0 Fine-Design_Basic_Community_Video=\u89C6\u9891\u6559\u7A0B Fine-Design_Basic_Community_sign=\u62A5\u8868\u5DE5\u7A0B\u5E08\u8BA4\u8BC1 @@ -2574,4 +2574,5 @@ Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9002\u5E94\u5C5E\u6027 Fine-Engine_Fit-Impl=\u81EA\u9002\u5E94\u63D2\u4EF6 Fine_Design_Basic_Engine_Event_After_Delete=\u5220\u9664\u884C\u540E Fine_Design_Basic_M_Data_Analysis=\u6570\u636E\u5206\u6790 -Fine_Design_Chart_Year=\u5E74 \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 +、Fine-Design_Basic_Community_TechSupport= \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties index f22062e..8a542cf 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties @@ -184,14 +184,14 @@ Fine-Design_Basic_Common_Save_Successfully=Save successfully Fine-Design_Basic_Commuinity_Center=\u6D3B\u52D5\u4E2D\u5FC3 Fine-Design_Basic_Commuinity_Demand=\u9700\u6C42\u5B9A\u88FD Fine-Design_Basic_Commuinity_Need=\u9700\u6C42\u53CD\u994B -Fine-Design_Basic_Community_TechSupport= -Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Commuinity_Solution=\u6280\u8853\u65B9\u6848 Fine-Design_Basic_Community=\u793E\u5340 Fine-Design_Basic_Community_Bbs=\u793E\u5340\u9996\u9801 Fine-Design_Basic_Community_Bug=BUG\u53CD\u994B +Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Community_FaceBook_Fans=FineReport\u81C9\u66F8\u7C89\u7D72\u5718 Fine-Design_Basic_Community_Questions=\u554F\u984C\u6C42\u52A9 +Fine-Design_Basic_Community_TechSupport= Fine-Design_Basic_Community_Update=\u7522\u54C1\u66F4\u65B0 Fine-Design_Basic_Community_Video=\u8AB2\u7A0B\u6559\u5B78 Fine-Design_Basic_Community_sign=\u5831\u8868\u5DE5\u7A0B\u5E2B\u8A8D\u8B49 @@ -2574,4 +2574,5 @@ Fine-Designer_PC_Fit_Attr=PC\u7AEF\u81EA\u9069\u61C9\u5C6C\u6027 Fine-Engine_Fit-Impl=\u81EA\u52D5\u8ABF\u6574\u63D2\u4EF6 Fine_Design_Basic_Engine_Event_After_Delete=\u522A\u9664\u5217\u5F8C Fine_Design_Basic_M_Data_Analysis=\u8CC7\u6599\u5206\u6790 -Fine_Design_Chart_Year=\u5E74 \ No newline at end of file +Fine_Design_Chart_Year=\u5E74 +、Fine-Design_Basic_Community_TechSupport= \ No newline at end of file From 6f4c259f6a37d55b2a02f75e3b2ce04e18d486c1 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Mon, 3 Aug 2020 23:06:59 +0800 Subject: [PATCH 16/25] =?UTF-8?q?CHART-11549=20=E4=BF=AE=E6=94=B9=E7=AE=B1?= =?UTF-8?q?=E5=9E=8B=E5=9B=BE=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=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 | 2 ++ .../src/main/resources/com/fr/design/i18n/chart_en.properties | 2 ++ .../main/resources/com/fr/design/i18n/chart_ja_JP.properties | 2 ++ .../main/resources/com/fr/design/i18n/chart_ko_KR.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/chart_zh.properties | 2 ++ .../main/resources/com/fr/design/i18n/chart_zh_TW.properties | 2 ++ 6 files changed, 12 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 1c3c5cb..14a7291 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 @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median= Fine-Design_Chart_Data_Min= Fine-Design_Chart_Data_Q3= Fine-Design_Chart_Data_Q1= +Fine-Design_Chart_Normal_Value= +Fine-Design_Chart_Outlier_Value= Fine-Design_Chart_Data_Not_Show_Cate= Fine-Design_Chart_Data_Not_Show_Series= Fine-Design_Chart_Data_Point_Tooltip= 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 0237505..142fd75 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 @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median=Median Fine-Design_Chart_Data_Min=Minimum Fine-Design_Chart_Data_Q3=Upper quartile Fine-Design_Chart_Data_Q1=Lower quartile +Fine-Design_Chart_Normal_Value=Normal value +Fine-Design_Chart_Outlier_Value=Outliers Fine-Design_Chart_Data_Not_Show_Cate=No Display If Category Is Empty Fine-Design_Chart_Data_Not_Show_Series=No Display If Series Is Empty Fine-Design_Chart_Data_Point_Tooltip=Data Point Tips 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 85ae7d9..2aa3b1d 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 @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median=\u4E2D\u592E\u5024 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D +Fine-Design_Chart_Normal_Value=\u901A\u5E38\u5024 +Fine-Design_Chart_Outlier_Value=\u5916\u308C\u5024 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Point_Tooltip=\u30C7\u30FC\u30BF\u30DD\u30A4\u30F3\u30C8\u306E\u30D2\u30F3\u30C8 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 38071f8..e682365 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 @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median=\uC911\uC559\uAC12 Fine-Design_Chart_Data_Min=\uCD5C\uC18C\uAC12 Fine-Design_Chart_Data_Q3=\uC704 \uC0AC \uBD84\uC704 Fine-Design_Chart_Data_Q1=\uB0AE\uC740 \uC0AC \uBD84\uC704\uC218 +Fine-Design_Chart_Normal_Value=\uC815\uC0C1 \uAC12 +Fine-Design_Chart_Outlier_Value=\uD2B9\uC774 \uCE58 Fine-Design_Chart_Data_Not_Show_Cate=\uCE74\uD14C\uACE0\uB9AC\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Not_Show_Series=\uC2DC\uB9AC\uC988\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Point_Tooltip=\uB370\uC774\uD130 \uD234\uD301 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 00154f1..0fa6380 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 @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6570 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u503C Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6570 Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6570 +Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C +Fine-Design_Chart_Outlier_Value=\u5F02\u5E38\u503C Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u7C7B\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u5206\u7C7B Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u7CFB\u5217 Fine-Design_Chart_Data_Point_Tooltip=\u6570\u636E\u70B9\u63D0\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 40faf8f..1e710a1 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 @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6578 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6578 Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6578 +Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C +Fine-Design_Chart_Outlier_Value=\u7570\u5E38\u503C Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u70BA\u7A7A\u6642\uFF0C\u4E0D\u986F\u793A\u8A72\u5206\u985E Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u70BA\u7A7A\u6642,\u4E0D\u986F\u793A\u8A72\u7CFB\u5217 Fine-Design_Chart_Data_Point_Tooltip=\u8CC7\u6599\u9EDE\u63D0\u793A From 12b09c6c25d58b8004baea8d80f2c51579632991 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Mon, 3 Aug 2020 23:16:23 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/chart.properties | 5 ----- .../main/resources/com/fr/design/i18n/chart_en.properties | 5 ----- .../main/resources/com/fr/design/i18n/chart_ja_JP.properties | 5 ----- .../main/resources/com/fr/design/i18n/chart_ko_KR.properties | 5 ----- .../main/resources/com/fr/design/i18n/chart_zh.properties | 5 ----- .../main/resources/com/fr/design/i18n/chart_zh_TW.properties | 5 ----- 6 files changed, 30 deletions(-) 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 c632145..c244a6d 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 @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide= Fine-Design_Chart_Data_Max= Fine-Design_Chart_Data_Median= Fine-Design_Chart_Data_Min= -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3= -Fine-Design_Chart_Data_Q1= Fine-Design_Chart_Normal_Value= Fine-Design_Chart_Outlier_Value= -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate= Fine-Design_Chart_Data_Not_Show_Series= Fine-Design_Chart_Data_Number= 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 f4f5d7d..3899988 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 @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=Datalabel Outside Fine-Design_Chart_Data_Max=Maximum Fine-Design_Chart_Data_Median=Median Fine-Design_Chart_Data_Min=Minimum -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3=Upper quartile -Fine-Design_Chart_Data_Q1=Lower quartile Fine-Design_Chart_Normal_Value=Normal value Fine-Design_Chart_Outlier_Value=Outliers -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate=No Display If Category Is Empty Fine-Design_Chart_Data_Not_Show_Series=No Display If Series Is Empty Fine-Design_Chart_Data_Number=Number of data 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 898aa98..d145d55 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 @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u5024 Fine-Design_Chart_Data_Median=\u4E2D\u592E\u5024 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D -Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D Fine-Design_Chart_Normal_Value=\u901A\u5E38\u5024 Fine-Design_Chart_Outlier_Value=\u5916\u308C\u5024 -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Number=\u30C7\u30FC\u30BF\u6570 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 7209da3..238f232 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 @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\uB77C\uBCA8 \uBC14\uAE65\uCABD Fine-Design_Chart_Data_Max=\uCD5C\uB300\uAC12 Fine-Design_Chart_Data_Median=\uC911\uC559\uAC12 Fine-Design_Chart_Data_Min=\uCD5C\uC18C\uAC12 -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3=\uC704 \uC0AC \uBD84\uC704 -Fine-Design_Chart_Data_Q1=\uB0AE\uC740 \uC0AC \uBD84\uC704\uC218 Fine-Design_Chart_Normal_Value=\uC815\uC0C1 \uAC12 Fine-Design_Chart_Outlier_Value=\uD2B9\uC774 \uCE58 -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate=\uCE74\uD14C\uACE0\uB9AC\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Not_Show_Series=\uC2DC\uB9AC\uC988\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Number=\uB370\uC774\uD130 \uC218 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 b539f90..bffadd4 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 @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\u6570\u636E\u6807\u7B7E\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6570 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u503C -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6570 -Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6570 Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C Fine-Design_Chart_Outlier_Value=\u5F02\u5E38\u503C -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u7C7B\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u5206\u7C7B Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u7CFB\u5217 Fine-Design_Chart_Data_Number=\u6570\u636E\u4E2A\u6570 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 9b6a0fa..b546315 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 @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\u8CC7\u6599\u6A19\u7C64\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6578 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6578 -Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6578 Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C Fine-Design_Chart_Outlier_Value=\u7570\u5E38\u503C -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u70BA\u7A7A\u6642\uFF0C\u4E0D\u986F\u793A\u8A72\u5206\u985E Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u70BA\u7A7A\u6642,\u4E0D\u986F\u793A\u8A72\u7CFB\u5217 Fine-Design_Chart_Data_Number=\u6578\u64DA\u500B\u6578 From cc275051ee78d049516efecea2eec1bb0088d647 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Wed, 5 Aug 2020 10:32:50 +0800 Subject: [PATCH 18/25] =?UTF-8?q?REPORT-26209=20=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 --- .../main/resources/com/fr/design/i18n/chart.properties | 4 ++-- .../main/resources/com/fr/design/i18n/chart_en.properties | 4 ++-- .../resources/com/fr/design/i18n/chart_ja_JP.properties | 4 ++-- .../resources/com/fr/design/i18n/chart_ko_KR.properties | 4 ++-- .../main/resources/com/fr/design/i18n/chart_zh.properties | 4 ++-- .../resources/com/fr/design/i18n/chart_zh_TW.properties | 8 ++++---- .../main/resources/com/fr/design/i18n/main_en.properties | 6 +++--- .../resources/com/fr/design/i18n/main_ja_JP.properties | 4 ++-- .../resources/com/fr/design/i18n/main_zh_TW.properties | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) 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 c244a6d..de0b5ec 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 @@ -155,8 +155,6 @@ Fine-Design_Chart_Data_Label_OutSide= Fine-Design_Chart_Data_Max= Fine-Design_Chart_Data_Median= Fine-Design_Chart_Data_Min= -Fine-Design_Chart_Normal_Value= -Fine-Design_Chart_Outlier_Value= Fine-Design_Chart_Data_Not_Show_Cate= Fine-Design_Chart_Data_Not_Show_Series= Fine-Design_Chart_Data_Number= @@ -436,6 +434,7 @@ Fine-Design_Chart_Node_Name= Fine-Design_Chart_Node_Radius= Fine-Design_Chart_Non_Adjustment= Fine-Design_Chart_Normal_Line= +Fine-Design_Chart_Normal_Value= Fine-Design_Chart_Not_Follow_Mouse= Fine-Design_Chart_Not_Limit= Fine-Design_Chart_Not_Support_Img_And_Cell= @@ -449,6 +448,7 @@ Fine-Design_Chart_Only_Use_Before_Records= Fine-Design_Chart_Open= Fine-Design_Chart_Open_Large_Data_Model= Fine-Design_Chart_Origin= +Fine-Design_Chart_Outlier_Value= Fine-Design_Chart_Pane_Background= Fine-Design_Chart_Parent_ID= Fine-Design_Chart_Pattern= 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 3899988..9e96451 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 @@ -155,8 +155,6 @@ Fine-Design_Chart_Data_Label_OutSide=Datalabel Outside Fine-Design_Chart_Data_Max=Maximum Fine-Design_Chart_Data_Median=Median Fine-Design_Chart_Data_Min=Minimum -Fine-Design_Chart_Normal_Value=Normal value -Fine-Design_Chart_Outlier_Value=Outliers Fine-Design_Chart_Data_Not_Show_Cate=No Display If Category Is Empty Fine-Design_Chart_Data_Not_Show_Series=No Display If Series Is Empty Fine-Design_Chart_Data_Number=Number of data @@ -436,6 +434,7 @@ Fine-Design_Chart_Node_Name=Node Name Fine-Design_Chart_Node_Radius=Node Radius Fine-Design_Chart_Non_Adjustment=No Adjustment Fine-Design_Chart_Normal_Line=Normal +Fine-Design_Chart_Normal_Value=Normal value Fine-Design_Chart_Not_Follow_Mouse=Not Follow Mouse Fine-Design_Chart_Not_Limit=No Limit Fine-Design_Chart_Not_Support_Img_And_Cell=Not Support IMG & Cell Data @@ -449,6 +448,7 @@ Fine-Design_Chart_Only_Use_Before_Records=Only use front records Fine-Design_Chart_Open=On Fine-Design_Chart_Open_Large_Data_Model=Open big data optimization Fine-Design_Chart_Origin=Original +Fine-Design_Chart_Outlier_Value=Outliers Fine-Design_Chart_Pane_Background=Pane Background Fine-Design_Chart_Parent_ID=Parent ID Fine-Design_Chart_Pattern=Pattern 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 d145d55..59de23b 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 @@ -155,8 +155,6 @@ Fine-Design_Chart_Data_Label_OutSide=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u5024 Fine-Design_Chart_Data_Median=\u4E2D\u592E\u5024 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 -Fine-Design_Chart_Normal_Value=\u901A\u5E38\u5024 -Fine-Design_Chart_Outlier_Value=\u5916\u308C\u5024 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Number=\u30C7\u30FC\u30BF\u6570 @@ -436,6 +434,7 @@ Fine-Design_Chart_Node_Name=\u30CE\u30FC\u30C9\u540D Fine-Design_Chart_Node_Radius=\u30CE\u30FC\u30C9\u534A\u5F84 Fine-Design_Chart_Non_Adjustment=\u8ABF\u6574\u4E0D\u53EF Fine-Design_Chart_Normal_Line=\u4E00\u822C +Fine-Design_Chart_Normal_Value=\u901A\u5E38\u5024 Fine-Design_Chart_Not_Follow_Mouse=\u975E\u30DE\u30A6\u30B9\u30D5\u30A9\u30ED\u30FC Fine-Design_Chart_Not_Limit=\u7121\u5236\u9650 Fine-Design_Chart_Not_Support_Img_And_Cell=\u753B\u50CF\u3068\u30BB\u30EB\u30C7\u30FC\u30BF\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093 @@ -449,6 +448,7 @@ Fine-Design_Chart_Only_Use_Before_Records=\u5148\u982D\u306E\u30C7\u30FC\u30BF\u Fine-Design_Chart_Open=\u6709\u52B9 Fine-Design_Chart_Open_Large_Data_Model=\u30D3\u30C3\u30B0\u30C7\u30FC\u30BF\u6700\u9069\u5316\u3092\u6709\u52B9 Fine-Design_Chart_Origin=\u6A19\u6E96\u8868\u793A +Fine-Design_Chart_Outlier_Value=\u5916\u308C\u5024 Fine-Design_Chart_Pane_Background=\u30E1\u30FC\u30BF\u80CC\u666F Fine-Design_Chart_Parent_ID=\u89AAID Fine-Design_Chart_Pattern=\u30B9\u30BF\u30A4\u30EB 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 238f232..19c81d4 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 @@ -155,8 +155,6 @@ Fine-Design_Chart_Data_Label_OutSide=\uB77C\uBCA8 \uBC14\uAE65\uCABD Fine-Design_Chart_Data_Max=\uCD5C\uB300\uAC12 Fine-Design_Chart_Data_Median=\uC911\uC559\uAC12 Fine-Design_Chart_Data_Min=\uCD5C\uC18C\uAC12 -Fine-Design_Chart_Normal_Value=\uC815\uC0C1 \uAC12 -Fine-Design_Chart_Outlier_Value=\uD2B9\uC774 \uCE58 Fine-Design_Chart_Data_Not_Show_Cate=\uCE74\uD14C\uACE0\uB9AC\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Not_Show_Series=\uC2DC\uB9AC\uC988\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Number=\uB370\uC774\uD130 \uC218 @@ -436,6 +434,7 @@ Fine-Design_Chart_Node_Name=\uB178\uB4DC \uC774\uB984 Fine-Design_Chart_Node_Radius=\uB178\uB4DC \uBC18\uACBD Fine-Design_Chart_Non_Adjustment=\uC870\uC815\uBD88\uAC00 Fine-Design_Chart_Normal_Line=\uBCF4\uD1B5 +Fine-Design_Chart_Normal_Value=\uC815\uC0C1 \uAC12 Fine-Design_Chart_Not_Follow_Mouse=\uB9C8\uC6B0\uC2A4 \uB530\uB77C\uAC00\uC9C0 \uC54A\uC74C Fine-Design_Chart_Not_Limit=\uC81C\uD55C\uC5C6\uC74C Fine-Design_Chart_Not_Support_Img_And_Cell=\uC774\uBBF8\uC9C0\uC640 \uC140 \uB370\uC774\uD130 \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC74C @@ -449,6 +448,7 @@ Fine-Design_Chart_Only_Use_Before_Records=\uC55E\uCABD \uC9C0\uC815 \uAE30\uB85D Fine-Design_Chart_Open=\uC624\uD508 Fine-Design_Chart_Open_Large_Data_Model=\uBE45\uB370\uC774\uD130 \uCD5C\uC801\uD654 Fine-Design_Chart_Origin=\uC624\uB9AC\uC9C0\uB110 +Fine-Design_Chart_Outlier_Value=\uD2B9\uC774 \uCE58 Fine-Design_Chart_Pane_Background=\uD328\uB110 \uBC30\uACBD Fine-Design_Chart_Parent_ID=Parent ID Fine-Design_Chart_Pattern=\uC591\uC2DD 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 bffadd4..e74d957 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 @@ -155,8 +155,6 @@ Fine-Design_Chart_Data_Label_OutSide=\u6570\u636E\u6807\u7B7E\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6570 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u503C -Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C -Fine-Design_Chart_Outlier_Value=\u5F02\u5E38\u503C Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u7C7B\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u5206\u7C7B Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u7CFB\u5217 Fine-Design_Chart_Data_Number=\u6570\u636E\u4E2A\u6570 @@ -436,6 +434,7 @@ Fine-Design_Chart_Node_Name=\u8282\u70B9\u540D\u79F0 Fine-Design_Chart_Node_Radius=\u8282\u70B9\u534A\u5F84 Fine-Design_Chart_Non_Adjustment=\u4E0D\u53EF\u8C03\u6574 Fine-Design_Chart_Normal_Line=\u666E\u901A +Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C Fine-Design_Chart_Not_Follow_Mouse=\u4E0D\u8DDF\u968F\u9F20\u6807 Fine-Design_Chart_Not_Limit=\u4E0D\u9650\u5236 Fine-Design_Chart_Not_Support_Img_And_Cell=\u4E0D\u652F\u6301\u56FE\u7247\u5F62\u5F0F\u548C\u5355\u5143\u683C\u6570\u636E\u6E90 @@ -449,6 +448,7 @@ Fine-Design_Chart_Only_Use_Before_Records=\u53EA\u4F7F\u7528\u524D\u6709\u9650\u Fine-Design_Chart_Open=\u5F00\u542F Fine-Design_Chart_Open_Large_Data_Model=\u5F00\u542F\u5927\u6570\u636E\u4F18\u5316 Fine-Design_Chart_Origin=\u539F\u6837\u5C55\u793A +Fine-Design_Chart_Outlier_Value=\u5F02\u5E38\u503C Fine-Design_Chart_Pane_Background=\u5E95\u76D8\u80CC\u666F Fine-Design_Chart_Parent_ID=\u7236ID Fine-Design_Chart_Pattern=\u6837\u5F0F 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 b546315..9c3b9fb 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 @@ -155,8 +155,6 @@ Fine-Design_Chart_Data_Label_OutSide=\u8CC7\u6599\u6A19\u7C64\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6578 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 -Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C -Fine-Design_Chart_Outlier_Value=\u7570\u5E38\u503C Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u70BA\u7A7A\u6642\uFF0C\u4E0D\u986F\u793A\u8A72\u5206\u985E Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u70BA\u7A7A\u6642,\u4E0D\u986F\u793A\u8A72\u7CFB\u5217 Fine-Design_Chart_Data_Number=\u6578\u64DA\u500B\u6578 @@ -378,7 +376,7 @@ Fine-Design_Chart_Marker_Time=\u91CC\u7A0B\u7891\u6642\u9593 Fine-Design_Chart_Marker_Type=\u6A19\u8A18\u985E\u578B Fine-Design_Chart_Match_Color=\u914D\u8272 Fine-Design_Chart_Match_Color_Scheme=\u914D\u8272\u65B9\u6848 -Fine-Design_Chart_Match_Default_Color_Scheme= +Fine-Design_Chart_Match_Default_Color_Scheme=\u9810\u8A2D\u914D\u8272\u65B9\u6848 Fine-Design_Chart_Match_To=\u5339\u914D\u5230 Fine-Design_Chart_Math_Exponent=\u6307\u6578\u64EC\u5408 Fine-Design_Chart_Math_Linear=\u7DDA\u6027\u64EC\u5408 @@ -436,6 +434,7 @@ Fine-Design_Chart_Node_Name=\u7BC0\u9EDE\u540D\u7A31 Fine-Design_Chart_Node_Radius=\u7BC0\u9EDE\u534A\u5F91 Fine-Design_Chart_Non_Adjustment=\u4E0D\u53EF\u8ABF\u6574 Fine-Design_Chart_Normal_Line=\u666E\u901A +Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C Fine-Design_Chart_Not_Follow_Mouse=\u4E0D\u8DDF\u96A8\u6ED1\u9F20 Fine-Design_Chart_Not_Limit=\u4E0D\u9650\u5236 Fine-Design_Chart_Not_Support_Img_And_Cell=\u4E0D\u652F\u63F4\u5716\u7247\u5F62\u5F0F\u548C\u5132\u5B58\u683C\u8CC7\u6599\u6E90 @@ -449,6 +448,7 @@ Fine-Design_Chart_Only_Use_Before_Records=\u53EA\u4F7F\u7528\u524D\u6709\u6548\u Fine-Design_Chart_Open=\u958B\u555F Fine-Design_Chart_Open_Large_Data_Model=\u958B\u555F\u5927\u6578\u64DA\u6700\u4F73\u5316 Fine-Design_Chart_Origin=\u539F\u6A23\u5C55\u793A +Fine-Design_Chart_Outlier_Value=\u7570\u5E38\u503C Fine-Design_Chart_Pane_Background=\u5E95\u76E4\u80CC\u666F Fine-Design_Chart_Parent_ID=\u7236ID Fine-Design_Chart_Pattern=\u6A23\u5F0F @@ -496,7 +496,7 @@ Fine-Design_Chart_Region_Field=\u5340\u57DF\u6B04\u4F4D Fine-Design_Chart_Region_Map=\u5340\u57DF\u5730\u5716 Fine-Design_Chart_Region_Value=\u5340\u57DF\u503C Fine-Design_Chart_Respectively_Specified=\u5206\u5225\u6307\u5B9A -Fine-Design_Chart_Result_Data=\u7D50\u679C\u6578\u64DA +Fine-Design_Chart_Result_Data=\u7D50\u679C\u8CC7\u6599 Fine-Design_Chart_Reversal=\u7FFB\u8F49 Fine-Design_Chart_Right_Boundary=\u53F3\u908A\u754C Fine-Design_Chart_Right_Top=\u53F3\u4E0A 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 23b1c8f..b91a973 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 @@ -188,10 +188,10 @@ Fine-Design_Basic_Commuinity_Solution=Tech Solutions Fine-Design_Basic_Community=Community Fine-Design_Basic_Community_Bbs=Community Home Fine-Design_Basic_Community_Bug=Bug Feedback -Fine-Design_Basic_Community_BugAndNeed= +Fine-Design_Basic_Community_BugAndNeed=BUG&Feedback Fine-Design_Basic_Community_FaceBook_Fans=FineReport Facebook Fans Fine-Design_Basic_Community_Questions=Problems -Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_TechSupport=Tech Support Fine-Design_Basic_Community_Update=Update Fine-Design_Basic_Community_Video=Learning Path Fine-Design_Basic_Community_sign=Engineer Certification @@ -1218,7 +1218,7 @@ Fine-Design_Chart_Empty_Data=Empty Data Hint Fine-Design_Chart_Enable_Auto_Refresh=Enable Auto Refresh Fine-Design_Chart_Enable_Field_Name=Enable Field Name Fine-Design_Chart_Enable_Field_Value=Enable Field Value -Fine-Design_Chart_Field_Value= +Fine-Design_Chart_Field_Value=Field Value Fine-Design_Chart_Float=Chart Hyperlink-Floating Element Fine-Design_Chart_Float_Chart=Chart Hyperlink-Floating Chart Fine-Design_Chart_Format=Format diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties index 9d8bc73..343c86c 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties @@ -191,7 +191,7 @@ Fine-Design_Basic_Community_Bug=BUG\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF Fine-Design_Basic_Community_BugAndNeed= Fine-Design_Basic_Community_FaceBook_Fans=FineReport\u30D5\u30A7\u30A4\u30B9\u30D6\u30C3\u30AF\u30D5\u30A1\u30F3\u30BA Fine-Design_Basic_Community_Questions=\u304A\u554F\u3044\u5408\u308F\u305B -Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_TechSupport=\u6280\u8853\u30B5\u30DD\u30FC\u30C8 Fine-Design_Basic_Community_Update=\u88FD\u54C1\u66F4\u65B0 Fine-Design_Basic_Community_Video=\u30C8\u30EC\u30FC\u30CB\u30F3\u30B0\u30D3\u30C7\u30AA Fine-Design_Basic_Community_sign=\u5E33\u7968\u30A8\u30F3\u30B8\u30CB\u30A2\u306E\u8A8D\u8A3C @@ -1218,7 +1218,7 @@ Fine-Design_Chart_Empty_Data=\u30B0\u30E9\u30D5\u7A7A\u767D\u30C7\u30FC\u30BF\u3 Fine-Design_Chart_Enable_Auto_Refresh=\u81EA\u52D5\u66F4\u65B0 Fine-Design_Chart_Enable_Field_Name=\u30D5\u30A3\u30FC\u30EB\u30C9\u540D\u4F7F\u7528 Fine-Design_Chart_Enable_Field_Value=\u30D5\u30A3\u30FC\u30EB\u30C9\u5024\u4F7F\u7528 -Fine-Design_Chart_Field_Value= +Fine-Design_Chart_Field_Value=\u30D5\u30A3\u30FC\u30EB\u30C9\u5024 Fine-Design_Chart_Float=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF-\u30D5\u30ED\u30FC\u30C6\u30A3\u30F3\u30B0\u8981\u7D20\u9023\u52D5 Fine-Design_Chart_Float_Chart=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF-\u30D5\u30ED\u30FC\u30C6\u30A3\u30F3\u30B0\u30B0\u30E9\u30D5 Fine-Design_Chart_Format=\u66F8\u5F0F diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties index 8a542cf..f0df2e1 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties @@ -188,10 +188,10 @@ Fine-Design_Basic_Commuinity_Solution=\u6280\u8853\u65B9\u6848 Fine-Design_Basic_Community=\u793E\u5340 Fine-Design_Basic_Community_Bbs=\u793E\u5340\u9996\u9801 Fine-Design_Basic_Community_Bug=BUG\u53CD\u994B -Fine-Design_Basic_Community_BugAndNeed= +Fine-Design_Basic_Community_BugAndNeed=BUG\u9700\u6C42\u53CD\u994B Fine-Design_Basic_Community_FaceBook_Fans=FineReport\u81C9\u66F8\u7C89\u7D72\u5718 Fine-Design_Basic_Community_Questions=\u554F\u984C\u6C42\u52A9 -Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_TechSupport=\u6280\u8853\u652F\u63F4 Fine-Design_Basic_Community_Update=\u7522\u54C1\u66F4\u65B0 Fine-Design_Basic_Community_Video=\u8AB2\u7A0B\u6559\u5B78 Fine-Design_Basic_Community_sign=\u5831\u8868\u5DE5\u7A0B\u5E2B\u8A8D\u8B49 @@ -1218,7 +1218,7 @@ Fine-Design_Chart_Empty_Data=\u5716\u8868\u7A7A\u8CC7\u6599\u63D0\u793A Fine-Design_Chart_Enable_Auto_Refresh=\u81EA\u52D5\u91CD\u65B0\u6574\u7406 Fine-Design_Chart_Enable_Field_Name=\u4F7F\u7528\u6B04\u4F4D\u540D Fine-Design_Chart_Enable_Field_Value=\u4F7F\u7528\u6B04\u4F4D\u503C -Fine-Design_Chart_Field_Value= +Fine-Design_Chart_Field_Value=\u6B04\u4F4D\u503C Fine-Design_Chart_Float=\u5716\u8868\u8D85\u9023\u7D50-\u806F\u52D5\u61F8\u6D6E\u5143\u7D20 Fine-Design_Chart_Float_Chart=\u5716\u8868\u8D85\u9023\u7D50-\u61F8\u6D6E\u7A97\u5716\u8868 Fine-Design_Chart_Format=\u683C\u5F0F From b98c883513f6913893d1711e3e8e426ef1fe1e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Wed, 5 Aug 2020 11:01:10 +0800 Subject: [PATCH 19/25] =?UTF-8?q?CHART-12124=20=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/chart.properties | 6 +++++- .../main/resources/com/fr/design/i18n/chart_en.properties | 6 +++++- .../resources/com/fr/design/i18n/chart_ja_JP.properties | 6 +++++- .../resources/com/fr/design/i18n/chart_ko_KR.properties | 6 +++++- .../main/resources/com/fr/design/i18n/chart_zh.properties | 6 +++++- .../resources/com/fr/design/i18n/chart_zh_TW.properties | 6 +++++- 6 files changed, 30 insertions(+), 6 deletions(-) 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 c244a6d..59442c7 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 @@ -709,4 +709,8 @@ Fine-Engine_Chart_New_Radar= Fine-Engine_Chart_New_Scatter= Fine-Engine_Chart_New_Structure= Fine-Engine_Chart_New_TreeMap= -Fine-Engine_Chart_WordCloud_New= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New= +Fine-Design_Chart_Continuous_Gradient= +Fine-Design_Chart_Area_Gradient= +Fine-Design_Chart_Color_Type= +Fine-Design_Chart_Color_Divide= \ No newline at end of file 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 3899988..ceae6d1 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 @@ -709,4 +709,8 @@ Fine-Engine_Chart_New_Radar=Radar Chart Fine-Engine_Chart_New_Scatter=Scatter Plot Fine-Engine_Chart_New_Structure=Structure Chart Fine-Engine_Chart_New_TreeMap=Rctangular Tree Map -Fine-Engine_Chart_WordCloud_New=Word Cloud \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=Word Cloud +Fine-Design_Chart_Continuous_Gradient= +Fine-Design_Chart_Area_Gradient= +Fine-Design_Chart_Color_Type= +Fine-Design_Chart_Color_Divide= \ No newline at end of file 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 d145d55..105ac76 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 @@ -709,4 +709,8 @@ Fine-Engine_Chart_New_Radar=\u30EC\u30FC\u30C0\u30FC\u30C1\u30E3\u30FC(\u65B0\u6 Fine-Engine_Chart_New_Scatter=\u6563\u5E03\u56F3(\u65B0\u6A5F\u80FD) Fine-Engine_Chart_New_Structure=\u6A39\u5F62\u56F3(\u65B0\u6A5F\u80FD) Fine-Engine_Chart_New_TreeMap=\u30C4\u30EA\u30FC\u30DE\u30C3\u30D7(\u65B0\u6A5F\u80FD) -Fine-Engine_Chart_WordCloud_New=\u30EF\u30FC\u30C9\u30AF\u30E9\u30A6\u30C9(\u65B0\u6A5F\u80FD) \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u30EF\u30FC\u30C9\u30AF\u30E9\u30A6\u30C9(\u65B0\u6A5F\u80FD) +Fine-Design_Chart_Continuous_Gradient= +Fine-Design_Chart_Area_Gradient= +Fine-Design_Chart_Color_Type= +Fine-Design_Chart_Color_Divide= \ No newline at end of file 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 238f232..1df993c 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 @@ -709,4 +709,8 @@ Fine-Engine_Chart_New_Radar=\uB808\uC774\uB354 Fine-Engine_Chart_New_Scatter=\uC0B0\uCC45 \uC880 \uADF8\uB798\uD504 Fine-Engine_Chart_New_Structure=\uAD6C\uC870\uB3C4(new) Fine-Engine_Chart_New_TreeMap=\uC0AC\uAC01\uD615 \uB098\uBB34 \uADF8\uB9BC -Fine-Engine_Chart_WordCloud_New=Word Cloud \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=Word Cloud +Fine-Design_Chart_Continuous_Gradient= +Fine-Design_Chart_Area_Gradient= +Fine-Design_Chart_Color_Type= +Fine-Design_Chart_Color_Divide= \ No newline at end of file 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 bffadd4..4d034e2 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 @@ -709,4 +709,8 @@ Fine-Engine_Chart_New_Radar=\u96F7\u8FBE\u56FE Fine-Engine_Chart_New_Scatter=\u6563\u70B9\u56FE Fine-Engine_Chart_New_Structure=\u6846\u67B6\u56FE Fine-Engine_Chart_New_TreeMap=\u77E9\u5F62\u6811\u56FE -Fine-Engine_Chart_WordCloud_New=\u8BCD\u4E91 \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u8BCD\u4E91 +Fine-Design_Chart_Continuous_Gradient=\u8FDE\u7EED\u6E10\u53D8 +Fine-Design_Chart_Area_Gradient=\u533A\u57DF\u6E10\u53D8 +Fine-Design_Chart_Color_Type=\u989C\u8272\u7C7B\u578B +Fine-Design_Chart_Color_Divide=\u989C\u8272\u5212\u5206 \ No newline at end of file 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 b546315..5b9dfbd 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 @@ -709,4 +709,8 @@ Fine-Engine_Chart_New_Radar=\u96F7\u9054\u5716 Fine-Engine_Chart_New_Scatter=\u6563\u9EDE\u5716 Fine-Engine_Chart_New_Structure=\u6846\u67B6\u5716 Fine-Engine_Chart_New_TreeMap=\u77E9\u5F62\u6A39\u5716 -Fine-Engine_Chart_WordCloud_New=\u6587\u5B57\u96F2 \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u6587\u5B57\u96F2 +Fine-Design_Chart_Continuous_Gradient= +Fine-Design_Chart_Area_Gradient= +Fine-Design_Chart_Color_Type= +Fine-Design_Chart_Color_Divide= \ No newline at end of file From 8dc44323bf436c8c965146692f41918a04924e35 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Wed, 5 Aug 2020 17:17:22 +0800 Subject: [PATCH 20/25] =?UTF-8?q?CHART-14928=20=E6=95=B0=E6=8D=AE=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=94=B9=E4=B8=BA=E6=95=B0=E6=8D=AE=E5=BD=A2=E5=BC=8F?= 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 c244a6d..ed0c8b6 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 @@ -167,6 +167,7 @@ Fine-Design_Chart_Data_Range_Configuration= Fine-Design_Chart_Data_Sheet= Fine-Design_Chart_Data_Source= Fine-Design_Chart_Data_Type= +Fine-Design_Chart_Data_Form= Fine-Design_Chart_Date_Time_Axis= Fine-Design_Chart_Default= Fine-Design_Chart_Default_Interval= 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 3899988..d4c33cb 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 @@ -167,6 +167,7 @@ Fine-Design_Chart_Data_Range_Configuration=Data Range Configuration Fine-Design_Chart_Data_Sheet=Data Table Fine-Design_Chart_Data_Source=Data Source Fine-Design_Chart_Data_Type=Data Format +Fine-Design_Chart_Data_Form=Data form Fine-Design_Chart_Date_Time_Axis=Time Axis Fine-Design_Chart_Default=Default Fine-Design_Chart_Default_Interval=Default Interval 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 d145d55..78bd872 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 @@ -167,6 +167,7 @@ Fine-Design_Chart_Data_Range_Configuration=\u30C7\u30FC\u30BF\u7BC4\u56F2\u306E\ Fine-Design_Chart_Data_Sheet=\u30C7\u30FC\u30BF\u30B7\u30FC\u30C8 Fine-Design_Chart_Data_Source=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9 Fine-Design_Chart_Data_Type=\u30C7\u30FC\u30BF\u5F62\u5F0F +Fine-Design_Chart_Data_Form=\u30C7\u30FC\u30BF\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8 Fine-Design_Chart_Date_Time_Axis=\u6642\u9593\u5EA7\u6A19\u8EF8 Fine-Design_Chart_Default=\u65E2\u5B9A Fine-Design_Chart_Default_Interval=\u65E2\u5B9A\u9593\u9694 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 238f232..9a2252f 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 @@ -167,6 +167,7 @@ Fine-Design_Chart_Data_Range_Configuration=\uB370\uC774\uD130 \uAD6C\uAC04 \uC13 Fine-Design_Chart_Data_Sheet=\uB370\uC774\uD130 \uD14C\uC774\uBE14 Fine-Design_Chart_Data_Source=\uB370\uC774\uD130\uCD9C\uCC98 Fine-Design_Chart_Data_Type=\uB370\uC774\uD130 \uD3EC\uBA67 +Fine-Design_Chart_Data_Form=\uB370\uC774\uD130 \uD615\uC2DD Fine-Design_Chart_Date_Time_Axis=\uC2DC\uAC04\uC88C\uD45C\uCD95 Fine-Design_Chart_Default=\uAE30\uBCF8\uAC12 Fine-Design_Chart_Default_Interval=\uB514\uD3F4\uD2B8 \uAC04\uACA9 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 bffadd4..dd75870 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 @@ -167,6 +167,7 @@ Fine-Design_Chart_Data_Range_Configuration=\u6570\u636E\u533A\u95F4\u914D\u7F6E Fine-Design_Chart_Data_Sheet=\u6570\u636E\u8868 Fine-Design_Chart_Data_Source=\u6570\u636E\u6765\u6E90 Fine-Design_Chart_Data_Type=\u6570\u636E\u683C\u5F0F +Fine-Design_Chart_Data_Form=\u6570\u636E\u5F62\u5F0F Fine-Design_Chart_Date_Time_Axis=\u65F6\u95F4\u5750\u6807\u8F74 Fine-Design_Chart_Default=\u9ED8\u8BA4 Fine-Design_Chart_Default_Interval=\u9ED8\u8BA4\u95F4\u9694 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 b546315..dea8961 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 @@ -167,6 +167,7 @@ Fine-Design_Chart_Data_Range_Configuration=\u8CC7\u6599\u5340\u9593\u8A2D\u5B9A Fine-Design_Chart_Data_Sheet=\u8CC7\u6599\u8868 Fine-Design_Chart_Data_Source=\u8CC7\u6599\u4F86\u6E90 Fine-Design_Chart_Data_Type=\u8CC7\u6599\u683C\u5F0F +Fine-Design_Chart_Data_Form=\u6578\u64DA\u5F62\u5F0F Fine-Design_Chart_Date_Time_Axis=\u6642\u9593\u5750\u6A19\u8EF8 Fine-Design_Chart_Default=\u9810\u8A2D Fine-Design_Chart_Default_Interval=\u9810\u8A2D\u9593\u9694 From c5baf199b92bcefc9f4660c2ee6c9b28faea0366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com> Date: Thu, 6 Aug 2020 17:36:44 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=09CHART-14912=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/chart.properties | 4 +++- .../src/main/resources/com/fr/design/i18n/chart_en.properties | 4 +++- .../main/resources/com/fr/design/i18n/chart_ja_JP.properties | 4 +++- .../main/resources/com/fr/design/i18n/chart_ko_KR.properties | 4 +++- .../src/main/resources/com/fr/design/i18n/chart_zh.properties | 4 +++- .../main/resources/com/fr/design/i18n/chart_zh_TW.properties | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) 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 5b2f1d5..40d1318 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 @@ -714,4 +714,6 @@ Fine-Engine_Chart_WordCloud_New= Fine-Design_Chart_Continuous_Gradient= Fine-Design_Chart_Area_Gradient= Fine-Design_Chart_Color_Type= -Fine-Design_Chart_Color_Divide= \ No newline at end of file +Fine-Design_Chart_Color_Divide= +Fine-Design_Chart_Node_Id= +Fine-Design_Chart_Parent_Node_Id= \ No newline at end of file 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 22ae952..34f09d9 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 @@ -714,4 +714,6 @@ Fine-Engine_Chart_WordCloud_New=Word Cloud Fine-Design_Chart_Continuous_Gradient= Fine-Design_Chart_Area_Gradient= Fine-Design_Chart_Color_Type= -Fine-Design_Chart_Color_Divide= \ No newline at end of file +Fine-Design_Chart_Color_Divide= +Fine-Design_Chart_Node_Id= +Fine-Design_Chart_Parent_Node_Id= \ No newline at end of file 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 74849e7..6bdecf3 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 @@ -714,4 +714,6 @@ Fine-Engine_Chart_WordCloud_New=\u30EF\u30FC\u30C9\u30AF\u30E9\u30A6\u30C9(\u65B Fine-Design_Chart_Continuous_Gradient= Fine-Design_Chart_Area_Gradient= Fine-Design_Chart_Color_Type= -Fine-Design_Chart_Color_Divide= \ No newline at end of file +Fine-Design_Chart_Color_Divide= +Fine-Design_Chart_Node_Id= +Fine-Design_Chart_Parent_Node_Id= \ No newline at end of file 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 42cfef5..6b19b7a 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 @@ -714,4 +714,6 @@ Fine-Engine_Chart_WordCloud_New=Word Cloud Fine-Design_Chart_Continuous_Gradient= Fine-Design_Chart_Area_Gradient= Fine-Design_Chart_Color_Type= -Fine-Design_Chart_Color_Divide= \ No newline at end of file +Fine-Design_Chart_Color_Divide= +Fine-Design_Chart_Node_Id= +Fine-Design_Chart_Parent_Node_Id= \ No newline at end of file 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 9fca69f..1dfe14d 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 @@ -714,4 +714,6 @@ Fine-Engine_Chart_WordCloud_New=\u8BCD\u4E91 Fine-Design_Chart_Continuous_Gradient=\u8FDE\u7EED\u6E10\u53D8 Fine-Design_Chart_Area_Gradient=\u533A\u57DF\u6E10\u53D8 Fine-Design_Chart_Color_Type=\u989C\u8272\u7C7B\u578B -Fine-Design_Chart_Color_Divide=\u989C\u8272\u5212\u5206 \ No newline at end of file +Fine-Design_Chart_Color_Divide=\u989C\u8272\u5212\u5206 +Fine-Design_Chart_Node_Id=\u8282\u70B9id +Fine-Design_Chart_Parent_Node_Id=\u7236\u8282\u70B9id \ No newline at end of file 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 f743386..2aff5b4 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 @@ -714,4 +714,6 @@ Fine-Engine_Chart_WordCloud_New=\u6587\u5B57\u96F2 Fine-Design_Chart_Continuous_Gradient= Fine-Design_Chart_Area_Gradient= Fine-Design_Chart_Color_Type= -Fine-Design_Chart_Color_Divide= \ No newline at end of file +Fine-Design_Chart_Color_Divide= +Fine-Design_Chart_Node_Id= +Fine-Design_Chart_Parent_Node_Id= \ No newline at end of file From 18c6d7442f940527e7c26b64ee7cfda67c837f7e Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Fri, 7 Aug 2020 17:13:29 +0800 Subject: [PATCH 22/25] =?UTF-8?q?REPORT-26209=20=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 --- .../com/fr/design/i18n/chart.properties | 16 ++-- .../com/fr/design/i18n/chart_en.properties | 16 ++-- .../com/fr/design/i18n/chart_ja_JP.properties | 16 ++-- .../com/fr/design/i18n/chart_ko_KR.properties | 16 ++-- .../com/fr/design/i18n/chart_zh.properties | 16 ++-- .../com/fr/design/i18n/chart_zh_TW.properties | 16 ++-- .../com/fr/design/i18n/main_zh_TW.properties | 90 +++++++++---------- 7 files changed, 93 insertions(+), 93 deletions(-) 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 40d1318..1e155da 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 @@ -27,6 +27,7 @@ Fine-Design_Chart_Animation_Show= Fine-Design_Chart_Animation_Type= Fine-Design_Chart_AntiClockWise= Fine-Design_Chart_Area= +Fine-Design_Chart_Area_Gradient= Fine-Design_Chart_Area_Name= Fine-Design_Chart_Area_Size= Fine-Design_Chart_Area_Title= @@ -111,6 +112,8 @@ Fine-Design_Chart_Close= Fine-Design_Chart_Collapse= Fine-Design_Chart_Color= Fine-Design_Chart_Color_Background= +Fine-Design_Chart_Color_Divide= +Fine-Design_Chart_Color_Type= Fine-Design_Chart_Column_Chart= Fine-Design_Chart_Combine_Chart= Fine-Design_Chart_Combine_Map= @@ -121,6 +124,7 @@ Fine-Design_Chart_Condition_Display= Fine-Design_Chart_Connect_WMP= Fine-Design_Chart_Connecting_WMP= Fine-Design_Chart_Continuity= +Fine-Design_Chart_Continuous_Gradient= Fine-Design_Chart_Cross= Fine-Design_Chart_Curve= Fine-Design_Chart_CurveLine= @@ -149,6 +153,7 @@ Fine-Design_Chart_Data_CombineOther= Fine-Design_Chart_Data_Configuration= Fine-Design_Chart_Data_Field= Fine-Design_Chart_Data_Filter= +Fine-Design_Chart_Data_Form= Fine-Design_Chart_Data_Function_Percent= Fine-Design_Chart_Data_Label_Inside= Fine-Design_Chart_Data_Label_OutSide= @@ -165,7 +170,6 @@ Fine-Design_Chart_Data_Range_Configuration= Fine-Design_Chart_Data_Sheet= Fine-Design_Chart_Data_Source= Fine-Design_Chart_Data_Type= -Fine-Design_Chart_Data_Form= Fine-Design_Chart_Date_Time_Axis= Fine-Design_Chart_Default= Fine-Design_Chart_Default_Interval= @@ -431,6 +435,7 @@ Fine-Design_Chart_New_StackColumn_Line= Fine-Design_Chart_New_Structure= Fine-Design_Chart_New_TreeMap= Fine-Design_Chart_Node= +Fine-Design_Chart_Node_Id= Fine-Design_Chart_Node_Name= Fine-Design_Chart_Node_Radius= Fine-Design_Chart_Non_Adjustment= @@ -452,6 +457,7 @@ Fine-Design_Chart_Origin= Fine-Design_Chart_Outlier_Value= Fine-Design_Chart_Pane_Background= Fine-Design_Chart_Parent_ID= +Fine-Design_Chart_Parent_Node_Id= Fine-Design_Chart_Pattern= Fine-Design_Chart_Percent_Label= Fine-Design_Chart_Percent_Stacked= @@ -710,10 +716,4 @@ Fine-Engine_Chart_New_Radar= Fine-Engine_Chart_New_Scatter= Fine-Engine_Chart_New_Structure= Fine-Engine_Chart_New_TreeMap= -Fine-Engine_Chart_WordCloud_New= -Fine-Design_Chart_Continuous_Gradient= -Fine-Design_Chart_Area_Gradient= -Fine-Design_Chart_Color_Type= -Fine-Design_Chart_Color_Divide= -Fine-Design_Chart_Node_Id= -Fine-Design_Chart_Parent_Node_Id= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New= \ No newline at end of file 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 34f09d9..d605e54 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 @@ -27,6 +27,7 @@ Fine-Design_Chart_Animation_Show=Dynamic Display Fine-Design_Chart_Animation_Type=Animation Type Fine-Design_Chart_AntiClockWise=Counterclockwise Fine-Design_Chart_Area=Area +Fine-Design_Chart_Area_Gradient= Fine-Design_Chart_Area_Name=Area Name Fine-Design_Chart_Area_Size=Area Size Fine-Design_Chart_Area_Title=Area Title @@ -111,6 +112,8 @@ Fine-Design_Chart_Close=Off Fine-Design_Chart_Collapse=Collapse to Menu Fine-Design_Chart_Color=Color Fine-Design_Chart_Color_Background=BG Color +Fine-Design_Chart_Color_Divide= +Fine-Design_Chart_Color_Type= Fine-Design_Chart_Column_Chart=Column Chart Fine-Design_Chart_Combine_Chart=Combination Chart Fine-Design_Chart_Combine_Map=Combination Map @@ -121,6 +124,7 @@ Fine-Design_Chart_Condition_Display=Conditional Display Fine-Design_Chart_Connect_WMP=Connection Fine-Design_Chart_Connecting_WMP=Connecting Fine-Design_Chart_Continuity=Continuity +Fine-Design_Chart_Continuous_Gradient= Fine-Design_Chart_Cross=Cross Fine-Design_Chart_Curve=Curve Fine-Design_Chart_CurveLine=Curve Line @@ -149,6 +153,7 @@ Fine-Design_Chart_Data_CombineOther=Merge residual items as others Fine-Design_Chart_Data_Configuration=Data Configuration Fine-Design_Chart_Data_Field=Data Field Fine-Design_Chart_Data_Filter=Data Filter +Fine-Design_Chart_Data_Form=Data form Fine-Design_Chart_Data_Function_Percent=Proportion Fine-Design_Chart_Data_Label_Inside=Datalabel Inside Fine-Design_Chart_Data_Label_OutSide=Datalabel Outside @@ -165,7 +170,6 @@ Fine-Design_Chart_Data_Range_Configuration=Data Range Configuration Fine-Design_Chart_Data_Sheet=Data Table Fine-Design_Chart_Data_Source=Data Source Fine-Design_Chart_Data_Type=Data Format -Fine-Design_Chart_Data_Form=Data form Fine-Design_Chart_Date_Time_Axis=Time Axis Fine-Design_Chart_Default=Default Fine-Design_Chart_Default_Interval=Default Interval @@ -431,6 +435,7 @@ Fine-Design_Chart_New_StackColumn_Line=Stack Column-Line Chart Fine-Design_Chart_New_Structure=Structure Chart Fine-Design_Chart_New_TreeMap=Rectangular Tree Fine-Design_Chart_Node=Node +Fine-Design_Chart_Node_Id= Fine-Design_Chart_Node_Name=Node Name Fine-Design_Chart_Node_Radius=Node Radius Fine-Design_Chart_Non_Adjustment=No Adjustment @@ -452,6 +457,7 @@ Fine-Design_Chart_Origin=Original Fine-Design_Chart_Outlier_Value=Outliers Fine-Design_Chart_Pane_Background=Pane Background Fine-Design_Chart_Parent_ID=Parent ID +Fine-Design_Chart_Parent_Node_Id= Fine-Design_Chart_Pattern=Pattern Fine-Design_Chart_Percent_Label=100% Label Fine-Design_Chart_Percent_Stacked=100% Stacked @@ -710,10 +716,4 @@ Fine-Engine_Chart_New_Radar=Radar Chart Fine-Engine_Chart_New_Scatter=Scatter Plot Fine-Engine_Chart_New_Structure=Structure Chart Fine-Engine_Chart_New_TreeMap=Rctangular Tree Map -Fine-Engine_Chart_WordCloud_New=Word Cloud -Fine-Design_Chart_Continuous_Gradient= -Fine-Design_Chart_Area_Gradient= -Fine-Design_Chart_Color_Type= -Fine-Design_Chart_Color_Divide= -Fine-Design_Chart_Node_Id= -Fine-Design_Chart_Parent_Node_Id= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=Word Cloud \ No newline at end of file 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 6bdecf3..b05bf70 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 @@ -27,6 +27,7 @@ Fine-Design_Chart_Animation_Show=\u52D5\u7684\u8868\u793A Fine-Design_Chart_Animation_Type=\u904B\u52D5\u65B9\u5F0F Fine-Design_Chart_AntiClockWise=\u53CD\u6642\u8A08\u56DE\u308A Fine-Design_Chart_Area=\u9762\u7A4D +Fine-Design_Chart_Area_Gradient= Fine-Design_Chart_Area_Name=\u30A8\u30EA\u30A2\u540D Fine-Design_Chart_Area_Size=\u30A8\u30EA\u30A2\u30B5\u30A4\u30BA Fine-Design_Chart_Area_Title=\u30A8\u30EA\u30A2\u30BF\u30A4\u30C8\u30EB @@ -111,6 +112,8 @@ Fine-Design_Chart_Close=\u7121\u52B9 Fine-Design_Chart_Collapse=\u30E1\u30CB\u30E5\u30FC\u306B\u5165\u308C\u308B Fine-Design_Chart_Color=\u8272 Fine-Design_Chart_Color_Background=\u80CC\u666F\u8272 +Fine-Design_Chart_Color_Divide= +Fine-Design_Chart_Color_Type= Fine-Design_Chart_Column_Chart=\u7E26\u68D2\u30B0\u30E9\u30D5 Fine-Design_Chart_Combine_Chart=\u7D44\u307F\u5408\u308F\u305B\u30B0\u30E9\u30D5 Fine-Design_Chart_Combine_Map=\u7D44\u307F\u5408\u308F\u305B\u5730\u56F3 @@ -121,6 +124,7 @@ Fine-Design_Chart_Condition_Display=\u6761\u4EF6\u8868\u793A Fine-Design_Chart_Connect_WMP=\u63A5\u7D9A Fine-Design_Chart_Connecting_WMP=\u63A5\u7D9A\u4E2D... Fine-Design_Chart_Continuity=\u9023\u7D9A\u6027 +Fine-Design_Chart_Continuous_Gradient= Fine-Design_Chart_Cross=\u30AF\u30ED\u30B9 Fine-Design_Chart_Curve=\u66F2\u7DDA Fine-Design_Chart_CurveLine=\u66F2\u7DDA @@ -149,6 +153,7 @@ Fine-Design_Chart_Data_CombineOther=\u4F59\u308A\u3092\u300C\u305D\u306E\u4ED6\u Fine-Design_Chart_Data_Configuration=\u30C7\u30FC\u30BF\u8A2D\u5B9A Fine-Design_Chart_Data_Field=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9 Fine-Design_Chart_Data_Filter=\u30C7\u30FC\u30BF\u30D5\u30A3\u30EB\u30BF +Fine-Design_Chart_Data_Form=\u30C7\u30FC\u30BF\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8 Fine-Design_Chart_Data_Function_Percent=\u5272\u5408 Fine-Design_Chart_Data_Label_Inside=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5185 Fine-Design_Chart_Data_Label_OutSide=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5916 @@ -165,7 +170,6 @@ Fine-Design_Chart_Data_Range_Configuration=\u30C7\u30FC\u30BF\u7BC4\u56F2\u306E\ Fine-Design_Chart_Data_Sheet=\u30C7\u30FC\u30BF\u30B7\u30FC\u30C8 Fine-Design_Chart_Data_Source=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9 Fine-Design_Chart_Data_Type=\u30C7\u30FC\u30BF\u5F62\u5F0F -Fine-Design_Chart_Data_Form=\u30C7\u30FC\u30BF\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8 Fine-Design_Chart_Date_Time_Axis=\u6642\u9593\u5EA7\u6A19\u8EF8 Fine-Design_Chart_Default=\u65E2\u5B9A Fine-Design_Chart_Default_Interval=\u65E2\u5B9A\u9593\u9694 @@ -431,6 +435,7 @@ Fine-Design_Chart_New_StackColumn_Line=\u7A4D\u307F\u4E0A\u3052\u7E26\u68D2\u30B Fine-Design_Chart_New_Structure=\u6A39\u5F62\u56F3(\u65B0\u6A5F\u80FD) Fine-Design_Chart_New_TreeMap=\u30C4\u30EA\u30FC\u30DE\u30C3\u30D7(\u65B0\u6A5F\u80FD) Fine-Design_Chart_Node=\u30CE\u30FC\u30C9 +Fine-Design_Chart_Node_Id= Fine-Design_Chart_Node_Name=\u30CE\u30FC\u30C9\u540D Fine-Design_Chart_Node_Radius=\u30CE\u30FC\u30C9\u534A\u5F84 Fine-Design_Chart_Non_Adjustment=\u8ABF\u6574\u4E0D\u53EF @@ -452,6 +457,7 @@ Fine-Design_Chart_Origin=\u6A19\u6E96\u8868\u793A Fine-Design_Chart_Outlier_Value=\u5916\u308C\u5024 Fine-Design_Chart_Pane_Background=\u30E1\u30FC\u30BF\u80CC\u666F Fine-Design_Chart_Parent_ID=\u89AAID +Fine-Design_Chart_Parent_Node_Id= Fine-Design_Chart_Pattern=\u30B9\u30BF\u30A4\u30EB Fine-Design_Chart_Percent_Label=\u30E9\u30D9\u30EB(%) Fine-Design_Chart_Percent_Stacked=100%\u7A4D\u307F\u4E0A\u3052\u7E26\u68D2\u30B0\u30E9\u30D5 @@ -710,10 +716,4 @@ Fine-Engine_Chart_New_Radar=\u30EC\u30FC\u30C0\u30FC\u30C1\u30E3\u30FC(\u65B0\u6 Fine-Engine_Chart_New_Scatter=\u6563\u5E03\u56F3(\u65B0\u6A5F\u80FD) Fine-Engine_Chart_New_Structure=\u6A39\u5F62\u56F3(\u65B0\u6A5F\u80FD) Fine-Engine_Chart_New_TreeMap=\u30C4\u30EA\u30FC\u30DE\u30C3\u30D7(\u65B0\u6A5F\u80FD) -Fine-Engine_Chart_WordCloud_New=\u30EF\u30FC\u30C9\u30AF\u30E9\u30A6\u30C9(\u65B0\u6A5F\u80FD) -Fine-Design_Chart_Continuous_Gradient= -Fine-Design_Chart_Area_Gradient= -Fine-Design_Chart_Color_Type= -Fine-Design_Chart_Color_Divide= -Fine-Design_Chart_Node_Id= -Fine-Design_Chart_Parent_Node_Id= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u30EF\u30FC\u30C9\u30AF\u30E9\u30A6\u30C9(\u65B0\u6A5F\u80FD) \ No newline at end of file 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 6b19b7a..ad68cdb 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 @@ -27,6 +27,7 @@ Fine-Design_Chart_Animation_Show=\uB3D9\uC801 \uB514\uC2A4\uD50C\uB808\uC774 Fine-Design_Chart_Animation_Type=\uC560\uB2C8\uBA54\uC774\uC158 \uD0C0\uC785 Fine-Design_Chart_AntiClockWise=\uC2DC\uACC4 \uBC18\uB300\uBC29\uD5A5 Fine-Design_Chart_Area=\uBA74\uC801 +Fine-Design_Chart_Area_Gradient= Fine-Design_Chart_Area_Name=\uAD6C\uC5ED\uBA85 Fine-Design_Chart_Area_Size=\uAD6C\uC5ED \uC0AC\uC774\uC988 Fine-Design_Chart_Area_Title=\uAD6C\uC5ED \uD0C0\uC774\uD2C0 @@ -111,6 +112,8 @@ Fine-Design_Chart_Close=\uB2EB\uAE30 Fine-Design_Chart_Collapse=\uBA54\uB274 \uC811\uAE30 Fine-Design_Chart_Color=\uCEEC\uB7EC Fine-Design_Chart_Color_Background=\uBC30\uACBD\uC0C9 +Fine-Design_Chart_Color_Divide= +Fine-Design_Chart_Color_Type= Fine-Design_Chart_Column_Chart=\uB9C9\uB300 \uCC28\uD2B8 Fine-Design_Chart_Combine_Chart=\uCF64\uBC14\uC778 \uCC28\uD2B8 Fine-Design_Chart_Combine_Map=\uCF64\uBC14\uC778 \uB9F5 @@ -121,6 +124,7 @@ Fine-Design_Chart_Condition_Display=\uC870\uAC74\uBCC4 \uD45C\uC2DC Fine-Design_Chart_Connect_WMP=\uC5F0\uACB0 Fine-Design_Chart_Connecting_WMP=\uC5F0\uACB0 \uC911... Fine-Design_Chart_Continuity=\uC5F0\uC18D\uC131 +Fine-Design_Chart_Continuous_Gradient= Fine-Design_Chart_Cross=\uAD50\uCC28 Fine-Design_Chart_Curve=\uACE1\uC120 Fine-Design_Chart_CurveLine=\uACE1\uC120 @@ -149,6 +153,7 @@ Fine-Design_Chart_Data_CombineOther=\uB098\uBA38\uC9C0 \uD56D\uBAA9\uC744 "\uAE3 Fine-Design_Chart_Data_Configuration=\uB370\uC774\uD130 \uC124\uC815 Fine-Design_Chart_Data_Field=\uB370\uC774\uD130 \uD544\uB4DC Fine-Design_Chart_Data_Filter=\uB370\uC774\uD130 \uD544\uD130 +Fine-Design_Chart_Data_Form=\uB370\uC774\uD130 \uD615\uC2DD Fine-Design_Chart_Data_Function_Percent=\uC810\uC720\uC728 Fine-Design_Chart_Data_Label_Inside=\uB77C\uBCA8 \uC548\uCABD Fine-Design_Chart_Data_Label_OutSide=\uB77C\uBCA8 \uBC14\uAE65\uCABD @@ -165,7 +170,6 @@ Fine-Design_Chart_Data_Range_Configuration=\uB370\uC774\uD130 \uAD6C\uAC04 \uC13 Fine-Design_Chart_Data_Sheet=\uB370\uC774\uD130 \uD14C\uC774\uBE14 Fine-Design_Chart_Data_Source=\uB370\uC774\uD130\uCD9C\uCC98 Fine-Design_Chart_Data_Type=\uB370\uC774\uD130 \uD3EC\uBA67 -Fine-Design_Chart_Data_Form=\uB370\uC774\uD130 \uD615\uC2DD Fine-Design_Chart_Date_Time_Axis=\uC2DC\uAC04\uC88C\uD45C\uCD95 Fine-Design_Chart_Default=\uAE30\uBCF8\uAC12 Fine-Design_Chart_Default_Interval=\uB514\uD3F4\uD2B8 \uAC04\uACA9 @@ -431,6 +435,7 @@ Fine-Design_Chart_New_StackColumn_Line=\uB204\uC801\uB9C9\uB300 - \uB77C\uC778 \ Fine-Design_Chart_New_Structure=\uAD6C\uC870\uB3C4 Fine-Design_Chart_New_TreeMap=\uC81C\uD615 \uD2B8\uB9AC\uB9F5 Fine-Design_Chart_Node=\uB178\uB4DC +Fine-Design_Chart_Node_Id= Fine-Design_Chart_Node_Name=\uB178\uB4DC \uC774\uB984 Fine-Design_Chart_Node_Radius=\uB178\uB4DC \uBC18\uACBD Fine-Design_Chart_Non_Adjustment=\uC870\uC815\uBD88\uAC00 @@ -452,6 +457,7 @@ Fine-Design_Chart_Origin=\uC624\uB9AC\uC9C0\uB110 Fine-Design_Chart_Outlier_Value=\uD2B9\uC774 \uCE58 Fine-Design_Chart_Pane_Background=\uD328\uB110 \uBC30\uACBD Fine-Design_Chart_Parent_ID=Parent ID +Fine-Design_Chart_Parent_Node_Id= Fine-Design_Chart_Pattern=\uC591\uC2DD Fine-Design_Chart_Percent_Label=\uB77C\uBCA8(%) Fine-Design_Chart_Percent_Stacked=\uBC31\uBD84\uBE44 \uB204\uC801 @@ -710,10 +716,4 @@ Fine-Engine_Chart_New_Radar=\uB808\uC774\uB354 Fine-Engine_Chart_New_Scatter=\uC0B0\uCC45 \uC880 \uADF8\uB798\uD504 Fine-Engine_Chart_New_Structure=\uAD6C\uC870\uB3C4(new) Fine-Engine_Chart_New_TreeMap=\uC0AC\uAC01\uD615 \uB098\uBB34 \uADF8\uB9BC -Fine-Engine_Chart_WordCloud_New=Word Cloud -Fine-Design_Chart_Continuous_Gradient= -Fine-Design_Chart_Area_Gradient= -Fine-Design_Chart_Color_Type= -Fine-Design_Chart_Color_Divide= -Fine-Design_Chart_Node_Id= -Fine-Design_Chart_Parent_Node_Id= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=Word Cloud \ No newline at end of file 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 1dfe14d..60e1319 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 @@ -27,6 +27,7 @@ Fine-Design_Chart_Animation_Show=\u52A8\u6001\u5C55\u793A Fine-Design_Chart_Animation_Type=\u8FD0\u52A8\u65B9\u5F0F Fine-Design_Chart_AntiClockWise=\u9006\u65F6\u9488 Fine-Design_Chart_Area=\u9762\u79EF +Fine-Design_Chart_Area_Gradient=\u533A\u57DF\u6E10\u53D8 Fine-Design_Chart_Area_Name=\u533A\u57DF\u540D Fine-Design_Chart_Area_Size=\u533A\u57DF\u5927\u5C0F Fine-Design_Chart_Area_Title=\u533A\u57DF\u6807\u9898 @@ -111,6 +112,8 @@ Fine-Design_Chart_Close=\u5173\u95ED Fine-Design_Chart_Collapse=\u6536\u7F29\u4E8E\u62BD\u5C49\u83DC\u5355\u5185 Fine-Design_Chart_Color=\u989C\u8272 Fine-Design_Chart_Color_Background=\u80CC\u666F\u989C\u8272 +Fine-Design_Chart_Color_Divide=\u989C\u8272\u5212\u5206 +Fine-Design_Chart_Color_Type=\u989C\u8272\u7C7B\u578B Fine-Design_Chart_Column_Chart=\u67F1\u5F62\u56FE Fine-Design_Chart_Combine_Chart=\u7EC4\u5408\u56FE Fine-Design_Chart_Combine_Map=\u7EC4\u5408\u5730\u56FE @@ -121,6 +124,7 @@ Fine-Design_Chart_Condition_Display=\u6761\u4EF6\u663E\u793A Fine-Design_Chart_Connect_WMP=\u8FDE\u63A5 Fine-Design_Chart_Connecting_WMP=\u8FDE\u63A5\u4E2D Fine-Design_Chart_Continuity=\u8FDE\u7EED\u6027 +Fine-Design_Chart_Continuous_Gradient=\u8FDE\u7EED\u6E10\u53D8 Fine-Design_Chart_Cross=\u4EA4\u53C9 Fine-Design_Chart_Curve=\u66F2\u7EBF Fine-Design_Chart_CurveLine=\u66F2\u7EBF @@ -149,6 +153,7 @@ Fine-Design_Chart_Data_CombineOther=\u5408\u5E76\u5269\u4F59\u9879\u4E3A"\u5176\ Fine-Design_Chart_Data_Configuration=\u6570\u636E\u914D\u7F6E Fine-Design_Chart_Data_Field=\u6570\u636E\u5B57\u6BB5 Fine-Design_Chart_Data_Filter=\u6570\u636E\u7B5B\u9009 +Fine-Design_Chart_Data_Form=\u6570\u636E\u5F62\u5F0F Fine-Design_Chart_Data_Function_Percent=\u5360\u6BD4 Fine-Design_Chart_Data_Label_Inside=\u6570\u636E\u6807\u7B7E\u5185 Fine-Design_Chart_Data_Label_OutSide=\u6570\u636E\u6807\u7B7E\u5916 @@ -165,7 +170,6 @@ Fine-Design_Chart_Data_Range_Configuration=\u6570\u636E\u533A\u95F4\u914D\u7F6E Fine-Design_Chart_Data_Sheet=\u6570\u636E\u8868 Fine-Design_Chart_Data_Source=\u6570\u636E\u6765\u6E90 Fine-Design_Chart_Data_Type=\u6570\u636E\u683C\u5F0F -Fine-Design_Chart_Data_Form=\u6570\u636E\u5F62\u5F0F Fine-Design_Chart_Date_Time_Axis=\u65F6\u95F4\u5750\u6807\u8F74 Fine-Design_Chart_Default=\u9ED8\u8BA4 Fine-Design_Chart_Default_Interval=\u9ED8\u8BA4\u95F4\u9694 @@ -431,6 +435,7 @@ Fine-Design_Chart_New_StackColumn_Line=\u5806\u79EF\u67F1\u5F62\u56FE-\u6298\u7E Fine-Design_Chart_New_Structure=\u6846\u67B6\u56FE Fine-Design_Chart_New_TreeMap=\u77E9\u5F62\u6811\u56FE Fine-Design_Chart_Node=\u8282\u70B9 +Fine-Design_Chart_Node_Id=\u8282\u70B9id Fine-Design_Chart_Node_Name=\u8282\u70B9\u540D\u79F0 Fine-Design_Chart_Node_Radius=\u8282\u70B9\u534A\u5F84 Fine-Design_Chart_Non_Adjustment=\u4E0D\u53EF\u8C03\u6574 @@ -452,6 +457,7 @@ Fine-Design_Chart_Origin=\u539F\u6837\u5C55\u793A Fine-Design_Chart_Outlier_Value=\u5F02\u5E38\u503C Fine-Design_Chart_Pane_Background=\u5E95\u76D8\u80CC\u666F Fine-Design_Chart_Parent_ID=\u7236ID +Fine-Design_Chart_Parent_Node_Id=\u7236\u8282\u70B9id Fine-Design_Chart_Pattern=\u6837\u5F0F Fine-Design_Chart_Percent_Label=\u767E\u5206\u6BD4\u6807\u7B7E Fine-Design_Chart_Percent_Stacked=\u767E\u5206\u6BD4\u5806\u79EF @@ -710,10 +716,4 @@ Fine-Engine_Chart_New_Radar=\u96F7\u8FBE\u56FE Fine-Engine_Chart_New_Scatter=\u6563\u70B9\u56FE Fine-Engine_Chart_New_Structure=\u6846\u67B6\u56FE Fine-Engine_Chart_New_TreeMap=\u77E9\u5F62\u6811\u56FE -Fine-Engine_Chart_WordCloud_New=\u8BCD\u4E91 -Fine-Design_Chart_Continuous_Gradient=\u8FDE\u7EED\u6E10\u53D8 -Fine-Design_Chart_Area_Gradient=\u533A\u57DF\u6E10\u53D8 -Fine-Design_Chart_Color_Type=\u989C\u8272\u7C7B\u578B -Fine-Design_Chart_Color_Divide=\u989C\u8272\u5212\u5206 -Fine-Design_Chart_Node_Id=\u8282\u70B9id -Fine-Design_Chart_Parent_Node_Id=\u7236\u8282\u70B9id \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u8BCD\u4E91 \ No newline at end of file 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 2aff5b4..814ff9b 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 @@ -27,6 +27,7 @@ Fine-Design_Chart_Animation_Show=\u52D5\u614B\u5C55\u793A Fine-Design_Chart_Animation_Type=\u904B\u52D5\u65B9\u5F0F Fine-Design_Chart_AntiClockWise=\u9006\u6642\u91DD Fine-Design_Chart_Area=\u9762\u7A4D +Fine-Design_Chart_Area_Gradient= Fine-Design_Chart_Area_Name=\u5340\u57DF\u540D Fine-Design_Chart_Area_Size=\u5340\u57DF\u5927\u5C0F Fine-Design_Chart_Area_Title=\u5340\u57DF\u6A19\u984C @@ -111,6 +112,8 @@ Fine-Design_Chart_Close=\u95DC\u9589 Fine-Design_Chart_Collapse=\u6536\u7E2E\u65BC\u62BD\u5C5C\u83DC\u55AE\u5167 Fine-Design_Chart_Color=\u984F\u8272 Fine-Design_Chart_Color_Background=\u80CC\u666F\u984F\u8272 +Fine-Design_Chart_Color_Divide= +Fine-Design_Chart_Color_Type= Fine-Design_Chart_Column_Chart=\u67F1\u5F62\u5716 Fine-Design_Chart_Combine_Chart=\u7D44\u5408\u5716 Fine-Design_Chart_Combine_Map=\u7D44\u5408\u5730\u5716 @@ -121,6 +124,7 @@ Fine-Design_Chart_Condition_Display=\u689D\u4EF6\u986F\u793A Fine-Design_Chart_Connect_WMP=\u9023\u7D50 Fine-Design_Chart_Connecting_WMP=\u9023\u7D50\u4E2D Fine-Design_Chart_Continuity=\u9023\u7E8C\u6027 +Fine-Design_Chart_Continuous_Gradient= Fine-Design_Chart_Cross=\u4EA4\u53C9 Fine-Design_Chart_Curve=\u66F2\u7DDA Fine-Design_Chart_CurveLine=\u66F2\u7DDA @@ -149,6 +153,7 @@ Fine-Design_Chart_Data_CombineOther=\u5408\u4F75\u5269\u9918\u9805\u70BA\u201C\u Fine-Design_Chart_Data_Configuration=\u8CC7\u6599\u914D\u7F6E Fine-Design_Chart_Data_Field=\u8CC7\u6599\u6B04\u4F4D Fine-Design_Chart_Data_Filter=\u8CC7\u6599\u7BE9\u9078 +Fine-Design_Chart_Data_Form=\u6578\u64DA\u5F62\u5F0F Fine-Design_Chart_Data_Function_Percent=\u4F54\u6BD4 Fine-Design_Chart_Data_Label_Inside=\u8CC7\u6599\u6A19\u7C64\u5167 Fine-Design_Chart_Data_Label_OutSide=\u8CC7\u6599\u6A19\u7C64\u5916 @@ -165,7 +170,6 @@ Fine-Design_Chart_Data_Range_Configuration=\u8CC7\u6599\u5340\u9593\u8A2D\u5B9A Fine-Design_Chart_Data_Sheet=\u8CC7\u6599\u8868 Fine-Design_Chart_Data_Source=\u8CC7\u6599\u4F86\u6E90 Fine-Design_Chart_Data_Type=\u8CC7\u6599\u683C\u5F0F -Fine-Design_Chart_Data_Form=\u6578\u64DA\u5F62\u5F0F Fine-Design_Chart_Date_Time_Axis=\u6642\u9593\u5750\u6A19\u8EF8 Fine-Design_Chart_Default=\u9810\u8A2D Fine-Design_Chart_Default_Interval=\u9810\u8A2D\u9593\u9694 @@ -431,6 +435,7 @@ Fine-Design_Chart_New_StackColumn_Line=\u5806\u7A4D\u67F1\u5F62\u5716-\u6298\u7D Fine-Design_Chart_New_Structure=\u6846\u67B6\u5716 Fine-Design_Chart_New_TreeMap=\u77E9\u5F62\u6A39\u5716 Fine-Design_Chart_Node=\u7BC0\u9EDE +Fine-Design_Chart_Node_Id= Fine-Design_Chart_Node_Name=\u7BC0\u9EDE\u540D\u7A31 Fine-Design_Chart_Node_Radius=\u7BC0\u9EDE\u534A\u5F91 Fine-Design_Chart_Non_Adjustment=\u4E0D\u53EF\u8ABF\u6574 @@ -452,6 +457,7 @@ Fine-Design_Chart_Origin=\u539F\u6A23\u5C55\u793A Fine-Design_Chart_Outlier_Value=\u7570\u5E38\u503C Fine-Design_Chart_Pane_Background=\u5E95\u76E4\u80CC\u666F Fine-Design_Chart_Parent_ID=\u7236ID +Fine-Design_Chart_Parent_Node_Id= Fine-Design_Chart_Pattern=\u6A23\u5F0F Fine-Design_Chart_Percent_Label=\u767E\u5206\u6BD4\u6A19\u7C64 Fine-Design_Chart_Percent_Stacked=\u767E\u5206\u6BD4\u5806\u7A4D @@ -710,10 +716,4 @@ Fine-Engine_Chart_New_Radar=\u96F7\u9054\u5716 Fine-Engine_Chart_New_Scatter=\u6563\u9EDE\u5716 Fine-Engine_Chart_New_Structure=\u6846\u67B6\u5716 Fine-Engine_Chart_New_TreeMap=\u77E9\u5F62\u6A39\u5716 -Fine-Engine_Chart_WordCloud_New=\u6587\u5B57\u96F2 -Fine-Design_Chart_Continuous_Gradient= -Fine-Design_Chart_Area_Gradient= -Fine-Design_Chart_Color_Type= -Fine-Design_Chart_Color_Divide= -Fine-Design_Chart_Node_Id= -Fine-Design_Chart_Parent_Node_Id= \ No newline at end of file +Fine-Engine_Chart_WordCloud_New=\u6587\u5B57\u96F2 \ No newline at end of file diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties index f0df2e1..269f506 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties @@ -6,7 +6,7 @@ Find-Design_Basic_Hyperlink_Extends_Report_Parameters=Inherit Report Parameters Fine-Core_Vertical_LeftToRight=\u6587\u5B57\u8C4E\u6392(\u5F9E\u5DE6\u5411\u53F3) Fine-Core_Vertical_RightToLeft=\u6587\u5B57\u8C4E\u6392(\u5F9E\u53F3\u5411\u5DE6) Fine-Design-Basic_Save_Failure= \u5132\u5B58\u5931\u6557 -Fine-Design-Mobile_Max_Show_Rows=\u6700\u5927\u986F\u793A\u884C\u6578 +Fine-Design-Mobile_Max_Show_Rows=\u6700\u5927\u986F\u793A\u5217\u6578 Fine-Design_Appear_Refresh=\u9801\u9762\u518D\u73FE\u6642\u91CD\u65B0\u6574\u7406 Fine-Design_Automatic_Push_Update=\u81EA\u52D5\u63A8\u9001\u66F4\u65B0 Fine-Design_Basic_About=\u95DC\u65BC @@ -126,7 +126,7 @@ Fine-Design_Basic_Background_Texture_Walnut=\u80E1\u6843 Fine-Design_Basic_Background_Texture_Water_Droplets=\u6C34\u6EF4 Fine-Design_Basic_Background_Texture_White_Marble=\u767D\u8272\u5927\u7406\u77F3 Fine-Design_Basic_Background_Texture_Woven_Mat=\u7DE8\u7E54\u7269 -Fine-Design_Basic_Base_Column=\u884C +Fine-Design_Basic_Base_Column=\u6B04 Fine-Design_Basic_Base_Formula_Plugin=\u63D2\u4EF6\u51FD\u5F0F Fine-Design_Basic_Base_Help=\u8AAA\u660E Fine-Design_Basic_Base_No=\u5426 @@ -172,7 +172,7 @@ Fine-Design_Basic_Close=\u95DC\u9589 Fine-Design_Basic_Close_Window=\u95DC\u9589\u8996\u7A97 Fine-Design_Basic_Color=\u984F\u8272 Fine-Design_Basic_Colors=\u984F\u8272 -Fine-Design_Basic_Column_Name=\u884C\u540D +Fine-Design_Basic_Column_Name=\u6B04\u540D Fine-Design_Basic_Combo_CheckBox_End_Symbol=\u7D50\u675F\u7B26 Fine-Design_Basic_Combo_CheckBox_Start_Symbol=\u8D77\u59CB\u7B26 Fine-Design_Basic_Comma_Dismenber=\u9017\u865F @@ -262,7 +262,7 @@ Fine-Design_Basic_Database_Connection_Failed=\u8CC7\u6599\u5EAB\u9023\u7D50\u593 Fine-Design_Basic_Database_Manager=\u8CC7\u6599\u9023\u7D50\u7BA1\u7406\u5668 Fine-Design_Basic_Database_Select_Table=\u9078\u64C7\u8CC7\u6599\u5EAB\u8868 Fine-Design_Basic_Datasource_Charset=\u7DE8\u78BC -Fine-Design_Basic_Datasource_Column_Index=\u884C\u5E8F\u865F +Fine-Design_Basic_Datasource_Column_Index=\u6B04\u5E8F\u865F Fine-Design_Basic_Datasource_Connection_Successfully=\u9023\u7D50\u6210\u529F Fine-Design_Basic_Datasource_Context=\u4E0A\u4E0B\u6587 Fine-Design_Basic_Datasource_Convert_Charset=\u7DE8\u78BC\u8F49\u63DB @@ -416,7 +416,7 @@ Fine-Design_Basic_FileLocked_Undeleted=\u7BC4\u672C\u88AB\u9396\u5B9A\uFF0C\u4E0 Fine-Design_Basic_File_Address=\u6A94\u6848\u4F4D\u5740 Fine-Design_Basic_Filed_Chosen=\u4F9D\u8CF4\u7684\u6B04\u4F4D Fine-Design_Basic_Finish=\u5B8C\u6210 -Fine-Design_Basic_FirstRow_IS_Column_Name=\u7B2C\u4E00\u5217\u5305\u542B\u884C\u6A19\u984C +Fine-Design_Basic_FirstRow_IS_Column_Name=\u7B2C\u4E00\u5217\u5305\u542B\u6B04\u6A19\u984C Fine-Design_Basic_Float=\u6D6E\u9EDE\u578B Fine-Design_Basic_Float_Element=\u61F8\u6D6E\u5143\u7D20 Fine-Design_Basic_Focus_Hotkey=\u6309'F2' \u805A\u7126 @@ -462,7 +462,7 @@ Fine-Design_Basic_FormulaD_Valid_Formula=\u5408\u6CD5\u7684\u516C\u5F0F Fine-Design_Basic_FormulaPane_Formula_Description=\u516C\u5F0F\u8AAA\u660E Fine-Design_Basic_FormulaPane_Function_Detail=\u51FD\u5F0F\u660E\u7D30 Fine-Design_Basic_FormulaPane_Search=\u641C\u5C0B -Fine-Design_Basic_FormulaPane_Tips=\u63D0\u793A:\u60A8\u53EF\u4EE5\u901A\u904E\u8F38\u5165B1\u4F86\u5BEB\u5165\u7B2C\u4E00\u5217\u7B2C\u4E8C\u884C\u7684\u8CC7\u6599\u3002 +Fine-Design_Basic_FormulaPane_Tips=\u63D0\u793A:\u60A8\u53EF\u4EE5\u901A\u904E\u8F38\u5165B1\u4F86\u5BEB\u5165\u7B2C\u4E00\u5217\u7B2C\u4E8C\u6B04\u7684\u8CC7\u6599\u3002 Fine-Design_Basic_FormulaPane_Variables=\u8B8A\u6578 Fine-Design_Basic_Formula_Dictionary_Display_Examples_Html=\u63D0\u793A\uFF1A\u5BE6\u969B\u503C\u7BC4\u570D\u70BA=range(100),\u5C0D\u5BE6\u969B\u503C\u7BC4\u570D\u5167\u7684\u6BCF\u500B$$$\u7684\u986F\u793A\u516C\u5F0F\u70BA=0 - $$$\uFF0C
\u5247\u6700\u7D42\u7684\u7D50\u679C\u5BE6\u969B\u503C\u70BA1, 2, ..., 100,\u986F\u793A\u503C\u70BA-1, -2, ... , -100\u3002
  Fine-Design_Basic_Forum=\u8AD6\u58C7 @@ -1011,7 +1011,7 @@ Fine-Design_Basic_Table_Data_Duplicate_Name_Tips=\u540D\u5B57\u70BA{}\u7684\u8CC Fine-Design_Basic_Table_Data_Empty_Name_Tips=\u8CC7\u6599\u96C6\u540D\u5B57\u70BA\u7A7A\uFF0C\u8ACB\u8A2D\u5B9A\u4E00\u500B\u540D\u5B57\uFF01 Fine-Design_Basic_Table_Dismember=\u88FD\u9304\u7B26 Fine-Design_Basic_Tabledata_Default_Parameter=\u8CC7\u6599\u96C6\u9810\u8A2D\u53C3\u6578 -Fine-Design_Basic_Tabledata_Embedded_Column_Setting=\u884C\u8A2D\u5B9A +Fine-Design_Basic_Tabledata_Embedded_Column_Setting=\u6B04\u8A2D\u5B9A Fine-Design_Basic_Tabledata_Embedded_Table_Design=\u8868\u8A2D\u8A08 Fine-Design_Basic_Tabledata_Preview_Warn_Text=\u7B2C{}\u884C\u4E0D\u5B58\u5728\uFF0C\u7E3D\u8A08{}\u884C\uFF01 Fine-Design_Basic_Tabledata_Select_To_Merge=\u9078\u64C7\u8981\u5408\u4F75\u7684\u8CC7\u6599\u96C6 @@ -1070,7 +1070,7 @@ Fine-Design_Basic_Utils_App_AllFiles=\u6240\u6709\u6A94\u6848 Fine-Design_Basic_Utils_Are_You_Sure_To_Delete_The_Role_And_Its_Design_Authorities=\u662F\u5426\u78BA\u8A8D\u522A\u9664\u8A72\u89D2\u8272\u53CA\u5176\u8A2D\u8A08\u6B0A\u9650 Fine-Design_Basic_Utils_Are_You_Sure_To_Delete_The_User_And_Its_Design_Authorities=\u662F\u5426\u78BA\u8A8D\u522A\u9664\u8A72\u7528\u6236\u53CA\u5176\u8A2D\u8A08\u6B0A\u9650 Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item=\u4F60\u78BA\u5B9A\u522A\u9664\u9078\u4E2D\u7684\u9805 -Fine-Design_Basic_Utils_Available_Columns=\u53EF\u9078\u884C +Fine-Design_Basic_Utils_Available_Columns=\u53EF\u9078\u6B04 Fine-Design_Basic_Utils_Background=\u80CC\u666F Fine-Design_Basic_Utils_Default_Value=\u9810\u8A2D\u503C Fine-Design_Basic_Utils_Delete_Row=\u522A\u9664\u5217 @@ -1362,7 +1362,7 @@ Fine-Design_Form_Border_Layout=\u908A\u754C\u4F48\u5C40 Fine-Design_Form_Border_Style_Normal=\u76F4\u89D2\u6846\u7DDA Fine-Design_Form_Brown=\u8910\u8272 Fine-Design_Form_Brown_Orange=\u68D5\u9EC3 -Fine-Design_Form_Button_Group_Display_Columns=\u5C55\u793A\u884C\u6578 +Fine-Design_Form_Button_Group_Display_Columns=\u5C55\u793A\u6B04\u6578 Fine-Design_Form_Button_Hot_keys=\u5FEB\u6377\u9375 Fine-Design_Form_Button_Name=\u6309\u9215\u540D\u5B57 Fine-Design_Form_Cannot_Add_To_This_Area=\u7121\u6CD5\u65B0\u589E\u5230\u8A72\u5340\u57DF @@ -1374,7 +1374,7 @@ Fine-Design_Form_Change_Widget_Name=\u66F4\u6539\u5143\u4EF6\u540D Fine-Design_Form_Change_Widget_Name_Discription=\u8ACB\u8F38\u5165\u4E00\u500B\u65B0\u7684\u5143\u4EF6\u540D Fine-Design_Form_Chart_Adaptivity=\u5716\u8868\u81EA\u6211\u8ABF\u6574 Fine-Design_Form_Click_Me=\u9EDE\u6211\u6709\u9A5A\u559C\u54E6\uFF01 -Fine-Design_Form_Columns=\u884C +Fine-Design_Form_Columns=\u6B04 Fine-Design_Form_ComboCheckBox=\u4E0B\u62C9\u8907\u9078\u6846 Fine-Design_Form_Component_Bounds=\u5143\u4EF6\u908A\u754C Fine-Design_Form_Component_Frozen=\u5143\u4EF6\u51CD\u7D50 @@ -1441,10 +1441,10 @@ Fine-Design_Form_Install_Template=\u5B89\u88DD Fine-Design_Form_Joption_News=\u8A0A\u606F Fine-Design_Form_Label_Name=\u6A19\u7C64\u540D\u7A31 Fine-Design_Form_Layout=\u4F48\u5C40 -Fine-Design_Form_Layout_2x2=2\u52172\u884C\u4F48\u5C40\u5BB9\u5668 -Fine-Design_Form_Layout_2x3=2\u52173\u884C\u4F48\u5C40\u5BB9\u5668 -Fine-Design_Form_Layout_3x2=3\u52172\u884C\u4F48\u5C40\u5BB9\u5668 -Fine-Design_Form_Layout_3x3=3\u52173\u884C\u4F48\u5C40\u5BB9\u5668 +Fine-Design_Form_Layout_2x2=2\u52172\u6B04\u4F48\u5C40\u5BB9\u5668 +Fine-Design_Form_Layout_2x3=2\u52173\u6B04\u4F48\u5C40\u5BB9\u5668 +Fine-Design_Form_Layout_3x2=3\u52172\u6B04\u4F48\u5C40\u5BB9\u5668 +Fine-Design_Form_Layout_3x3=3\u52173\u6B04\u4F48\u5C40\u5BB9\u5668 Fine-Design_Form_Layout_Adaptive_Layout=\u81EA\u6211\u8ABF\u6574\u4F48\u5C40 Fine-Design_Form_Layout_Block_Absolute=\u7D55\u5C0D\u756B\u5E03\u584A Fine-Design_Form_Layout_Block_Blank=\u7A7A\u767D\u584A @@ -1696,7 +1696,7 @@ Fine-Design_Report_Activate_Register_Product_For_Free=\u514D\u8CBB\u6FC0\u6D3B\u Fine-Design_Report_Add_Condition=\u65B0\u589E\u689D\u4EF6 Fine-Design_Report_Add_Event=\u65B0\u589E\u4E8B\u4EF6 Fine-Design_Report_Add_FloatElement=\u65B0\u589E\u5143\u7D20 -Fine-Design_Report_Add_Row_Column_Numbers=\u65B0\u589E\u5217\u884C\u6578\u76EE +Fine-Design_Report_Add_Row_Column_Numbers=\u65B0\u589E\u5217\u6B04\u6578\u76EE Fine-Design_Report_Advaced=\u9032\u968E Fine-Design_Report_Advanced=\u9032\u968E Fine-Design_Report_After_Changed_Some_Attributes_Are_Different=\u8F49\u63DB\u5F8C\u5831\u8868\u7684\u67D0\u4E9B\u5C6C\u6027\u6703\u767C\u751F\u6539\u8B8A\uFF0C\u662F\u5426\u7E7C\u7E8C @@ -1728,7 +1728,7 @@ Fine-Design_Report_Attention=\u6CE8\u610F Fine-Design_Report_Attribute=\u5C6C\u6027 Fine-Design_Report_Auto_Adjust_Height=\u81EA\u52D5\u8ABF\u6574\u5217\u9AD8 Fine-Design_Report_Auto_Adjust_Size=\u81EA\u52D5\u8ABF\u6574 -Fine-Design_Report_Auto_Adjust_Width=\u81EA\u52D5\u8ABF\u6574\u884C\u5BEC +Fine-Design_Report_Auto_Adjust_Width=\u81EA\u52D5\u8ABF\u6574\u6B04\u5BEC Fine-Design_Report_Auto_Choose=\u81EA\u52D5\u9078\u64C7 Fine-Design_Report_BBSLogin_Account=\u8CEC\u865F Fine-Design_Report_BBSLogin_Connection_Failure=\u7DB2\u8DEF\u9023\u7D50\u5931\u6557\uFF0C\u8ACB\u6AA2\u67E5\u7576\u524D\u7DB2\u8DEF\u72C0\u614B @@ -1747,7 +1747,7 @@ Fine-Design_Report_Background=\u7D19\u5F35\u80CC\u666F Fine-Design_Report_Bar_CodeD_Drawing_Text=\u986F\u793A\u689D\u78BC\u7684\u6587\u5B57 Fine-Design_Report_Barcode_Size=\u689D\u78BC\u5927\u5C0F Fine-Design_Report_Base_Background=\u80CC\u666F -Fine-Design_Report_Base_Columns=\u884C +Fine-Design_Report_Base_Columns=\u6B04 Fine-Design_Report_Base_Format=\u683C\u5F0F Fine-Design_Report_Base_Option=\u9078\u9805 Fine-Design_Report_Base_Option_Half_Up=\u56DB\u6368\u4E94\u5165 @@ -1787,16 +1787,16 @@ Fine-Design_Report_CSS_Warning=\u76F8\u5C0D\u5831\u8868\u5DE5\u7A0B\u76EE\u9304\ Fine-Design_Report_Cache_Validate_Time=\u5831\u8868\u5FEB\u53D6\u6709\u6548\u6642\u9593 Fine-Design_Report_Can_Not_Use_Format_Brush=\u4E0D\u80FD\u5C0D\u591A\u91CD\u9078\u5B9A\u5340\u57DF\u4F7F\u7528\u8907\u88FD\u683C\u5F0F! Fine-Design_Report_Cancel_Hide=\u53D6\u6D88\u96B1\u85CF -Fine-Design_Report_Cancel_Repeat_Attributes=\u53D6\u6D88\u91CD\u8907\u5217\u884C +Fine-Design_Report_Cancel_Repeat_Attributes=\u53D6\u6D88\u91CD\u8907\u5217\u6B04 Fine-Design_Report_CellElement_Property_Table=\u5132\u5B58\u683C\u5C6C\u6027\u8868 Fine-Design_Report_CellPage_Can_Break_On_Paginate=\u5206\u9801\u6642\u53EF\u4EE5\u65B7\u958B Fine-Design_Report_CellPage_Repeat_Content_When_Paging=\u5206\u9801\u65B7\u958B\u6642\u503C\u91CD\u8907\u986F\u793A Fine-Design_Report_CellWrite_InsertRow_COPY=\u539F\u503C Fine-Design_Report_CellWrite_InsertRow_NULL=\u7A7A\u503C Fine-Design_Report_CellWrite_InsertRow_Policy=\u63D2\u5165\u5217\u7B56\u7565 -Fine-Design_Report_CellWrite_Page_After_Column=\u884C\u5F8C\u5206\u9801 +Fine-Design_Report_CellWrite_Page_After_Column=\u6B04\u5F8C\u5206\u9801 Fine-Design_Report_CellWrite_Page_After_Row=\u5217\u5F8C\u5206\u9801 -Fine-Design_Report_CellWrite_Page_Before_Column=\u884C\u524D\u5206\u9801 +Fine-Design_Report_CellWrite_Page_Before_Column=\u6B04\u524D\u5206\u9801 Fine-Design_Report_CellWrite_Page_Before_Row=\u5217\u524D\u5206\u9801 Fine-Design_Report_CellWrite_Preview_Cell_Content=\u9810\u89BD\u5132\u5B58\u683C\u5167\u5BB9 Fine-Design_Report_CellWrite_Print_Background=\u5217\u5370/\u532F\u51FA\u5132\u5B58\u683C\u80CC\u666F @@ -1806,9 +1806,9 @@ Fine-Design_Report_CellWrite_Show_As_Image=\u7528\u5716\u7247\u986F\u793A\u5167\ Fine-Design_Report_CellWrite_ToolTip=\u5167\u5BB9\u63D0\u793A Fine-Design_Report_Cell_Value=\u5132\u5B58\u683C\u503C Fine-Design_Report_Cell_Visible=\u5132\u5B58\u683C\u53EF\u898B -Fine-Design_Report_Cell_Write_Page_After_Column=\u884C\u5F8C\u5206\u9801 +Fine-Design_Report_Cell_Write_Page_After_Column=\u6B04\u5F8C\u5206\u9801 Fine-Design_Report_Cell_Write_Page_After_Row=\u5217\u5F8C\u5206\u9801 -Fine-Design_Report_Cell_Write_Page_Before_Column=\u884C\u524D\u5206\u9801 +Fine-Design_Report_Cell_Write_Page_Before_Column=\u6B04\u524D\u5206\u9801 Fine-Design_Report_Cell_Write_Page_Before_Row=\u5217\u524D\u5206\u9801 Fine-Design_Report_Center_Display=\u7F6E\u4E2D\u986F\u793A Fine-Design_Report_Choose_Data_Confusion_Tip=\u8ACB\u9078\u64C7\u9700\u8981\u6DF7\u6DC6\u7684\u6B04\u4F4D\u5F8C\u9810\u89BD @@ -1818,14 +1818,14 @@ Fine-Design_Report_Col_Icon_File_Name=col.png Fine-Design_Report_Collect_Information_Description=\u63CF\u8FF0 Fine-Design_Report_Collect_Information_free=\u514D\u8CBB Fine-Design_Report_Collect_Use_Designer=\u4F7F\u7528\u8A2D\u8A08\u5668 -Fine-Design_Report_Column=\u884C +Fine-Design_Report_Column=\u6B04 Fine-Design_Report_Column_Area=\u5206\u6B04\u5340\u57DF Fine-Design_Report_Column_Data=\u5206\u6B04\u8CC7\u6599 Fine-Design_Report_Column_Multiple=\u8CC7\u6599\u500D\u6578 Fine-Design_Report_Column_Style=\u5206\u6B04\u6A23\u5F0F -Fine-Design_Report_Column_To=\u884C\u81F3\u7B2C +Fine-Design_Report_Column_To=\u6B04\u81F3\u7B2C Fine-Design_Report_Column_Warn_Text=\u5206\u6B04\u5340\u57DF\u683C\u5F0F\u932F\u8AA4 -Fine-Design_Report_Columns_Repeat_Column=\u8907\u88FD\u884C\u5E8F\u5217 +Fine-Design_Report_Columns_Repeat_Column=\u8907\u88FD\u6B04\u5E8F\u5217 Fine-Design_Report_Columns_Repeat_Row=\u8907\u88FD\u5217\u5E8F\u5217 Fine-Design_Report_ComboBox=\u4E0B\u62C9\u6846 Fine-Design_Report_Common=\u666E\u901A @@ -1843,9 +1843,9 @@ Fine-Design_Report_Copy_Number=\u4EFD\u6578 Fine-Design_Report_Create_Tree=\u69CB\u5EFA\u6A39 Fine-Design_Report_Current_Keys=\u7576\u524D\u5FEB\u6377\u9375\uFF1A Fine-Design_Report_Current_Page=\u7576\u524D\u9801 -Fine-Design_Report_Cursor_To_Next_Column=\u5149\u6A19\u79FB\u5230\u4E0B\u4E00\u884C +Fine-Design_Report_Cursor_To_Next_Column=\u5149\u6A19\u79FB\u5230\u4E0B\u4E00\u6B04 Fine-Design_Report_Cursor_To_Next_Row=\u5149\u6A19\u79FB\u5230\u4E0B\u4E00\u5217 -Fine-Design_Report_Cursor_To_Previous_Column=\u5149\u6A19\u79FB\u5230\u4E0A\u4E00\u884C\u70BA\uFF1A +Fine-Design_Report_Cursor_To_Previous_Column=\u5149\u6A19\u79FB\u5230\u4E0A\u4E00\u6B04\u70BA\uFF1A Fine-Design_Report_Cursor_To_Previous_Row=\u5149\u6A19\u79FB\u5230\u4E0A\u4E00\u5217\u70BA\uFF1A Fine-Design_Report_Custom_Consignee=\u6536\u4EF6\u4EBA\u5141\u8A31\u81EA\u8A02\u503C Fine-Design_Report_Custom_Event=\u81EA\u8A02\u4E8B\u4EF6 @@ -1882,7 +1882,7 @@ Fine-Design_Report_ECP_Error_Pwd=\u5BC6\u78BC\u932F\u8AA4 Fine-Design_Report_Edit=\u7DE8\u8F2F Fine-Design_Report_Edit_Button_ToolBar=\u7DE8\u8F2F\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04 Fine-Design_Report_Edit_DashBoard_Potence=\u9580\u6236\u7DE8\u8F2F -Fine-Design_Report_Edit_RC-Entire_Column=\u6574\u884C(C) +Fine-Design_Report_Edit_RC-Entire_Column=\u6574\u6B04(C) Fine-Design_Report_Edit_RC_Entire_Row=\u6574\u5217(R) Fine-Design_Report_Edit_Row_Count=\u5217\u6578 Fine-Design_Report_Editing_Listeners=\u4E8B\u4EF6\u7DE8\u8F2F @@ -1914,7 +1914,7 @@ Fine-Design_Report_Engine_Need_Select_Sheet_When_Printing=\u5217\u5370\u9700\u89 Fine-Design_Report_Engine_No_Client_Print=\u96F6\u7528\u6236\u7AEF\u5217\u5370 Fine-Design_Report_Engine_Page-Frozen=\u5206\u9801\u51CD\u7D50 Fine-Design_Report_Engine_Page_Number=\u9801\u78BC -Fine-Design_Report_Engine_Please_Set_Repeat_First=\u8ACB\u5148\u8A2D\u5B9A\u91CD\u8907\u6A19\u984C\u5217\u548C\u884C +Fine-Design_Report_Engine_Please_Set_Repeat_First=\u8ACB\u5148\u8A2D\u5B9A\u91CD\u8907\u6A19\u984C\u5217\u548C\u6B04 Fine-Design_Report_Engine_Print=\u5217\u5370 Fine-Design_Report_Engine_Print_Compatible=\u5217\u5370\uFF08\u76F8\u5BB9\uFF09 Fine-Design_Report_Engine_ReportServerP_First=\u9996\u9801 @@ -1923,7 +1923,7 @@ Fine-Design_Report_Engine_ReportServerP_Next=\u4E0B\u4E00\u9801 Fine-Design_Report_Engine_ReportServerP_PDF=PDF Fine-Design_Report_Engine_ReportServerP_Previous=\u4E0A\u4E00\u9801 Fine-Design_Report_Engine_Role=\u89D2\u8272 -Fine-Design_Report_Engine_Select_the_repeated_row_and_column=\u9078\u64C7\u9700\u8981\u91CD\u8907\u7684\u5217\u884C +Fine-Design_Report_Engine_Select_the_repeated_row_and_column=\u9078\u64C7\u9700\u8981\u91CD\u8907\u7684\u5217\u6B04 Fine-Design_Report_Engine_Selection_Filter=\u689D\u4EF6\u7BE9\u9078 Fine-Design_Report_Engine_SetPrinterOffset=\u5370\u8868\u6A5F\u504F\u79FB Fine-Design_Report_Engine_Set_Margin_When_Printing=\u5217\u5370\u6642\u53EF\u8A2D\u5B9A\u5217\u5370\u908A\u8DDD @@ -1933,7 +1933,7 @@ Fine-Design_Report_Engine_Style=\u6A23\u5F0F Fine-Design_Report_Engine_Style_Name=\u683C\u5F0F\u540D Fine-Design_Report_Engine_Tab_Layout_Title=\u6A19\u984C Fine-Design_Report_Engine_Tab_Layout_Width=\u5BEC\u5EA6 -Fine-Design_Report_Engine_Utils_Import_Excel_Data_Customized=\u81EA\u8A02\u532F\u5165EXCEL\u5217\u884C +Fine-Design_Report_Engine_Utils_Import_Excel_Data_Customized=\u81EA\u8A02\u532F\u5165EXCEL\u5217\u6B04 Fine-Design_Report_Engine_Utils_Print[Client]=\u5217\u5370[\u7528\u6236\u7AEF] Fine-Design_Report_Engine_Utils_Submit=\u63D0\u4EA4 Fine-Design_Report_Engine_Verify_Message=\u932F\u8AA4\u8AEE\u8A62 @@ -1986,7 +1986,7 @@ Fine-Design_Report_Fill=\u586B\u5145 Fine-Design_Report_Fill_Blank_Data=\u88DC\u5145\u7A7A\u767D\u8CC7\u6599 Fine-Design_Report_Filter=\u904E\u6FFE Fine-Design_Report_Filter_Conditions=\u904E\u6FFE\u689D\u4EF6 -Fine-Design_Report_Finis_Start_Column_Form=\u91CD\u8907\u7D50\u5C3E\u884C\u5F9E\u7B2C +Fine-Design_Report_Finis_Start_Column_Form=\u91CD\u8907\u7D50\u5C3E\u6B04\u5F9E\u7B2C Fine-Design_Report_Finis_Start_Row_Form=\u91CD\u8907\u7D50\u5C3E\u5217\u5F9E\u7B2C Fine-Design_Report_Finish_Export=\u532F\u51FA\u5B8C\u7562 Fine-Design_Report_Finish_Modify_Share=\u5B8C\u6210\u4FEE\u6539\u4E26\u5206\u4EAB @@ -2165,7 +2165,7 @@ Fine-Design_Report_PageSetup_Header=\u9801\u9996 Fine-Design_Report_PageSetup_Horizontally=\u6C34\u5E73\u7F6E\u4E2D Fine-Design_Report_PageSetup_Horizou200Bu200Bntally=\u6C34\u5E73\u7F6E\u4E2D Fine-Design_Report_PageSetup_Landscape=\u6A6B\u5411 -Fine-Design_Report_PageSetup_Left_To_Right=\u5148\u5217\u5F8C\u884C +Fine-Design_Report_PageSetup_Left_To_Right=\u5148\u5217\u5F8C\u6B04 Fine-Design_Report_PageSetup_Margin=\u9801\u908A\u8DDD Fine-Design_Report_PageSetup_Page=\u9801\u9762 Fine-Design_Report_PageSetup_Page_Setup=\u9801\u9762\u8A2D\u5B9A @@ -2174,7 +2174,7 @@ Fine-Design_Report_PageSetup_Placement_Center_On_Page=\u7F6E\u4E2D\u65B9\u5F0F Fine-Design_Report_PageSetup_Portrait=\u7E31\u5411 Fine-Design_Report_PageSetup_Predefined=\u9810\u5B9A\u7FA9 Fine-Design_Report_PageSetup_Shrink_To_Fit_Content=\u6839\u64DA\u5132\u5B58\u683C\u5167\u5BB9\u81EA\u52D5\u8ABF\u6574 -Fine-Design_Report_PageSetup_Top_To_Bottom=\u5148\u884C\u5F8C\u5217 +Fine-Design_Report_PageSetup_Top_To_Bottom=\u5148\u6B04\u5F8C\u5217 Fine-Design_Report_PageSetup_Vertically=\u5782\u76F4\u7F6E\u4E2D Fine-Design_Report_PageSetup_mm=\u516C\u91D0 Fine-Design_Report_Page_Order=\u5206\u9801\u9806\u5E8F @@ -2224,7 +2224,7 @@ Fine-Design_Report_RCode_Error_Correct=\u7CFE\u932F Fine-Design_Report_RCode_Version=\u7248\u672C Fine-Design_Report_RWA_Batch_Modify_Cells=\u6279\u91CF\u4FEE\u6539\u5132\u5B58\u683C Fine-Design_Report_RWA_Click_Cell_To_Edit_Value=\u55AE\u64CA\u7BC4\u672C\u5132\u5B58\u683C\u4FEE\u6539\u503C -Fine-Design_Report_RWA_Column_Offset=\u884C\u504F\u79FB +Fine-Design_Report_RWA_Column_Offset=\u6B04\u504F\u79FB Fine-Design_Report_RWA_Row_Offset=\u5217\u504F\u79FB Fine-Design_Report_RWA_Smart_Add_Cell_Group=\u667A\u6167\u65B0\u589E\u5132\u5B58\u683C\u7D44 Fine-Design_Report_RWA_Smart_Add_Cells=\u667A\u6167\u65B0\u589E\u5132\u5B58\u683C @@ -2242,10 +2242,10 @@ Fine-Design_Report_ReportColumns_Columns_After=\u8D85\u904E Fine-Design_Report_ReportColumns_Columns_Horizontally=\u5217\u5206\u6B04 Fine-Design_Report_ReportColumns_Columns_Horizou200Bu200Bntally=\u5217\u5206\u6B04 Fine-Design_Report_ReportColumns_Columns_To=\u5206\u6B04\u6210 -Fine-Design_Report_ReportColumns_Columns_Vertically=\u884C\u5206\u6B04 +Fine-Design_Report_ReportColumns_Columns_Vertically=\u6B04\u5206\u5217 Fine-Design_Report_ReportColumns_Report_Columns=\u5831\u8868\u5206\u6B04 Fine-Design_Report_ReportD_Excel_Export=\u7BC4\u672C\u532F\u51FA\u5C6C\u6027 -Fine-Design_Report_ReportD_Export_Hided_Column=\u532F\u51FA\u96B1\u85CF\u884C +Fine-Design_Report_ReportD_Export_Hided_Column=\u532F\u51FA\u96B1\u85CF\u6B04 Fine-Design_Report_ReportD_Export_Hided_Row=\u532F\u51FA\u96B1\u85CF\u5217 Fine-Design_Report_ReportD_Report_Write_Attributes=\u5831\u8868\u586B\u5831\u5C6C\u6027 Fine-Design_Report_ReportGUI_Print_Background=\u5217\u5370/\u532F\u51FA\u5831\u8868\u80CC\u666F @@ -2283,8 +2283,8 @@ Fine-Design_Report_Set_Background=\u80CC\u666F\u8A2D\u5B9A Fine-Design_Report_Set_Background_Of_Current_Row=\u586B\u5831\u7576\u524D\u7DE8\u8F2F\u5217\u80CC\u666F\u8A2D\u5B9A Fine-Design_Report_Set_Callback_Function=\u8A2D\u5B9A\u56DE\u8ABF\u51FD\u6578 Fine-Design_Report_Set_Carousel=\u958B\u555F\u8F2A\u64AD -Fine-Design_Report_Set_Column_Title_End=\u8A2D\u5B9A\u91CD\u8907\u7D50\u5C3E\u884C -Fine-Design_Report_Set_Column_Title_Start=\u8A2D\u5B9A\u91CD\u8907\u6A19\u984C\u884C +Fine-Design_Report_Set_Column_Title_End=\u8A2D\u5B9A\u91CD\u8907\u7D50\u5C3E\u6B04 +Fine-Design_Report_Set_Column_Title_Start=\u8A2D\u5B9A\u91CD\u8907\u6A19\u984C\u6B04 Fine-Design_Report_Set_Delivery_Parameter=\u8A2D\u5B9A\u50B3\u905E\u53C3\u6578 Fine-Design_Report_Set_Face_Write_Current_Edit_Row_Background=\u7576\u524D\u7DE8\u8F2F\u5217\u80CC\u666F\u8A2D\u5B9A Fine-Design_Report_Set_Float_Element_Name=\u8A2D\u7F6E\u61F8\u6D6E\u5143\u7D20\u540D\u7A31 @@ -2299,7 +2299,7 @@ Fine-Design_Report_Sheet_Label_Page_Display_Position=sheet\u6A19\u7C64\u9801\u98 Fine-Design_Report_Sheet_Password=\u5DE5\u4F5C\u8868\u5BC6\u78BC Fine-Design_Report_Shortcut_Set=\u5FEB\u6377\u9375\u8A2D\u5B9A Fine-Design_Report_Show_As_Download=\u7528\u4E0B\u8F09\u9023\u7D50\u986F\u793A\u4E8C\u9032\u5236\u5167\u5BB9 -Fine-Design_Report_Show_Blank_Column=\u88DC\u5145\u7A7A\u767D\u884C +Fine-Design_Report_Show_Blank_Column=\u88DC\u5145\u7A7A\u767D\u6B04 Fine-Design_Report_Show_Blank_Row=\u88DC\u5145\u7A7A\u767D\u5217 Fine-Design_Report_Show_Content=\u986F\u793A\u5167\u5BB9 Fine-Design_Report_Show_Icon=\u986F\u793A\u6309\u9215\u5716\u793A @@ -2371,7 +2371,7 @@ Fine-Design_Report_Tip_Native_Print_Need_Client=\u63D0\u793A\uFF1A\u672C\u6A5F\u Fine-Design_Report_Tip_Use_Default_Print_Margin=\u63D0\u793A\uFF1A\u82E5\u4E0D\u52FE\u9078\uFF0C\u5247\u4F7F\u7528\u5982\u4E0B\u9810\u8A2D\u8A2D\u5B9A\u4E2D\u7684\u5217\u5370\u908A\u8DDD\u3002 Fine-Design_Report_Tip_Use_Default_Settings=\u63D0\u793A\uFF1A\u82E5\u4E0D\u52FE\u9078\uFF0C\u5247\u4F7F\u7528\u5982\u4E0B\u9810\u8A2D\u8A2D\u5B9A\u3002 Fine-Design_Report_Title=\u6A19\u984C -Fine-Design_Report_Title_Start_Column_Form=\u91CD\u8907\u6A19\u984C\u884C\u5F9E\u7B2C +Fine-Design_Report_Title_Start_Column_Form=\u91CD\u8907\u6A19\u984C\u6B04\u5F9E\u7B2C Fine-Design_Report_Title_Start_Row_Form=\u91CD\u8907\u6A19\u984C\u5217\u5F9E\u7B2C Fine-Design_Report_ToolBar_Bottom=\u5E95\u90E8\u5DE5\u5177\u6B04 Fine-Design_Report_ToolBar_Top=\u9802\u90E8\u5DE5\u5177\u6B04 @@ -2410,18 +2410,18 @@ Fine-Design_Report_Utils_Beyond_The_Left_Side_Of_Border=\u8D85\u51FA\u5DE6\u908A Fine-Design_Report_Utils_Beyond_The_Right_Side_Of_Border=\u8D85\u51FA\u53F3\u908A\u754C Fine-Design_Report_Utils_Beyond_The_Top_Side_Of_Border=\u8D85\u51FA\u4E0A\u908A\u754C Fine-Design_Report_Utils_Bottom_To_Top=\u5F9E\u4E0B\u5230\u4E0A -Fine-Design_Report_Utils_Column_Width=\u884C\u5BEC +Fine-Design_Report_Utils_Column_Width=\u6B04\u5BEC Fine-Design_Report_Utils_Current_Cell=\u7576\u524D\u683C\u5B50 -Fine-Design_Report_Utils_Current_Column=\u7576\u524D\u884C +Fine-Design_Report_Utils_Current_Column=\u7576\u524D\u6B04 Fine-Design_Report_Utils_Current_Row=\u7576\u524D\u5217 Fine-Design_Report_Utils_Current_Sheet=\u7576\u524DSheet -Fine-Design_Report_Utils_Delete_Column=\u522A\u9664\u884C +Fine-Design_Report_Utils_Delete_Column=\u522A\u9664\u6B04 Fine-Design_Report_Utils_Delete_Record=\u522A\u9664\u8A18\u9304 Fine-Design_Report_Utils_Exit_Designer=\u9000\u51FA\u8A2D\u8A08\u5668 Fine-Design_Report_Utils_File_Type=\u6A94\u6848\u578B\u5225 Fine-Design_Report_Utils_Has_Been_Existed=\u5DF2\u5B58\u5728 Fine-Design_Report_Utils_Import_Excel_Data=\u532F\u5165[Excel] -Fine-Design_Report_Utils_Insert_Column=\u63D2\u5165\u884C +Fine-Design_Report_Utils_Insert_Column=\u63D2\u5165\u6B04 Fine-Design_Report_Utils_Insert_Record=\u63D2\u5165\u8A18\u9304 Fine-Design_Report_Utils_Insert_Row=\u63D2\u5165\u5217 Fine-Design_Report_Utils_Last_Page=\u6700\u5F8C\u4E00\u9801 From aa0a0a761a5f5547235755ec40c11907a44c0d84 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Tue, 11 Aug 2020 09:39:12 +0800 Subject: [PATCH 23/25] =?UTF-8?q?REPORT-26209=20=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 --- .../com/fr/design/i18n/chart_zh_TW.properties | 12 +++++----- .../com/fr/design/i18n/main_en.properties | 2 +- .../com/fr/design/i18n/main_zh_TW.properties | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) 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 814ff9b..8821abc 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 @@ -27,7 +27,7 @@ Fine-Design_Chart_Animation_Show=\u52D5\u614B\u5C55\u793A Fine-Design_Chart_Animation_Type=\u904B\u52D5\u65B9\u5F0F Fine-Design_Chart_AntiClockWise=\u9006\u6642\u91DD Fine-Design_Chart_Area=\u9762\u7A4D -Fine-Design_Chart_Area_Gradient= +Fine-Design_Chart_Area_Gradient=\u5340\u57DF\u6F38\u8B8A Fine-Design_Chart_Area_Name=\u5340\u57DF\u540D Fine-Design_Chart_Area_Size=\u5340\u57DF\u5927\u5C0F Fine-Design_Chart_Area_Title=\u5340\u57DF\u6A19\u984C @@ -112,8 +112,8 @@ Fine-Design_Chart_Close=\u95DC\u9589 Fine-Design_Chart_Collapse=\u6536\u7E2E\u65BC\u62BD\u5C5C\u83DC\u55AE\u5167 Fine-Design_Chart_Color=\u984F\u8272 Fine-Design_Chart_Color_Background=\u80CC\u666F\u984F\u8272 -Fine-Design_Chart_Color_Divide= -Fine-Design_Chart_Color_Type= +Fine-Design_Chart_Color_Divide=\u984F\u8272\u5283\u5206 +Fine-Design_Chart_Color_Type=\u984F\u8272\u578B\u5225 Fine-Design_Chart_Column_Chart=\u67F1\u5F62\u5716 Fine-Design_Chart_Combine_Chart=\u7D44\u5408\u5716 Fine-Design_Chart_Combine_Map=\u7D44\u5408\u5730\u5716 @@ -124,7 +124,7 @@ Fine-Design_Chart_Condition_Display=\u689D\u4EF6\u986F\u793A Fine-Design_Chart_Connect_WMP=\u9023\u7D50 Fine-Design_Chart_Connecting_WMP=\u9023\u7D50\u4E2D Fine-Design_Chart_Continuity=\u9023\u7E8C\u6027 -Fine-Design_Chart_Continuous_Gradient= +Fine-Design_Chart_Continuous_Gradient=\u9023\u7E8C\u6F38\u8B8A Fine-Design_Chart_Cross=\u4EA4\u53C9 Fine-Design_Chart_Curve=\u66F2\u7DDA Fine-Design_Chart_CurveLine=\u66F2\u7DDA @@ -435,7 +435,7 @@ Fine-Design_Chart_New_StackColumn_Line=\u5806\u7A4D\u67F1\u5F62\u5716-\u6298\u7D Fine-Design_Chart_New_Structure=\u6846\u67B6\u5716 Fine-Design_Chart_New_TreeMap=\u77E9\u5F62\u6A39\u5716 Fine-Design_Chart_Node=\u7BC0\u9EDE -Fine-Design_Chart_Node_Id= +Fine-Design_Chart_Node_Id=\u7BC0\u9EDEid Fine-Design_Chart_Node_Name=\u7BC0\u9EDE\u540D\u7A31 Fine-Design_Chart_Node_Radius=\u7BC0\u9EDE\u534A\u5F91 Fine-Design_Chart_Non_Adjustment=\u4E0D\u53EF\u8ABF\u6574 @@ -457,7 +457,7 @@ Fine-Design_Chart_Origin=\u539F\u6A23\u5C55\u793A Fine-Design_Chart_Outlier_Value=\u7570\u5E38\u503C Fine-Design_Chart_Pane_Background=\u5E95\u76E4\u80CC\u666F Fine-Design_Chart_Parent_ID=\u7236ID -Fine-Design_Chart_Parent_Node_Id= +Fine-Design_Chart_Parent_Node_Id=\u7236\u7BC0\u9EDEid Fine-Design_Chart_Pattern=\u6A23\u5F0F Fine-Design_Chart_Percent_Label=\u767E\u5206\u6BD4\u6A19\u7C64 Fine-Design_Chart_Percent_Stacked=\u767E\u5206\u6BD4\u5806\u7A4D 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 b91a973..9bf83d0 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 @@ -2335,7 +2335,7 @@ Fine-Design_Report_Sub_Script=Subscript Fine-Design_Report_Submit_Event=Submit Event Fine-Design_Report_Submit_Type_Build_In_Sql=Built-in SQL Fine-Design_Report_Submit_Type_Custom=Custom Submit -Fine-Design_Report_Submmit_WClass=Submmit By Custom Class +Fine-Design_Report_Submmit_WClass=Submit By Custom Class Fine-Design_Report_Super_Script=Superscript Fine-Design_Report_Support_Scan_Code=Support Code Scan Fine-Design_Report_Support_String_To_Formula=Surport String To Formula diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties index 269f506..e12877b 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties @@ -1747,11 +1747,11 @@ Fine-Design_Report_Background=\u7D19\u5F35\u80CC\u666F Fine-Design_Report_Bar_CodeD_Drawing_Text=\u986F\u793A\u689D\u78BC\u7684\u6587\u5B57 Fine-Design_Report_Barcode_Size=\u689D\u78BC\u5927\u5C0F Fine-Design_Report_Base_Background=\u80CC\u666F -Fine-Design_Report_Base_Columns=\u6B04 +Fine-Design_Report_Base_Columns=\u6B04\u5206\u5217 Fine-Design_Report_Base_Format=\u683C\u5F0F Fine-Design_Report_Base_Option=\u9078\u9805 Fine-Design_Report_Base_Option_Half_Up=\u56DB\u6368\u4E94\u5165 -Fine-Design_Report_Base_Rows=\u5217 +Fine-Design_Report_Base_Rows=\u5217\u5206\u6B04 Fine-Design_Report_Base_StyleFormat_Sample=\u793A\u4F8B Fine-Design_Report_Base_TurnOff=\u95DC\u9589 Fine-Design_Report_Base_TurnOn=\u958B\u5553 @@ -1819,14 +1819,14 @@ Fine-Design_Report_Collect_Information_Description=\u63CF\u8FF0 Fine-Design_Report_Collect_Information_free=\u514D\u8CBB Fine-Design_Report_Collect_Use_Designer=\u4F7F\u7528\u8A2D\u8A08\u5668 Fine-Design_Report_Column=\u6B04 -Fine-Design_Report_Column_Area=\u5206\u6B04\u5340\u57DF -Fine-Design_Report_Column_Data=\u5206\u6B04\u8CC7\u6599 +Fine-Design_Report_Column_Area=\u8907\u88FD\u5340\u57DF +Fine-Design_Report_Column_Data=\u5132\u5B58\u683C\u7BC4\u570D Fine-Design_Report_Column_Multiple=\u8CC7\u6599\u500D\u6578 Fine-Design_Report_Column_Style=\u5206\u6B04\u6A23\u5F0F Fine-Design_Report_Column_To=\u6B04\u81F3\u7B2C -Fine-Design_Report_Column_Warn_Text=\u5206\u6B04\u5340\u57DF\u683C\u5F0F\u932F\u8AA4 -Fine-Design_Report_Columns_Repeat_Column=\u8907\u88FD\u6B04\u5E8F\u5217 -Fine-Design_Report_Columns_Repeat_Row=\u8907\u88FD\u5217\u5E8F\u5217 +Fine-Design_Report_Column_Warn_Text=\u8907\u88FD\u5340\u57DF\u683C\u5F0F\u932F\u8AA4 +Fine-Design_Report_Columns_Repeat_Column=\u91CD\u8907\u6B04\u5E8F\u865F +Fine-Design_Report_Columns_Repeat_Row=\u91CD\u8907\u5217\u5E8F\u865F Fine-Design_Report_ComboBox=\u4E0B\u62C9\u6846 Fine-Design_Report_Common=\u666E\u901A Fine-Design_Report_Community_Help=\u8AAA\u660E\u6A94\u6848 @@ -2239,10 +2239,10 @@ Fine-Design_Report_Repeat-Freeze=\u91CD\u8907\u8207\u51CD\u7D50\u8A2D\u5B9A Fine-Design_Report_Report=\u5831\u8868 Fine-Design_Report_ReportColumns_Columns=\u5206\u6B04 Fine-Design_Report_ReportColumns_Columns_After=\u8D85\u904E -Fine-Design_Report_ReportColumns_Columns_Horizontally=\u5217\u5206\u6B04 -Fine-Design_Report_ReportColumns_Columns_Horizou200Bu200Bntally=\u5217\u5206\u6B04 +Fine-Design_Report_ReportColumns_Columns_Horizontally=\u6309\u5217\u5206\u6B04 +Fine-Design_Report_ReportColumns_Columns_Horizou200Bu200Bntally=\u6309\u5217\u5206\u6B04 Fine-Design_Report_ReportColumns_Columns_To=\u5206\u6B04\u6210 -Fine-Design_Report_ReportColumns_Columns_Vertically=\u6B04\u5206\u5217 +Fine-Design_Report_ReportColumns_Columns_Vertically=\u6309\u6B04\u5206\u5217 Fine-Design_Report_ReportColumns_Report_Columns=\u5831\u8868\u5206\u6B04 Fine-Design_Report_ReportD_Excel_Export=\u7BC4\u672C\u532F\u51FA\u5C6C\u6027 Fine-Design_Report_ReportD_Export_Hided_Column=\u532F\u51FA\u96B1\u85CF\u6B04 @@ -2256,7 +2256,7 @@ Fine-Design_Report_ReportServerP_Import_Css=\u5F15\u7528Css Fine-Design_Report_ReportServerP_Import_JavaScript=\u5F15\u7528JavaScript Fine-Design_Report_ReportServerP_Report_Server_Parameter=\u5831\u8868\u4F3A\u670D\u5668\u53C3\u6578 Fine-Design_Report_ReportServerP_The_Name_Of_Printer_Cannot_Be_Null=\u5370\u8868\u6A5F\u7684\u540D\u5B57\u4E0D\u80FD\u70BA\u7A7A -Fine-Design_Report_Report_Columns_Columns_Optional=\u5206\u6B04 +Fine-Design_Report_Report_Columns_Columns_Optional= Fine-Design_Report_Report_Engine_Attribute=\u5831\u8868\u5F15\u64CE\u5C6C\u6027 Fine-Design_Report_Report_Links=\u5831\u8868\u9023\u7D50 Fine-Design_Report_Restore_Default=\u6062\u5FA9\u9810\u8A2D From ee394c234da5fc0822562333b20cd31689f58c84 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Fri, 14 Aug 2020 10:20:35 +0800 Subject: [PATCH 24/25] =?UTF-8?q?REPORT-26209=20=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/chart_en.properties | 12 ++++++------ .../com/fr/design/i18n/chart_ja_JP.properties | 12 ++++++------ .../com/fr/design/i18n/main_ja_JP.properties | 2 +- .../com/fr/design/i18n/main_zh_TW.properties | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) 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 d605e54..6025a92 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 @@ -27,7 +27,7 @@ Fine-Design_Chart_Animation_Show=Dynamic Display Fine-Design_Chart_Animation_Type=Animation Type Fine-Design_Chart_AntiClockWise=Counterclockwise Fine-Design_Chart_Area=Area -Fine-Design_Chart_Area_Gradient= +Fine-Design_Chart_Area_Gradient=Section Gradient Fine-Design_Chart_Area_Name=Area Name Fine-Design_Chart_Area_Size=Area Size Fine-Design_Chart_Area_Title=Area Title @@ -112,8 +112,8 @@ Fine-Design_Chart_Close=Off Fine-Design_Chart_Collapse=Collapse to Menu Fine-Design_Chart_Color=Color Fine-Design_Chart_Color_Background=BG Color -Fine-Design_Chart_Color_Divide= -Fine-Design_Chart_Color_Type= +Fine-Design_Chart_Color_Divide=Color Section +Fine-Design_Chart_Color_Type=Color Type Fine-Design_Chart_Column_Chart=Column Chart Fine-Design_Chart_Combine_Chart=Combination Chart Fine-Design_Chart_Combine_Map=Combination Map @@ -124,7 +124,7 @@ Fine-Design_Chart_Condition_Display=Conditional Display Fine-Design_Chart_Connect_WMP=Connection Fine-Design_Chart_Connecting_WMP=Connecting Fine-Design_Chart_Continuity=Continuity -Fine-Design_Chart_Continuous_Gradient= +Fine-Design_Chart_Continuous_Gradient=Continuous Gradient Fine-Design_Chart_Cross=Cross Fine-Design_Chart_Curve=Curve Fine-Design_Chart_CurveLine=Curve Line @@ -435,7 +435,7 @@ Fine-Design_Chart_New_StackColumn_Line=Stack Column-Line Chart Fine-Design_Chart_New_Structure=Structure Chart Fine-Design_Chart_New_TreeMap=Rectangular Tree Fine-Design_Chart_Node=Node -Fine-Design_Chart_Node_Id= +Fine-Design_Chart_Node_Id=Node id Fine-Design_Chart_Node_Name=Node Name Fine-Design_Chart_Node_Radius=Node Radius Fine-Design_Chart_Non_Adjustment=No Adjustment @@ -457,7 +457,7 @@ Fine-Design_Chart_Origin=Original Fine-Design_Chart_Outlier_Value=Outliers Fine-Design_Chart_Pane_Background=Pane Background Fine-Design_Chart_Parent_ID=Parent ID -Fine-Design_Chart_Parent_Node_Id= +Fine-Design_Chart_Parent_Node_Id=Parent Node id Fine-Design_Chart_Pattern=Pattern Fine-Design_Chart_Percent_Label=100% Label Fine-Design_Chart_Percent_Stacked=100% Stacked 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 b05bf70..14cc6da 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 @@ -27,7 +27,7 @@ Fine-Design_Chart_Animation_Show=\u52D5\u7684\u8868\u793A Fine-Design_Chart_Animation_Type=\u904B\u52D5\u65B9\u5F0F Fine-Design_Chart_AntiClockWise=\u53CD\u6642\u8A08\u56DE\u308A Fine-Design_Chart_Area=\u9762\u7A4D -Fine-Design_Chart_Area_Gradient= +Fine-Design_Chart_Area_Gradient=\u30A8\u30EA\u30A2\u30B0\u30E9\u30C7\u30FC\u30B7\u30E7\u30F3 Fine-Design_Chart_Area_Name=\u30A8\u30EA\u30A2\u540D Fine-Design_Chart_Area_Size=\u30A8\u30EA\u30A2\u30B5\u30A4\u30BA Fine-Design_Chart_Area_Title=\u30A8\u30EA\u30A2\u30BF\u30A4\u30C8\u30EB @@ -112,8 +112,8 @@ Fine-Design_Chart_Close=\u7121\u52B9 Fine-Design_Chart_Collapse=\u30E1\u30CB\u30E5\u30FC\u306B\u5165\u308C\u308B Fine-Design_Chart_Color=\u8272 Fine-Design_Chart_Color_Background=\u80CC\u666F\u8272 -Fine-Design_Chart_Color_Divide= -Fine-Design_Chart_Color_Type= +Fine-Design_Chart_Color_Divide=\u8272\u5206\u3051 +Fine-Design_Chart_Color_Type=\u30AB\u30E9\u30FC\u30BF\u30A4\u30D7 Fine-Design_Chart_Column_Chart=\u7E26\u68D2\u30B0\u30E9\u30D5 Fine-Design_Chart_Combine_Chart=\u7D44\u307F\u5408\u308F\u305B\u30B0\u30E9\u30D5 Fine-Design_Chart_Combine_Map=\u7D44\u307F\u5408\u308F\u305B\u5730\u56F3 @@ -124,7 +124,7 @@ Fine-Design_Chart_Condition_Display=\u6761\u4EF6\u8868\u793A Fine-Design_Chart_Connect_WMP=\u63A5\u7D9A Fine-Design_Chart_Connecting_WMP=\u63A5\u7D9A\u4E2D... Fine-Design_Chart_Continuity=\u9023\u7D9A\u6027 -Fine-Design_Chart_Continuous_Gradient= +Fine-Design_Chart_Continuous_Gradient=\u9023\u7D9A\u30B0\u30E9\u30C7\u30FC\u30B7\u30E7\u30F3 Fine-Design_Chart_Cross=\u30AF\u30ED\u30B9 Fine-Design_Chart_Curve=\u66F2\u7DDA Fine-Design_Chart_CurveLine=\u66F2\u7DDA @@ -435,7 +435,7 @@ Fine-Design_Chart_New_StackColumn_Line=\u7A4D\u307F\u4E0A\u3052\u7E26\u68D2\u30B Fine-Design_Chart_New_Structure=\u6A39\u5F62\u56F3(\u65B0\u6A5F\u80FD) Fine-Design_Chart_New_TreeMap=\u30C4\u30EA\u30FC\u30DE\u30C3\u30D7(\u65B0\u6A5F\u80FD) Fine-Design_Chart_Node=\u30CE\u30FC\u30C9 -Fine-Design_Chart_Node_Id= +Fine-Design_Chart_Node_Id=\u30CE\u30FC\u30C9ID Fine-Design_Chart_Node_Name=\u30CE\u30FC\u30C9\u540D Fine-Design_Chart_Node_Radius=\u30CE\u30FC\u30C9\u534A\u5F84 Fine-Design_Chart_Non_Adjustment=\u8ABF\u6574\u4E0D\u53EF @@ -457,7 +457,7 @@ Fine-Design_Chart_Origin=\u6A19\u6E96\u8868\u793A Fine-Design_Chart_Outlier_Value=\u5916\u308C\u5024 Fine-Design_Chart_Pane_Background=\u30E1\u30FC\u30BF\u80CC\u666F Fine-Design_Chart_Parent_ID=\u89AAID -Fine-Design_Chart_Parent_Node_Id= +Fine-Design_Chart_Parent_Node_Id=\u89AA\u30CE\u30FC\u30C9ID Fine-Design_Chart_Pattern=\u30B9\u30BF\u30A4\u30EB Fine-Design_Chart_Percent_Label=\u30E9\u30D9\u30EB(%) Fine-Design_Chart_Percent_Stacked=100%\u7A4D\u307F\u4E0A\u3052\u7E26\u68D2\u30B0\u30E9\u30D5 diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties index 343c86c..8293e98 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties @@ -188,7 +188,7 @@ Fine-Design_Basic_Commuinity_Solution=\u6280\u8853\u30BD\u30EA\u30E5\u30FC\u30B7 Fine-Design_Basic_Community=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3 Fine-Design_Basic_Community_Bbs=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3\u306E\u30C8\u30C3\u30D7\u30DA\u30FC\u30B8 Fine-Design_Basic_Community_Bug=BUG\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF -Fine-Design_Basic_Community_BugAndNeed= +Fine-Design_Basic_Community_BugAndNeed=BUG\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF Fine-Design_Basic_Community_FaceBook_Fans=FineReport\u30D5\u30A7\u30A4\u30B9\u30D6\u30C3\u30AF\u30D5\u30A1\u30F3\u30BA Fine-Design_Basic_Community_Questions=\u304A\u554F\u3044\u5408\u308F\u305B Fine-Design_Basic_Community_TechSupport=\u6280\u8853\u30B5\u30DD\u30FC\u30C8 diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties index e12877b..a0381da 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties @@ -1814,7 +1814,7 @@ Fine-Design_Report_Center_Display=\u7F6E\u4E2D\u986F\u793A Fine-Design_Report_Choose_Data_Confusion_Tip=\u8ACB\u9078\u64C7\u9700\u8981\u6DF7\u6DC6\u7684\u6B04\u4F4D\u5F8C\u9810\u89BD Fine-Design_Report_Choose_One_Button=\u8ACB\u9078\u64C7\u4E00\u500B\u5143\u4EF6\u5F8C\u518D\u65B0\u589E Fine-Design_Report_Clear_DashBoard_Potence=\u6E05\u7A7A\u5100\u9336\u677F -Fine-Design_Report_Col_Icon_File_Name=col.png +Fine-Design_Report_Col_Icon_File_Name=col_en.png Fine-Design_Report_Collect_Information_Description=\u63CF\u8FF0 Fine-Design_Report_Collect_Information_free=\u514D\u8CBB Fine-Design_Report_Collect_Use_Designer=\u4F7F\u7528\u8A2D\u8A08\u5668 @@ -2266,7 +2266,7 @@ Fine-Design_Report_RichTextEditor=RTF\u7DE8\u8F2F\u5668 Fine-Design_Report_Right_Border_Line=\u53F3\u6846\u7DDA Fine-Design_Report_Role=\u89D2\u8272 Fine-Design_Report_Row=\u5217 -Fine-Design_Report_Row_Icon_File_Name=row.png +Fine-Design_Report_Row_Icon_File_Name=row_en.png Fine-Design_Report_Row_To=\u5217\u81F3\u7B2C Fine-Design_Report_Save_As_Global_Style=\u5132\u5B58\u70BA\u5168\u57DF\u6027\u683C\u5F0F Fine-Design_Report_Select_Data_Column=\u9078\u64C7\u8CC7\u6599\u6B04 From 9aaaa9abe6b516d0a34612e5994c49cd87f2707c Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Fri, 14 Aug 2020 15:35:29 +0800 Subject: [PATCH 25/25] =?UTF-8?q?REPORT-26209=20=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 --- .../com/fr/design/i18n/chart_ko_KR.properties | 12 ++++++------ .../com/fr/design/i18n/main_ko_KR.properties | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) 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 ad68cdb..63bded5 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 @@ -27,7 +27,7 @@ Fine-Design_Chart_Animation_Show=\uB3D9\uC801 \uB514\uC2A4\uD50C\uB808\uC774 Fine-Design_Chart_Animation_Type=\uC560\uB2C8\uBA54\uC774\uC158 \uD0C0\uC785 Fine-Design_Chart_AntiClockWise=\uC2DC\uACC4 \uBC18\uB300\uBC29\uD5A5 Fine-Design_Chart_Area=\uBA74\uC801 -Fine-Design_Chart_Area_Gradient= +Fine-Design_Chart_Area_Gradient=\uC9C0\uC5ED \uADF8\uB7EC\uB370\uC774\uC158 Fine-Design_Chart_Area_Name=\uAD6C\uC5ED\uBA85 Fine-Design_Chart_Area_Size=\uAD6C\uC5ED \uC0AC\uC774\uC988 Fine-Design_Chart_Area_Title=\uAD6C\uC5ED \uD0C0\uC774\uD2C0 @@ -112,8 +112,8 @@ Fine-Design_Chart_Close=\uB2EB\uAE30 Fine-Design_Chart_Collapse=\uBA54\uB274 \uC811\uAE30 Fine-Design_Chart_Color=\uCEEC\uB7EC Fine-Design_Chart_Color_Background=\uBC30\uACBD\uC0C9 -Fine-Design_Chart_Color_Divide= -Fine-Design_Chart_Color_Type= +Fine-Design_Chart_Color_Divide=\uC0C9\uC0C1 \uAD6C\uBD84 +Fine-Design_Chart_Color_Type=\uC0C9\uC0C1 \uC720\uD615 Fine-Design_Chart_Column_Chart=\uB9C9\uB300 \uCC28\uD2B8 Fine-Design_Chart_Combine_Chart=\uCF64\uBC14\uC778 \uCC28\uD2B8 Fine-Design_Chart_Combine_Map=\uCF64\uBC14\uC778 \uB9F5 @@ -124,7 +124,7 @@ Fine-Design_Chart_Condition_Display=\uC870\uAC74\uBCC4 \uD45C\uC2DC Fine-Design_Chart_Connect_WMP=\uC5F0\uACB0 Fine-Design_Chart_Connecting_WMP=\uC5F0\uACB0 \uC911... Fine-Design_Chart_Continuity=\uC5F0\uC18D\uC131 -Fine-Design_Chart_Continuous_Gradient= +Fine-Design_Chart_Continuous_Gradient=\uC5F0\uC18D \uADF8\uB7EC\uB370\uC774\uC158 Fine-Design_Chart_Cross=\uAD50\uCC28 Fine-Design_Chart_Curve=\uACE1\uC120 Fine-Design_Chart_CurveLine=\uACE1\uC120 @@ -435,7 +435,7 @@ Fine-Design_Chart_New_StackColumn_Line=\uB204\uC801\uB9C9\uB300 - \uB77C\uC778 \ Fine-Design_Chart_New_Structure=\uAD6C\uC870\uB3C4 Fine-Design_Chart_New_TreeMap=\uC81C\uD615 \uD2B8\uB9AC\uB9F5 Fine-Design_Chart_Node=\uB178\uB4DC -Fine-Design_Chart_Node_Id= +Fine-Design_Chart_Node_Id=\uB178\uB4DC ID Fine-Design_Chart_Node_Name=\uB178\uB4DC \uC774\uB984 Fine-Design_Chart_Node_Radius=\uB178\uB4DC \uBC18\uACBD Fine-Design_Chart_Non_Adjustment=\uC870\uC815\uBD88\uAC00 @@ -457,7 +457,7 @@ Fine-Design_Chart_Origin=\uC624\uB9AC\uC9C0\uB110 Fine-Design_Chart_Outlier_Value=\uD2B9\uC774 \uCE58 Fine-Design_Chart_Pane_Background=\uD328\uB110 \uBC30\uACBD Fine-Design_Chart_Parent_ID=Parent ID -Fine-Design_Chart_Parent_Node_Id= +Fine-Design_Chart_Parent_Node_Id=\uC0C1\uC704 \uB178\uB4DC ID Fine-Design_Chart_Pattern=\uC591\uC2DD Fine-Design_Chart_Percent_Label=\uB77C\uBCA8(%) Fine-Design_Chart_Percent_Stacked=\uBC31\uBD84\uBE44 \uB204\uC801 diff --git a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties index d25d092..031520e 100644 --- a/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties +++ b/design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties @@ -188,10 +188,10 @@ Fine-Design_Basic_Commuinity_Solution=\uC194\uB8E8\uC158 Fine-Design_Basic_Community=\uCEE4\uBBA4\uB2C8\uD2F0 Fine-Design_Basic_Community_Bbs=\uCEE4\uBBA4\uB2C8\uD2F0 \uD648 Fine-Design_Basic_Community_Bug=BUG \uD53C\uB4DC\uBC31 -Fine-Design_Basic_Community_BugAndNeed= +Fine-Design_Basic_Community_BugAndNeed=\uBC84\uADF8 \uC694\uAD6C\uC0AC\uD56D \uD53C\uB4DC\uBC31 Fine-Design_Basic_Community_FaceBook_Fans=FineReport \uD398\uC774\uC2A4\uBD81 \uD32C Fine-Design_Basic_Community_Questions=\uC9C8\uBB38 -Fine-Design_Basic_Community_TechSupport= +Fine-Design_Basic_Community_TechSupport=\uAE30\uC220 \uC9C0\uC6D0 Fine-Design_Basic_Community_Update=\uC81C\uD488 \uC5C5\uB370\uC774\uD2B8 Fine-Design_Basic_Community_Video=\uAD50\uC721 \uBE44\uB514\uC624 Fine-Design_Basic_Community_sign=\uB9AC\uD3EC\uD2B8 \uC5D4\uC9C0\uB2C8\uC5B4 \uC778\uC99D @@ -1218,7 +1218,7 @@ Fine-Design_Chart_Empty_Data=\uCC28\uD2B8 \uBE48 \uB370\uC774\uD130 \uC54C\uB9BC Fine-Design_Chart_Enable_Auto_Refresh=\uC790\uB3D9 \uC0C8\uB85C\uACE0\uCE68 Fine-Design_Chart_Enable_Field_Name=\uD544\uB4DC\uBA85\uC0AC\uC6A9 Fine-Design_Chart_Enable_Field_Value=\uD544\uB4DC\uAC12\uC0AC\uC6A9 -Fine-Design_Chart_Field_Value= +Fine-Design_Chart_Field_Value=\uD544\uB4DC \uAC12 Fine-Design_Chart_Float=\uCC28\uD2B8-\uD50C\uB85C\uD2B8 \uC694\uC18C \uB9C1\uD0A4\uC9C0 Fine-Design_Chart_Float_Chart=\uCC28\uD2B8-\uD50C\uB85C\uD2B8 \uCC28\uD2B8 \uB9C1\uD0A4\uC9C0 Fine-Design_Chart_Format=\uD3EC\uBA67