Browse Source

REPORT-13441 & REPORT-13442

bugfix/10.0
Mata.Li 6 years ago
parent
commit
aabedeaa0b
  1. 2
      designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java

2
designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java

@ -607,7 +607,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
} else { } else {
liteCondition = new FormulaCondition(formulaTextArea.getText()); liteCondition = new FormulaCondition(formulaTextArea.getText());
} }
//修改的时候加入判断条件类型 REPORT-13441 //修改的时候加入判断条件重复 REPORT-13441
boolean result = isExistedInParentTreeNode(parentTreeNode, liteCondition, true); boolean result = isExistedInParentTreeNode(parentTreeNode, liteCondition, true);
if (result) { if (result) {
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this), JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),

Loading…
Cancel
Save