@xuda.io/xuda-worker-bundle 1.3.1276 → 1.3.1278

package/index.js

@@ -3215,8 +3215,15 @@ func.datasource.run_events_functions = async function (
   dataSourceSession,
   event_id,
   calling_job,
-  async_event
+  async_event,
+  event_parameters
 ) {
+
+  if (typeof dataSourceSession === "undefined" || dataSourceSession === null) {
+    console.warn(`Event ${event_id} not exist or not found`)
+    return
+  }
+
   // return new Promise(async (resolve, reject) => {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   var args = _ds.args;
@@ -3236,7 +3243,7 @@ func.datasource.run_events_functions = async function (
           dataSourceSession,
           val.data.event_name,
           args.callingSourceP,
-          val.data.parameters
+          event_parameters// val.data.parameters
         );
 
         if (calling_job || async_event) continue
@@ -3262,20 +3269,7 @@ func.datasource.run_events_functions = async function (
   if (job_promises.length) {
     await Promise.all(job_promises)
   }
-  // console.log(job_promises)
-  // resolve()
-
-  // if (job_promises.length) {
-  //   Promise.all(job_promises)
-  //     .then((e) => {
-  //       resolve()
-  //     });
-
-  // } else {
-  //   resolve()
-  // }
 
-  // })
 
 };
 
@@ -8094,7 +8088,39 @@ func.events.validate = async function (
               const set_arguments = async function () {
                 var args = argumentsP || {};
 
-                for await (let [key, fieldId] of Object.entries(
+                // for await (let [key, fieldId] of Object.entries(
+                //   val.data.parameters
+                // )) {
+                //   const field_info = func.common.find_item_by_key(
+                //     _view_obj.progFields,
+                //     "field_id",
+                //     fieldId
+                //   );
+
+                //   var value = await func.common.get_cast_val(
+                //     SESSION_ID,
+                //     "events",
+                //     fieldId,
+                //     field_info.props.fieldType,
+                //     args[fieldId]
+                //   );
+
+                //   const ret = await func.datasource.get_value(
+                //     SESSION_ID,
+                //     fieldId,
+                //     dsSessionP,
+                //     _ds.currentRecordId
+                //   );
+
+                //   const datasource_changes = {
+                //     [ret.dsSessionP]: {
+                //       [ret.currentRecordId]: { [fieldId]: value },
+                //     },
+                //   };
+                //   await func.datasource.update(SESSION_ID, datasource_changes);
+                // }
+
+                for await (let [fieldId, val_obj] of Object.entries(
                   val.data.parameters
                 )) {
                   const field_info = func.common.find_item_by_key(
@@ -8103,14 +8129,34 @@ func.events.validate = async function (
                     fieldId
                   );
 
-                  var value = await func.common.get_cast_val(
+                  if (field_info?.data?.type !== "virtual") {
+                    console.warn("parameter field must be virtual, update ignored");
+                    continue;
+                  }
+
+                  if (!args[fieldId]) continue
+
+
+
+                  let value = await func.common.get_cast_val(
                     SESSION_ID,
                     "events",
                     fieldId,
                     field_info.props.fieldType,
-                    args[fieldId]
+                    args[fieldId].value
                   );
 
+                  if (!_.isEmpty(args[fieldId].fx)) {
+                    value = (
+                      await func.expression.get(
+                        SESSION_ID,
+                        args[fieldId].fx,
+                        dsSessionP,
+                        "update"
+                      )
+                    ).result;
+                  }
+                  // find the target field in the program dataset
                   const ret = await func.datasource.get_value(
                     SESSION_ID,
                     fieldId,
@@ -9061,7 +9107,8 @@ func.events.execute = async function (
             dsP,
             event_name,
             jobNoP,
-            null
+            null,
+            calling_trigger_prop?.data?.name?.parameters || {}
           );
         }
         // done_execution(event_name);
@@ -9091,7 +9138,8 @@ func.events.execute = async function (
           dsP,
           event_name,
           jobNoP,
-          calling_trigger_prop?.props?.async
+          calling_trigger_prop?.props?.async,
+          calling_trigger_prop?.data?.name?.parameters || {}
         );
         // done_execution(event_name);
       }

package/package.json

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