@xuda.io/runtime-bundle 1.0.898 → 1.0.900

package/js/xuda-runtime-bundle.js

@@ -31119,19 +31119,30 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
 
           let attr = [];
 
+          const validate_param_in = function (exp) {
+            if (!typeof exp === 'string') return;
+            if (!exp.includes('@')) return;
+            if (_.isEmpty(elm_data?.xuData?.paramsP?.parameters_raw_obj)) return;
+            let exp_val_for_parameter_in_validation = _.clone(exp);
+            for (const [param_key, param_val] of Object.entries(elm_data?.xuData?.paramsP?.parameters_raw_obj)) {
+              exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll('@' + param_key, param_val);
+            }
+            return exp_val_for_parameter_in_validation?.includes?.('@' + val_field);
+          };
+
           $.each(elm_data?.xuAttributes, function (key, val) {
             if (key.substr(0, 3) !== 'xu-') return true;
 
             let parameter_in_filed_id; //= elm_data?.xuData?.paramsP?.parameters_raw_obj?.[val.substr(1)] ? val.substr(1) : undefined;
-            let exp_val_for_parameter_in_validation = _.clone(val);
-            if (!_.isEmpty(elm_data?.xuData?.paramsP?.parameters_raw_obj) && typeof exp_val_for_parameter_in_validation === 'string') {
-              for (const [param_key, param_val] of Object.entries(elm_data?.xuData?.paramsP?.parameters_raw_obj)) {
-                exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll(param_val, '@' + param_key);
-              }
-            }
+            // let exp_val_for_parameter_in_validation = _.clone(val);
+            // if (!_.isEmpty(elm_data?.xuData?.paramsP?.parameters_raw_obj) && typeof exp_val_for_parameter_in_validation === 'string') {
+            //   for (const [param_key, param_val] of Object.entries(elm_data?.xuData?.paramsP?.parameters_raw_obj)) {
+            //     exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll(param_val, '@' + param_key);
+            //   }
+            // }
 
             if (key === 'xu-bind') {
-              if (val?.includes?.(val_field) || exp_val_for_parameter_in_validation?.includes?.(val_field)) {
+              if (val?.includes?.(val_field) || validate_param_in(val)) {
                 attr.push(key);
               }
               return true;
@@ -31139,7 +31150,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
 
             if (key === 'xu-for') {
               // match static value for xu-for
-              if (val?.includes?.(val_field) || exp_val_for_parameter_in_validation?.includes?.(val_field)) {
+              if (val?.includes?.(val_field) || validate_param_in(val)) {
                 attr.push(key);
               }
               return true;
@@ -31147,7 +31158,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
             // console.log(key, val);
 
             if (key.substr(0, 6) === 'xu-exp' && key.substr(6, 1) === ':') {
-              if (val?.includes?.('@' + val_field) || exp_val_for_parameter_in_validation?.includes?.('@' + val_field)) {
+              if (val?.includes?.('@' + val_field) || validate_param_in(val)) {
                 attr.push(key);
               }
               return true;