@xuda.io/xuda-worker-bundle-min 1.3.1095 → 1.3.1097

package/index.js

@@ -8091,6 +8091,51 @@ func.events.execute = async function (
 
     return _value;
   };
+
+  const set_outputField = async function (SESSION_ID, elementP, triggerP, functionP, dsSessionP, result) {
+    var _session = SESSION_OBJ[SESSION_ID];
+
+    const output_field = await get_args_property_value("outputField");
+
+    // if (!output_field) {
+    //   func.utils.debug_report(
+    //     SESSION_ID,
+    //     "func.events.execute",
+    //     `${elementP} >${triggerP} >${functionP} > Output field not defined`,
+    //     "W"
+    //   );
+
+    // }
+
+
+
+    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
+        ] = result;
+        await func.datasource.update(SESSION_ID, datasource_changes);
+      }
+    }
+
+  }
   var args = {
     prog_id: refIdP?.prog,
     screenIdP: refIdP?.prog,
@@ -8650,7 +8695,11 @@ func.events.execute = async function (
       return this.get_data();
     },
     batch: async function () {
-      return this.get_data();
+      const result = await this.get_data();
+      debugger
+      await set_outputField(SESSION_ID, elementP, triggerP, functionP, dsSessionP, result);
+      return result
+
     },
     update: async function () {
       const obj_values_to_update =
@@ -8785,46 +8834,48 @@ func.events.execute = async function (
         return;
       }
 
-      const output_field = await get_args_property_value("outputField");
+      // const output_field = await get_args_property_value("outputField");
 
-      if (!output_field) {
-        func.utils.debug_report(
-          SESSION_ID,
-          "func.events.execute",
-          `${elementP} >${triggerP} >${functionP} > Output field not defined`,
-          "W"
-        );
-        // func.events.delete_job(SESSION_ID, jobNoP);
-        // return;
-      }
+      // if (!output_field) {
+      //   func.utils.debug_report(
+      //     SESSION_ID,
+      //     "func.events.execute",
+      //     `${elementP} >${triggerP} >${functionP} > Output field not defined`,
+      //     "W"
+      //   );
+      //   // func.events.delete_job(SESSION_ID, jobNoP);
+      //   // return;
+      // }
 
       const api_ret = await func.api.call_project_api(_prog_id, params_obj);
 
-      if (output_field) {
-        let datasource_changes = {};
+      await set_outputField(SESSION_ID, elementP, triggerP, functionP, dsSessionP, api_ret);
 
-        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);
-        }
-      }
+      // 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.1095",
+  "version": "1.3.1097",
   "description": "xuda framework min",
   "main": "index.js",
   "scripts": {