@xuda.io/xuda-worker-bundle-min 1.3.839 → 1.3.841

package/index.js

@@ -2891,50 +2891,75 @@ func.datasource.render_fields_dataset = async function (
   };
 
   if (!_ds.data_feed) {
-    _ds.data_feed = { rows: [] };
+    _ds.data_feed = { rows: [{ _ROWID: _ds.currentRecordId }] };
   }
-  let data_feed = { _ROWID: _ds.currentRecordId };
 
-  _ds.dataset_alias = {};
+  let row_idx;
+  try {
+    row_idx = func.common.find_ROWID_idx(_ds, _ds.currentRecordId);
+  } catch (err) {
+    _ds.data_feed.rows.push({ _ROWID: _ds.currentRecordId });
+    row_idx = func.common.find_ROWID_idx(_ds, _ds.currentRecordId);
+    // console.error(err);
+  } finally {
+    _ds.dataset_alias = {};
 
-  for await (const val of _progFields) {
-    try {
-      var fieldId = val.data.field_id;
+    for await (const val of _progFields) {
+      try {
+        var fieldId = val.data.field_id;
+
+        if (val.data.type === "virtual" || _ds.set_mode === "C") {
+          if (typeof data?.[fieldId] !== "undefined") {
+            // supports x=x+1
+            _ds.data_feed.rows[row_idx][fieldId] = await get_value(
+              fieldId,
+              data[fieldId]
+            );
+            continue;
+          }
 
-      if (val.data.type === "virtual" || _ds.set_mode === "C") {
-        if (typeof data?.[fieldId] !== "undefined") {
-          // supports x=x+1
-          data_feed[fieldId] = await get_value(fieldId, data[fieldId]);
-          continue;
-        }
+          if (val.props?.propExpressions?.fieldValue) {
+            let ret = await func.expression.get(
+              SESSION_ID,
+              val.props?.propExpressions?.fieldValue,
+              dataSourceSession,
+              "update",
+              args.rowIdP
+            );
+            _ds.data_feed.rows[row_idx][fieldId] = await get_value(
+              fieldId,
+              ret.result
+            );
+            continue;
+          }
 
-        if (val.props?.propExpressions?.fieldValue) {
-          let ret = await func.expression.get(
-            SESSION_ID,
-            val.props?.propExpressions?.fieldValue,
-            dataSourceSession,
-            "update",
-            args.rowIdP
+          _ds.data_feed.rows[row_idx][fieldId] = await get_value(
+            fieldId,
+            val.props?.fieldValue
           );
-          data_feed[fieldId] = await get_value(fieldId, ret.result);
           continue;
         }
-
-        data_feed[fieldId] = await get_value(fieldId, val.props?.fieldValue);
-        continue;
-      }
-      if (val.data.type === "table" || val.data.type === "datasource") {
-        if (typeof data[fieldId] === "undefined") {
-          throw "field do not exist in data: " + fieldId;
+        if (val.data.type === "table" || val.data.type === "datasource") {
+          if (typeof data[fieldId] === "undefined") {
+            throw "field do not exist in data: " + fieldId;
+          }
+          _ds.data_feed.rows[row_idx][fieldId] = await get_value(
+            fieldId,
+            data[fieldId]
+          );
         }
-        data_feed[fieldId] = await get_value(fieldId, data[fieldId]);
+      } catch (err) {
+        func.utils.debug_report(SESSION_ID, "Datasource", err, "E", null, _ds);
       }
-    } catch (err) {
-      func.utils.debug_report(SESSION_ID, "Datasource", err, "E", null, _ds);
     }
   }
+
+  // let data_feed = { _ROWID: _ds.currentRecordId };
+
+  // _ds.data_feed._ROWID = _ds.currentRecordId;
+
   // _ds.data_feed.rows.push(data_feed);
-  _ds.data_feed.rows[0] = data_feed;
+  // _ds.data_feed.rows[0] = data_feed;
 };
 
 func.datasource.run_events_functions = async function (
@@ -3911,26 +3936,30 @@ func.datasource.callback = function (
   var _session = SESSION_OBJ[SESSION_ID];
   var _ds = _session.DS_GLB[dsSessionP];
 
-  const dataset = 0;
+  try {
+    const row_idx = func.common.find_ROWID_idx(_ds, "dataset");
 
-  if (_ds.PARAM_OUT_INFO) {
-    // write log for out params
-    for (const [key, val] of Object.entries(_ds.PARAM_OUT_INFO)) {
-      if (
-        typeof _ds?.data_feed?.rows?.[dataset]?.[val.fieldId] === "undefined"
-      ) {
-        // func.utils.debug.log(SESSION_ID, key, val);
-        func.utils.alerts.invoke(
-          SESSION_ID,
-          "system_msg",
-          "SYS_MSG_0310",
-          val.fieldId,
-          dsSessionP
-        );
-        break;
+    if (_ds.PARAM_OUT_INFO) {
+      // write log for out params
+      for (const [key, val] of Object.entries(_ds.PARAM_OUT_INFO)) {
+        if (
+          typeof _ds?.data_feed?.rows?.[row_idx]?.[val.fieldId] === "undefined"
+        ) {
+          // func.utils.debug.log(SESSION_ID, key, val);
+          func.utils.alerts.invoke(
+            SESSION_ID,
+            "system_msg",
+            "SYS_MSG_0310",
+            val.fieldId,
+            dsSessionP
+          );
+          break;
+        }
+        val.result = _ds.data_feed.rows[row_idx][val.fieldId];
       }
-      val.result = _ds.data_feed.rows[dataset][val.fieldId];
     }
+  } catch (err) {
+    console.error(err);
   }
 
   func.utils.debug.log(SESSION_ID, nodeIdP, {
@@ -3944,16 +3973,6 @@ func.datasource.callback = function (
   });
   if (!glb.IS_WORKER) $(_session.root_element).css("cursor", "default");
 
-  function arrayUnique(array) {
-    var a = array.concat();
-    for (var i = 0; i < a.length; ++i) {
-      for (var j = i + 1; j < a.length; ++j) {
-        if (a[i] === a[j]) a.splice(j--, 1);
-      }
-    }
-    return a;
-  }
-
   if (_ds.prog_id) {
     let _ds = _session.DS_GLB[dsSessionP];
 
@@ -8348,8 +8367,16 @@ func.events.execute = async function (
             _ds_new.PARAM_OUT_INFO
           )) {
             if (val.prop === "out") {
-              data[val.details] =
-                _ds_new.data_feed.rows[_ds_new.currentRecordId][val.fieldId];
+              try {
+                const row_idx = func.common.find_ROWID_idx(
+                  _ds,
+                  _ds_new.currentRecordId
+                );
+                data[val.details] =
+                  _ds_new.data_feed.rows[row_idx][val.fieldId];
+              } catch (err) {
+                console.error(err);
+              }
             }
           }
           if (!_.isEmpty(data)) {

package/package.json

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