修复分组条件保存后不能编辑的BUG

ureport2-core/src/main/java/com/bstek/ureport/expression/parse/builder/BaseExpressionBuilder.java

@@ -102,6 +102,7 @@ public abstract class BaseExpressionBuilder implements ExpressionBuilder{
 			condition.setRight(rightExpr);
 			condition.setRightExpression(ExpressionUtils.parseExpression(rightExpr));
 			condition.setOp(parseOp(ctx.OP()));
+			condition.setOperation(ctx.OP().getText());
 			return condition;
 		}else if(context instanceof CurrentValueConditionContext){
 			CurrentValueConditionContext ctx=(CurrentValueConditionContext)context;

ureport2-core/src/main/java/com/bstek/ureport/parser/impl/ConditionParameterItemParser.java

@@ -115,7 +115,9 @@ public class ConditionParameterItemParser implements Parser<ConditionPropertyIte
 			String property=ele.attributeValue("property");
 			condition.setLeftProperty(property);
 			condition.setLeft(property);
-			condition.setOp(Op.parse(ele.attributeValue("op")));
+			String operation=ele.attributeValue("op");
+			condition.setOperation(operation);
+			condition.setOp(Op.parse(operation));
 			for(Object o:ele.elements()){
 				if(o==null || !(o instanceof Element)){
 					continue;

ureport2-core/src/main/java/com/bstek/ureport/parser/impl/value/DatasetValueParser.java

@@ -126,7 +126,9 @@ public class DatasetValueParser extends ValueParser {
 		String property=ele.attributeValue("property");
 		condition.setLeftProperty(property);
 		condition.setLeft(property);
-		condition.setOp(Op.parse(ele.attributeValue("op")));
+		String operation=ele.attributeValue("op");
+		condition.setOperation(operation);
+		condition.setOp(Op.parse(operation));
 		for(Object o:ele.elements()){
 			if(o==null || !(o instanceof Element)){
 				continue;

ureport2-js/src/Utils.js

@@ -176,7 +176,7 @@ export function tableToXml(context){
                     for(let groupItem of groupItems){
                         cellXml+=`<group-item name="${groupItem.name}">`;
                         for(let condition of groupItem.conditions){
-                            cellXml+=`<condition property="${condition.left}" op="${encode(condition.op)}" id="${condition.id}"`;
+                            cellXml+=`<condition property="${condition.left}" op="${encode(condition.operation || condition.op)}" id="${condition.id}"`;
                             if(condition.join){
                                 cellXml+=` join="${condition.join}">`;
                             }else{

ureport2-js/src/dialog/CustomGroupDialog.js

@@ -112,7 +112,8 @@ export default class CustomGroupDialog{
             const conditions=selectionOption.data().conditions;
             let index=0;
             for(let condition of conditions){
-                let text=condition.left+" "+condition.op+" "+condition.right;
+                const op=condition.operation || condition.op;
+                let text=condition.left+" "+op+" "+condition.right;
                 const join=condition.join;
                 if(index>0 && join){
                     text=join+" "+text;
@@ -151,7 +152,7 @@ export default class CustomGroupDialog{
             const conditions=groupItem.conditions;
             const conditionDialog=new ConditionDialog(conditions);
             conditionDialog.show(function(leftProperty,op,rightExpression,join){
-                const c={left:leftProperty,op,right:rightExpression,join,id:uuid.v1()};
+                const c={left:leftProperty,op,operation:op,right:rightExpression,join,id:uuid.v1()};
                 conditions.push(c);
                 let text=leftProperty+" "+op+" "+rightExpression;
                 if(join){
@@ -190,6 +191,7 @@ export default class CustomGroupDialog{
                 }
                 targetCondition.left=leftProperty;
                 targetCondition.op=op;
+                targetCondition.operation=op;
                 targetCondition.right=rightExpression;
                 targetCondition.join=join;
                 let text=leftProperty+" "+op+" "+rightExpression;