@xuda.io/xuda-worker-bundle-min 1.3.73 → 1.3.74

package/index.js

@@ -1800,11 +1800,8 @@ func.datasource.execute = async function (
   };
   let data_arr = [];
   switch (tree_obj.menuType) {
-    case "api":
+    case "api": {
       _ds.api_rendered_output = "";
-
-    case "batch":
-    case "api":
       let has_datasource = await calc_batch_loops();
 
       data_arr = _ds.v?.raw_data?.rows || [];
@@ -1844,12 +1841,69 @@ func.datasource.execute = async function (
             "after_record"
           );
         }
-        if (tree_obj.menuType === "api") {
-          await render_api_output();
+
+        await render_api_output();
+      }
+
+      if (tree_obj.apiOutput === "json") {
+        var str = _ds.api_rendered_output.substring(
+          0,
+          _ds.api_rendered_output.length - 1
+        );
+        if (Number(_ds.v.progDataSource?.dataSourceLimit) === 1) {
+          _ds.api_rendered_output = str;
+        } else {
+          _ds.api_rendered_output = "[" + str + "]";
         }
       }
-      // ret = await callback_datasource();
+
       break;
+    }
+
+    case "batch": {
+      let has_datasource = await calc_batch_loops();
+
+      data_arr = _ds.v?.raw_data?.rows || [];
+      if (!has_datasource) {
+        for (n = 0; n < _ds.v.batch_loops; n++) {
+          data_arr.push({});
+        }
+      }
+      _ds.currentRecordId = "dataset";
+      for await (let [key, val] of Object.entries(data_arr)) {
+        if (has_datasource && Number(key) >= _ds.v.batch_loops) break;
+
+        if (!has_datasource) {
+          val.value = _ds?.data_feed?.rows?.[_ds.currentRecordId] || {
+            value: {},
+          };
+        }
+
+        if (await get_before_record_count()) {
+          await func.datasource.execute_view_events(
+            SESSION_ID,
+            dataSourceSession,
+            "before_record"
+          );
+        }
+
+        await func.datasource.render_fields_dataset(
+          SESSION_ID,
+          dataSourceSession,
+          val
+        );
+
+        if (await get_after_record_count()) {
+          await func.datasource.execute_view_events(
+            SESSION_ID,
+            dataSourceSession,
+            "after_record"
+          );
+        }
+      }
+
+      break;
+    }
 
     case "get_data":
       if (await get_before_record_count()) {
@@ -1960,20 +2014,6 @@ func.datasource.execute = async function (
 
       break;
 
-    case "api":
-      if (_ds.apiOutput === "json") {
-        var str = _ds.api_rendered_output.substring(
-          0,
-          _ds.api_rendered_output.length - 1
-        );
-        if (Number(_ds.v.progDataSource?.dataSourceLimit) === 1) {
-          _ds.api_rendered_output = str;
-        } else {
-          _ds.api_rendered_output = "[" + str + "]";
-        }
-      }
-      break;
-
     case "component":
       _ds.data_feed = { sort: {}, groupBy: {}, rows: {} };
 

package/package.json

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