Browse Source

10.0支持

9.0
richie 6 years ago
parent
commit
6788064856
  1. 3
      .gitignore
  2. 97
      plugin-formula-script.iml
  3. 29
      pom.xml
  4. 5
      src/com/fr/solution/plugin/design/formula/locale/formula.properties
  5. 5
      src/com/fr/solution/plugin/design/formula/locale/formula_en_US.properties
  6. 5
      src/com/fr/solution/plugin/design/formula/locale/formula_ja_JP.properties
  7. 5
      src/com/fr/solution/plugin/design/formula/locale/formula_zh_CN.properties
  8. 0
      src/main/java/com/fr/solution/plugin/design/formula/FormulaConstants.java
  9. 0
      src/main/java/com/fr/solution/plugin/design/formula/ScriptFormulaLocalFinder.java
  10. 0
      src/main/java/com/fr/solution/plugin/design/formula/ScriptFormulaUI.java
  11. 39
      src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java
  12. 4
      src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPaneWhenReserveFormula.java
  13. 0
      src/main/java/com/fr/solution/plugin/design/formula/ui/evt/OperateListener.java
  14. 8
      src/main/java/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java
  15. 0
      src/main/java/com/fr/solution/plugin/design/formula/ui/type/CategoryFormulaPane.java
  16. 0
      src/main/java/com/fr/solution/plugin/design/formula/ui/type/CommonEvent.java
  17. 0
      src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/BasicFormulaPane.java
  18. 2
      src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/ScriptFormulaPane.java
  19. 23
      src/main/resources/com/fr/solution/plugin/design/formula/locale/formula.properties
  20. 23
      src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_en_US.properties
  21. 23
      src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_ja_JP.properties
  22. 23
      src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_zh_CN.properties

3
.gitignore vendored

@ -0,0 +1,3 @@
*.iml
.idea/
target/

97
plugin-formula-script.iml

@ -1,97 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager">
<output url="file://$USER_HOME$/Documents/finereport/master-9.0/finereport-collection/env/WebReport/WEB-INF/plugins/plugin-com.fr.solution.plugin.design.formula.script-3.0/classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="jdk1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="lib" level="project" />
<orderEntry type="module" module-name="base-attachments" />
<orderEntry type="module" module-name="base-attachments-interface" />
<orderEntry type="module" module-name="base-basic" />
<orderEntry type="module" module-name="base-cache" />
<orderEntry type="module" module-name="base-calculate" />
<orderEntry type="module" module-name="base-cluster" />
<orderEntry type="module" module-name="base-cluster-interface" />
<orderEntry type="module" module-name="base-cluster-rpc" />
<orderEntry type="module" module-name="base-condition" />
<orderEntry type="module" module-name="base-connection" />
<orderEntry type="module" module-name="base-data-base" />
<orderEntry type="module" module-name="base-db-handler" />
<orderEntry type="module" module-name="base-dialect" />
<orderEntry type="module" module-name="base-excel" />
<orderEntry type="module" module-name="base-fr-log" />
<orderEntry type="module" module-name="base-general-base" />
<orderEntry type="module" module-name="base-general-data" />
<orderEntry type="module" module-name="base-i18n" />
<orderEntry type="module" module-name="base-license" />
<orderEntry type="module" module-name="base-platform" />
<orderEntry type="module" module-name="base-plugin" />
<orderEntry type="module" module-name="base-privilege-interface" />
<orderEntry type="module" module-name="base-write" />
<orderEntry type="module" module-name="base-xml-filemanager" />
<orderEntry type="module" module-name="basic-base" />
<orderEntry type="module" module-name="basic-chart" />
<orderEntry type="module" module-name="basic-email" />
<orderEntry type="module" module-name="basic-form" />
<orderEntry type="module" module-name="basic-function" />
<orderEntry type="module" module-name="basic-headerfooter" />
<orderEntry type="module" module-name="basic-module" />
<orderEntry type="module" module-name="basic-plugin" />
<orderEntry type="module" module-name="basic-privilege" />
<orderEntry type="module" module-name="basic-record" />
<orderEntry type="module" module-name="basic-upload" />
<orderEntry type="module" module-name="basic-web" />
<orderEntry type="module" module-name="chart-base" />
<orderEntry type="module" module-name="chart-chartattr" />
<orderEntry type="module" module-name="chart-chartdata" />
<orderEntry type="module" module-name="chart-chartglyph" />
<orderEntry type="module" module-name="chart-web" />
<orderEntry type="module" module-name="core-clone" />
<orderEntry type="module" module-name="core-collections" />
<orderEntry type="module" module-name="core-common" />
<orderEntry type="module" module-name="core-gif" />
<orderEntry type="module" module-name="core-http" />
<orderEntry type="module" module-name="core-i18n-interface" />
<orderEntry type="module" module-name="core-image4j" />
<orderEntry type="module" module-name="core-json" />
<orderEntry type="module" module-name="core-jwt" />
<orderEntry type="module" module-name="core-log-interface" />
<orderEntry type="module" module-name="core-log4j" />
<orderEntry type="module" module-name="core-monitor" />
<orderEntry type="module" module-name="core-performance" />
<orderEntry type="module" module-name="core-pinyin" />
<orderEntry type="module" module-name="core-plugin-interface" />
<orderEntry type="module" module-name="core-project" />
<orderEntry type="module" module-name="core-project-base" />
<orderEntry type="module" module-name="core-project-plugin-interface" />
<orderEntry type="module" module-name="core-security" />
<orderEntry type="module" module-name="core-sqlparser" />
<orderEntry type="module" module-name="core-unit" />
<orderEntry type="module" module-name="core-web" />
<orderEntry type="module" module-name="core-xml" />
<orderEntry type="module" module-name="core-zip4j" />
<orderEntry type="module" module-name="designer" />
<orderEntry type="module" module-name="designer_base" />
<orderEntry type="module" module-name="designer_chart" />
<orderEntry type="module" module-name="designer_form" />
<orderEntry type="module" module-name="engine" />
<orderEntry type="module" module-name="engine-cross" />
<orderEntry type="module" module-name="engine-enhancement" />
<orderEntry type="module" module-name="engine-file" />
<orderEntry type="module" module-name="engine-page" />
<orderEntry type="module" module-name="engine-remote" />
<orderEntry type="module" module-name="engine-view" />
<orderEntry type="module" module-name="engine-write" />
<orderEntry type="module" module-name="fmobile" />
<orderEntry type="module" module-name="form" />
<orderEntry type="module" module-name="fr-unit-test" />
<orderEntry type="module" module-name="fsbakrestore" />
<orderEntry type="module" module-name="fschedule" />
<orderEntry type="module" module-name="fservice" />
<orderEntry type="module" module-name="fsmonitor" />
<orderEntry type="module" module-name="fsworkflow" />
</component>
</module>

29
pom.xml

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.fr.plugin</groupId>
<artifactId>starter</artifactId>
<version>10.0</version>
</parent>
<packaging>jar</packaging>
<artifactId>plugin-formula-script</artifactId>
<build>
<!---如果要更改调试插件,改这里的配置就可以了-->
<outputDirectory>${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.solution.plugin.design.formula.script-1.0/classes</outputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>6</source>
<target>6</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

5
src/com/fr/solution/plugin/design/formula/locale/formula.properties

@ -1,5 +0,0 @@
FR-Designer_Group_Formula_Script_Title=Script Formula
FR-Designer_Group_Formula_Basic_Title=Basic Formula
FR-Designer_Group_Formula_Calculate=Calculate
FR-Designer_Group_Formula_Result=Result
FR-Designer_Group_Formula_Calculate_Error=Error

5
src/com/fr/solution/plugin/design/formula/locale/formula_en_US.properties

@ -1,5 +0,0 @@
FR-Designer_Group_Formula_Script_Title=Script Formula
FR-Designer_Group_Formula_Basic_Title=Basic Formula
FR-Designer_Group_Formula_Calculate=Calculate
FR-Designer_Group_Formula_Result=Result
FR-Designer_Group_Formula_Calculate_Error=Error

5
src/com/fr/solution/plugin/design/formula/locale/formula_ja_JP.properties

@ -1,5 +0,0 @@
FR-Designer_Group_Formula_Script_Title=Script Formula
FR-Designer_Group_Formula_Basic_Title=Basic Formula
FR-Designer_Group_Formula_Calculate=Calculate
FR-Designer_Group_Formula_Result=Result
FR-Designer_Group_Formula_Calculate_Error=Error

5
src/com/fr/solution/plugin/design/formula/locale/formula_zh_CN.properties

@ -1,5 +0,0 @@
FR-Designer_Group_Formula_Script_Title=\u811A\u672C\u516C\u5F0F
FR-Designer_Group_Formula_Basic_Title=\u5E38\u89C4\u516C\u5F0F
FR-Designer_Group_Formula_Calculate=\u5B9E\u65F6\u8BA1\u7B97
FR-Designer_Group_Formula_Result=\u516C\u5F0F\u7684\u8BA1\u7B97\u7ED3\u679C\u4E3A
FR-Designer_Group_Formula_Calculate_Error=\u53D1\u751F\u9519\u8BEF\uFF0C\u9519\u8BEF\u4FE1\u606F\u4E3A

0
src/com/fr/solution/plugin/design/formula/FormulaConstants.java → src/main/java/com/fr/solution/plugin/design/formula/FormulaConstants.java

0
src/com/fr/solution/plugin/design/formula/ScriptFormulaLocalFinder.java → src/main/java/com/fr/solution/plugin/design/formula/ScriptFormulaLocalFinder.java

0
src/com/fr/solution/plugin/design/formula/ScriptFormulaUI.java → src/main/java/com/fr/solution/plugin/design/formula/ScriptFormulaUI.java

39
src/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java → src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPane.java

@ -4,7 +4,6 @@ import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
import com.fr.base.Parameter;
import com.fr.base.ParameterHelper;
import com.fr.base.ParameterMapNameSpace;
import com.fr.base.io.IOFile;
import com.fr.data.TableDataSource;
@ -123,7 +122,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("FormulaD-Input_formula_in_the_text_area_below") + ":"
UILabel formulaLabel = new UILabel(Inter.getLocText("Plugin-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":"
+ " ");
formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
@ -136,10 +135,10 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
initTipsPane();
UIButton checkValidButton = new UIButton(Inter.getLocText("FormulaD-Check_Valid"));
UIButton checkValidButton = new UIButton(Inter.getLocText("Plugin-Design_Basic_FormulaD_Check_Valid"));
checkValidButton.addActionListener(checkValidActionListener);
UIButton calculateButton = new UIButton(Inter.getLocText("FR-Designer_Group_Formula_Calculate"));
UIButton calculateButton = new UIButton(Inter.getLocText("Plugin-Design_Group_Formula_Calculate"));
calculateButton.addActionListener(calculateActionListener);
JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
@ -158,7 +157,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("FR-Designer_FormulaPane_Search"));
UIButton searchButton = new UIButton(Inter.getLocText("Plugin-Design_Basic_FormulaPane_Search"));
searchPane.add(searchButton, BorderLayout.EAST);
tipsPane.add(searchPane, BorderLayout.NORTH);
initKeyWordTextFieldKeyListener();
@ -290,7 +289,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
@Override
protected String title4PopupWindow() {
return Inter.getLocText("FormulaD-Formula_Definition");
return Inter.getLocText("Plugin-Design_Basic_FormulaD_Formula_Definition");
}
/**
@ -325,7 +324,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
Calculator calculator = Calculator.createCalculator();
JTemplate<?, ?> template = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
if (template != null) {
IOFile file = template.getTarget();
IOFile file = (IOFile) template.getTarget();
calculator.setAttribute(TableDataSource.class, file);
calculator.pushNameSpace(SimpleCellValueNameSpace.getInstance());
}
@ -350,9 +349,9 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
String message;
try {
Object result = formula.evalValue(calculator);
message = Inter.getLocText("FR-Designer_Group_Formula_Result") + ":" + GeneralUtils.objectToString(result);
message = Inter.getLocText("Plugin-Design_Group_Formula_Result") + ":" + GeneralUtils.objectToString(result);
} catch (UtilEvalError utilEvalError) {
message = Inter.getLocText("FR-Designer_Group_Formula_Calculate_Error") + ":" + utilEvalError.getMessage();
message = Inter.getLocText("Plugin-Design_Group_Formula_Calculate_Error") + ":" + utilEvalError.getMessage();
}
return message;
}
@ -371,7 +370,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("FormulaD-Function_category") + ":", functionTypeScrollPane), BorderLayout.WEST);
functionPane.add(this.createNamePane(Inter.getLocText("Plugin-Design_Basic_FormulaD_Function_Category") + ":", functionTypeScrollPane), BorderLayout.WEST);
initTypeListCellRenderer();
initGroupTypeModel();
initTypeListSelectionListener();
@ -485,7 +484,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("FormulaD-Function_name") + ":", functionNameScrollPane),
this.createNamePane(Inter.getLocText("Plugin-Design_Basic_FormulaD_Function_Name") + ":", functionNameScrollPane),
BorderLayout.CENTER);
functionNameScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
initFunctionNameListCellRenderer();
@ -499,7 +498,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea);
desScrollPane.setBorder(null);
this.add(this.createNamePane(Inter.getLocText("FR-Designer_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST);
this.add(this.createNamePane(Inter.getLocText("Plugin-Design_Basic_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST);
descriptionTextArea.setBackground(Color.white);
descriptionTextArea.setLineWrap(true);
descriptionTextArea.setWrapStyleWord(true);
@ -572,7 +571,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("FR-Designer_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.CENTER);
Inter.getLocText("Plugin-Design_Basic_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.CENTER);
variablesTree.setRootVisible(false);
variablesTree.setShowsRootHandles(true);
variablesTree.addMouseListener(applyTextMouseListener);
@ -601,7 +600,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
private class LookDetailAction extends UpdateAction {
public LookDetailAction() {
this.setName(Inter.getLocText("FR-Designer_FormulaPane_Function_Detail"));
this.setName(Inter.getLocText("Plugin-Design_Basic_FormulaPane_Function_Detail"));
this.setMnemonic('L');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png"));
}
@ -616,7 +615,7 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
BasicPane basicPane = new BasicPane() {
@Override
protected String title4PopupWindow() {
return Inter.getLocText("FR-Designer_FormulaPane_Function_Detail");
return Inter.getLocText("Plugin-Design_Basic_FormulaPane_Function_Detail");
}
};
basicPane.setLayout(FRGUIPaneFactory.createBorderLayout());
@ -705,24 +704,24 @@ public class GroupFormulaPane extends BasicPane implements UIFormula, OperateLis
rootNode.add(bindCellNode);
}
rootNode.add(new TextFolderUserObject(Inter.getLocText("FormulaD-Data_Fields"),
rootNode.add(new TextFolderUserObject(Inter.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("FR-Designer_FormulaPane_Variables"),
rootNode.add(new TextFolderUserObject(Inter.getLocText("Plugin-Design_Basic_FormulaPane_Variables"),
BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"),
variableResolver.resolveCurReportVariables()).createMutableTreeNode());
rootNode.add(new TextFolderUserObject(Inter.getLocText(new String[]{"Datasource-Datasource", "Parameter"}),
rootNode.add(new TextFolderUserObject(Inter.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("ParameterD-Report_Parameter"),
rootNode.add(new TextFolderUserObject(Inter.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("M_Server-Global_Parameters"),
rootNode.add(new TextFolderUserObject(Inter.getLocText("Plugin-Design_Basic_M_Server_Global_Parameters"),
BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"),
variableResolver.resolveGlobalParameterVariables()).createMutableTreeNode());

4
src/com/fr/solution/plugin/design/formula/ui/GroupFormulaPaneWhenReserveFormula.java → src/main/java/com/fr/solution/plugin/design/formula/ui/GroupFormulaPaneWhenReserveFormula.java

@ -20,7 +20,7 @@ public class GroupFormulaPaneWhenReserveFormula extends GroupFormulaPane {
@Override
protected void extendCheckBoxPane(JPanel checkBoxPane) {
reserveCheckBox4Result = new UICheckBox(Inter.getLocText("FR-Designer_Export-Save-Formula"));
reserveCheckBox4Result = new UICheckBox(Inter.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("FR-Designer_Write-Save-Formula"));
reserveCheckBox4Write = new UICheckBox(Inter.getLocText("Plugin-Design_Basic_Write_Save_Formula"));
reserveCheckBox4Write.setSelected(false);
checkBoxPane.add(reserveCheckBox4Result, BorderLayout.CENTER);

0
src/com/fr/solution/plugin/design/formula/ui/evt/OperateListener.java → src/main/java/com/fr/solution/plugin/design/formula/ui/evt/OperateListener.java

8
src/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java → src/main/java/com/fr/solution/plugin/design/formula/ui/type/BaseFormulaPane.java

@ -63,7 +63,7 @@ public abstract class BaseFormulaPane<T extends BaseFormula> extends FurtherBasi
formulaTextArea.setForeground(Color.black);
String text = formulaTextArea.getText();
// 判断在中文输入状态是否还包含提示符 要删掉
String tip = "\n\n\n" + Inter.getLocText("FR-Designer_FormulaPane_Tips");
String tip = "\n\n\n" + Inter.getLocText("Plugin-Design_Basic_FormulaPane_Tips");
if (text.contains(tip)) {
text = text.substring(0, text.indexOf(tip));
insertPosition = 0;
@ -151,7 +151,7 @@ public abstract class BaseFormulaPane<T extends BaseFormula> extends FurtherBasi
protected void fixContent(String content) {
if (content.trim().equals("=")) {
this.formulaTextArea.setForeground(Color.gray);
this.formulaTextArea.setText("\n\n\n" + Inter.getLocText("FR-Designer_FormulaPane_Tips"));
this.formulaTextArea.setText("\n\n\n" + Inter.getLocText("Plugin-Design_Basic_FormulaPane_Tips"));
this.formulaTextArea.setCaretPosition(0);
ifHasBeenWritten = 0;
operateListener.clearMathListModel();
@ -320,7 +320,7 @@ public abstract class BaseFormulaPane<T extends BaseFormula> extends FurtherBasi
JOptionPane.showMessageDialog(
BaseFormulaPane.this,
(expression != null ? Inter.getLocText("FormulaD-Valid_Formula") : Inter.getLocText("FormulaD-Invalid_Formula")) + ".", ProductConstants.PRODUCT_NAME,
(expression != null ? Inter.getLocText("Plugin-Design_Basic_FormulaD_Valid_Formula") : Inter.getLocText("Plugin-Design_Basic_FormulaD_Invalid_Formula")) + ".", ProductConstants.PRODUCT_NAME,
JOptionPane.INFORMATION_MESSAGE);
}
}
@ -336,6 +336,6 @@ public abstract class BaseFormulaPane<T extends BaseFormula> extends FurtherBasi
@Override
public String title4PopupWindow() {
return Inter.getLocText("FR-Designer_Group_Formula_Basic_Title");
return Inter.getLocText("Plugin-Design_Group_Formula_Basic_Title");
}
}

0
src/com/fr/solution/plugin/design/formula/ui/type/CategoryFormulaPane.java → src/main/java/com/fr/solution/plugin/design/formula/ui/type/CategoryFormulaPane.java

0
src/com/fr/solution/plugin/design/formula/ui/type/CommonEvent.java → src/main/java/com/fr/solution/plugin/design/formula/ui/type/CommonEvent.java

0
src/com/fr/solution/plugin/design/formula/ui/type/impl/BasicFormulaPane.java → src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/BasicFormulaPane.java

2
src/com/fr/solution/plugin/design/formula/ui/type/impl/ScriptFormulaPane.java → src/main/java/com/fr/solution/plugin/design/formula/ui/type/impl/ScriptFormulaPane.java

@ -78,6 +78,6 @@ public class ScriptFormulaPane extends BaseFormulaPane<ScriptFormula> {
@Override
public String title4PopupWindow() {
return Inter.getLocText("FR-Designer_Group_Formula_Script_Title");
return Inter.getLocText("Plugin-Design_Group_Formula_Script_Title");
}
}

23
src/main/resources/com/fr/solution/plugin/design/formula/locale/formula.properties

@ -0,0 +1,23 @@
Plugin-Design_Group_Formula_Script_Title=Script Formula
Plugin-Design_Group_Formula_Basic_Title=Basic Formula
Plugin-Design_Group_Formula_Calculate=Calculate
Plugin-Design_Group_Formula_Result=Result
Plugin-Design_Group_Formula_Calculate_Error=Error
Plugin-Design_Basic_FormulaD_Check_Valid=Check Valid
Plugin-Design_Basic_FormulaPane_Search=Search
Plugin-Design_Basic_FormulaD_Formula_Definition=Definition
Plugin-Design_Basic_FormulaD_Function_Category=Category
Plugin-Design_Basic_FormulaD_Function_Name=Name
Plugin-Design_Basic_FormulaPane_Formula_Description=Description
Plugin-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below=Input formula in the text area below
Plugin-Design_Basic_FormulaPane_Variables=Variables
Plugin-Design_Basic_FormulaPane_Function_Detail= Function Detail
Plugin-Design_Basic_FormulaD_Data_Fields=Data Fields
Plugin-Design_Basic_Parameter_Source_Type_Tabledata=Tabledata parameter
Plugin-Design_Basic_ParameterD_Report_Parameter=Report Parameter
Plugin-Design_Basic_M_Server_Global_Parameters=Global Parameters
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

23
src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_en_US.properties

@ -0,0 +1,23 @@
Plugin-Design_Group_Formula_Script_Title=Script Formula
Plugin-Design_Group_Formula_Basic_Title=Basic Formula
Plugin-Design_Group_Formula_Calculate=Calculate
Plugin-Design_Group_Formula_Result=Result
Plugin-Design_Group_Formula_Calculate_Error=Error
Plugin-Design_Basic_FormulaD_Check_Valid=Check Valid
Plugin-Design_Basic_FormulaPane_Search=Search
Plugin-Design_Basic_FormulaD_Formula_Definition=Definition
Plugin-Design_Basic_FormulaD_Function_Category=Category
Plugin-Design_Basic_FormulaD_Function_Name=Name
Plugin-Design_Basic_FormulaPane_Formula_Description=Description
Plugin-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below=Input formula in the text area below
Plugin-Design_Basic_FormulaPane_Variables=Variables
Plugin-Design_Basic_FormulaPane_Function_Detail=Function Detail
Plugin-Design_Basic_FormulaD_Data_Fields=Data Fields
Plugin-Design_Basic_Parameter_Source_Type_Tabledata=Tabledata parameter
Plugin-Design_Basic_ParameterD_Report_Parameter=Report Parameter
Plugin-Design_Basic_M_Server_Global_Parameters=Global Parameters
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

23
src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_ja_JP.properties

@ -0,0 +1,23 @@
Plugin-Design_Group_Formula_Script_Title=Script Formula
Plugin-Design_Group_Formula_Basic_Title=Basic Formula
Plugin-Design_Group_Formula_Calculate=Calculate
Plugin-Design_Group_Formula_Result=Result
Plugin-Design_Group_Formula_Calculate_Error=Error
Plugin-Design_Basic_FormulaD_Check_Valid=Check Valid
Plugin-Design_Basic_FormulaPane_Search=Search
Plugin-Design_Basic_FormulaD_Formula_Definition=Definition
Plugin-Design_Basic_FormulaD_Function_Category=Category
Plugin-Design_Basic_FormulaD_Function_Name=Name
Plugin-Design_Basic_FormulaPane_Formula_Description=Description
Plugin-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below=Input formula in the text area below
Plugin-Design_Basic_FormulaPane_Variables=Variables
Plugin-Design_Basic_FormulaPane_Function_Detail=Function Detail
Plugin-Design_Basic_FormulaD_Data_Fields=Data Fields
Plugin-Design_Basic_Parameter_Source_Type_Tabledata=Tabledata parameter
Plugin-Design_Basic_ParameterD_Report_Parameter=Report Parameter
Plugin-Design_Basic_M_Server_Global_Parameters=Global Parameters
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

23
src/main/resources/com/fr/solution/plugin/design/formula/locale/formula_zh_CN.properties

@ -0,0 +1,23 @@
Plugin-Design_Group_Formula_Script_Title=\u811A\u672C\u516C\u5F0F
Plugin-Design_Group_Formula_Basic_Title=\u5E38\u89C4\u516C\u5F0F
Plugin-Design_Group_Formula_Calculate=\u5B9E\u65F6\u8BA1\u7B97
Plugin-Design_Group_Formula_Result=\u516C\u5F0F\u7684\u8BA1\u7B97\u7ED3\u679C\u4E3A
Plugin-Design_Group_Formula_Calculate_Error=\u53D1\u751F\u9519\u8BEF\uFF0C\u9519\u8BEF\u4FE1\u606F\u4E3A
Plugin-Design_Basic_FormulaD_Check_Valid=\u68C0\u67E5\u5408\u6CD5\u6027
Plugin-Design_Basic_FormulaPane_Search=\u641C\u7D22
Plugin-Design_Basic_FormulaD_Formula_Definition=\u51FD\u6570\u5B9A\u4E49
Plugin-Design_Basic_FormulaD_Function_Category=\u51FD\u6570\u7C7B\u578B
Plugin-Design_Basic_FormulaD_Function_Name=\u51FD\u6570\u540D
Plugin-Design_Basic_FormulaPane_Formula_Description=\u516C\u5F0F\u8BF4\u660E
Plugin-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below=\u8BF7\u5728\u4E0B\u9762\u7684\u6587\u672C\u7F16\u8F91\u6846\u91CC\u9762\u8F93\u5165\u516C\u5F0F
Plugin-Design_Basic_FormulaPane_Variables=\u53D8\u91CF
Plugin-Design_Basic_FormulaPane_Function_Detail=\u51FD\u6570\u660E\u7EC6
Plugin-Design_Basic_FormulaD_Data_Fields=\u6570\u636E\u9879
Plugin-Design_Basic_Parameter_Source_Type_Tabledata=\u6570\u636E\u96C6\u53C2\u6570
Plugin-Design_Basic_ParameterD_Report_Parameter=\u62A5\u8868\u53C2\u6570
Plugin-Design_Basic_M_Server_Global_Parameters=\u5168\u5C40\u53C2\u6570
Plugin-Design_Basic_Export_Save_Formula=\u5BFC\u51FA/\u7F16\u8F91\u7ED3\u679C\u65F6,\u4FDD\u7559\u516C\u5F0F
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
Loading…
Cancel
Save