Browse Source

Pull request #13358: REPORT-111169 数据集含有注释的参数,但参数依然生效

Merge in DESIGN/design from ~YUAN.WANG/design:release/11.0 to release/11.0

* commit '4e51294812ca53b2cc3c8fcfc4bc35200c4f0305':
  REPORT-111169 数据集含有注释的参数,但参数依然生效
release/11.0
Yuan.Wang-王垣 11 months ago
parent
commit
ab6bca297c
  1. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

4
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@ -417,8 +417,8 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
private void checkParameter() { private void checkParameter() {
String[] paramTexts = new String[2]; String[] paramTexts = new String[2];
paramTexts[0] = this.sqlTextPane.getText(); paramTexts[0] = SqlUtils.clearSqlComments(this.sqlTextPane.getText());
paramTexts[1] = this.pageQuery; paramTexts[1] = SqlUtils.clearSqlComments(this.pageQuery);
Parameter[] parameters = ParameterHelper.analyze4Parameters(paramTexts, false); Parameter[] parameters = ParameterHelper.analyze4Parameters(paramTexts, false);
if (parameters.length < 1 && this.editorPane.update().size() < 1) { if (parameters.length < 1 && this.editorPane.update().size() < 1) {

Loading…
Cancel
Save