@xuda.io/xuda-worker-bundle-min 1.3.845 → 1.3.847

package/index.js

@@ -2184,11 +2184,10 @@ func.datasource.execute = async function (
   if (_ds.prog_id === "system") {
     //TBD tree_obj.menuType === "globals"
     _ds.currentRecordId = "dataset";
-    await func.datasource.render_fields_dataset(
-      SESSION_ID,
-      dataSourceSession,
-      _session.url_params
-    );
+    await func.datasource.render_fields_dataset(SESSION_ID, dataSourceSession, {
+      id: "dataset",
+      value: _session.url_params,
+    });
 
     return await callback_datasource();
   }
@@ -2925,56 +2924,55 @@ func.datasource.render_fields_dataset = async function (
     _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;
-
-        if (val.data.type === "virtual" || _ds.set_mode === "C") {
-          if (typeof raw_data_row?.value?.[fieldId] !== "undefined") {
-            // supports x=x+1
-            _ds.data_feed.rows[row_idx][fieldId] = await get_value(
-              fieldId,
-              raw_data_row.value[fieldId]
-            );
-            continue;
-          }
+  }
+  _ds.dataset_alias = {};
 
-          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;
-          }
+  for await (const val of _progFields) {
+    try {
+      var fieldId = val.data.field_id;
 
+      if (val.data.type === "virtual" || _ds.set_mode === "C") {
+        if (typeof raw_data_row?.value?.[fieldId] !== "undefined") {
+          // supports x=x+1
           _ds.data_feed.rows[row_idx][fieldId] = await get_value(
             fieldId,
-            val.props?.fieldValue
+            raw_data_row.value[fieldId]
           );
           continue;
         }
-        if (val.data.type === "table" || val.data.type === "datasource") {
-          if (typeof raw_data_row.value[fieldId] === "undefined") {
-            throw "field do not exist in data: " + fieldId;
-          }
+
+        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,
-            raw_data_row.value[fieldId]
+            ret.result
           );
+          continue;
         }
-      } catch (err) {
-        func.utils.debug_report(SESSION_ID, "Datasource", err, "E", null, _ds);
+
+        _ds.data_feed.rows[row_idx][fieldId] = await get_value(
+          fieldId,
+          val.props?.fieldValue
+        );
+        continue;
+      }
+      if (val.data.type === "table" || val.data.type === "datasource") {
+        if (typeof raw_data_row.value[fieldId] === "undefined") {
+          throw "field do not exist in data: " + fieldId;
+        }
+        _ds.data_feed.rows[row_idx][fieldId] = await get_value(
+          fieldId,
+          raw_data_row.value[fieldId]
+        );
       }
+    } catch (err) {
+      func.utils.debug_report(SESSION_ID, "Datasource", err, "E", null, _ds);
     }
   }
 };

package/package.json

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