@xuda.io/runtime-bundle 1.0.898 → 1.0.900

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11433,19 +11433,30 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
11433
11433
 
11434
11434
  let attr = [];
11435
11435
 
11436
+ const validate_param_in = function (exp) {
11437
+ if (!typeof exp === 'string') return;
11438
+ if (!exp.includes('@')) return;
11439
+ if (_.isEmpty(elm_data?.xuData?.paramsP?.parameters_raw_obj)) return;
11440
+ let exp_val_for_parameter_in_validation = _.clone(exp);
11441
+ for (const [param_key, param_val] of Object.entries(elm_data?.xuData?.paramsP?.parameters_raw_obj)) {
11442
+ exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll('@' + param_key, param_val);
11443
+ }
11444
+ return exp_val_for_parameter_in_validation?.includes?.('@' + val_field);
11445
+ };
11446
+
11436
11447
  $.each(elm_data?.xuAttributes, function (key, val) {
11437
11448
  if (key.substr(0, 3) !== 'xu-') return true;
11438
11449
 
11439
11450
  let parameter_in_filed_id; //= elm_data?.xuData?.paramsP?.parameters_raw_obj?.[val.substr(1)] ? val.substr(1) : undefined;
11440
- let exp_val_for_parameter_in_validation = _.clone(val);
11441
- if (!_.isEmpty(elm_data?.xuData?.paramsP?.parameters_raw_obj) && typeof exp_val_for_parameter_in_validation === 'string') {
11442
- for (const [param_key, param_val] of Object.entries(elm_data?.xuData?.paramsP?.parameters_raw_obj)) {
11443
- exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll(param_val, '@' + param_key);
11444
- }
11445
- }
11451
+ // let exp_val_for_parameter_in_validation = _.clone(val);
11452
+ // if (!_.isEmpty(elm_data?.xuData?.paramsP?.parameters_raw_obj) && typeof exp_val_for_parameter_in_validation === 'string') {
11453
+ // for (const [param_key, param_val] of Object.entries(elm_data?.xuData?.paramsP?.parameters_raw_obj)) {
11454
+ // exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll(param_val, '@' + param_key);
11455
+ // }
11456
+ // }
11446
11457
 
11447
11458
  if (key === 'xu-bind') {
11448
- if (val?.includes?.(val_field) || exp_val_for_parameter_in_validation?.includes?.(val_field)) {
11459
+ if (val?.includes?.(val_field) || validate_param_in(val)) {
11449
11460
  attr.push(key);
11450
11461
  }
11451
11462
  return true;
@@ -11453,7 +11464,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
11453
11464
 
11454
11465
  if (key === 'xu-for') {
11455
11466
  // match static value for xu-for
11456
- if (val?.includes?.(val_field) || exp_val_for_parameter_in_validation?.includes?.(val_field)) {
11467
+ if (val?.includes?.(val_field) || validate_param_in(val)) {
11457
11468
  attr.push(key);
11458
11469
  }
11459
11470
  return true;
@@ -11461,7 +11472,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
11461
11472
  // console.log(key, val);
11462
11473
 
11463
11474
  if (key.substr(0, 6) === 'xu-exp' && key.substr(6, 1) === ':') {
11464
- if (val?.includes?.('@' + val_field) || exp_val_for_parameter_in_validation?.includes?.('@' + val_field)) {
11475
+ if (val?.includes?.('@' + val_field) || validate_param_in(val)) {
11465
11476
  attr.push(key);
11466
11477
  }
11467
11478
  return true;
@@ -9160,19 +9160,30 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
9160
9160
 
9161
9161
  let attr = [];
9162
9162
 
9163
+ const validate_param_in = function (exp) {
9164
+ if (!typeof exp === 'string') return;
9165
+ if (!exp.includes('@')) return;
9166
+ if (_.isEmpty(elm_data?.xuData?.paramsP?.parameters_raw_obj)) return;
9167
+ let exp_val_for_parameter_in_validation = _.clone(exp);
9168
+ for (const [param_key, param_val] of Object.entries(elm_data?.xuData?.paramsP?.parameters_raw_obj)) {
9169
+ exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll('@' + param_key, param_val);
9170
+ }
9171
+ return exp_val_for_parameter_in_validation?.includes?.('@' + val_field);
9172
+ };
9173
+
9163
9174
  $.each(elm_data?.xuAttributes, function (key, val) {
9164
9175
  if (key.substr(0, 3) !== 'xu-') return true;
9165
9176
 
9166
9177
  let parameter_in_filed_id; //= elm_data?.xuData?.paramsP?.parameters_raw_obj?.[val.substr(1)] ? val.substr(1) : undefined;
9167
- let exp_val_for_parameter_in_validation = _.clone(val);
9168
- if (!_.isEmpty(elm_data?.xuData?.paramsP?.parameters_raw_obj) && typeof exp_val_for_parameter_in_validation === 'string') {
9169
- for (const [param_key, param_val] of Object.entries(elm_data?.xuData?.paramsP?.parameters_raw_obj)) {
9170
- exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll(param_val, '@' + param_key);
9171
- }
9172
- }
9178
+ // let exp_val_for_parameter_in_validation = _.clone(val);
9179
+ // if (!_.isEmpty(elm_data?.xuData?.paramsP?.parameters_raw_obj) && typeof exp_val_for_parameter_in_validation === 'string') {
9180
+ // for (const [param_key, param_val] of Object.entries(elm_data?.xuData?.paramsP?.parameters_raw_obj)) {
9181
+ // exp_val_for_parameter_in_validation = exp_val_for_parameter_in_validation.replaceAll(param_val, '@' + param_key);
9182
+ // }
9183
+ // }
9173
9184
 
9174
9185
  if (key === 'xu-bind') {
9175
- if (val?.includes?.(val_field) || exp_val_for_parameter_in_validation?.includes?.(val_field)) {
9186
+ if (val?.includes?.(val_field) || validate_param_in(val)) {
9176
9187
  attr.push(key);
9177
9188
  }
9178
9189
  return true;
@@ -9180,7 +9191,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
9180
9191
 
9181
9192
  if (key === 'xu-for') {
9182
9193
  // match static value for xu-for
9183
- if (val?.includes?.(val_field) || exp_val_for_parameter_in_validation?.includes?.(val_field)) {
9194
+ if (val?.includes?.(val_field) || validate_param_in(val)) {
9184
9195
  attr.push(key);
9185
9196
  }
9186
9197
  return true;
@@ -9188,7 +9199,7 @@ func.UI.screen.refresh_xu_attributes = async function (SESSION_ID, fields_arr, j
9188
9199
  // console.log(key, val);
9189
9200
 
9190
9201
  if (key.substr(0, 6) === 'xu-exp' && key.substr(6, 1) === ':') {
9191
- if (val?.includes?.('@' + val_field) || exp_val_for_parameter_in_validation?.includes?.('@' + val_field)) {
9202
+ if (val?.includes?.('@' + val_field) || validate_param_in(val)) {
9192
9203
  attr.push(key);
9193
9204
  }
9194
9205
  return true;