From 7a94d3bc55a2627166ea2abd51c8a4e3fe0065f4 Mon Sep 17 00:00:00 2001 From: Hades Date: Wed, 21 Aug 2019 15:34:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-19462=E3=80=90=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E3=80=91=E9=87=8D=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=A1=B6=E9=83=A8=E5=86=BB=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main.properties | 1 + .../src/main/resources/com/fr/design/i18n/main_en_US.properties | 1 + .../src/main/resources/com/fr/design/i18n/main_ja_JP.properties | 1 + .../src/main/resources/com/fr/design/i18n/main_ko_KR.properties | 1 + .../src/main/resources/com/fr/design/i18n/main_zh_CN.properties | 1 + .../src/main/resources/com/fr/design/i18n/main_zh_TW.properties | 1 + 6 files changed, 6 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 07ec5a5..cda27d0 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 @@ -1097,6 +1097,7 @@ Fine-Design_Report_ComboBox=ComboBox Fine-Design_Basic_Comma_Dismenber=CommaDismenber Fine-Design_Form_Component_Interval=Components Interval Fine-Design_Form_Component_Scale=Component Scale +Fine-Design_Form_Component_Frozen=Component Freeze Fine-Design_Basic_ConditionB_Operator=Operator Fine-Design_Basic_Condition_Attributes=Condition attributes Fine-Design_Basic_Config=Config 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 5115428..e06450c 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 @@ -1097,6 +1097,7 @@ Fine-Design_Report_ComboBox=Drop-down Boxes Fine-Design_Basic_Comma_Dismenber=Comma Fine-Design_Form_Component_Interval=Component Interval Fine-Design_Form_Component_Scale=Component Scale +Fine-Design_Form_Component_Frozen=Component Freeze Fine-Design_Basic_ConditionB_Operator=Operator Fine-Design_Basic_Condition_Attributes=Conditional Formatting Fine-Design_Basic_Config=Config 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 4c3e0d7..a9c09c3 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 @@ -1097,6 +1097,7 @@ Fine-Design_Report_ComboBox=\u30D7\u30EB\u30C0\u30A6\u30F3\u30DC\u30C3\u30AF\u30 Fine-Design_Basic_Comma_Dismenber=\u30AB\u30F3\u30DE Fine-Design_Form_Component_Interval=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u9593\u9694 Fine-Design_Form_Component_Scale=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u62E1\u7E2E +Fine-Design_Form_Component_Frozen= Fine-Design_Basic_ConditionB_Operator=\u6F14\u7B97\u5B50 Fine-Design_Basic_Condition_Attributes=\u6761\u4EF6\u5C5E\u6027 Fine-Design_Basic_Config=\u8A2D\u5B9A 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 bfec380..41bf739 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 @@ -1090,6 +1090,7 @@ Fine-Design_Report_ComboBox=\uB4DC\uB7FD\uB2E4\uC6B4 \uBC15\uC2A4 Fine-Design_Basic_Comma_Dismenber=\uCF64\uB9C8 Fine-Design_Form_Component_Interval=\uCEF4\uD3EC\uB10C\uD2B8 \uAC04\uACA9 Fine-Design_Form_Component_Scale=\uCEF4\uD3EC\uB10C\uD2B8 \uC2A4\uCF00\uC77C +Fine-Design_Form_Component_Frozen= Fine-Design_Basic_ConditionB_Operator=\uC870\uC791\uBD80\uD638 Fine-Design_Basic_Condition_Attributes=\uC870\uAC74\uC18D\uC131 Fine-Design_Basic_Config=\uAD6C\uC131 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 fbaca7d..1e19695 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 @@ -1097,6 +1097,7 @@ Fine-Design_Report_ComboBox=\u4E0B\u62C9\u6846 Fine-Design_Basic_Comma_Dismenber=\u9017\u53F7 Fine-Design_Form_Component_Interval=\u7EC4\u4EF6\u95F4\u9694 Fine-Design_Form_Component_Scale=\u7EC4\u4EF6\u7F29\u653E +Fine-Design_Form_Component_Frozen=\u7EC4\u4EF6\u51BB\u7ED3 Fine-Design_Basic_ConditionB_Operator=\u64CD\u4F5C\u7B26 Fine-Design_Basic_Condition_Attributes=\u6761\u4EF6\u5C5E\u6027 Fine-Design_Basic_Config=\u914D\u7F6E 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 c061de7..66cdbc7 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 @@ -1086,6 +1086,7 @@ Fine-Design_Report_ComboBox=\u4E0B\u62C9\u6846 Fine-Design_Basic_Comma_Dismenber=\u9017\u865F Fine-Design_Form_Component_Interval=\u5143\u4EF6\u9593\u9694 Fine-Design_Form_Component_Scale=\u5143\u4EF6\u7E2E\u653E +Fine-Design_Form_Component_Frozen=\u5143\u4EF6\u51CD\u7D50 Fine-Design_Basic_ConditionB_Operator=\u64CD\u4F5C\u7B26 Fine-Design_Basic_Condition_Attributes=\u689D\u4EF6\u5C6C\u6027 Fine-Design_Basic_Config=\u914D\u7F6E From 600913597a1e448d06ae7b1e0a586a60e1d08bfd Mon Sep 17 00:00:00 2001 From: "Hugh.C" Date: Mon, 26 Aug 2019 10:49:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-19008=20=E6=B0=B4=E5=8D=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=E5=BA=A6=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/main.properties | 1 + .../src/main/resources/com/fr/design/i18n/main_en_US.properties | 1 + .../src/main/resources/com/fr/design/i18n/main_zh_CN.properties | 1 + .../src/main/resources/com/fr/design/i18n/main_zh_TW.properties | 1 + 4 files changed, 4 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 cda27d0..cbd86f5 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 @@ -1583,6 +1583,7 @@ Fine-Design_Form_Vertical_Box_Layout=\u5782\u76F4\u76D2\u5B50\u5E03\u5C40 Fine-Design_Report_Visible=\u53EF\u89C1 Fine-Design_Report_WF_Name=Name Fine-Design_Form_WaterMark=WaterMark +Fine-Design_Form_Watermark_Gap=Watermark Gap Fine-Design_Basic_Watermark_Text=text Fine-Design_Basic_Web_Preview_Port=\u7AEF\u53E3\u53F7 Fine-Design_Basic_Web_Preview_Port_Setting=\u7AEF\u53E3\u8BBE\u7F6E 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 e06450c..3045b31 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 @@ -1581,6 +1581,7 @@ Fine-Design_Form_Vertical_Box_Layout=Vertical Box Layout Fine-Design_Report_Visible=Visible Fine-Design_Report_WF_Name=Name Fine-Design_Form_WaterMark=Water Mark +Fine-Design_Form_Watermark_Gap=Watermark Gap Fine-Design_Basic_Watermark_Text=text Fine-Design_Basic_Web_Preview_Port=Port number Fine-Design_Basic_Web_Preview_Port_Setting=Port Setting 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 1e19695..1a70fcd 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 @@ -1583,6 +1583,7 @@ Fine-Design_Form_Vertical_Box_Layout=\u5782\u76F4\u76D2\u5B50\u5E03\u5C40 Fine-Design_Report_Visible=\u53EF\u89C1 Fine-Design_Report_WF_Name=\u540D\u79F0 Fine-Design_Form_WaterMark=\u6C34\u5370 +Fine-Design_Form_Watermark_Gap=\u6C34\u5370\u95F4\u8DDD Fine-Design_Basic_Watermark_Text=\u6587\u5B57 Fine-Design_Basic_Web_Preview_Port=\u7AEF\u53E3\u53F7 Fine-Design_Basic_Web_Preview_Port_Setting=\u7AEF\u53E3\u8BBE\u7F6E 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 66cdbc7..e5e12ad 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 @@ -1573,6 +1573,7 @@ Fine-Design_Form_Vertical_Box_Layout=\u6A6B\u5411\u4F48\u5C40 Fine-Design_Report_Visible=\u53EF\u898B Fine-Design_Report_WF_Name=\u540D\u7A31 Fine-Design_Form_WaterMark=\u6C34\u5370 +Fine-Design_Form_Watermark_Gap=\u6C34\u5370\u9593\u8DDD Fine-Design_Basic_Watermark_Text=\u6587\u5B57 Fine-Design_Basic_Web_Preview_Port=\u57E0\u865F Fine-Design_Basic_Web_Preview_Port_Setting=\u57E0\u8A2D\u5B9A