unknown 5 лет назад
Родитель
Сommit
8817884c49

+ 1 - 1
o2web/source/x_component_query_Query/Statement.js

@@ -567,7 +567,7 @@ MWF.xApplication.query.Query.Statement.Item = new Class({
             }
         }
 
-        if( code && code.trim())obj = MWF.Macro.exec( code, {"value": obj,  "data": this.data, "entry": c, "node" : td, "json" : c, "row" : this});
+        if( code && code.trim())obj = this.view.Macro.exec( code, {"value": obj,  "data": this.data, "entry": c, "node" : td, "json" : c, "row" : this});
 
         var toName = function (value) {
             if(typeOf(value) === "array"){

+ 1 - 1
o2web/source/x_component_query_StatementDesigner/Statement.js

@@ -1169,7 +1169,7 @@ MWF.xApplication.query.StatementDesigner.View = new Class({
                             }
                         }
 
-                        if( code && code.trim())obj = MWF.Macro.exec( code, {"value": obj,  "data": line, "entry": c});
+                        if( code && code.trim())obj = MWF.Macro.exec( code, { "target" : {"value": obj,  "data": line, "entry": c} });
 
                         var toName = function (value) {
                             if(typeOf(value) === "array"){