@xuda.io/runtime-bundle 1.0.259 → 1.0.261

package/js/xuda-runtime-bundle.js

@@ -34105,13 +34105,13 @@ func.UI.screen.execute_xu_functions = async function (
         if (!custom_iterator_key) {
           is_key_dynamic_field = true
           // iterator_key = (reference_source_obj?.fieldIdP || "") + "_FOR_KEY";
-          iterator_key = $elm.data().xuData.node_org.id + "_FOR_KEY";
+          iterator_key = $elm.data().xuData.node_org.id.replaceAll("-", "_") + "_FOR_KEY";
         }
 
         if (!custom_iterator_val) {
           is_val_dynamic_field = true
           // iterator_val = (reference_source_obj?.fieldIdP || "") + "_FOR_VAL";
-          iterator_val = $elm.data().xuData.node_org.id + "_FOR_VAL";
+          iterator_val = $elm.data().xuData.node_org.id.replaceAll("-", "_") + "_FOR_VAL";
         }
 
         var i = 0;
@@ -34250,19 +34250,23 @@ func.UI.screen.execute_xu_functions = async function (
       }
     },
     "xu-exp": async function ($elm, val) {
-      let view_field_id = val.value === null ? true : val.value
-      if (val.value === "@_FOR_KEY") {
-        view_field_id = "@" + $elm.data().xuData.iterate_info.iterator_key;
+      let exp = val.value === null ? true : val.value
+      if (val.value.includes("@_FOR_KEY")) {
+        exp = exp.replaceAll("@_FOR_KEY", "@" + $elm.data().xuData.iterate_info.iterator_key);
       }
 
-      if (val.value === "@_FOR_VAL") {
-        view_field_id = "@" + $elm.data().xuData.iterate_info.iterator_val;
+      if (val.value.includes("@_FOR_VAL")) {
+        exp = exp.replaceAll("@_FOR_VAL", "@" + $elm.data().xuData.iterate_info.iterator_val);
       }
 
+      // if (val.value === "@_FOR_VAL") {
+      //   exp = "@" + $elm.data().xuData.iterate_info.iterator_val;
+      // }
+
 
       let exp_ret = await func.expression.get(
         SESSION_ID,
-        view_field_id,
+        exp,
         paramsP.dsSessionP,
         "UI Attr EXP",
         SESSION_OBJ[SESSION_ID].DS_GLB[paramsP.dsSessionP].currentRecordId