@xuda.io/xuda-worker-bundle-min 1.3.883 → 1.3.884

package/index.js

@@ -2724,7 +2724,7 @@ func.datasource.execute = async function (
         ) {
           const dbMsgP = await func.db.save_data(SESSION_ID, dataSourceSession);
           if (dbMsgP) _ds.currentRecordId = dbMsgP.id;
-          _ds.set_mode = "M";
+          _ds.set_mode = "U";
         }
 
         if (_ds.set_mode === "D") {
@@ -2747,48 +2747,48 @@ func.datasource.execute = async function (
       _ds.data_feed.rows_deleted = [];
       _ds.data_feed.rows_added = [];
 
+      if (tree_obj.rwMode === "U") {
+        _ds.set_mode = "U";
+      } else {
+        _ds.set_mode = "R";
+      }
+
       const row_not_found = async function () {
-        _ds.currentRecordId = "newRecord";
-        _ds.set_mode = "C";
-        _ds.record_not_found = true;
+        if (tree_obj.rwMode === "U" && tree_obj.allowCreate) {
+          _ds.currentRecordId = "newRecord";
+          _ds.set_mode = "C";
+          _ds.record_not_found = true;
 
-        try {
-          const row_idx = func.common.find_ROWID_idx(_ds, _ds.currentRecordId);
-        } catch (error) {
-          await func.datasource.render_fields_form(
-            SESSION_ID,
-            dataSourceSession,
-            { id: "newRecord", value: {} }
-          );
-        }
+          try {
+            const row_idx = func.common.find_ROWID_idx(
+              _ds,
+              _ds.currentRecordId
+            );
+          } catch (error) {
+            await func.datasource.render_fields_form(
+              SESSION_ID,
+              dataSourceSession,
+              { id: "newRecord", value: {} }
+            );
+          }
 
-        // 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,
-          "newRecord",
-          false
-        );
-        if (
-          count > 0 // was: &&  !args.dataSourceNoP
-        ) {
-          await func.datasource.execute_field_init_events(
+          var count = await func.datasource.get_field_init_count(
             SESSION_ID,
             dataSourceSession,
-            "form",
-            "newRecord"
+            "newRecord",
+            false
           );
+          if (
+            count > 0 // was: &&  !args.dataSourceNoP
+          ) {
+            await func.datasource.execute_field_init_events(
+              SESSION_ID,
+              dataSourceSession,
+              "form",
+              "newRecord"
+            );
+          }
         }
-        // return await callback_datasource();
       };
       if (!rows) {
         await row_not_found();
@@ -2829,13 +2829,46 @@ func.datasource.execute = async function (
           );
         }
 
-        await func.datasource.run_rows_form(
+        // await func.datasource.run_rows_form(
+        //   SESSION_ID,
+        //   dataSourceSession,
+        //   idx,
+        //   raw_data_row
+        // );
+
+        ///////////////////////
+
+        _ds.currentRecordId = raw_data_row.id; // set temporary to allow expression decoder work
+
+        await func.datasource.render_fields_form(
           SESSION_ID,
           dataSourceSession,
-          idx,
           raw_data_row
         );
 
+        try {
+          const init_count = await func.datasource.get_field_init_count(
+            SESSION_ID,
+            dataSourceSession,
+            _ROWID,
+            false,
+            _ds.oninit_triggers_to_run
+          );
+
+          if (init_count > 0) {
+            await func.datasource.execute_field_init_events(
+              SESSION_ID,
+              dataSourceSession,
+              "form",
+              raw_data_row.id
+            );
+          }
+        } catch (err) {
+          console.error(err);
+        }
+
+        /////////////////////
+
         if (await get_after_record_count()) {
           await func.datasource.execute_view_events(
             SESSION_ID,
@@ -3028,7 +3061,6 @@ func.datasource.render_fields_form = async function (
   raw_data_row
 ) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
-  // var v = _ds.v;
 
   const _progFields = await func.datasource.get_progFields(
     SESSION_ID,
@@ -3101,13 +3133,8 @@ func.datasource.render_fields_form = async function (
   let row_idx;
   try {
     row_idx = func.common.find_ROWID_idx(_ds, raw_data_row.id);
-    // data_arr[row_idx] = [{ _ROWID: "newRecord" }];
   } catch (error) {
-    // if (raw_data_row._ROWID === "newRecord") {
-    //   _ds.data_feed.rows[glb.newRecord] = { _ROWID: raw_data_row._ROWID };
-    // } else {
     _ds.data_feed.rows.push({ _ROWID: raw_data_row.id });
-    // }
     row_idx = func.common.find_ROWID_idx(_ds, raw_data_row.id);
   }
 
@@ -3185,76 +3212,63 @@ func.datasource.render_fields_form = async function (
   }
 };
 
-func.datasource.run_rows_form = async function (
-  SESSION_ID,
-  dataSourceSession,
-  rowIdxP,
-  raw_data_row
-) {
-  var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
-  if (!_ds) return;
-  let _ROWID = raw_data_row.id;
-  // var val = _ds.data_feed.rows[rowIdxP];
-
-  var idx = rowIdxP;
-
-  const find_ROWID_idx_from_raw_data_arr = function (rowId) {
-    if (!_ds?.v?.raw_data?.rows) {
-      throw new Error("ds.v.raw_data.rows not found");
-    }
-
-    const index = _ds.v.raw_data.rows.findIndex((item) => item.id === rowId);
-    if (index === -1) {
-      throw new Error(`item.id "${rowId}" not found`);
-    }
-    return index;
-  };
+// func.datasource.run_rows_form = async function (
+//   SESSION_ID,
+//   dataSourceSession,
+//   rowIdxP,
+//   raw_data_row
+// ) {
+//   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
+//   if (!_ds) return;
+//   let _ROWID = raw_data_row.id;
+//   // var val = _ds.data_feed.rows[rowIdxP];
 
-  try {
-    idx = find_ROWID_idx_from_raw_data_arr(raw_data_row.id);
-  } catch (e) {
-    _ROWID = "newRecord";
-    _ds.data_feed.rows.push({ _ROWID });
-    idx = func.common.find_ROWID_idx(_ds, _ROWID);
-  }
+//   var idx = rowIdxP;
 
-  // try {
-  //   if (typeof val !== "undefined") {
-  //     idx = rowIdxP;
-  //     _ROWID = val._ROWID;
-  //   } else {
-  //     _ROWID = "newRecord";
-  //     val = _ds.data_feed.rows.push({ _ROWID });
-  //     idx = func.common.find_ROWID_idx(_ds, _ROWID);
-  //   }
-  // } catch (e) {
-  //   console.error(e);
-  // }
+//   const find_ROWID_idx_from_raw_data_arr = function (rowId) {
+//     if (!_ds?.v?.raw_data?.rows) {
+//       throw new Error("ds.v.raw_data.rows not found");
+//     }
 
-  _ds.currentRecordId = _ROWID; // set temporary to allow expression decoder work
+//     const index = _ds.v.raw_data.rows.findIndex((item) => item.id === rowId);
+//     if (index === -1) {
+//       throw new Error(`item.id "${rowId}" not found`);
+//     }
+//     return index;
+//   };
+
+//   try {
+//     idx = find_ROWID_idx_from_raw_data_arr(raw_data_row.id);
+//   } catch (e) {
+//     _ROWID = "newRecord";
+//     _ds.data_feed.rows.push({ _ROWID });
+//     idx = func.common.find_ROWID_idx(_ds, _ROWID);
+//   }
 
-  await func.datasource.render_fields_form(
-    SESSION_ID,
-    dataSourceSession,
-    raw_data_row
-  );
-  const init_count = await func.datasource.get_field_init_count(
-    SESSION_ID,
-    dataSourceSession,
-    _ROWID,
-    false,
-    _ds.oninit_triggers_to_run
-  );
-  if (init_count > 0) {
-    await func.datasource.execute_field_init_events(
-      SESSION_ID,
-      dataSourceSession,
-      "form",
-      _ds.data_feed.rows[idx]._ROWID
-    );
-  }
-  // await form_continue();
-};
+//   _ds.currentRecordId = _ROWID; // set temporary to allow expression decoder work
+
+//   await func.datasource.render_fields_form(
+//     SESSION_ID,
+//     dataSourceSession,
+//     raw_data_row
+//   );
+//   const init_count = await func.datasource.get_field_init_count(
+//     SESSION_ID,
+//     dataSourceSession,
+//     _ROWID,
+//     false,
+//     _ds.oninit_triggers_to_run
+//   );
+//   if (init_count > 0) {
+//     await func.datasource.execute_field_init_events(
+//       SESSION_ID,
+//       dataSourceSession,
+//       "form",
+//       _ds.data_feed.rows[idx]._ROWID
+//     );
+//   }
+//   // await form_continue();
+// };
 
 func.datasource.execute_field_init_events = async function (
   SESSION_ID,
@@ -3333,6 +3347,7 @@ func.datasource.execute_field_init_events = async function (
     }
   }
 };
+
 func.datasource.get_field_init_count = async function (
   SESSION_ID,
   dataSourceSession,
@@ -3427,6 +3442,7 @@ func.datasource.get_field_init_count = async function (
   // }
   return ret;
 };
+
 func.datasource.get_view_events_count = async function (
   SESSION_ID,
   dataSourceSession,

package/package.json

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