@xuda.io/xuda-worker-bundle-min 1.3.292 → 1.3.294

package/index.js

@@ -3861,7 +3861,35 @@ func.datasource.get_value = async function (
   }
 
   if (glb.GLOBAL_VARS[fieldIdP]) {
-    await func.datasource.set_system_vars(SESSION_ID, dsSessionP);
+    if (!_ds.data_system) {
+      _ds.data_system = {};
+    }
+
+    if (dsSessionP > 0) {
+      _ds.data_system["SYS_STR_ACTIVE_ROW_ID"] = _ds.currentRecordId;
+      _ds.data_system["SYS_STR_PROG_DS_SESSION"] = dsSessionP;
+    }
+
+    // set system time
+    if (glb.SYS_DATE_ARR.includes(fieldIdP)) {
+      var _ds_0 = SESSION_OBJ[SESSION_ID].DS_GLB[0];
+
+      if (_ds_0) {
+        if (!_ds_0.data_system) {
+          _ds_0.data_system = {};
+        }
+        const ts = await func.utils.get_dateTime(SESSION_ID, "SYS_DATE_VALUE");
+        for (const val of glb.SYS_DATE_ARR) {
+          _ds_0.data_system[val] = await func.utils.get_dateTime(
+            SESSION_ID,
+            val,
+            ts
+          );
+        }
+      }
+    }
+
+    // await func.datasource.set_system_vars(SESSION_ID, dsSessionP);
     if (typeof _ds?.data_system?.[fieldIdP] !== "undefined") {
       return await return_value_system(fieldIdP, _ds?.data_system?.[fieldIdP]);
     }
@@ -3989,48 +4017,48 @@ func.datasource.reset_jobs = function (SESSION_ID, dsSessionP, sourceP, errP) {
     null
   );
 };
-func.datasource.set_system_vars = async function (SESSION_ID, dsSessionP) {
-  var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP];
-  if (!_ds) return;
-
-  if (!_ds.data_system) {
-    _ds.data_system = {};
-  }
-
-  if (dsSessionP > 0) {
-    _ds.data_system["SYS_STR_ACTIVE_ROW_ID"] = _ds.currentRecordId;
-    _ds.data_system["SYS_STR_PROG_DS_SESSION"] = dsSessionP;
-  }
+// func.datasource.set_system_vars = async function (SESSION_ID, dsSessionP) {
+//   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP];
+//   if (!_ds) return;
 
-  // _ds.data_system["SYS_OBJ_DS_INFO"] = {
-  //   rows: _ds.rows_found,
-  //   first_row_id: _ds.firstRecordId,
-  //   last_row_id: _ds.lastRecordId,
-  //   query_from_segments_json: _ds.filter_from,
-  //   query_to_segments_json: _ds.filter_from,
-  //   locate_query_from_segments_json: _ds.locate_from,
-  //   locate_query_to_segments_json: _ds.locate_to,
-  //   first_row_segments_json: _ds.firstRecordKey_object,
-  //   last_row_segments_json: _ds.lastRecordKey_object,
-  //   rowid: _ds.currentRecordId,
-  // };
+//   if (!_ds.data_system) {
+//     _ds.data_system = {};
+//   }
 
-  // if (!_ds.data_system["SYS_OBJ_DS_DATA"] && dsSessionP == 0) {
-  //   _ds.data_system["SYS_OBJ_DS_DATA"] = {
-  //     value: _.cloneDeep(_ds.data_system),
-  //   };
-  // }
-  var _ds_0 = SESSION_OBJ[SESSION_ID].DS_GLB[0];
-  if (!_ds_0) return;
+//   if (dsSessionP > 0) {
+//     _ds.data_system["SYS_STR_ACTIVE_ROW_ID"] = _ds.currentRecordId;
+//     _ds.data_system["SYS_STR_PROG_DS_SESSION"] = dsSessionP;
+//   }
 
-  if (!_ds_0.data_system) {
-    _ds_0.data_system = {};
-  }
-  const ts = await func.utils.get_dateTime(SESSION_ID, "SYS_DATE_VALUE");
-  for (const val of glb.SYS_DATE_ARR) {
-    _ds_0.data_system[val] = await func.utils.get_dateTime(SESSION_ID, val, ts);
-  }
-};
+//   // _ds.data_system["SYS_OBJ_DS_INFO"] = {
+//   //   rows: _ds.rows_found,
+//   //   first_row_id: _ds.firstRecordId,
+//   //   last_row_id: _ds.lastRecordId,
+//   //   query_from_segments_json: _ds.filter_from,
+//   //   query_to_segments_json: _ds.filter_from,
+//   //   locate_query_from_segments_json: _ds.locate_from,
+//   //   locate_query_to_segments_json: _ds.locate_to,
+//   //   first_row_segments_json: _ds.firstRecordKey_object,
+//   //   last_row_segments_json: _ds.lastRecordKey_object,
+//   //   rowid: _ds.currentRecordId,
+//   // };
+
+//   // if (!_ds.data_system["SYS_OBJ_DS_DATA"] && dsSessionP == 0) {
+//   //   _ds.data_system["SYS_OBJ_DS_DATA"] = {
+//   //     value: _.cloneDeep(_ds.data_system),
+//   //   };
+//   // }
+//   var _ds_0 = SESSION_OBJ[SESSION_ID].DS_GLB[0];
+//   if (!_ds_0) return;
+
+//   if (!_ds_0.data_system) {
+//     _ds_0.data_system = {};
+//   }
+//   const ts = await func.utils.get_dateTime(SESSION_ID, "SYS_DATE_VALUE");
+//   for (const val of glb.SYS_DATE_ARR) {
+//     _ds_0.data_system[val] = await func.utils.get_dateTime(SESSION_ID, val, ts);
+//   }
+// };
 func.datasource.get_currentRecordId = function (
   SESSION_ID,
   dsSessionP,
@@ -6043,7 +6071,7 @@ func.utils.alerts.invoke = async function (
       [SESSION_ID, alert_type, alertDisplay, message]
     );
   }
-
+  const sys_alerts_obj = func.utils.get_system_error_msg();
   if (sys_alerts_obj[paramsP]) {
     var str = paramsP + " " + title + " " + message;
     if (sys_alerts_obj[paramsP].alert_type === "error") {

package/package.json

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