@xuda.io/runtime-bundle 1.0.275 → 1.0.277

package/js/xuda-runtime-slim.js

@@ -14398,7 +14398,8 @@ func.UI.screen.execute_xu_functions = async function (
 
       let is_dynamic_field = false
       let field_prop;
-      let bind_field_id
+      let bind_field_id;
+      let bind_field_exp
 
       const get_bind_field = async function (field_id) {
         if (["_FOR_VAL", "_FOR_KEY"].includes(field_id)) {
@@ -14444,10 +14445,11 @@ func.UI.screen.execute_xu_functions = async function (
       } catch (err) {
         try {
           if (!_.isEmpty($elm?.data()?.xuAttributes?.["xu-exp:xu-bind"])) {
+            bind_field_exp = $elm.data().xuAttributes["xu-exp:xu-bind"]
             const res = (
               await func.expression.get(
                 SESSION_ID,
-                $elm.data().xuAttributes["xu-exp:xu-bind"],
+                bind_field_exp,
                 paramsP.dsSessionP,
                 "UI Attr EXP"
               )
@@ -14481,9 +14483,11 @@ func.UI.screen.execute_xu_functions = async function (
           bind.getter($elm[0])
         );
 
-        if (!_ds.currentRecordId) return;
-
+        if (field_prop.props.fieldType === "object" && !val_is_reference_field) {
+          value = bind.getter($elm[0])
+        }
 
+        if (!_ds.currentRecordId) return;
 
         let datasource_changes = {
           [_dsP]: {
@@ -14499,8 +14503,16 @@ func.UI.screen.execute_xu_functions = async function (
         if (reference_source_obj) {
           if (reference_source_obj.ret.type === "array") {
             if (iterate_info.iterator_val === bind_field_id) {
+              const arr_idx = Number($elm?.data()?.xuData?.iterate_info._key)
               let new_arr = reference_source_obj.ret.value
-              new_arr[Number($elm?.data()?.xuData?.iterate_info._key)] = value
+              if (field_prop.props.fieldType === "object" && !val_is_reference_field) {
+                let obj_item = new_arr[arr_idx]
+                let e_exp = bind_field_exp.replace("@_FOR_VAL", obj_item);
+                let new_val = eval(e_exp)
+                new_arr[arr_idx] = new_val
+              } else {
+                new_arr[arr_idx] = value
+              }
               datasource_changes[_dsP][_ds.currentRecordId][reference_source_obj.fieldIdP] = new_arr
 
               datasource_changes = {
@@ -14541,7 +14553,7 @@ func.UI.screen.execute_xu_functions = async function (
               value = _ds.data_feed.rows?.[row_idx]?.[val.value];
             }
           } else {
-            value = val
+            value = val.value
           }
           if (typeof value === "undefined") return;
           bind.setter($elm[0], value);

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

@@ -11808,7 +11808,8 @@ func.UI.screen.execute_xu_functions = async function (
 
       let is_dynamic_field = false
       let field_prop;
-      let bind_field_id
+      let bind_field_id;
+      let bind_field_exp
 
       const get_bind_field = async function (field_id) {
         if (["_FOR_VAL", "_FOR_KEY"].includes(field_id)) {
@@ -11854,10 +11855,11 @@ func.UI.screen.execute_xu_functions = async function (
       } catch (err) {
         try {
           if (!_.isEmpty($elm?.data()?.xuAttributes?.["xu-exp:xu-bind"])) {
+            bind_field_exp = $elm.data().xuAttributes["xu-exp:xu-bind"]
             const res = (
               await func.expression.get(
                 SESSION_ID,
-                $elm.data().xuAttributes["xu-exp:xu-bind"],
+                bind_field_exp,
                 paramsP.dsSessionP,
                 "UI Attr EXP"
               )
@@ -11891,9 +11893,11 @@ func.UI.screen.execute_xu_functions = async function (
           bind.getter($elm[0])
         );
 
-        if (!_ds.currentRecordId) return;
-
+        if (field_prop.props.fieldType === "object" && !val_is_reference_field) {
+          value = bind.getter($elm[0])
+        }
 
+        if (!_ds.currentRecordId) return;
 
         let datasource_changes = {
           [_dsP]: {
@@ -11909,8 +11913,16 @@ func.UI.screen.execute_xu_functions = async function (
         if (reference_source_obj) {
           if (reference_source_obj.ret.type === "array") {
             if (iterate_info.iterator_val === bind_field_id) {
+              const arr_idx = Number($elm?.data()?.xuData?.iterate_info._key)
               let new_arr = reference_source_obj.ret.value
-              new_arr[Number($elm?.data()?.xuData?.iterate_info._key)] = value
+              if (field_prop.props.fieldType === "object" && !val_is_reference_field) {
+                let obj_item = new_arr[arr_idx]
+                let e_exp = bind_field_exp.replace("@_FOR_VAL", obj_item);
+                let new_val = eval(e_exp)
+                new_arr[arr_idx] = new_val
+              } else {
+                new_arr[arr_idx] = value
+              }
               datasource_changes[_dsP][_ds.currentRecordId][reference_source_obj.fieldIdP] = new_arr
 
               datasource_changes = {
@@ -11951,7 +11963,7 @@ func.UI.screen.execute_xu_functions = async function (
               value = _ds.data_feed.rows?.[row_idx]?.[val.value];
             }
           } else {
-            value = val
+            value = val.value
           }
           if (typeof value === "undefined") return;
           bind.setter($elm[0], value);