@xuda.io/xuda-worker-bundle-min 1.3.836 → 1.3.838

package/index.js

@@ -32,7 +32,7 @@ glb.PROTECTED_VARS = [
   "_VAL",
 ];
 
-glb.newRecord = 999999;
+// glb.newRecord = 999999;
 
 func.common = {};
 func.common.find_item_by_key = function (arr, key, val) {
@@ -49,16 +49,16 @@ func.common.find_ROWID_idx = function (_ds, rowId) {
   if (!_ds?.data_feed?.rows) {
     throw new Error("data_feed not found");
   }
-  let index;
-  if (rowId === "newRecord") {
-    index = glb.newRecord;
-    if (!_ds.data_feed.rows[index]) {
-      index = -1;
-    }
-  } else {
-    // Find the index of the object with the given _ROWID
-    index = _ds.data_feed.rows.findIndex((item) => item._ROWID === rowId);
-  }
+  // let index;
+  // if (rowId === "newRecord") {
+  //   index = glb.newRecord;
+  //   if (!_ds.data_feed.rows[index]) {
+  //     index = -1;
+  //   }
+  // } else {
+  // Find the index of the object with the given _ROWID
+  const index = _ds.data_feed.rows.findIndex((item) => item._ROWID === rowId);
+  // }
   // If the index is -1, the ROWID was not found, so throw an error
   if (index === -1) {
     throw new Error(`ROWID "${rowId}" not found`);
@@ -2361,7 +2361,8 @@ func.datasource.execute = async function (
         null,
         _ds?.progDataSource?.sortModel,
         null,
-        filterModel
+        filterModel,
+        _ds?.progDataSource?.dataSourceFilterModelType
       );
 
       const ret_rows_found = await func.db.get_query(
@@ -2378,7 +2379,8 @@ func.datasource.execute = async function (
         null,
         null,
         null,
-        filterModel
+        filterModel,
+        _ds?.progDataSource?.dataSourceFilterModelType
       );
       _ds.rows_found = ret_rows_found?.rows?.[0]?.value || 0;
 
@@ -2641,12 +2643,25 @@ func.datasource.execute = async function (
         !_ds?.data_feed?.rows?.length
       ) {
         _ds.set_mode = "C";
-        data_arr[glb.newRecord] = [{ _ROWID: "newRecord" }];
+        // data_arr[glb.newRecord] = [{ _ROWID: "newRecord" }];
+
+        try {
+          const row_idx = func.common.find_ROWID_idx(_ds, "newRecord");
+          data_arr[row_idx] = [{ _ROWID: "newRecord" }];
+        } catch (error) {
+          data_arr.push({ _ROWID: "newRecord" });
+        }
       }
 
       if (tree_obj.crudMode === "C") {
         _ds.set_mode = "C";
-        data_arr[glb.newRecord] = [{ _ROWID: "newRecord" }];
+        // data_arr[glb.newRecord] = [{ _ROWID: "newRecord" }];
+        try {
+          const row_idx = func.common.find_ROWID_idx(_ds, "newRecord");
+          data_arr[row_idx] = [{ _ROWID: "newRecord" }];
+        } catch (error) {
+          data_arr.push({ _ROWID: "newRecord" });
+        }
       }
 
       for await (let val of data_arr) {
@@ -3032,12 +3047,13 @@ func.datasource.render_fields_form = async function (
   let row_idx;
   try {
     row_idx = func.common.find_ROWID_idx(_ds, data._ROWID);
+    // 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 });
-    }
+    // if (data._ROWID === "newRecord") {
+    //   _ds.data_feed.rows[glb.newRecord] = { _ROWID: data._ROWID };
+    // } else {
+    _ds.data_feed.rows.push({ _ROWID: data._ROWID });
+    // }
     row_idx = func.common.find_ROWID_idx(_ds, data._ROWID);
   }
 
@@ -3138,8 +3154,8 @@ func.datasource.run_rows_form = async function (
     if (typeof val !== "undefined") {
       idx = rowIdxP;
     } else {
-      val = _ds.data_feed.rows[glb.newRecord] = { _ROWID: "newRecord" };
-      idx = glb.newRecord;
+      val = _ds.data_feed.rows.push({ _ROWID: "newRecord" });
+      idx = func.common.find_ROWID_idx(_ds, "newRecord");
     }
   } catch (e) {
     console.error(e);

package/package.json

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