From 038a911398173b861a8c7236c59b10c747e2b902 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Tue, 10 Oct 2017 09:51:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/editor/ValueEditorPaneFactory.java | 128 ++++++++++-------- .../design/editor/editor/IntegerEditor.java | 2 +- .../editor/editor/SpinnerIntegerEditor.java | 3 +- .../com/fr/design/locale/designer.properties | 4 +- .../design/locale/designer_en_US.properties | 4 +- .../design/locale/designer_ja_JP.properties | 4 +- .../design/locale/designer_ko_KR.properties | 4 +- .../design/locale/designer_zh_CN.properties | 5 +- .../design/locale/designer_zh_TW.properties | 4 +- .../design/present/dict/FormulaDictPane.java | 4 +- 10 files changed, 86 insertions(+), 76 deletions(-) diff --git a/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java b/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java index e63b3c9741..ebf712cc85 100644 --- a/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java +++ b/designer_base/src/com/fr/design/editor/ValueEditorPaneFactory.java @@ -65,9 +65,10 @@ public class ValueEditorPaneFactory { * @return 返回公式编辑器面板 */ public static ValueEditorPane createFormulaValueEditorPane() { - return createValueEditorPane(new Editor[]{new FormulaEditor(Inter.getLocText("Parameter-Formula"))}, + return createValueEditorPane(new Editor[]{new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula"))}, StringUtils.EMPTY, StringUtils.EMPTY); } + /** * 创建基本的值编辑器面板 * @@ -138,11 +139,13 @@ public class ValueEditorPaneFactory { /** * 创建不带公式面板的pane + * * @return 编辑器面板 */ - public static ValueEditorPane createBasicEditorWithoutFormulaPane(){ + public static ValueEditorPane createBasicEditorWithoutFormulaPane() { return createValueEditorPane(basicEditorsWithoutFormula(), StringUtils.EMPTY, StringUtils.EMPTY); } + /** * 创建NoCRNoColumn * @@ -154,19 +157,22 @@ public class ValueEditorPaneFactory { /** * 创建数值编辑器 + * * @return 值编辑器 */ - public static ValueEditorPane createNumberValueEditorPane(){ + public static ValueEditorPane createNumberValueEditorPane() { return createValueEditorPane(numberEditors(), StringUtils.EMPTY, StringUtils.EMPTY); } /** * 创建日期编辑器 + * * @return 值编辑器 */ - public static ValueEditorPane createDateValueEditorPane(){ + public static ValueEditorPane createDateValueEditorPane() { return createValueEditorPane(dateEditors(), StringUtils.EMPTY, StringUtils.EMPTY); } + /** * 根据参数paraUseType 创建编辑器类型. * @@ -199,7 +205,7 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] basicEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); return new Editor[]{ new TextEditor(), new SpinnerIntegerEditor(), @@ -216,7 +222,7 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] formEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); return new Editor[]{ new TextEditor(), new IntegerEditor(), @@ -234,7 +240,7 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] extendedEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); return new Editor[]{ new TextEditor(), new IntegerEditor(), @@ -247,35 +253,37 @@ public class ValueEditorPaneFactory { }; } - /** - * 带单元格组的编辑器 - * @return 值编辑器 - */ - public static Editor[] extendedCellGroupEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); - return new Editor[]{ - new TextEditor(), - new IntegerEditor(), - new DoubleEditor(), - new DateEditor(true, Inter.getLocText("Date")), - new BooleanEditor(), - formulaEditor, - new ParameterEditor(), - new ColumnRowEditor(Inter.getLocText("Cell")), - new ColumnRowGroupEditor(Inter.getLocText("Cell_Group")) - }; - } - - /** - * 只有单元格和单元格组的编辑器 - * @return 编辑器b - */ - public static Editor[] cellGroupEditor() { - return new Editor[] { - new ColumnRowEditor(Inter.getLocText("Cell")), - new ColumnRowGroupEditor(Inter.getLocText("Cell_Group")) - }; - } + /** + * 带单元格组的编辑器 + * + * @return 值编辑器 + */ + public static Editor[] extendedCellGroupEditors() { + FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + return new Editor[]{ + new TextEditor(), + new IntegerEditor(), + new DoubleEditor(), + new DateEditor(true, Inter.getLocText("Date")), + new BooleanEditor(), + formulaEditor, + new ParameterEditor(), + new ColumnRowEditor(Inter.getLocText("Cell")), + new ColumnRowGroupEditor(Inter.getLocText("FR-Designer-Cell_Group")) + }; + } + + /** + * 只有单元格和单元格组的编辑器 + * + * @return 编辑器b + */ + public static Editor[] cellGroupEditor() { + return new Editor[]{ + new ColumnRowEditor(Inter.getLocText("Cell")), + new ColumnRowGroupEditor(Inter.getLocText("FR-Designer-Cell_Group")) + }; + } /** * URL的一些编辑器. @@ -302,7 +310,7 @@ public class ValueEditorPaneFactory { return new Editor[]{ new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? Inter.getLocText("None") : popupName), new DateEditor(true, Inter.getLocText("Date")), - new FormulaEditor(Inter.getLocText("Parameter-Formula")) + new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")) }; } @@ -312,7 +320,7 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] allEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); // formulaEditor.setEnabled(true); return new Editor[]{ new TextEditor(), @@ -331,9 +339,10 @@ public class ValueEditorPaneFactory { /** * 不带公式编辑器 + * * @return 编辑器不带公式 */ - public static Editor[] basicEditorsWithoutFormula(){ + public static Editor[] basicEditorsWithoutFormula() { return new Editor[]{ new TextEditor(), new IntegerEditor(), @@ -349,7 +358,7 @@ public class ValueEditorPaneFactory { * @return 编辑器 */ public static Editor[] noCRnoColumnEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); return new Editor[]{ new TextEditor(), new IntegerEditor(), @@ -363,10 +372,11 @@ public class ValueEditorPaneFactory { /** * 数值编辑器 - * @return 编辑器 + * + * @return 编辑器 */ public static Editor[] numberEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); return new Editor[]{ new IntegerEditor(), new DoubleEditor(), @@ -377,10 +387,11 @@ public class ValueEditorPaneFactory { /** * 日期编辑器 + * * @return 编辑器 */ public static Editor[] dateEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); return new Editor[]{ new DateEditor(true, Inter.getLocText("Date")), formulaEditor, @@ -394,7 +405,7 @@ public class ValueEditorPaneFactory { * @return 存储过程的编辑器 */ public static Editor[] StoreProcedureEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); formulaEditor.setEnabled(true); return new Editor[]{ new CursorEditor(), @@ -422,7 +433,7 @@ public class ValueEditorPaneFactory { list.add(new DateEditor(true, Inter.getLocText("Date"))); list.add(new BooleanEditor()); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); formulaEditor.setEnabled(true); list.add(formulaEditor); @@ -436,30 +447,29 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ private static List createEditors4Chart(int paraUseType) { - if(paraUseType == ParameterTableModel.CHART_PIE_USE) { + if (paraUseType == ParameterTableModel.CHART_PIE_USE) { return getPieEditor(); - } else if(paraUseType == ParameterTableModel.CHART_MAP_USE) { + } else if (paraUseType == ParameterTableModel.CHART_MAP_USE) { return getMapEditor(); - } else if(paraUseType == ParameterTableModel.CHART_GIS_USE) { + } else if (paraUseType == ParameterTableModel.CHART_GIS_USE) { return getGisEditor(); - } else if(paraUseType == ParameterTableModel.CHART__XY_USE) { + } else if (paraUseType == ParameterTableModel.CHART__XY_USE) { return getXYEditor(); - } else if(paraUseType == ParameterTableModel.CHART_BUBBLE_USE) { + } else if (paraUseType == ParameterTableModel.CHART_BUBBLE_USE) { return getBubbbleEdtor(); - } else if(paraUseType == ParameterTableModel.CHART_NO_USE) { + } else if (paraUseType == ParameterTableModel.CHART_NO_USE) { return getChartNoUseEditor(); - } else if(paraUseType == ParameterTableModel.CHART_METER_USE) { + } else if (paraUseType == ParameterTableModel.CHART_METER_USE) { return getMeterEditor(); - } else if(paraUseType == ParameterTableModel.CHART_STOCK_USE) { + } else if (paraUseType == ParameterTableModel.CHART_STOCK_USE) { return getStockEditor(); - } else if(paraUseType == ParameterTableModel.CHART_GANTT_USE) { + } else if (paraUseType == ParameterTableModel.CHART_GANTT_USE) { return getGanttEditor(); - } else if(paraUseType == ParameterTableModel.FORM_ELEMENTCASE_USE) { + } else if (paraUseType == ParameterTableModel.FORM_ELEMENTCASE_USE) { return getFormElementCaseEditor(); - } else if(paraUseType == ParameterTableModel.FORM_CHART_USE) { - return getFormChartEditor(); - } - else { + } else if (paraUseType == ParameterTableModel.FORM_CHART_USE) { + return getFormChartEditor(); + } else { return getChartEditor(); } } diff --git a/designer_base/src/com/fr/design/editor/editor/IntegerEditor.java b/designer_base/src/com/fr/design/editor/editor/IntegerEditor.java index b1661277a2..ff69446baf 100644 --- a/designer_base/src/com/fr/design/editor/editor/IntegerEditor.java +++ b/designer_base/src/com/fr/design/editor/editor/IntegerEditor.java @@ -18,7 +18,7 @@ public class IntegerEditor extends NumberEditor { } public IntegerEditor(Integer value) { - super(value, Inter.getLocText("Parameter-Integer")); + super(value, Inter.getLocText("FR-Designer_Parameter_Integer")); } @Override diff --git a/designer_base/src/com/fr/design/editor/editor/SpinnerIntegerEditor.java b/designer_base/src/com/fr/design/editor/editor/SpinnerIntegerEditor.java index 2366350f69..5448a08680 100644 --- a/designer_base/src/com/fr/design/editor/editor/SpinnerIntegerEditor.java +++ b/designer_base/src/com/fr/design/editor/editor/SpinnerIntegerEditor.java @@ -6,7 +6,6 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Inter; import com.fr.stable.StringUtils; -import javax.swing.*; import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; @@ -22,7 +21,7 @@ public class SpinnerIntegerEditor extends Editor { spinner = new UISpinner(-Integer.MAX_VALUE, Integer.MAX_VALUE, 1, 0); this.add(spinner, BorderLayout.CENTER); this.spinner.addKeyListener(textKeyListener); - this.setName(Inter.getLocText("Parameter-Integer")); + this.setName(Inter.getLocText("FR-Designer_Parameter_Integer")); } @Override diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 59ead52371..f006d5afbc 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -856,7 +856,7 @@ RP_Authority_Edit=Authority Warnning=Warning RoleName_Can_Not_Be_Null=RoleName_Can_Not_Be_Null Application=Applications -Formula_Dictionary_Display_Examples_Html=the real value is \=range(100), the real value($$$)'s display value is \=0 - $$$,
the result is 1, 2, ..., 100 and -1, -2, ..., -100.
+FR-Designer-Formula_Dictionary_Display_Examples_Html=the real value is \=range(100), the real value($$$)'s display value is \=0 - $$$,
the result is 1, 2, ..., 100 and -1, -2, ..., -100.
ECP-error_pwd= FR-Hyperlink_ChartHyperlink= M_Edit-FormatBrush=Format Painter @@ -1425,7 +1425,7 @@ Out_Thick_Border_Line=Out Thick Border Line FR-App-File_Lookup_range= ReportColumns-Columns_to=Columns to Transparent=Transparent -Parameter-Integer=Integer +FR-Designer_Parameter_Integer=Integer PDF-Print_Setting=PDF Print Setting Server-Embedded_Server=Embedded Server M_Server-Server_Config_Manager=Server Configuration Manager diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index e7094c00c0..7392e95897 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -859,7 +859,7 @@ RP_Authority_Edit=Permission Warnning=Warning RoleName_Can_Not_Be_Null=Role name can not be null or duplicate Application=Applications -Formula_Dictionary_Display_Examples_Html=Tip: the real value is \=range(100), the real value($$$)'s display value is \=0 - $$$,
the result is 1, 2, ..., 100 and -1, -2, ..., -100.
+FR-Designer-Formula_Dictionary_Display_Examples_Html=Tip: the real value is \=range(100), the real value($$$)'s display value is \=0 - $$$,
the result is 1, 2, ..., 100 and -1, -2, ..., -100.
ECP-error_pwd=Password Error FR-Hyperlink_ChartHyperlink=Chart Hyperlink M_Edit-FormatBrush=Format Painter @@ -1427,7 +1427,7 @@ Out_Thick_Border_Line=Thick Border FR-App-File_Lookup_range=Search range ReportColumns-Columns_to=Split To Transparent=Transparent -Parameter-Integer=Integer +FR-Designer_Parameter_Integer=Integer PDF-Print_Setting=PDF Print Setting Server-Embedded_Server=Built-in server M_Server-Server_Config_Manager=Server Configuration Manager diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index 2d6ec86418..aa65d9ba45 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -857,7 +857,7 @@ RP_Authority_Edit=\u6A29\u9650\u7DE8\u96C6 Warnning=\u30EA\u30DE\u30A4\u30F3\u30C9 RoleName_Can_Not_Be_Null=\u5F79\u5272\u540D\u306F\u7A7A\u6B04\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u305A\u3001\u91CD\u8907\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u305B\u3093 Application=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3 -Formula_Dictionary_Display_Examples_Html=\u30D2\u30F3\u30C8: \u5B9F\u969B\u306E\u5024\u304C \=range(100)\u306E\u3068\u304D\u3001\u5B9F\u969B\u306E\u5024($$$)\u306E\u8868\u793A\u3059\u308B\u5024\u306E\u6570\u5F0F\u304C \= 0 - $$$\u306E\u3068\u304D\u3001\n\u6700\u7D42\u7684\u306A\u5B9F\u969B\u306E\u5024\u306F\u30011, 2, ..., 100\u3067\u3042\u308A\u3001\n\u305D\u306E\u8868\u793A\u7D50\u679C\u306F-1, -2, ..., -100\u3068\u306A\u308B\u3002
+FR-Designer-Formula_Dictionary_Display_Examples_Html=\u30D2\u30F3\u30C8: \u5B9F\u969B\u306E\u5024\u304C \=range(100)\u306E\u3068\u304D\u3001\u5B9F\u969B\u306E\u5024($$$)\u306E\u8868\u793A\u3059\u308B\u5024\u306E\u6570\u5F0F\u304C \= 0 - $$$\u306E\u3068\u304D\u3001\n\u6700\u7D42\u7684\u306A\u5B9F\u969B\u306E\u5024\u306F\u30011, 2, ..., 100\u3067\u3042\u308A\u3001\n\u305D\u306E\u8868\u793A\u7D50\u679C\u306F-1, -2, ..., -100\u3068\u306A\u308B\u3002
ECP-error_pwd=\u30D1\u30B9\u30EF\u30FC\u30C9\u30A8\u30E9\u30FC FR-Hyperlink_ChartHyperlink=\u30B0\u30E9\u30D5\u30CF\u30A4\u30D1\u30FC\u30EA\u30F3\u30AF M_Edit-FormatBrush=\u66F8\u5F0F\u30D6\u30E9\u30B7(B) @@ -1427,7 +1427,7 @@ Out_Thick_Border_Line=\u30DC\u30C3\u30AF\u30B9\u30D5\u30EC\u30FC\u30E0\u30E9\u30 FR-App-File_Lookup_range=\u691C\u7D22\u7BC4\u56F2 ReportColumns-Columns_to=\u306E\u3088\u3046\u306B\u6539\u5217\u3059\u308B Transparent=\u900F\u660E -Parameter-Integer=\u6574\u6570\u578B +FR-Designer_Parameter_Integer=\u6574\u6570\u578B PDF-Print_Setting=PDF\u5370\u5237\u8A2D\u5B9A Server-Embedded_Server=\u5185\u8535\u30B5\u30FC\u30D0\u30FC M_Server-Server_Config_Manager=\u30B5\u30FC\u30D0\u30FC\u914D\u7F6E(S) diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index 586d858699..a600453f5b 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -857,7 +857,7 @@ RP_Authority_Edit=\uAD8C\uD55C\uD3B8\uC9D1 Warnning=\uC54C\uB9BC RoleName_Can_Not_Be_Null=\uC5ED\uD560\uC774\uB984\uC740\uBE44\uC5B4\uC788\uAC70\uB098\uC911\uBCF5\uB418\uC5B4\uC11C\uB294\uC548\uB429\uB2C8\uB2E4. Application=\uC560\uD50C\uB9AC\uCF00\uC774\uC158 -Formula_Dictionary_Display_Examples_Html=\uD301: \uC2E4\uC81C\uAC12\uBC94\uC704:\=0 - $$$\uFF0C
\uCD5C\uC885\uACB0\uACFC\uC758\uC2E4\uC81C\uAC12: 1, 2, ..., 100,\uD45C\uC2DC\uAC12: -1, -2, ... , -100.
  +FR-Designer-Formula_Dictionary_Display_Examples_Html=\uD301: \uC2E4\uC81C\uAC12\uBC94\uC704:\=0 - $$$\uFF0C
\uCD5C\uC885\uACB0\uACFC\uC758\uC2E4\uC81C\uAC12: 1, 2, ..., 100,\uD45C\uC2DC\uAC12: -1, -2, ... , -100.
  ECP-error_pwd=\uBE44\uBC00\uBC88\uD638\uC785\uB825\uC624\uB958 FR-Hyperlink_ChartHyperlink=\uCC28\uD2B8\uD558\uC774\uD37C\uB9C1\uD06C M_Edit-FormatBrush=\uC11C\uC2DD\uD504\uB9B0\uD2B8(B) @@ -1426,7 +1426,7 @@ Out_Thick_Border_Line=\uAD75\uC740\uBC14\uAE65\uCABD\uD14C\uB450\uB9AC\uC120 FR-App-File_Lookup_range=\uBC94\uC704\uAC80\uC0C9 ReportColumns-Columns_to=\uC140\uB098\uB204\uAE30 Transparent=\uD22C\uBA85 -Parameter-Integer=\uC804\uCCB4\uD0C0\uC785 +FR-Designer_Parameter_Integer=\uC804\uCCB4\uD0C0\uC785 PDF-Print_Setting=PDF\uC778\uC1C4\uC124\uC815 Server-Embedded_Server=\uB0B4\uC7A5\uB41C\uC11C\uBC84 M_Server-Server_Config_Manager=\uC11C\uBC84\uAD6C\uC131 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 4b38fc25e0..984a94a542 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -860,7 +860,7 @@ RP_Authority_Edit=\u6743\u9650\u7F16\u8F91 Warnning=\u63D0\u9192 RoleName_Can_Not_Be_Null=\u89D2\u8272\u540D\u4E0D\u5141\u8BB8\u4E3A\u7A7A\u4E14\u4E0D\u80FD\u91CD\u590D Application=\u5E94\u7528\u7A0B\u5E8F -Formula_Dictionary_Display_Examples_Html=\u63D0\u793A\uFF1A\u5B9E\u9645\u503C\u8303\u56F4\u4E3A \=range(100),\u5BF9\u5B9E\u9645\u503C\u8303\u56F4\u5185\u7684\u6BCF\u4E2A$$$\u7684\u663E\u793A\u516C\u5F0F\u4E3A \=0 - $$$\uFF0C\u5219\u6700\u7EC8\u7684\u7ED3\u679C\u5B9E\u9645\u503C\u4E3A1, 2, ..., 100,\u663E\u793A\u503C\u4E3A-1, -2, ... , -100\u3002
  +FR-Designer-Formula_Dictionary_Display_Examples_Html=\u63D0\u793A\uFF1A\u5B9E\u9645\u503C\u8303\u56F4\u4E3A \=range(100),\u5BF9\u5B9E\u9645\u503C\u8303\u56F4\u5185\u7684\u6BCF\u4E2A$$$\u7684\u663E\u793A\u516C\u5F0F\u4E3A \=0 - $$$\uFF0C\u5219\u6700\u7EC8\u7684\u7ED3\u679C\u5B9E\u9645\u503C\u4E3A1, 2, ..., 100,\u663E\u793A\u503C\u4E3A-1, -2, ... , -100\u3002
  ECP-error_pwd=\u5BC6\u7801\u9519\u8BEF FR-Hyperlink_ChartHyperlink=\u56FE\u8868\u8D85\u94FE M_Edit-FormatBrush=\u683C\u5F0F\u5237(B) @@ -1243,6 +1243,7 @@ Rose_Red=\u73AB\u7470\u7EA2 StyleAlignment-The_value_of_rotation_must_between_-90_and_90_degrees=\u65CB\u8F6C\u503C\u5FC5\u987B\u5728\u8D1F90\u5EA6\u523090\u5EA6 HF-Move_Left=\u5DE6\u79FB Cell_Group=\u5355\u5143\u683C\u7EC4 +FR-Designer-Cell_Group=\u5355\u5143\u683C\u7EC4 Week=\u5468 PageSetup-Orientation=\u65B9\u5411 M-Open_Recent=\u6700\u8FD1\u6253\u5F00\u7684 @@ -1428,7 +1429,7 @@ Out_Thick_Border_Line=\u7C97\u5323\u6846\u7EBF FR-App-File_Lookup_range=\u67E5\u627E\u8303\u56F4 ReportColumns-Columns_to=\u5206\u680F\u6210 Transparent=\u900F\u660E -Parameter-Integer=\u6574\u578B +FR-Designer_Parameter_Integer=\u6574\u578B PDF-Print_Setting=PDF\u6253\u5370\u8BBE\u7F6E Server-Embedded_Server=\u5167\u7F6E\u7684\u670D\u52A1\u5668 M_Server-Server_Config_Manager=\u670D\u52A1\u5668\u914D\u7F6E diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 2073e65ae8..e2a9d856a8 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -859,7 +859,7 @@ RP_Authority_Edit=\u6B0A\u9650\u7DE8\u8F2F Warnning=\u63D0\u9192 RoleName_Can_Not_Be_Null=\u89D2\u8272\u540D\u4E0D\u5141\u8A31\u70BA\u7A7A\u4E14\u4E0D\u80FD\u91CD\u8907 Application=\u61C9\u7528\u7A0B\u5F0F -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
  +FR-Designer-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
  ECP-error_pwd=\u5BC6\u78BC\u932F\u8AA4 FR-Hyperlink_ChartHyperlink=\u5716\u8868\u8D85\u93C8 M_Edit-FormatBrush=\u8907\u88FD\u683C\u5F0F(B) @@ -1426,7 +1426,7 @@ Out_Thick_Border_Line=\u7C97\u5323\u6846\u7DDA FR-App-File_Lookup_range=\u67E5\u627E\u7BC4\u570D ReportColumns-Columns_to=\u5206\u6B04\u6210 Transparent=\u900F\u660E -Parameter-Integer=\u6574\u578B +FR-Designer_Parameter_Integer=\u6574\u578B PDF-Print_Setting=PDF\u5217\u5370\u8A2D\u5B9A Server-Embedded_Server=\u5167\u7F6E\u7684\u4F3A\u670D\u5668 M_Server-Server_Config_Manager=\u4F3A\u670D\u5668\u914D\u7F6E(S) diff --git a/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java b/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java index dab59eaffe..bcc41943f8 100644 --- a/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java +++ b/designer_base/src/com/fr/design/present/dict/FormulaDictPane.java @@ -48,14 +48,14 @@ public class FormulaDictPane extends FurtherBasicBeanPane { double[] rowSize = {p, p, p}; int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; - UILabel tag = new UILabel(Inter.getLocText("Formula_Dictionary_Display_Examples_Html")); + UILabel tag = new UILabel(Inter.getLocText("FR-Designer-Formula_Dictionary_Display_Examples_Html")); tag.setForeground(new Color(51, 51, 52)); tag.setPreferredSize(new Dimension(225, 80)); JPanel t = new JPanel(new BorderLayout()); t.add(tag, BorderLayout.CENTER); Formula vf = new Formula("$$$"); - valueFormulaEditor = new FormulaEditor("", vf); + valueFormulaEditor = new FormulaEditor(StringUtils.EMPTY, vf); JPanel valueFormulaContainer = new JPanel(new FlowLayout(FlowLayout.RIGHT, LEFT_BORDER, 0)); valueFormulaContainer.setBorder(BorderFactory.createEmptyBorder(0, -LEFT_BORDER, 0, -LEFT_BORDER));