@@ -37,7 +37,6 @@ import {
3737FetchCheckNode ,
3838FetchInfo ,
3939fromRecord ,
40- fromValue ,
4140isCustomAction ,
4241MultiBaseComp ,
4342multiChangeAction ,
@@ -369,7 +368,7 @@ QueryCompTmp = class extends QueryCompTmp {
369368}
370369if ( action . type === CompActionTypes . EXECUTE_QUERY ) {
371370if ( getReduceContext ( ) . disableUpdateState ) return this ;
372- if ( ! action . args ) action . args = this . children . variables . toJsonValue ( ) . filter ( kv => kv . key ) . reduce ( ( acc , curr ) => Object . assign ( acc , { [ curr . key as string ] : curr . value } ) , { } ) ;
371+ action . args = action . args || { } ;
373372action . args . $queryName = this . children . name . getView ( ) ;
374373
375374return this . executeQuery ( action ) ;
@@ -711,25 +710,18 @@ class QueryListComp extends QueryListTmpComp implements BottomResListComp {
711710}
712711
713712nameAndExposingInfo ( ) :NameAndExposingInfo {
714- const result :NameAndExposingInfo = { } ;
713+ let result :NameAndExposingInfo = { } ;
715714Object . values ( this . children ) . forEach ( ( comp ) => {
716715result [ comp . children . name . getView ( ) ] = comp . exposingInfo ( ) ;
717716
718- const variables = comp . children . variables . toJsonValue ( ) ;
719- variables . forEach ( ( variable :Record < string , any > ) => {
720- result [ variable . key ] = {
721- property :fromRecord ( {
722- value :fromValue ( variable . value ) ,
723- } ) ,
724- propertyValue :{
725- value :variable . value ,
726- } ,
727- propertyDesc :{ } ,
728- methods :{ } ,
729- } ;
730- } )
717+ const variables = comp . children . variables . nameAndExposingInfo ( ) ;
718+ if ( variables ) {
719+ result = {
720+ ...result ,
721+ ...variables ,
722+ }
723+ }
731724} ) ;
732-
733725return result ;
734726}
735727