@xuda.io/xuda-worker-bundle-min 1.3.842 → 1.3.844

package/index.js

@@ -2285,6 +2285,10 @@ func.datasource.execute = async function (
     }
   };
 
+  if (!_ds.v.raw_data) {
+    _ds.v.raw_data = { rows: [] };
+  }
+
   switch (prog_obj.progDataSource?.dataSourceType) {
     case "table":
       _ds._dataSourceTableId = prog_obj.progDataSource?.dataSourceTableId; // get file id
@@ -2347,7 +2351,9 @@ func.datasource.execute = async function (
         filterModelUserSql: _ds.progDataSource.filterModelUserSql,
       };
 
-      _ds.data_feed = await func.db.get_query(
+      _ds.data_feed = [];
+
+      _ds.v.raw_data = await func.db.get_query(
         SESSION_ID,
         _ds._dataSourceTableId,
         _ds.v.couchView,
@@ -2393,19 +2399,22 @@ func.datasource.execute = async function (
         data = [];
       }
 
-      let _KEY = 0;
-      for (const _VAL of data) {
-        _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
-        _KEY++;
-      }
-      // if (!_ds.v.raw_data) {
-      //   _ds.v.raw_data = { rows: [] };
-      // }
       // let _KEY = 0;
       // for (const _VAL of data) {
-      //   _ds.v.raw_data.rows[_KEY] = { id: _KEY, value: { _KEY, _VAL } };
+      //   _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
       //   _KEY++;
       // }
+
+      _ds.rows_found = data?.length || 0;
+
+      // if (!_ds.v.raw_data) {
+      //   _ds.v.raw_data = { rows: [] };
+      // }
+      let _KEY = 0;
+      for (const _VAL of data) {
+        _ds.v.raw_data.rows.push({ id: _KEY, value: { _KEY, _VAL } });
+        _KEY++;
+      }
       break;
     }
 
@@ -2415,16 +2424,17 @@ func.datasource.execute = async function (
         data = {};
       }
 
-      for (let [_KEY, _VAL] of Object.keys(data)) {
-        _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
-      }
+      // for (let [_KEY, _VAL] of Object.keys(data)) {
+      //   _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
+      // }
+      _ds.rows_found = Object.keys(data)?.length || 0;
       // if (!_ds.v.raw_data) {
       //   _ds.v.raw_data = { rows: [] };
       // }
 
-      // for (let [_KEY, _VAL] of Object.keys(data)) {
-      //   _ds.v.raw_data.rows[_KEY] = { id: _KEY, value: { _KEY, _VAL } };
-      // }
+      for (let [_KEY, _VAL] of Object.keys(data)) {
+        _ds.v.raw_data.rows.push({ id: _KEY, value: { _KEY, _VAL } });
+      }
 
       break;
     }
@@ -2435,16 +2445,6 @@ func.datasource.execute = async function (
         data = "";
       }
 
-      if (!_ds.v.raw_data) {
-        _ds.v.raw_data = { rows: [] };
-      }
-
-      let _KEY = 0;
-      let arr = data.split(",");
-      for (const _VAL of arr) {
-        _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
-        _KEY++;
-      }
       // if (!_ds.v.raw_data) {
       //   _ds.v.raw_data = { rows: [] };
       // }
@@ -2452,10 +2452,21 @@ func.datasource.execute = async function (
       // let _KEY = 0;
       // let arr = data.split(",");
       // for (const _VAL of arr) {
-      //   _ds.v.raw_data.rows[_KEY] = { id: _KEY, value: { _KEY, _VAL } };
+      //   _ds.data_feed.rows[_KEY] = { _KEY, _VAL };
       //   _KEY++;
       // }
+      // _ds.rows_found = arr?.length || 0;
+      // if (!_ds.v.raw_data) {
+      //   _ds.v.raw_data = { rows: [] };
+      // }
 
+      let _KEY = 0;
+      let arr = data.split(",");
+      for (const _VAL of arr) {
+        _ds.v.raw_data.rows.push({ id: _KEY, value: { _KEY, _VAL } });
+        _KEY++;
+      }
+      _ds.rows_found = arr?.length || 0;
       break;
 
     default:
@@ -2556,7 +2567,7 @@ func.datasource.execute = async function (
         if (has_datasource && Number(key) >= _ds.v.batch_loops) break;
 
         if (!has_datasource) {
-          val.value = _ds?.data_feed?.rows?.[key] || { _ROWID: key };
+          val = _ds?.data_feed?.rows?.[key] || { _ROWID: key };
         }
 
         if (await get_before_record_count()) {
@@ -2597,9 +2608,7 @@ func.datasource.execute = async function (
       ret = await db_adapter_module.process_view_dataset(
         SESSION_ID,
         dataSourceSession,
-        _ds.v,
         _ds
-        // json1
       );
 
       if (await get_after_record_count()) {
@@ -2711,7 +2720,7 @@ func.datasource.execute = async function (
       _ds.rows_processed = 0;
       _ds.viewRangeExp_rows_deleted = 0;
 
-      let rows = _ds?.data_feed?.rows?.length;
+      let rows = _ds?.raw_data?.rows?.length;
 
       _ds.data_feed.rows_changed = [];
       _ds.data_feed.rows_deleted = [];
@@ -2722,16 +2731,26 @@ func.datasource.execute = async function (
         _ds.set_mode = "C";
         _ds.record_not_found = true;
 
-        if (_.isEmpty(_ds.data_feed.rows[glb.newRecord])) {
+        try {
+          const row_idx = func.common.find_ROWID_idx(_ds, _ds.currentRecordId);
+        } catch (error) {
           await func.datasource.render_fields_form(
             SESSION_ID,
             dataSourceSession,
-            { _ROWID: "newRecord" } // { id: "newRecord", value: {} },
-            // null,
-            // false,
-            // "newRecord"
+            { id: "newRecord" }
           );
         }
+
+        // if (_.isEmpty(_ds.data_feed.rows[glb.newRecord])) {
+        //   await func.datasource.render_fields_form(
+        //     SESSION_ID,
+        //     dataSourceSession,
+        //     { _ROWID: "newRecord" } // { id: "newRecord", value: {} },
+        //     // null,
+        //     // false,
+        //     // "newRecord"
+        //   );
+        // }
         var count = await func.datasource.get_field_init_count(
           SESSION_ID,
           dataSourceSession,
@@ -2755,7 +2774,7 @@ func.datasource.execute = async function (
         break;
       }
 
-      _ds.firstRecordId = _ds.data_feed.rows[0]._ROWID;
+      _ds.firstRecordId = _ds.raw_data.rows[0].id;
 
       const finish_form = async function () {
         // check if locatedRecordId exist in SESSION_OBJ[SESSION_ID].DS_GLB
@@ -2778,7 +2797,7 @@ func.datasource.execute = async function (
         _ds.currentRecordId = _ds.finalRecordId;
       };
 
-      for await (const [key, val] of Object.entries(_ds.data_feed.rows)) {
+      for await (const [key, val] of Object.entries(_ds.raw_data.rows)) {
         if (await get_before_record_count()) {
           await func.datasource.execute_view_events(
             SESSION_ID,
@@ -2791,12 +2810,7 @@ func.datasource.execute = async function (
           SESSION_ID,
           dataSourceSession,
           key,
-          null,
-          null,
-          null,
-          _ds.pre_init_fields,
-          val,
-          db_adapter_module
+          val.value
         );
 
         if (await get_after_record_count()) {
@@ -3071,15 +3085,15 @@ func.datasource.render_fields_form = async function (
 
   let row_idx;
   try {
-    row_idx = func.common.find_ROWID_idx(_ds, data._ROWID);
+    row_idx = func.common.find_ROWID_idx(_ds, data.id);
     // data_arr[row_idx] = [{ _ROWID: "newRecord" }];
   } catch (error) {
     // if (data._ROWID === "newRecord") {
     //   _ds.data_feed.rows[glb.newRecord] = { _ROWID: data._ROWID };
     // } else {
-    _ds.data_feed.rows.push({ _ROWID: data._ROWID });
+    _ds.data_feed.rows.push({ _ROWID: data.id });
     // }
-    row_idx = func.common.find_ROWID_idx(_ds, data._ROWID);
+    row_idx = func.common.find_ROWID_idx(_ds, data.id);
   }
 
   _ds.dataset_alias = {};
@@ -3109,7 +3123,7 @@ func.datasource.render_fields_form = async function (
             case "_ROWDOC": {
               _ds.data_feed.rows[row_idx][fieldId] = await get_value(
                 fieldId,
-                data
+                data.value
               );
 
               continue;
@@ -3147,7 +3161,7 @@ func.datasource.render_fields_form = async function (
         }
         _ds.data_feed.rows[row_idx][fieldId] = await get_value(
           fieldId,
-          data[fieldId]
+          data.value[fieldId]
         );
       }
     } catch (err) {
@@ -3160,44 +3174,31 @@ func.datasource.run_rows_form = async function (
   SESSION_ID,
   dataSourceSession,
   rowIdxP,
-  NA_onDemandP,
-  NA_callbackP,
-  NA_oninit_triggers_to_runP,
-  pre_init_fieldsP,
-  data,
-  db_adapter_module
+  data
 ) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   if (!_ds) return;
   // var v = _ds.v;
 
   var val = _ds.data_feed.rows[rowIdxP];
-
+  let _ROWID = val.id;
   var idx;
 
   try {
     if (typeof val !== "undefined") {
       idx = rowIdxP;
     } else {
-      val = _ds.data_feed.rows.push({ _ROWID: "newRecord" });
-      idx = func.common.find_ROWID_idx(_ds, "newRecord");
+      _ROWID = "newRecord";
+      val = _ds.data_feed.rows.push({ _ROWID });
+      idx = func.common.find_ROWID_idx(_ds, _ROWID);
     }
   } catch (e) {
     console.error(e);
   }
 
-  _ds.currentRecordId = val._ROWID; // set temporary to allow expression decoder work
+  _ds.currentRecordId = _ROWID; // set temporary to allow expression decoder work
 
-  await func.datasource.render_fields_form(
-    SESSION_ID,
-    dataSourceSession,
-    data
-    // null,
-    // true,
-    // idx,
-    // true,
-    // pre_init_fieldsP
-  );
+  await func.datasource.render_fields_form(SESSION_ID, dataSourceSession, data);
   const init_count = await func.datasource.get_field_init_count(
     SESSION_ID,
     dataSourceSession,
@@ -3210,7 +3211,7 @@ func.datasource.run_rows_form = async function (
       SESSION_ID,
       dataSourceSession,
       "form",
-      idx
+      _ds.data_feed.rows[idx]._ROWID
     );
   }
   // await form_continue();
@@ -5183,7 +5184,7 @@ func.utils.clean_returned_datasource = function (SESSION_ID, DS) {
   // }
   delete obj.pre_init_fields;
   delete obj.oninit_triggers_to_run;
-  // delete obj.raw_data;
+  delete obj.raw_data;
 
   delete obj.debug;
 

package/package.json

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