@xuda.io/xuda-worker-bundle 1.3.2674 → 1.3.2675

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;

package/package.json

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