@xuda.io/runtime-bundle 1.0.272 → 1.0.274

package/js/xuda-runtime-bundle.js

@@ -33758,18 +33758,7 @@ func.UI.screen.execute_xu_functions = async function (
       if (is_skeleton) return;
 
       let view_field_id = val.value;
-      let field_id_from_exp
-      if (!_.isEmpty($elm?.data()?.xuAttributes?.["xu-exp:xu-bind"])) {
-        const res = (
-          await func.expression.get(
-            SESSION_ID,
-            $elm.data().xuAttributes["xu-exp:xu-bind"],
-            paramsP.dsSessionP,
-            "UI Attr EXP"
-          )
-        )
-        console.log(res)
-      }
+
 
       let _prog_id = $elm.data().xuData.paramsP.prog_id;
       let _dsP = $elm.data().xuData.paramsP.dsSessionP;
@@ -33777,46 +33766,79 @@ func.UI.screen.execute_xu_functions = async function (
       if (!view_ret) return {};
 
       let is_dynamic_field = false
-      let field_prop
+      let field_prop;
+      let bind_field_id
 
-      if (["_FOR_VAL", "_FOR_KEY"].includes(view_field_id)) {
-        is_dynamic_field = true
-        field_prop = _ds.dynamic_fields[view_field_id]
-      } else {
-        field_prop = func.common.find_item_by_key(
-          view_ret.progFields,
-          "field_id",
-          view_field_id
-        );
-        if (!field_prop) {
-          /// find the field everywhere in the chain Aug 30 2024
-          const ret_get_value = await func.datasource.get_value(
-            SESSION_ID,
-            view_field_id,
-            _dsP // $elm.data().xuData.paramsP.dsSessionP
+      const get_bind_field = async function (field_id) {
+        if (["_FOR_VAL", "_FOR_KEY"].includes(field_id)) {
+          is_dynamic_field = true
+          field_prop = _ds.dynamic_fields[field_id]
+        } else {
+          field_prop = func.common.find_item_by_key(
+            view_ret.progFields,
+            "field_id",
+            field_id
           );
-
-          if (ret_get_value.found) {
-            _dsP = ret_get_value.dsSessionP;
-            let _ds = SESSION_OBJ[SESSION_ID].DS_GLB[_dsP];
-            _prog_id = _ds.prog_id;
-            const view_ret = await func.utils.VIEWS_OBJ.get(SESSION_ID, _prog_id);
-            if (!view_ret) return {};
-            field_prop = func.common.find_item_by_key(
-              view_ret.progFields,
-              "field_id",
-              view_field_id
-            );
-          }
           if (!field_prop) {
-            console.error(
-              `field ${view_field_id} not found in the program scope`
+            /// find the field everywhere in the chain Aug 30 2024
+            const ret_get_value = await func.datasource.get_value(
+              SESSION_ID,
+              field_id,
+              _dsP // $elm.data().xuData.paramsP.dsSessionP
             );
-            return {};
+
+            if (ret_get_value.found) {
+              _dsP = ret_get_value.dsSessionP;
+              let _ds = SESSION_OBJ[SESSION_ID].DS_GLB[_dsP];
+              _prog_id = _ds.prog_id;
+              const view_ret = await func.utils.VIEWS_OBJ.get(SESSION_ID, _prog_id);
+              if (!view_ret) return {};
+              field_prop = func.common.find_item_by_key(
+                view_ret.progFields,
+                "field_id",
+                field_id
+              );
+            }
+            if (!field_prop) {
+              throw (`field ${field_id} not found in the program scope`)
+            }
+          }
+        }
+        return field_id
+      }
+
+      try {
+        bind_field_id = await get_bind_field(val.value)
+      } catch (err) {
+        try {
+
+          if (!_.isEmpty($elm?.data()?.xuAttributes?.["xu-exp:xu-bind"])) {
+            const res = (
+              await func.expression.get(
+                SESSION_ID,
+                $elm.data().xuAttributes["xu-exp:xu-bind"],
+                paramsP.dsSessionP,
+                "UI Attr EXP"
+              )
+            )
+
+            if (Object.keys(res.fields).length) {
+              const field_id_from_exp = Object.keys(res.fields)[0]
+              bind_field_id = await get_bind_field(field_id_from_exp)
+            } else {
+              throw (err.message)
+            }
+          } else {
+            throw (err.message)
           }
+        } catch (err) {
+          console.error(err.message);
+          return {};
         }
+        // return {};
       }
 
+
       const field_changed = async function (e) {
 
         var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[_dsP];
@@ -33835,7 +33857,7 @@ func.UI.screen.execute_xu_functions = async function (
         let datasource_changes = {
           [_dsP]: {
             [_ds.currentRecordId]: {
-              [view_field_id]: value,
+              [bind_field_id]: value,
             },
           },
         };
@@ -33845,7 +33867,7 @@ func.UI.screen.execute_xu_functions = async function (
         const reference_source_obj = iterate_info?.reference_source_obj
         if (reference_source_obj) {
           if (reference_source_obj.ret.type === "array") {
-            if (iterate_info.iterator_val === view_field_id) {
+            if (iterate_info.iterator_val === bind_field_id) {
               let new_arr = reference_source_obj.ret.value
               new_arr[Number($elm?.data()?.xuData?.iterate_info._key)] = value
               datasource_changes[_dsP][_ds.currentRecordId][reference_source_obj.fieldIdP] = new_arr
@@ -33881,7 +33903,7 @@ func.UI.screen.execute_xu_functions = async function (
         let value
         try {
           if (is_dynamic_field) {
-            value = _ds.dynamic_fields[view_field_id].value;
+            value = _ds.dynamic_fields[bind_field_id].value;
           } else {
             const row_idx = func.common.find_ROWID_idx(_ds, _ds.currentRecordId);
             value = _ds.data_feed.rows?.[row_idx]?.[val.value];