From 2cc6656c284567ed19d15506ce078953d920c99d Mon Sep 17 00:00:00 2001 From: richie Date: Tue, 19 Mar 2019 10:47:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=85=BC=E5=AE=B99.0?= =?UTF-8?q?=E5=92=8C10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.xml | 2 +- plugin.xml | 3 +- .../design/formula/compat/DesignToolkit.java | 27 ++++++++++++ .../formula/compat/FunctionConstants.java | 42 +++++++++--------- .../design/formula/ui/GroupFormulaPane.java | 43 ++++++++++--------- .../GroupFormulaPaneWhenReserveFormula.java | 6 +-- .../design/formula/locale/formula.properties | 14 +++++- .../formula/locale/formula_en_US.properties | 14 +++++- .../formula/locale/formula_ja_JP.properties | 14 +++++- .../formula/locale/formula_zh_CN.properties | 14 +++++- .../formula/locale/formula_zh_TW.properties | 14 +++++- 11 files changed, 141 insertions(+), 52 deletions(-) create mode 100644 src/main/java/com/fr/solution/plugin/design/formula/compat/DesignToolkit.java diff --git a/build.xml b/build.xml index 4cf19ad..b15eec1 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + diff --git a/plugin.xml b/plugin.xml index c85cd4e..cf6786c 100644 --- a/plugin.xml +++ b/plugin.xml @@ -4,12 +4,13 @@ com.fr.solution.plugin.design.formula.script yes - 4.1 + 4.3 9.0 2017-10-20 richie [2018-12-19]适配10.0和增加繁体中文的支持。
[2017-12-20]修改功能点检测所在的位置。
[2017-12-10]在公式编辑器中增加实时计算按钮。
diff --git a/src/main/java/com/fr/solution/plugin/design/formula/compat/DesignToolkit.java b/src/main/java/com/fr/solution/plugin/design/formula/compat/DesignToolkit.java new file mode 100644 index 0000000..c6740e7 --- /dev/null +++ b/src/main/java/com/fr/solution/plugin/design/formula/compat/DesignToolkit.java @@ -0,0 +1,27 @@ +package com.fr.solution.plugin.design.formula.compat; + +import com.fr.general.Inter; +import com.fr.stable.ProductConstants; + +/** + * @author richie + * @version 10.0 + * Created by richie on 2019-03-19 + */ +public class DesignToolkit { + + private final static int version = Integer.parseInt(ProductConstants.MAIN_VERSION); + + public static String getLocText(String key) { + if (version < 10) { + return Inter.getLocText(key); + } else { + try { + return (String) Class.forName("com.fr.design.i18n.Toolkit").getMethod("i18nText", new Class[]{String.class}).invoke(null, key); + } catch (Exception ignore) { + + } + return key; + } + } +} diff --git a/src/main/java/com/fr/solution/plugin/design/formula/compat/FunctionConstants.java b/src/main/java/com/fr/solution/plugin/design/formula/compat/FunctionConstants.java index cb2b3f6..8efe0dc 100644 --- a/src/main/java/com/fr/solution/plugin/design/formula/compat/FunctionConstants.java +++ b/src/main/java/com/fr/solution/plugin/design/formula/compat/FunctionConstants.java @@ -5,7 +5,7 @@ import com.fr.design.formula.FunctionGroup; import com.fr.design.formula.NameAndDescription; import com.fr.design.formula.NameAndFunctionList; import com.fr.design.formula.NameAndTypeAndFunctionList; -import com.fr.file.FunctionConfig; +import com.fr.file.FunctionManager; import com.fr.function.AVERAGE; import com.fr.function.CHAR; import com.fr.function.COUNT; @@ -16,8 +16,8 @@ import com.fr.function.RANGE; import com.fr.function.SUM; import com.fr.function.TIME; import com.fr.general.ComparatorUtils; +import com.fr.general.FRLogger; import com.fr.general.GeneralUtils; -import com.fr.log.FineLoggerFactory; import com.fr.plugin.ExtraClassManager; import com.fr.stable.EncodeConstants; import com.fr.stable.OperatingSystem; @@ -28,7 +28,7 @@ import com.fr.stable.fun.mark.Mutable; import com.fr.stable.script.Function; import com.fr.stable.script.FunctionDef; -import javax.swing.DefaultListModel; +import javax.swing.*; import java.io.File; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -74,7 +74,7 @@ public final class FunctionConstants { try { urlEnumeration = classloader.getResources(pkgName.replace('.', '/')); } catch (IOException e) { - FineLoggerFactory.getLogger().error(e.getMessage()); + FRLogger.getLogger().error(e.getMessage()); return; } while (urlEnumeration.hasMoreElements()) { @@ -87,9 +87,9 @@ public final class FunctionConstants { try { classFilePath = URLDecoder.decode(classFilePath, EncodeConstants.ENCODING_UTF_8); } catch (UnsupportedEncodingException e1) { - FineLoggerFactory.getLogger().error(e1.getMessage(), e1); + FRLogger.getLogger().error(e1.getMessage(), e1); } - FineLoggerFactory.getLogger().info("ClassFilePath:" + classFilePath); + FRLogger.getLogger().info("ClassFilePath:" + classFilePath); if (isCustomFormulaPath(classFilePath)) { continue; } @@ -108,7 +108,7 @@ public final class FunctionConstants { } catch (Exception ignore) { } catch (Throwable e) { // 不要因为个别公式加载失败，而导致整个函数面板无法启动 - FineLoggerFactory.getLogger().error(e.getMessage()); + FRLogger.getLogger().error(e.getMessage()); } } } @@ -202,7 +202,7 @@ public final class FunctionConstants { classNameList.add(entryName.substring(classPath.length() + 1)); } } catch (IOException e) { - FineLoggerFactory.getLogger().error(e.getMessage(), e); + FRLogger.getLogger().error(e.getMessage(), e); } } else { File dir = new File(filePath); @@ -224,7 +224,7 @@ public final class FunctionConstants { return new FunctionGroup() { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Formula_Plugin"); + return DesignToolkit.getLocText("Plugin-Design_Basic_Base_Formula_Plugin"); } @Override @@ -244,12 +244,12 @@ public final class FunctionConstants { return new FunctionGroup() { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Custom_Function"); + return DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Custom_Function"); } @Override public NameAndDescription[] getDescriptions() { - FunctionConfig funtionManager = FunctionConfig.getInstance(); + FunctionManager funtionManager = FunctionManager.getInstance(); if (funtionManager != null) { int functionDefCount = funtionManager.getFunctionDefCount(); @@ -267,21 +267,21 @@ public final class FunctionConstants { } private static NameAndFunctionList getCommonFunctionList() { - return new NameAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Most_Recently_Used"), new Function[] { + return new NameAndFunctionList(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Most_Recently_Used"), new Function[] { new SUM(), new COUNT(), new AVERAGE(), new CHAR(), new DATE(), new MAX(), new MIN(), new TIME(), new RANGE() }); } private static NameAndTypeAndFunctionList[] getEmbededFunctionListArray() { return new NameAndTypeAndFunctionList[] { - new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Math_&_Trig"), Function.MATH), - new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Text"), Function.TEXT), - new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Date_&_Time"), Function.DATETIME), - new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Logical"), Function.LOGIC), - new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Array"), Function.ARRAY), - new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Report"), Function.REPORT), - new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Other"), Function.OTHER), - new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Type_Hierarchy"), Function.HA) + new NameAndTypeAndFunctionList(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Math_&_Trig"), Function.MATH), + new NameAndTypeAndFunctionList(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Text"), Function.TEXT), + new NameAndTypeAndFunctionList(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Date_&_Time"), Function.DATETIME), + new NameAndTypeAndFunctionList(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Logical"), Function.LOGIC), + new NameAndTypeAndFunctionList(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Array"), Function.ARRAY), + new NameAndTypeAndFunctionList(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Report"), Function.REPORT), + new NameAndTypeAndFunctionList(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Other"), Function.OTHER), + new NameAndTypeAndFunctionList(DesignToolkit.getLocText("Plugin-Design_Basic_Function_Type_Hierarchy"), Function.HA) }; } @@ -289,7 +289,7 @@ public final class FunctionConstants { return new FunctionGroup() { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_All"); + return DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_All"); } @Override diff --git a/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java b/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java index 5f61f31..a0301f5 100644 --- a/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java +++ b/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java @@ -29,10 +29,11 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.design.parameter.ParameterInputPane; import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.general.FRLogger; import com.fr.general.GeneralUtils; -import com.fr.general.Inter; import com.fr.report.core.namespace.SimpleCellValueNameSpace; import com.fr.script.Calculator; +import com.fr.solution.plugin.design.formula.compat.DesignToolkit; import com.fr.solution.plugin.design.formula.compat.FunctionConstants; import com.fr.solution.plugin.design.formula.ui.evt.OperateListener; import com.fr.solution.plugin.design.formula.ui.type.CategoryFormulaPane; @@ -122,7 +123,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis JPanel textPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(textPane, BorderLayout.CENTER); JPanel checkBoxAndButtonPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - UILabel formulaLabel = new UILabel(Inter.getLocText("Plugin-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":" + UILabel formulaLabel = new UILabel(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":" + " "); formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); @@ -135,10 +136,10 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis initTipsPane(); - UIButton checkValidButton = new UIButton(Inter.getLocText("Plugin-Design_Basic_FormulaD_Check_Valid")); + UIButton checkValidButton = new UIButton(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Check_Valid")); checkValidButton.addActionListener(checkValidActionListener); - UIButton calculateButton = new UIButton(Inter.getLocText("Plugin-Design_Group_Formula_Calculate")); + UIButton calculateButton = new UIButton(DesignToolkit.getLocText("Plugin-Design_Group_Formula_Calculate")); calculateButton.addActionListener(calculateActionListener); JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); @@ -157,7 +158,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis JPanel searchPane = new JPanel(new BorderLayout(4, 4)); searchPane.add(keyWordTextField, BorderLayout.CENTER); - UIButton searchButton = new UIButton(Inter.getLocText("Plugin-Design_Basic_FormulaPane_Search")); + UIButton searchButton = new UIButton(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaPane_Search")); searchPane.add(searchButton, BorderLayout.EAST); tipsPane.add(searchPane, BorderLayout.NORTH); initKeyWordTextFieldKeyListener(); @@ -289,7 +290,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-Design_Basic_FormulaD_Formula_Definition"); + return DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Formula_Definition"); } /** @@ -330,7 +331,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis } BaseFormula formula = GroupFormulaPane.this.update(); String message = calculate(formula, formulaPane.analyze4Parameters(calculator), calculator); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), message); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), message); } }; @@ -349,9 +350,9 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis String message; try { Object result = formula.evalValue(calculator); - message = Inter.getLocText("Plugin-Design_Group_Formula_Result") + ":" + GeneralUtils.objectToString(result); + message = DesignToolkit.getLocText("Plugin-Design_Group_Formula_Result") + ":" + GeneralUtils.objectToString(result); } catch (UtilEvalError utilEvalError) { - message = Inter.getLocText("Plugin-Design_Group_Formula_Calculate_Error") + ":" + utilEvalError.getMessage(); + message = DesignToolkit.getLocText("Plugin-Design_Group_Formula_Calculate_Error") + ":" + utilEvalError.getMessage(); } return message; } @@ -370,7 +371,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis UIScrollPane functionTypeScrollPane = new UIScrollPane(functionTypeList); functionTypeScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); functionTypeScrollPane.setPreferredSize(new Dimension(140, 200)); - functionPane.add(this.createNamePane(Inter.getLocText("Plugin-Design_Basic_FormulaD_Function_Category") + ":", functionTypeScrollPane), BorderLayout.WEST); + functionPane.add(this.createNamePane(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Function_Category") + ":", functionTypeScrollPane), BorderLayout.WEST); initTypeListCellRenderer(); initGroupTypeModel(); initTypeListSelectionListener(); @@ -484,7 +485,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis UIScrollPane functionNameScrollPane = new UIScrollPane(functionNameList); functionNameScrollPane.setPreferredSize(new Dimension(140, 200)); functionPane.add( - this.createNamePane(Inter.getLocText("Plugin-Design_Basic_FormulaD_Function_Name") + ":", functionNameScrollPane), + this.createNamePane(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Function_Name") + ":", functionNameScrollPane), BorderLayout.CENTER); functionNameScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); initFunctionNameListCellRenderer(); @@ -498,7 +499,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea); desScrollPane.setBorder(null); - this.add(this.createNamePane(Inter.getLocText("Plugin-Design_Basic_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST); + this.add(this.createNamePane(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST); descriptionTextArea.setBackground(Color.white); descriptionTextArea.setLineWrap(true); descriptionTextArea.setWrapStyleWord(true); @@ -557,7 +558,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis desBuf = getText((TextUserObject) selectedValue, path); } } catch (IOException exp) { - FRContext.getLogger().error(exp.getMessage(), exp); + FRLogger.getLogger().error(exp.getMessage(), exp); } descriptionTextArea.setText(desBuf.toString()); descriptionTextArea.moveCaretPosition(0); @@ -571,7 +572,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis UIScrollPane variablesTreePane = new UIScrollPane(variablesTree); variablesTreePane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); this.add(this.createNamePane( - Inter.getLocText("Plugin-Design_Basic_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.CENTER); + DesignToolkit.getLocText("Plugin-Design_Basic_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.CENTER); variablesTree.setRootVisible(false); variablesTree.setShowsRootHandles(true); variablesTree.addMouseListener(applyTextMouseListener); @@ -600,7 +601,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis private class LookDetailAction extends UpdateAction { public LookDetailAction() { - this.setName(Inter.getLocText("Plugin-Design_Basic_FormulaPane_Function_Detail")); + this.setName(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaPane_Function_Detail")); this.setMnemonic('L'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png")); } @@ -615,7 +616,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis BasicPane basicPane = new BasicPane() { @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-Design_Basic_FormulaPane_Function_Detail"); + return DesignToolkit.getLocText("Plugin-Design_Basic_FormulaPane_Function_Detail"); } }; basicPane.setLayout(FRGUIPaneFactory.createBorderLayout()); @@ -704,24 +705,24 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis rootNode.add(bindCellNode); } - rootNode.add(new TextFolderUserObject(Inter.getLocText("Plugin-Design_Basic_FormulaD_Data_Fields"), + rootNode.add(new TextFolderUserObject(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaD_Data_Fields"), BaseUtils.readIcon("/com/fr/design/images/dialog/table.png"), variableResolver.resolveColumnNames()).createMutableTreeNode()); // Set cutReport Variable - rootNode.add(new TextFolderUserObject(Inter.getLocText("Plugin-Design_Basic_FormulaPane_Variables"), + rootNode.add(new TextFolderUserObject(DesignToolkit.getLocText("Plugin-Design_Basic_FormulaPane_Variables"), BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"), variableResolver.resolveCurReportVariables()).createMutableTreeNode()); - rootNode.add(new TextFolderUserObject(Inter.getLocText("Plugin-Design_Basic_Parameter_Source_Type_Tabledata"), + rootNode.add(new TextFolderUserObject(DesignToolkit.getLocText("Plugin-Design_Basic_Parameter_Source_Type_Tabledata"), BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"), variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode()); - rootNode.add(new TextFolderUserObject(Inter.getLocText("Plugin-Design_Basic_ParameterD_Report_Parameter"), + rootNode.add(new TextFolderUserObject(DesignToolkit.getLocText("Plugin-Design_Basic_ParameterD_Report_Parameter"), BaseUtils.readIcon("/com/fr/design/images/m_report/p.gif"), variableResolver.resolveReportParameterVariables()).createMutableTreeNode()); - rootNode.add(new TextFolderUserObject(Inter.getLocText("Plugin-Design_Basic_M_Server_Global_Parameters"), + rootNode.add(new TextFolderUserObject(DesignToolkit.getLocText("Plugin-Design_Basic_M_Server_Global_Parameters"), BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"), variableResolver.resolveGlobalParameterVariables()).createMutableTreeNode()); diff --git a/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPaneWhenReserveFormula.java b/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPaneWhenReserveFormula.java index 4b02ab2..58e8055 100644 --- a/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPaneWhenReserveFormula.java +++ b/src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPaneWhenReserveFormula.java @@ -3,7 +3,7 @@ package com.fr.solution.plugin.design.formula.ui; import com.fr.base.BaseFormula; import com.fr.design.formula.VariableResolver; import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.general.Inter; +import com.fr.solution.plugin.design.formula.compat.DesignToolkit; import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -20,7 +20,7 @@ public class GroupFormulaPaneWhenReserveFormula extends GroupFormulaPane { @Override protected void extendCheckBoxPane(JPanel checkBoxPane) { - reserveCheckBox4Result = new UICheckBox(Inter.getLocText("Plugin-Design_Basic_Export_Save_Formula")); + reserveCheckBox4Result = new UICheckBox(DesignToolkit.getLocText("Plugin-Design_Basic_Export_Save_Formula")); reserveCheckBox4Result.setSelected(false); reserveCheckBox4Result.addChangeListener(new ChangeListener() { @@ -33,7 +33,7 @@ public class GroupFormulaPaneWhenReserveFormula extends GroupFormulaPane { } } }); - reserveCheckBox4Write = new UICheckBox(Inter.getLocText("Plugin-Design_Basic_Write_Save_Formula")); + reserveCheckBox4Write = new UICheckBox(DesignToolkit.getLocText("Plugin-Design_Basic_Write_Save_Formula")); reserveCheckBox4Write.setSelected(false); checkBoxPane.add(reserveCheckBox4Result, BorderLayout.CENTER); diff --git a/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula.properties b/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula.properties index ef93291..205246d 100644 --- a/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula.properties +++ b/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula.properties @@ -20,4 +20,16 @@ Plugin-Design_Basic_Export_Save_Formula=Preserve formula when export Plugin-Design_Basic_Write_Save_Formula=Preserve formula when fill Plugin-Design_Basic_FormulaPane_Tips=Tips\\:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column Plugin-Design_Basic_FormulaD_Valid_Formula=Valid Formula -Plugin-Design_Basic_FormulaD_Invalid_Formula=Invalid Formula \ No newline at end of file +Plugin-Design_Basic_FormulaD_Invalid_Formula=Invalid Formula +Plugin-Design_Basic_FormulaD_Math_&_Trig=Math & Trig +Plugin-Design_Basic_FormulaD_Text=Text +Plugin-Design_Basic_FormulaD_Date_&_Time=Date & Time +Plugin-Design_Basic_FormulaD_Logical=Logical +Plugin-Design_Basic_FormulaD_Array=Array +Plugin-Design_Basic_FormulaD_Report=Report +Plugin-Design_Basic_FormulaD_Other=Others +Plugin-Design_Basic_Function_Type_Hierarchy=Hierarchy +Plugin-Design_Basic_FormulaD_All=All +Plugin-Design_Basic_FormulaD_Most_Recently_Used=Most Recently Used +Plugin-Design_Basic_FormulaD_Custom_Function=Custom Function +Plugin-Design_Basic_Base_Formula_Plugin=Plugin Function \ No newline at end of file diff --git a/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_en_US.properties b/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_en_US.properties index d00870c..9f95475 100644 --- a/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_en_US.properties +++ b/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_en_US.properties @@ -20,4 +20,16 @@ Plugin-Design_Basic_Export_Save_Formula=Preserve formula when export Plugin-Design_Basic_Write_Save_Formula=Preserve formula when fill Plugin-Design_Basic_FormulaPane_Tips=Tips\\:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column Plugin-Design_Basic_FormulaD_Valid_Formula=Valid Formula -Plugin-Design_Basic_FormulaD_Invalid_Formula=Invalid Formula \ No newline at end of file +Plugin-Design_Basic_FormulaD_Invalid_Formula=Invalid Formula +Plugin-Design_Basic_FormulaD_Math_&_Trig=Math & Trig +Plugin-Design_Basic_FormulaD_Text=Text +Plugin-Design_Basic_FormulaD_Date_&_Time=Date & Time +Plugin-Design_Basic_FormulaD_Logical=Logical +Plugin-Design_Basic_FormulaD_Array=Array +Plugin-Design_Basic_FormulaD_Report=Report +Plugin-Design_Basic_FormulaD_Other=Others +Plugin-Design_Basic_Function_Type_Hierarchy=Hierarchy +Plugin-Design_Basic_FormulaD_All=All +Plugin-Design_Basic_FormulaD_Most_Recently_Used=Most Recently Used +Plugin-Design_Basic_FormulaD_Custom_Function=Custom Function +Plugin-Design_Basic_Base_Formula_Plugin=Plugin Function \ No newline at end of file diff --git a/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_ja_JP.properties b/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_ja_JP.properties index d00870c..ff2da90 100644 --- a/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_ja_JP.properties +++ b/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_ja_JP.properties @@ -20,4 +20,16 @@ Plugin-Design_Basic_Export_Save_Formula=Preserve formula when export Plugin-Design_Basic_Write_Save_Formula=Preserve formula when fill Plugin-Design_Basic_FormulaPane_Tips=Tips\\:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column Plugin-Design_Basic_FormulaD_Valid_Formula=Valid Formula -Plugin-Design_Basic_FormulaD_Invalid_Formula=Invalid Formula \ No newline at end of file +Plugin-Design_Basic_FormulaD_Invalid_Formula=Invalid Formula +Plugin-Design_Basic_FormulaD_Math_&_Trig=\u6570\u5B66\u3068\u4E09\u89D2\u95A2\u6570 +Plugin-Design_Basic_FormulaD_Text=\u30C6\u30AD\u30B9\u30C8\u95A2\u6570 +Plugin-Design_Basic_FormulaD_Date_&_Time=\u6642\u9593\u306E\u65E5\u4ED8\u95A2\u6570 +Plugin-Design_Basic_FormulaD_Logical=\u8AD6\u7406\u95A2\u6570 +Plugin-Design_Basic_FormulaD_Array=\u6570\u7D44\u95A2\u6570 +Plugin-Design_Basic_FormulaD_Report=\u30EC\u30DD\u30FC\u30C8\u95A2\u6570 +Plugin-Design_Basic_FormulaD_Other=\u305D\u306E\u4ED6 +Plugin-Design_Basic_Function_Type_Hierarchy=\u968E\u5C64 +Plugin-Design_Basic_FormulaD_All=\u3059\u3079\u3066\u306E\u95A2\u6570 +Plugin-Design_Basic_FormulaD_Most_Recently_Used=\u6700\u3082\u3088\u304F\u95A2\u6570\u3092\u4F7F\u7528\u3059\u308B +Plugin-Design_Basic_FormulaD_Custom_Function=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u95A2\u6570 +Plugin-Design_Basic_Base_Formula_Plugin=\u30D7\u30E9\u30B0\u30A4\u30F3 \ No newline at end of file diff --git a/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_zh_CN.properties b/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_zh_CN.properties index de1b9bb..381288c 100644 --- a/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_zh_CN.properties +++ b/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_zh_CN.properties @@ -20,4 +20,16 @@ Plugin-Design_Basic_Export_Save_Formula=\u5BFC\u51FA/\u7F16\u8F91\u7ED3\u679C\u6 Plugin-Design_Basic_Write_Save_Formula=\u586B\u62A5/\u5206\u6790\u65F6\uFF0C\u4FDD\u7559\u516C\u5F0F\u7528\u4E8E\u8BA1\u7B97 Plugin-Design_Basic_FormulaPane_Tips=\u63D0\u793A\\:\u60A8\u53EF\u4EE5\u901A\u8FC7\u8F93\u5165B1\u6765\u5199\u5165\u7B2C\u4E00\u884C\u7B2C\u4E8C\u5217\u7684\u6570\u636E\u3002 Plugin-Design_Basic_FormulaD_Valid_Formula=\u5408\u6CD5\u7684\u516C\u5F0F -Plugin-Design_Basic_FormulaD_Invalid_Formula=\u975E\u6CD5\u7684\u516C\u5F0F \ No newline at end of file +Plugin-Design_Basic_FormulaD_Invalid_Formula=\u975E\u6CD5\u7684\u516C\u5F0F +Plugin-Design_Basic_FormulaD_Math_&_Trig=\u6570\u5B66\u548C\u4E09\u89D2\u51FD\u6570 +Plugin-Design_Basic_FormulaD_Text=\u6587\u672C\u51FD\u6570 +Plugin-Design_Basic_FormulaD_Date_&_Time=\u65F6\u95F4\u65E5\u671F\u51FD\u6570 +Plugin-Design_Basic_FormulaD_Logical=\u903B\u8F91\u51FD\u6570 +Plugin-Design_Basic_FormulaD_Array=\u6570\u7EC4\u51FD\u6570 +Plugin-Design_Basic_FormulaD_Report=\u62A5\u8868\u51FD\u6570 +Plugin-Design_Basic_FormulaD_Other=\u5176\u4ED6\u51FD\u6570 +Plugin-Design_Basic_Function_Type_Hierarchy=\u5C42\u6B21\u5750\u6807\u51FD\u6570 +Plugin-Design_Basic_FormulaD_All=\u5168\u90E8\u51FD\u6570 +Plugin-Design_Basic_FormulaD_Most_Recently_Used=\u6700\u5E38\u4F7F\u7528\u51FD\u6570 +Plugin-Design_Basic_FormulaD_Custom_Function=\u81EA\u5B9A\u4E49\u51FD\u6570 +Plugin-Design_Basic_Base_Formula_Plugin=\u63D2\u4EF6\u51FD\u6570 \ No newline at end of file diff --git a/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_zh_TW.properties b/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_zh_TW.properties index dde1070..ec14783 100644 --- a/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_zh_TW.properties +++ b/src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_zh_TW.properties @@ -20,4 +20,16 @@ Plugin-Design_Basic_Export_Save_Formula=\u532F\u51FA/\u7DE8\u8F2F\u7D50\u679C\u6 Plugin-Design_Basic_Write_Save_Formula=\u586B\u5831/\u5206\u6790\u6642\uFF0C\u4FDD\u7559\u516C\u5F0F\u7528\u65BC\u8A08\u7B97 Plugin-Design_Basic_FormulaPane_Tips=\u63D0\u793A\\:\u60A8\u53EF\u4EE5\u901A\u904E\u8F38\u5165B1\u4F86\u5BEB\u5165\u7B2C\u4E00\u884C\u7B2C\u4E8C\u5217\u7684\u6578\u64DA\u3002 Plugin-Design_Basic_FormulaD_Valid_Formula=\u5408\u6CD5\u7684\u516C\u5F0F -Plugin-Design_Basic_FormulaD_Invalid_Formula=\u975E\u6CD5\u7684\u516C\u5F0F \ No newline at end of file +Plugin-Design_Basic_FormulaD_Invalid_Formula=\u975E\u6CD5\u7684\u516C\u5F0F +Plugin-Design_Basic_FormulaD_Math_&_Trig=\u6578\u5B78\u548C\u4E09\u89D2\u51FD\u6578 +Plugin-Design_Basic_FormulaD_Text=\u6587\u5B57\u51FD\u6578 +Plugin-Design_Basic_FormulaD_Date_&_Time=\u6642\u9593\u65E5\u671F\u51FD\u6578 +Plugin-Design_Basic_FormulaD_Logical=\u908F\u8F2F\u51FD\u6578 +Plugin-Design_Basic_FormulaD_Array=\u6578\u7D44\u51FD\u6578 +Plugin-Design_Basic_FormulaD_Report=\u5831\u8868\u51FD\u6578 +Plugin-Design_Basic_FormulaD_Other=\u5176\u4ED6\u51FD\u6578 +Plugin-Design_Basic_Function_Type_Hierarchy=\u5C64\u6B21\u5EA7\u6A19\u51FD\u6578 +Plugin-Design_Basic_FormulaD_All=\u5168\u90E8\u51FD\u6578 +Plugin-Design_Basic_FormulaD_Most_Recently_Used=\u6700\u5E38\u4F7F\u7528\u51FD\u6578 +Plugin-Design_Basic_FormulaD_Custom_Function=\u81EA\u5B9A\u7FA9\u51FD\u6578 +Plugin-Design_Basic_Base_Formula_Plugin=\u633F\u4EF6\u51FD\u6578 \ No newline at end of file