@xuda.io/runtime-bundle 1.0.251 → 1.0.252

package/js/xuda-runtime-slim.js

@@ -14398,6 +14398,9 @@ func.UI.screen.execute_xu_functions = async function (
       let is_dynamic_field = false
       let field_prop
 
+      const iterate_info = $elm?.data()?.xuData?.iterate_info
+      const reference_source_obj = iterate_info?.reference_source_obj
+
       if (["_FOR_VAL", "_FOR_KEY"].includes(view_field_id)) {
         is_dynamic_field = true
         field_prop = _ds.dynamic_fields[view_field_id]
@@ -14678,12 +14681,12 @@ func.UI.screen.execute_xu_functions = async function (
     "xu-for": async function ($elm, data) {
       if (parent_infoP?.iterate_info || !data.value) return {};
       try {
-
+        // data.value (xu-for) can store actual values such as an array, a CSV, or a field_id that references a specific field within the dataset, initialized with values for the iteration.
         let arr = data.value;
 
         // find reference source field
         let reference_source_obj
-        // try {
+
         const _progFields = await func.datasource.get_progFields(
           SESSION_ID,
           paramsP.dsSessionP
@@ -14694,28 +14697,13 @@ func.UI.screen.execute_xu_functions = async function (
           "field_id",
           data.value
         );
+        // detect if data.value (xu-for) is reference field_id  by checking if exist in the dataset 
         if (view_field_obj) {
-          // let _ds = SESSION_OBJ[SESSION_ID].DS_GLB[paramsP.dsSessionP];
-          // try {
-          //   const row_idx = func.common.find_ROWID_idx(
-          //     _ds,
-          //     currentRecordId
-          //   );
-          //   reference_source_field = data.value
-
-          //   arr = await func.datasource.get_value(SESSION_ID, paramsP.dsSessionP, reference_source_field)
-          // } catch (err) {
-
-          // }
-          // reference_source_field_id = data.value
-          // reference_source_field_type=
-
+          // xu-for is reference field_id
           reference_source_obj = await func.datasource.get_value(SESSION_ID, data.value, paramsP.dsSessionP)
           arr = reference_source_obj?.ret?.value
         } else {
-          // throw "field not found"
-
-
+          // xu-for is actual data  
           if (typeof data.value === "string") {
             arr = eval(data.value.replaceAll("\\", ""));
           }
@@ -14723,43 +14711,41 @@ func.UI.screen.execute_xu_functions = async function (
             arr = Array.from(Array(arr).keys());
           }
         }
-        // } catch (err) {
-
-        // }
-
-
-
 
+        const custom_iterator_key = $elm.data().xuData.iterator_key
+        const custom_iterator_val = $elm.data().xuData.iterator_val
 
+        let iterator_key = custom_iterator_key
+        let iterator_val = custom_iterator_val
 
+        // custom FOR_VAL name or namespaced default name  
+        if (!custom_iterator_key) {
+          is_key_dynamic_field = true
+          iterator_key = (reference_source_obj?.fieldIdP || "") + "_FOR_KEY";
+        }
 
+        if (!custom_iterator_val) {
+          is_val_dynamic_field = true
+          iterator_val = (reference_source_obj?.fieldIdP || "") + "_FOR_VAL";
+        }
 
-        // if (typeof data.value === "string") {
-        //   arr = eval(data.value.replaceAll("\\", ""));
-        // }
-        // if (typeof arr === "number") {
-        //   arr = Array.from(Array(arr).keys());
-        // }
-        let iterator_val = $elm.data().xuData.iterator_val;
-        let iterator_key = $elm.data().xuData.iterator_key;
         var i = 0;
         for await (let [_key, _val] of Object.entries(arr)) {
 
           if (_.isArray(arr)) { _key = Number(_key) }
 
-          const set_value = async function (currentRecordId, field_id, value) {
-            let is_dynamic_field = false;
+          const set_value = async function (is_dynamic_field, currentRecordId, field_id, value) {
 
 
+            if (is_dynamic_field) {
 
-            if (["_FOR_VAL", "_FOR_KEY"].includes(field_id)) {
-              is_dynamic_field = true;
               func.datasource.add_dynamic_field_to_ds(
                 SESSION_ID,
                 paramsP.dsSessionP,
                 field_id,
                 value
               );
+
             } else {
 
               const _progFields = await func.datasource.get_progFields(
@@ -14788,7 +14774,7 @@ func.UI.screen.execute_xu_functions = async function (
               }
             }
 
-            return is_dynamic_field
+
           };
 
           var currentRecordId =
@@ -14796,17 +14782,16 @@ func.UI.screen.execute_xu_functions = async function (
               paramsP.dsSessionP
             ].currentRecordId.toString();
 
-          let is_key_dynamic_field = await set_value(currentRecordId, iterator_key || "_FOR_KEY", _key);
-          let is_val_dynamic_field = await set_value(currentRecordId, iterator_val || "_FOR_VAL", _val);
-
+          await set_value(is_key_dynamic_field, currentRecordId, iterator_key, _key);
+          await set_value(is_val_dynamic_field, currentRecordId, iterator_val, _val);
 
           var iterate_info = {
             _val,
             _key,
-            iterator_key: iterator_key || "_FOR_KEY",
-            iterator_val: iterator_val || "_FOR_VAL",
-            is_val_dynamic_field,
+            iterator_key,
+            iterator_val,
             is_key_dynamic_field,
+            is_val_dynamic_field,
             reference_source_obj
           };
           if (parent_infoP) {
@@ -14836,10 +14821,6 @@ func.UI.screen.execute_xu_functions = async function (
               $(val).data().xuData.iterate_info = iterate_info;
             }
           });
-          // // set values in _FOR record
-          // currentRecordId = $divP.data().xuData.ui_id;
-          // set_value(currentRecordId, iterator_key || "_FOR_KEY", _key);
-          // set_value(currentRecordId, iterator_val || "_FOR_VAL", _val);
 
           i++;
         }

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

@@ -11808,6 +11808,9 @@ func.UI.screen.execute_xu_functions = async function (
       let is_dynamic_field = false
       let field_prop
 
+      const iterate_info = $elm?.data()?.xuData?.iterate_info
+      const reference_source_obj = iterate_info?.reference_source_obj
+
       if (["_FOR_VAL", "_FOR_KEY"].includes(view_field_id)) {
         is_dynamic_field = true
         field_prop = _ds.dynamic_fields[view_field_id]
@@ -12088,12 +12091,12 @@ func.UI.screen.execute_xu_functions = async function (
     "xu-for": async function ($elm, data) {
       if (parent_infoP?.iterate_info || !data.value) return {};
       try {
-
+        // data.value (xu-for) can store actual values such as an array, a CSV, or a field_id that references a specific field within the dataset, initialized with values for the iteration.
         let arr = data.value;
 
         // find reference source field
         let reference_source_obj
-        // try {
+
         const _progFields = await func.datasource.get_progFields(
           SESSION_ID,
           paramsP.dsSessionP
@@ -12104,28 +12107,13 @@ func.UI.screen.execute_xu_functions = async function (
           "field_id",
           data.value
         );
+        // detect if data.value (xu-for) is reference field_id  by checking if exist in the dataset 
         if (view_field_obj) {
-          // let _ds = SESSION_OBJ[SESSION_ID].DS_GLB[paramsP.dsSessionP];
-          // try {
-          //   const row_idx = func.common.find_ROWID_idx(
-          //     _ds,
-          //     currentRecordId
-          //   );
-          //   reference_source_field = data.value
-
-          //   arr = await func.datasource.get_value(SESSION_ID, paramsP.dsSessionP, reference_source_field)
-          // } catch (err) {
-
-          // }
-          // reference_source_field_id = data.value
-          // reference_source_field_type=
-
+          // xu-for is reference field_id
           reference_source_obj = await func.datasource.get_value(SESSION_ID, data.value, paramsP.dsSessionP)
           arr = reference_source_obj?.ret?.value
         } else {
-          // throw "field not found"
-
-
+          // xu-for is actual data  
           if (typeof data.value === "string") {
             arr = eval(data.value.replaceAll("\\", ""));
           }
@@ -12133,43 +12121,41 @@ func.UI.screen.execute_xu_functions = async function (
             arr = Array.from(Array(arr).keys());
           }
         }
-        // } catch (err) {
-
-        // }
-
-
-
 
+        const custom_iterator_key = $elm.data().xuData.iterator_key
+        const custom_iterator_val = $elm.data().xuData.iterator_val
 
+        let iterator_key = custom_iterator_key
+        let iterator_val = custom_iterator_val
 
+        // custom FOR_VAL name or namespaced default name  
+        if (!custom_iterator_key) {
+          is_key_dynamic_field = true
+          iterator_key = (reference_source_obj?.fieldIdP || "") + "_FOR_KEY";
+        }
 
+        if (!custom_iterator_val) {
+          is_val_dynamic_field = true
+          iterator_val = (reference_source_obj?.fieldIdP || "") + "_FOR_VAL";
+        }
 
-        // if (typeof data.value === "string") {
-        //   arr = eval(data.value.replaceAll("\\", ""));
-        // }
-        // if (typeof arr === "number") {
-        //   arr = Array.from(Array(arr).keys());
-        // }
-        let iterator_val = $elm.data().xuData.iterator_val;
-        let iterator_key = $elm.data().xuData.iterator_key;
         var i = 0;
         for await (let [_key, _val] of Object.entries(arr)) {
 
           if (_.isArray(arr)) { _key = Number(_key) }
 
-          const set_value = async function (currentRecordId, field_id, value) {
-            let is_dynamic_field = false;
+          const set_value = async function (is_dynamic_field, currentRecordId, field_id, value) {
 
 
+            if (is_dynamic_field) {
 
-            if (["_FOR_VAL", "_FOR_KEY"].includes(field_id)) {
-              is_dynamic_field = true;
               func.datasource.add_dynamic_field_to_ds(
                 SESSION_ID,
                 paramsP.dsSessionP,
                 field_id,
                 value
               );
+
             } else {
 
               const _progFields = await func.datasource.get_progFields(
@@ -12198,7 +12184,7 @@ func.UI.screen.execute_xu_functions = async function (
               }
             }
 
-            return is_dynamic_field
+
           };
 
           var currentRecordId =
@@ -12206,17 +12192,16 @@ func.UI.screen.execute_xu_functions = async function (
               paramsP.dsSessionP
             ].currentRecordId.toString();
 
-          let is_key_dynamic_field = await set_value(currentRecordId, iterator_key || "_FOR_KEY", _key);
-          let is_val_dynamic_field = await set_value(currentRecordId, iterator_val || "_FOR_VAL", _val);
-
+          await set_value(is_key_dynamic_field, currentRecordId, iterator_key, _key);
+          await set_value(is_val_dynamic_field, currentRecordId, iterator_val, _val);
 
           var iterate_info = {
             _val,
             _key,
-            iterator_key: iterator_key || "_FOR_KEY",
-            iterator_val: iterator_val || "_FOR_VAL",
-            is_val_dynamic_field,
+            iterator_key,
+            iterator_val,
             is_key_dynamic_field,
+            is_val_dynamic_field,
             reference_source_obj
           };
           if (parent_infoP) {
@@ -12246,10 +12231,6 @@ func.UI.screen.execute_xu_functions = async function (
               $(val).data().xuData.iterate_info = iterate_info;
             }
           });
-          // // set values in _FOR record
-          // currentRecordId = $divP.data().xuData.ui_id;
-          // set_value(currentRecordId, iterator_key || "_FOR_KEY", _key);
-          // set_value(currentRecordId, iterator_val || "_FOR_VAL", _val);
 
           i++;
         }