修复条件属性中多个属性连接显示错误及表达式条件无法显示比较操作符的BUG

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

@@ -138,6 +138,7 @@ public class ConditionParameterItemParser implements Parser<ConditionPropertyIte
 			return condition;
 		}else{
 			BothExpressionCondition exprCondition=new BothExpressionCondition();
+			exprCondition.setOperation(ele.attributeValue("op"));
 			exprCondition.setOp(Op.parse(ele.attributeValue("op")));
 			for(Object o:ele.elements()){
 				if(o==null || !(o instanceof Element)){

ureport2-js/src/Utils.js

@@ -542,6 +542,7 @@ function getSpan(hot,row,col){
 function buildConditions(conditions){
     let cellXml='';
     if(conditions){
+        const size=conditions.length;
         for(let condition of conditions){
             if(!condition.type || condition.type==='property'){
                 if(condition.left){
@@ -550,7 +551,7 @@ function buildConditions(conditions){
                     cellXml+=`<condition op="${encode(condition.operation)}" id="${condition.id}"`;
                 }
                 cellXml+=` type="${condition.type}"`;
-                if(condition.join){
+                if(condition.join && size>1){
                     cellXml+=` join="${condition.join}">`;
                 }else{
                     cellXml+=`>`;
@@ -558,7 +559,7 @@ function buildConditions(conditions){
                 cellXml+=`<value><![CDATA[${condition.right}]]></value>`;
             }else{
                 cellXml+=`<condition type="${condition.type}" op="${encode(condition.operation)}" id="${condition.id}"`;
-                if(condition.join){
+                if(condition.join && size>1){
                     cellXml+=` join="${condition.join}">`;
                 }else{
                     cellXml+=`>`;

ureport2-js/src/dialog/PropertyConditionDialog.js

@@ -126,6 +126,7 @@ export default class PropertyConditionDialog{
                 item.conditions=[];
             }
             const conditions=item.conditions;
+            let i=0;
             for(let condition of conditions){
                 if(!condition.id){
                     condition.id=uuid.v1();
@@ -135,12 +136,13 @@ export default class PropertyConditionDialog{
                 if(!condition.left || condition.left===''){
                     text=`${window.i18n.dialog.propCondition.currentValue} `+op+" "+(condition.right || condition.expr);
                 }
-                if(condition.join){
+                if(condition.join && i>0){
                     text=condition.join+' '+text;
                 }
                 const newOption=$(`<option>${text}</option>`);
                 newOption.data(condition);
                 _this.conditionList.append(newOption);
+                i++;
                 setDirty();
             }
         });