@xuda.io/xuda-worker-bundle-min 1.3.2437 → 1.3.2439

package/index.js

@@ -563,7 +563,7 @@ func.runtime.bind.build_datasource_changes = function (dsSessionP, currentRecord
     },
   };
 };
-func.runtime.bind.resolve_field = async function (SESSION_ID, prog_id, dsSessionP, field_id) {
+func.runtime.bind.resolve_field = async function (SESSION_ID, prog_id, dsSessionP, field_id, iterate_info) {
   let _prog_id = prog_id;
   let _dsP = dsSessionP;
   let is_dynamic_field = false;
@@ -579,7 +579,20 @@ func.runtime.bind.resolve_field = async function (SESSION_ID, prog_id, dsSession
 
   if (['_FOR_VAL', '_FOR_KEY'].includes(field_id)) {
     is_dynamic_field = true;
-    field_prop = SESSION_OBJ[SESSION_ID]?.DS_GLB?.[_dsP]?.dynamic_fields?.[field_id];
+    if (iterate_info && (iterate_info.iterator_val === field_id || iterate_info.iterator_key === field_id)) {
+      const iter_value = iterate_info.iterator_val === field_id ? iterate_info._val : iterate_info._key;
+      const toType = function (obj) {
+        return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
+      };
+      field_prop = {
+        id: field_id,
+        data: { type: 'virtual', field_id },
+        props: { fieldType: typeof iter_value !== 'undefined' ? toType(iter_value) : 'string' },
+        value: iter_value,
+      };
+    } else {
+      field_prop = SESSION_OBJ[SESSION_ID]?.DS_GLB?.[_dsP]?.dynamic_fields?.[field_id];
+    }
   } else {
     field_prop = await find_in_view(field_id, _prog_id);
     if (!field_prop) {
@@ -663,7 +676,7 @@ func.runtime.bind.update_reference_source_array = async function (options) {
   if (field_type === 'object' && options.val_is_reference_field) {
     let obj_item = new_arr[arr_idx];
     let e_exp = options.expression_value.replace(options.bind_field_id, 'obj_item');
-    eval(e_exp + (options.input_field_type === 'string' ? `="${options.value}"` : `=${options.value}`));
+    eval(e_exp + `=${JSON.stringify(options.value)}`);
     new_arr[arr_idx] = obj_item;
   } else {
     new_arr[arr_idx] = options.value;
@@ -2657,6 +2670,23 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
   let prog_obj = await func.utils.VIEWS_OBJ.get(SESSION_ID, _ds.prog_id);
 
   const callback_datasource = async function () {
+    const run_on_load_events = async function () {
+      if (!(await func.datasource.get_view_events_count(SESSION_ID, dataSourceSession, 'on_load'))) {
+        return false;
+      }
+      await func.datasource.execute_view_events(SESSION_ID, dataSourceSession, 'on_load');
+      return true;
+    };
+    const schedule_panel_on_load_events = function () {
+      setTimeout(async function () {
+        try {
+          await run_on_load_events();
+        } catch (error) {
+          console.error(error);
+        }
+      }, 0);
+    };
+
     if (typeof IS_WORKER === 'undefined' && typeof IS_DOCKER === 'undefined' && typeof IS_PROCESS_SERVER === 'undefined' && _ds.viewSourceProp === 'globals') {
       if (!['main'].includes(_session.opt.app_computing_mode)) {
         await func.index.call_worker(SESSION_ID, {
@@ -2666,10 +2696,13 @@ func.datasource.execute = async function (SESSION_ID, dataSourceSession, IS_DATA
       }
     }
 
-    if (await func.datasource.get_view_events_count(SESSION_ID, dataSourceSession, 'on_load')) {
-      await func.datasource.execute_view_events(SESSION_ID, dataSourceSession, 'on_load');
+    if (args.is_panelP) {
+      const callback_ret = await func.datasource.callback(SESSION_ID, dataSourceSession, args.rowIdP, args.jobNoP, _ds.prog_id);
+      schedule_panel_on_load_events();
+      return callback_ret;
     }
-    // }
+
+    await run_on_load_events();
     return await func.datasource.callback(SESSION_ID, dataSourceSession, args.rowIdP, args.jobNoP, _ds.prog_id);
   };
 
@@ -4207,6 +4240,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
           dsSession_changed: findMin(datasource_changed),
           avoid_xu_for_refresh,
           trigger,
+          ignore_screen_blocker: true,
         });
         // await removed from the below function cause to dead lock Mar 3 25
         await func.runtime.ui.refresh_screen({

package/package.json

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