@xuda.io/xuda-worker-bundle-min 1.3.90 → 1.3.92

package/index.js

@@ -828,7 +828,7 @@ func.api.invoke_event = async function (event_id) {
 
   return await api_utils.invoke_event(event_id);
 };
-func.api.call_api_program = async function (prog_id, params, opts) {
+func.api.call_api_program = async function (prog_id, params) {
   const SESSION_ID = Object.keys(SESSION_OBJ)[0];
   const api_utils = await func.common.get_module(
     SESSION_ID,
@@ -844,7 +844,7 @@ func.api.call_api_program = async function (prog_id, params, opts) {
     dsSession: Object.keys(SESSION_OBJ[SESSION_ID].DS_GLB).length - 1,
   });
 
-  return await api_utils.call_api_program(prog_id, params, null, opts);
+  return await api_utils.call_api_program(prog_id, params, null);
 };
  glb.DEBUG_INFO_OBJ = {};
 // var CONNECTION_ATTEMPTS = 0;
@@ -7366,6 +7366,39 @@ func.events.execute = async function (
     }
     return params_obj;
   };
+
+  const get_prog_id = async function () {
+    let _prop = args?.calling_trigger_prop?.data?.name?.properties;
+    let _prog_id = args.prog_id;
+    if (_prop?.["xu-exp:prog"]) {
+      _prog_id = (
+        await func.expression.get(
+          SESSION_ID,
+          _prop["xu-exp:prog"],
+          dsSession,
+          "prog_id expression"
+        )
+      ).result;
+    }
+
+    return _prog_id;
+  };
+  const get_args_property_value = async function (prop_name) {
+    let _prop = args?.calling_trigger_prop?.data?.name?.properties;
+    let _value = _prop[prop_name];
+    if (_prop?.[`xu-exp:${prop_name}`]) {
+      _value = (
+        await func.expression.get(
+          SESSION_ID,
+          _prop[`xu-exp:${prop_name}`],
+          dsSession,
+          `${prop_name} expression`
+        )
+      ).result;
+    }
+
+    return _value;
+  };
   var args = {
     prog_id: refIdP?.prog,
     screenIdP: refIdP?.prog,
@@ -7948,17 +7981,10 @@ func.events.execute = async function (
         );
         let _field_id = ret_field_id.result;
         let _value = ret_value.result;
-        // await func.api.set_field_value(SESSION_ID, _field_id, _value);
+
         updates.push({ _field_id, _value });
       }
 
-      // const drill_datasource = async function (ds_number) {
-      //   if (!_session.DS_GLB[ds_number]) {
-      //     return;
-      //   }
-      //   const _ds = _session.DS_GLB[ds_number];
-      // };
-
       let datasource_changes = {};
       for await (const change of updates) {
         let ret_get_value = await func.datasource.get_value(
@@ -7980,34 +8006,9 @@ func.events.execute = async function (
           datasource_changes[_ds.dsSession][ret_get_value.currentRecordId][
             change._field_id
           ] = change._value;
-          // break;
         }
       }
-      // for await (const change of updates) {
-      //   for await (const [key, val] of Object.entries(
-      //     Object.assign([], _session.DS_GLB).reverse()
-      //   )) {
-      //     let ret_get_value = await func.datasource.get_value(
-      //       SESSION_ID,
-      //       change._field_id,
-      //       val.dsSession
-      //     );
-      //     if (ret_get_value.found) {
-      //       ret = ret_get_value;
-      //       let _ds = _session.DS_GLB[ret.dsSessionP];
-      //       if (!datasource_changes[_ds.dsSession]) {
-      //         datasource_changes[_ds.dsSession] = {};
-      //       }
-      //       if (!datasource_changes[_ds.dsSession][ret.currentRecordId]) {
-      //         datasource_changes[_ds.dsSession][ret.currentRecordId] = {};
-      //       }
-      //       datasource_changes[_ds.dsSession][ret.currentRecordId][
-      //         change._field_id
-      //       ] = change._value;
-      //       break;
-      //     }
-      //   }
-      // }
+
       await func.datasource.update(SESSION_ID, datasource_changes);
       if (jobNoP) func.events.delete_job(SESSION_ID, jobNoP);
       // return changes;
@@ -8044,21 +8045,22 @@ func.events.execute = async function (
       if (jobNoP) func.events.delete_job(SESSION_ID, jobNoP);
     },
     call_api: async function () {
-      // console.log(args);
-      // debugger;
       const params_obj = await get_params_obj();
+      let _prog_id = await get_prog_id();
 
-      if (!args.prog_id) {
+      if (!_prog_id) {
         func.utils.debug_report(
           SESSION_ID,
           "func.events.execute",
           elementP + ">" + triggerP + ">" + functionP + ">" + "program missing",
           "E"
         );
+        func.events.delete_job(SESSION_ID, jobNoP);
+        return;
       }
-      let output_field =
-        args?.calling_trigger_prop?.data?.name?.properties?.outputField;
-      func.events.delete_job(SESSION_ID, jobNoP);
+
+      let output_field = await get_args_property_value("outputField");
+
       if (!output_field) {
         func.utils.debug_report(
           SESSION_ID,
@@ -8072,14 +8074,43 @@ func.events.execute = async function (
             "Output field missing",
           "E"
         );
-
+        func.events.delete_job(SESSION_ID, jobNoP);
         return;
       }
-      let parameters = args?.calling_trigger_prop?.data?.name?.parameters;
-      const ret = await func.api.call_api_program(args.prog_id, parameters, {
-        dsSession: dsSessionP,
-      });
-      await func.api.set_field_value(output_field, ret);
+
+      const api_ret = await func.api.call_api_program(_prog_id, params_obj);
+      // {
+      //   dsSession: dsSessionP,
+      // }
+      // await func.api.set_field_value(output_field, ret);
+      // const datasource_changes = {
+      //   [dsSessionP]: {
+      //     [ret_get_value.currentRecordId]: { [field_id]: value },
+      //   },
+      // };
+      // return await func.datasource.update(_this.SESSION_ID, datasource_changes);
+
+      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);
     },
   };

package/package.json

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