修复设计器单元格自定义分组保存后无法编辑的BUG

SievyMatt · Jun 26, 2018 · dc6d477 · dc6d477
1 parent 0502fc7
commit dc6d477
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js b/ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js
diff --git a/ureport2-console/src/main/resources/ureport-asserts/js/preview.bundle.js b/ureport2-console/src/main/resources/ureport-asserts/js/preview.bundle.js
diff --git a/ureport2-js/src/Utils.js b/ureport2-js/src/Utils.js
@@ -176,13 +176,13 @@ 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.leftProperty}" op="${encode(condition.op)}" id="${condition.id}"`;
+                            cellXml+=`<condition property="${condition.left}" op="${encode(condition.op)}" id="${condition.id}"`;
                             if(condition.join){
                                 cellXml+=` join="${condition.join}">`;
                             }else{
                                 cellXml+=`>`;
                             }
-                            cellXml+=`<value><![CDATA[${condition.rightExpression}]]></value>`;
+                            cellXml+=`<value><![CDATA[${condition.right}]]></value>`;
                             cellXml+=`</condition>`;
                         }
                         cellXml+='</group-item>';

diff --git a/ureport2-js/src/dialog/CustomGroupDialog.js b/ureport2-js/src/dialog/CustomGroupDialog.js
@@ -112,7 +112,7 @@ export default class CustomGroupDialog{
             const conditions=selectionOption.data().conditions;
             let index=0;
             for(let condition of conditions){
-                let text=condition.leftProperty+" "+condition.op+" "+condition.rightExpression;
+                let text=condition.left+" "+condition.op+" "+condition.right;
                 const join=condition.join;
                 if(index>0 && join){
                     text=join+" "+text;
@@ -151,7 +151,7 @@ export default class CustomGroupDialog{
             const conditions=groupItem.conditions;
             const conditionDialog=new ConditionDialog(conditions);
             conditionDialog.show(function(leftProperty,op,rightExpression,join){
-                const c={leftProperty,op,rightExpression,join,id:uuid.v1()};
+                const c={left:leftProperty,op,right:rightExpression,join,id:uuid.v1()};
                 conditions.push(c);
                 let text=leftProperty+" "+op+" "+rightExpression;
                 if(join){
@@ -188,9 +188,9 @@ export default class CustomGroupDialog{
                         break;
                     }
                 }
-                targetCondition.leftProperty=leftProperty;
+                targetCondition.left=leftProperty;
                 targetCondition.op=op;
-                targetCondition.rightExpression=rightExpression;
+                targetCondition.right=rightExpression;
                 targetCondition.join=join;
                 let text=leftProperty+" "+op+" "+rightExpression;
                 if(join){