@xuda.io/xuda-worker-bundle-min 1.3.1159 → 1.3.1161

package/index.js

@@ -3207,28 +3207,49 @@ func.datasource.run_events_functions = async function (
   calling_job,
   NA_calling_job_ds
 ) {
-  var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
-  var args = _ds.args;
-  // var v = _ds.v;
-  const _view_obj = await func.utils.VIEWS_OBJ.get(SESSION_ID, _ds.prog_id);
-  if (_view_obj.progEvents) {
-    for await (const [key, val] of Object.entries(_view_obj.progEvents)) {
-      if (
-        val.data.type === "user_defined" &&
-        val.data.event_name &&
-        val.data.event_name === event_id
-      ) {
-        await func.events.validate(
-          SESSION_ID,
-          "user_defined",
-          dataSourceSession,
-          val.data.event_name,
-          args.callingSourceP,
-          val.data.parameters
-        );
+  return new Promise(async (resolve, reject) => {
+    var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
+    var args = _ds.args;
+    // var v = _ds.v;
+    const _view_obj = await func.utils.VIEWS_OBJ.get(SESSION_ID, _ds.prog_id);
+    let job_promises = []
+    if (_view_obj.progEvents) {
+      for await (const [key, val] of Object.entries(_view_obj.progEvents)) {
+        if (
+          val.data.type === "user_defined" &&
+          val.data.event_name &&
+          val.data.event_name === event_id
+        ) {
+          const job_num = await func.events.validate(
+            SESSION_ID,
+            "user_defined",
+            dataSourceSession,
+            val.data.event_name,
+            args.callingSourceP,
+            val.data.parameters
+          );
+          job_promises.push(new Promise((resolve, reject) => {
+            const interval = setInterval(() => {
+              var job_index = func.events.find_job_index(SESSION_ID, job_num);
+              if (job_index == null) {
+                clearInterval(interval)
+                resolve(job_num);
+              }
+            }, 100);
+          }))
+        }
       }
+
+
+
     }
-  }
+    if (job_promises.length) {
+      Promise.all(job_promises)
+    }
+    resolve()
+
+  })
+
 };
 
 func.datasource.render_fields_form = async function (
@@ -7780,9 +7801,9 @@ func.events.validate = async function (
                   await func.datasource.update(SESSION_ID, datasource_changes);
                 }
 
-                add_event();
+                await add_event();
               };
-              var add_event = function () {
+              const add_event = async function () {
                 const _event = func.common.find_item_by_key_root(
                   _view_obj.progEvents,
                   "id",
@@ -7850,7 +7871,7 @@ func.events.validate = async function (
                     }
 
                     jobs.push(
-                      func.events.add_to_queue(
+                      await func.events.add_to_queue(
                         SESSION_ID,
                         sourceP + " event",
                         trigger_obj.id,
@@ -7887,7 +7908,7 @@ func.events.validate = async function (
               if (val.data.parameters) {
                 await set_arguments();
               } else {
-                add_event();
+                await add_event();
               }
             } else {
               if (val.data.condition && !expCond.result) {
@@ -8993,7 +9014,7 @@ func.events.execute = async function (
         return;
       }
 
-      // const output_field = await get_args_property_value("outputField");
+
 
       // if (!output_field) {
       //   func.utils.debug_report(
@@ -9010,31 +9031,7 @@ func.events.execute = async function (
 
       await func.datasource.set_outputField(SESSION_ID, dsSessionP, api_ret, args);
 
-      // if (output_field) {
-      //   let datasource_changes = {};
 
-      //   let ret_get_value = await func.datasource.get_value(
-      //     SESSION_ID,
-      //     output_field,
-      //     dsSessionP
-      //   );
-      //   if (ret_get_value.found) {
-      //     let _ds = _session.DS_GLB[ret_get_value.dsSessionP];
-      //     if (!datasource_changes[_ds.dsSession]) {
-      //       datasource_changes[_ds.dsSession] = {};
-      //     }
-      //     if (
-      //       !datasource_changes[_ds.dsSession][ret_get_value.currentRecordId]
-      //     ) {
-      //       datasource_changes[_ds.dsSession][ret_get_value.currentRecordId] =
-      //         {};
-      //     }
-      //     datasource_changes[_ds.dsSession][ret_get_value.currentRecordId][
-      //       output_field
-      //     ] = api_ret;
-      //     await func.datasource.update(SESSION_ID, datasource_changes);
-      //   }
-      // }
       func.events.delete_job(SESSION_ID, jobNoP);
     },
     call_system_api: async function () {

package/package.json

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