@xuda.io/runtime-bundle 1.0.907 → 1.0.909

package/js/xuda-runtime-slim.js

@@ -11433,7 +11433,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
 
           let attr = [];
 
-          const validate_param_in = function (exp) {
+          const validate_param_in = function (exp, without_var) {
             let exp_val_for_parameter_in_validation;
             if (typeof exp === 'string') exp_val_for_parameter_in_validation = exp;
             if (typeof exp === 'object') exp_val_for_parameter_in_validation = JSON.stringify(exp);
@@ -11443,18 +11443,18 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
 
             for (const [param_key, param_val] of Object.entries(elm_data?.xuData?.paramsP?.parameters_raw_obj)) {
               if (!param_val.includes('@')) continue;
-              exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll('@' + param_key, param_val);
+              exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll((without_var ? '' : '@') + param_key, param_val);
             }
-            return exp_val_for_parameter_in_validation?.includes?.('@' + val_field);
+            return exp_val_for_parameter_in_validation?.includes?.((without_var ? '' : '@') + val_field);
           };
 
           $.each(elm_data?.xuAttributes, function (key, val) {
-            if (typeof exp !== 'string' && typeof exp !== 'object') return true;
-            if (typeof exp === 'string' && !val?.includes('@')) return true;
+            if (typeof val !== 'string' && typeof val !== 'object') return true;
+            if (typeof val === 'string' && !val?.includes('@') && key !== 'xu-bind' && key !== 'xu-for') return true;
             if (key.substr(0, 3) !== 'xu-') return true;
 
             if (key === 'xu-bind' || key === 'xu-for') {
-              if (val?.includes?.(val_field) || validate_param_in(val)) {
+              if (val?.includes?.(val_field) || validate_param_in(val, true)) {
                 attr.push(key);
               }
               return true;
@@ -12507,7 +12507,6 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
         console.warn(e);
       }
       return;
-      return { abort: true };
     },
     'xu-text': async function ($elm, val) {
       try {
@@ -12516,7 +12515,6 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
         console.warn(e);
       }
       return;
-      return { abort: true };
     },
     'xu-html': async function ($elm, val) {
       try {
@@ -12525,7 +12523,6 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
         console.warn(e);
       }
       return;
-      return { abort: true };
     },
     'xu-for': async function ($elm, data) {
       // exit if call from rendered xu-for item to prevent infante loop (parent_infoP?.iterate_info indicate call from rendered item)

package/js/xuda-runtime-slim.min.es.js

@@ -9160,7 +9160,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
 
           let attr = [];
 
-          const validate_param_in = function (exp) {
+          const validate_param_in = function (exp, without_var) {
             let exp_val_for_parameter_in_validation;
             if (typeof exp === 'string') exp_val_for_parameter_in_validation = exp;
             if (typeof exp === 'object') exp_val_for_parameter_in_validation = JSON.stringify(exp);
@@ -9170,18 +9170,18 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
 
             for (const [param_key, param_val] of Object.entries(elm_data?.xuData?.paramsP?.parameters_raw_obj)) {
               if (!param_val.includes('@')) continue;
-              exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll('@' + param_key, param_val);
+              exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll((without_var ? '' : '@') + param_key, param_val);
             }
-            return exp_val_for_parameter_in_validation?.includes?.('@' + val_field);
+            return exp_val_for_parameter_in_validation?.includes?.((without_var ? '' : '@') + val_field);
           };
 
           $.each(elm_data?.xuAttributes, function (key, val) {
-            if (typeof exp !== 'string' && typeof exp !== 'object') return true;
-            if (typeof exp === 'string' && !val?.includes('@')) return true;
+            if (typeof val !== 'string' && typeof val !== 'object') return true;
+            if (typeof val === 'string' && !val?.includes('@') && key !== 'xu-bind' && key !== 'xu-for') return true;
             if (key.substr(0, 3) !== 'xu-') return true;
 
             if (key === 'xu-bind' || key === 'xu-for') {
-              if (val?.includes?.(val_field) || validate_param_in(val)) {
+              if (val?.includes?.(val_field) || validate_param_in(val, true)) {
                 attr.push(key);
               }
               return true;
@@ -10234,7 +10234,6 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
         console.warn(e);
       }
       return;
-      return { abort: true };
     },
     'xu-text': async function ($elm, val) {
       try {
@@ -10243,7 +10242,6 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
         console.warn(e);
       }
       return;
-      return { abort: true };
     },
     'xu-html': async function ($elm, val) {
       try {
@@ -10252,7 +10250,6 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
         console.warn(e);
       }
       return;
-      return { abort: true };
     },
     'xu-for': async function ($elm, data) {
       // exit if call from rendered xu-for item to prevent infante loop (parent_infoP?.iterate_info indicate call from rendered item)