Browse Source

Merge pull request #1583 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '78d85bdeeeb75edf0d77ae057b83536c59db4b04':
  REPORT-29886 中文写死情况排查修正
feature/big-screen
Hades 5 years ago
parent
commit
363410113d
  1. 28
      designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java

28
designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java

@ -220,8 +220,8 @@ public class JavaEditorPane extends BasicPane {
" }\n" + " }\n" +
"\n" + "\n" +
" /**\n" + " /**\n" +
" * 获取数据集的列数\n" + " * Get the number of columns in a dataset\n" +
" * @return 数据集的列\n" + " * @return Dataset columns\n" +
" * @throws TableDataException\n" + " * @throws TableDataException\n" +
" */\n" + " */\n" +
" public int getColumnCount() throws TableDataException {\n" + " public int getColumnCount() throws TableDataException {\n" +
@ -229,9 +229,9 @@ public class JavaEditorPane extends BasicPane {
" }\n" + " }\n" +
"\n" + "\n" +
" /**\n" + " /**\n" +
" * 获取数据集指定列的列名\n" + " * Get the column name of the specified column of the dataset\n" +
" * @param columnIndex 指定列的索引\n" + " * @param columnIndex The index of the specified column\n" +
" * @return 指定列的列名\n" + " * @return The column name of the specified column\n" +
" * @throws TableDataException\n" + " * @throws TableDataException\n" +
" */\n" + " */\n" +
" public String getColumnName(int columnIndex) throws TableDataException {\n" + " public String getColumnName(int columnIndex) throws TableDataException {\n" +
@ -239,8 +239,8 @@ public class JavaEditorPane extends BasicPane {
" }\n" + " }\n" +
"\n" + "\n" +
" /**\n" + " /**\n" +
" * 获取数据集的行数\n" + " * Get the number of rows in the dataset\n" +
" * @return 数据集数据行数\n" + " * @return Dataset rows\n" +
" * @throws TableDataException\n" + " * @throws TableDataException\n" +
" */\n" + " */\n" +
" public int getRowCount() throws TableDataException {\n" + " public int getRowCount() throws TableDataException {\n" +
@ -248,10 +248,10 @@ public class JavaEditorPane extends BasicPane {
" }\n" + " }\n" +
"\n" + "\n" +
" /**\n" + " /**\n" +
" * 获取数据集指定位置上的值\n" + " * Get the value at the specified position in the dataset\n" +
" * @param rowIndex 指定的行索引\n" + " * @param rowIndex The specified row index\n" +
" * @param columnIndex 指定的列索引\n" + " * @param columnIndex The specified column index\n" +
" * @return 指定位置的值\n" + " * @return The value of the specified location\n" +
" */\n" + " */\n" +
" public Object getValueAt(int rowIndex, int columnIndex) {\n" + " public Object getValueAt(int rowIndex, int columnIndex) {\n" +
" return null;\n" + " return null;\n" +
@ -263,12 +263,12 @@ public class JavaEditorPane extends BasicPane {
"import com.fr.script.AbstractFunction;\n" + "import com.fr.script.AbstractFunction;\n" +
"\n" + "\n" +
"/**\n" + "/**\n" +
" * 自定义函数\n" + " * Custom function\n" +
" */\n" + " */\n" +
"public class CustomFun extends AbstractFunction {\n" + "public class CustomFun extends AbstractFunction {\n" +
" /**\n" + " /**\n" +
" * @param args 函数的参数,是经过了算子处理了其中特殊参数的\n" + " * @param args The parameters of the function are processed by calculator with special parameters\n" +
" * @return 经过函数处理的值,用于参与最终计算\n" + " * @return The value processed by the function is used to participate in the final calculation\n" +
" */\n" + " */\n" +
" public Object run(Object[] args) {\n" + " public Object run(Object[] args) {\n" +
" return null;\n" + " return null;\n" +

Loading…
Cancel
Save