@xuda.io/xuda-worker-bundle 1.3.1157 → 1.3.1159

package/index.js

@@ -5092,7 +5092,51 @@ func.datasource.update_changes_for_out_parameter = async function (
     }
   }
 };
- func.utils = {};
+
+func.datasource.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);
+    }
+  }
+
+} func.utils = {};
 
 func.utils.debug = {};
 func.utils.debug.watch = async function (
@@ -8092,50 +8136,7 @@ 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,
@@ -8689,6 +8690,7 @@ func.events.execute = async function (
         // }
 
         func.events.delete_job(SESSION_ID, jobNoP);
+        return _ds_new
       }
     },
     set_data: async function () {
@@ -8697,7 +8699,7 @@ func.events.execute = async function (
     batch: async function () {
       const result = await this.get_data();
       debugger
-      await set_outputField(SESSION_ID, elementP, triggerP, functionP, dsSessionP, result);
+      // await set_outputField(SESSION_ID, elementP, triggerP, functionP, dsSessionP, result);
       return result
 
     },
@@ -8849,7 +8851,7 @@ func.events.execute = async function (
 
       const api_ret = await func.api.call_project_api(_prog_id, params_obj);
 
-      await set_outputField(SESSION_ID, elementP, triggerP, functionP, dsSessionP, api_ret);
+      await func.datasource.set_outputField(SESSION_ID, elementP, triggerP, functionP, dsSessionP, api_ret);
 
       // if (output_field) {
       //   let datasource_changes = {};

package/package.json

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