@xuda.io/xuda-worker-bundle-min 1.3.2453 → 1.3.2455

package/index.js

@@ -5288,6 +5288,38 @@ func.datasource.get_viewFields_for_update_function = function (SESSION_ID, calli
   return viewFields;
 };
 func.datasource.get_value = async function (SESSION_ID, fieldIdP, dsSessionP, rowIdP, org_dsSessionP) {
+  const normalize_field_id = function (field_id) {
+    if (typeof field_id === 'string') {
+      return field_id;
+    }
+    if (typeof field_id?.field_id === 'string') {
+      return field_id.field_id;
+    }
+    if (typeof field_id?.id === 'string') {
+      return field_id.id;
+    }
+    if (typeof field_id === 'number' || typeof field_id === 'boolean' || typeof field_id === 'bigint') {
+      return field_id.toString();
+    }
+    const coerced = field_id?.toString?.();
+    if (typeof coerced === 'string' && coerced && coerced !== '[object Object]') {
+      return coerced;
+    }
+    return null;
+  };
+  const return_missing_value = function (field_id, currentRecordId = null) {
+    return {
+      ret: {
+        value: undefined,
+        type: 'string',
+        prop: null,
+      },
+      dsSessionP,
+      fieldIdP: field_id,
+      currentRecordId,
+      found: false,
+    };
+  };
   const return_value = async (field_id, value) => {
     const _progFields = await func.datasource.get_progFields(SESSION_ID, dsSessionP);
     let view_field_obj = func.common.find_item_by_key(_progFields, 'field_id', field_id);
@@ -5416,9 +5448,21 @@ func.datasource.get_value = async function (SESSION_ID, fieldIdP, dsSessionP, ro
       // let prev_ds = dsSessionP - 1;
       return await func.datasource.get_value(SESSION_ID, fieldIdP, dsSessionP - 1, rowIdP, org_dsSessionP);
     }
+    const normalized_missing_field = normalize_field_id(fieldIdP);
+    if (normalized_missing_field === null) {
+      return return_missing_value(fieldIdP);
+    }
+    fieldIdP = normalized_missing_field;
     return await return_value(fieldIdP);
   } //console.error("error: datasource not exist: " + dsSessionP);
 
+  const normalized_field_id = normalize_field_id(fieldIdP);
+  if (normalized_field_id === null) {
+    func.utils.debug_report(SESSION_ID, 'Datasource get value', `Invalid field id type: ${typeof fieldIdP}`, 'W');
+    return return_missing_value(fieldIdP, _ds.currentRecordId);
+  }
+  fieldIdP = normalized_field_id;
+
   let recordId = rowIdP;
   if (!recordId) {
     recordId = _ds.currentRecordId;
@@ -8823,6 +8867,29 @@ func.events.execute = async function (
       return result;
     },
     update: async function () {
+      const resolve_update_field_id = async function (field_expr, iterate_info) {
+        let trimmed = field_expr?.trim?.() || '';
+        if (!trimmed) {
+          return trimmed;
+        }
+
+        const first = trimmed.substring(0, 1);
+        const last = trimmed.substring(trimmed.length - 1);
+        if ((first === "'" || first === '"' || first === '`') && last === first) {
+          trimmed = trimmed.substring(1, trimmed.length - 1).trim();
+        }
+
+        if (/^@?[A-Za-z_][\w\-\:\.]*$/.test(trimmed)) {
+          return trimmed.substring(0, 1) === '@' ? trimmed.substring(1) : trimmed;
+        }
+
+        let ret_field_id = await func.expression.get(SESSION_ID, trimmed, dsSessionP, 'update', null, null, null, null, null, null, iterate_info);
+        if (typeof ret_field_id?.result === 'string' && ret_field_id.result.substring(0, 1) === '@') {
+          return ret_field_id.result.substring(1);
+        }
+        return ret_field_id?.result;
+      };
+
       const obj_values_to_update = func.datasource.get_viewFields_for_update_function(SESSION_ID, calling_trigger_prop, null, dsSessionP);
       if (!obj_values_to_update || xu_isEmpty(obj_values_to_update)) {
         func.utils.debug_report(SESSION_ID, 'Update values object is empty', '', 'W');
@@ -8840,9 +8907,8 @@ func.events.execute = async function (
           iterate_info = element_meta?.iterate_info || null;
         }
 
-        let ret_field_id = await func.expression.get(SESSION_ID, val.id.trim(), dsSessionP, 'update', null, null, null, null, null, null, iterate_info);
         let ret_value = await func.expression.get(SESSION_ID, val.val.trim(), dsSessionP, 'update', null, null, null, null, null, null, iterate_info);
-        let _field_id = ret_field_id.result;
+        let _field_id = await resolve_update_field_id(val.id, iterate_info);
         let _value = ret_value.result;
 
         updates.push({ _field_id, _value });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-worker-bundle-min",
-  "version": "1.3.2453",
+  "version": "1.3.2455",
   "description": "xuda framework min",
   "main": "index.js",
   "scripts": {