@xuda.io/xuda-worker-bundle-min 1.3.265 → 1.3.266
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +35 -29
- package/package.json +1 -1
package/index.js
CHANGED
|
@@ -3979,28 +3979,34 @@ func.datasource.set_system_vars = async function (SESSION_ID, dsSessionP) {
|
|
|
3979
3979
|
_ds.data_system = {};
|
|
3980
3980
|
}
|
|
3981
3981
|
|
|
3982
|
-
(
|
|
3983
|
-
|
|
3984
|
-
|
|
3985
|
-
first_row_id: _ds.firstRecordId,
|
|
3986
|
-
last_row_id: _ds.lastRecordId,
|
|
3987
|
-
query_from_segments_json: _ds.filter_from,
|
|
3988
|
-
query_to_segments_json: _ds.filter_from,
|
|
3989
|
-
locate_query_from_segments_json: _ds.locate_from,
|
|
3990
|
-
locate_query_to_segments_json: _ds.locate_to,
|
|
3991
|
-
first_row_segments_json: _ds.firstRecordKey_object,
|
|
3992
|
-
last_row_segments_json: _ds.lastRecordKey_object,
|
|
3993
|
-
rowid: _ds.currentRecordId,
|
|
3994
|
-
});
|
|
3995
|
-
|
|
3996
|
-
if (!_ds.data_system["SYS_OBJ_DS_DATA"] && dsSessionP == 0) {
|
|
3997
|
-
_ds.data_system["SYS_OBJ_DS_DATA"] = {
|
|
3998
|
-
value: _.cloneDeep(_ds.data_system),
|
|
3999
|
-
};
|
|
3982
|
+
if (dsSessionP > 0) {
|
|
3983
|
+
_ds.data_system["SYS_STR_ACTIVE_ROW_ID"] = _ds.currentRecordId;
|
|
3984
|
+
_ds.data_system["SYS_STR_ACTIVE_DS_SESSION"] = dsSessionP;
|
|
4000
3985
|
}
|
|
4001
|
-
|
|
4002
|
-
|
|
4003
|
-
|
|
3986
|
+
|
|
3987
|
+
// _ds.data_system["SYS_OBJ_DS_INFO"] = {
|
|
3988
|
+
// rows: _ds.rows_found,
|
|
3989
|
+
// first_row_id: _ds.firstRecordId,
|
|
3990
|
+
// last_row_id: _ds.lastRecordId,
|
|
3991
|
+
// query_from_segments_json: _ds.filter_from,
|
|
3992
|
+
// query_to_segments_json: _ds.filter_from,
|
|
3993
|
+
// locate_query_from_segments_json: _ds.locate_from,
|
|
3994
|
+
// locate_query_to_segments_json: _ds.locate_to,
|
|
3995
|
+
// first_row_segments_json: _ds.firstRecordKey_object,
|
|
3996
|
+
// last_row_segments_json: _ds.lastRecordKey_object,
|
|
3997
|
+
// rowid: _ds.currentRecordId,
|
|
3998
|
+
// };
|
|
3999
|
+
|
|
4000
|
+
// if (!_ds.data_system["SYS_OBJ_DS_DATA"] && dsSessionP == 0) {
|
|
4001
|
+
// _ds.data_system["SYS_OBJ_DS_DATA"] = {
|
|
4002
|
+
// value: _.cloneDeep(_ds.data_system),
|
|
4003
|
+
// };
|
|
4004
|
+
// }
|
|
4005
|
+
if (dsSessionP == 0) {
|
|
4006
|
+
const ts = await func.utils.get_dateTime(SESSION_ID, "SYS_DATE_VALUE");
|
|
4007
|
+
for (const val of glb.SYS_DATE_ARR) {
|
|
4008
|
+
_ds.data_system[val] = await func.utils.get_dateTime(SESSION_ID, val, ts);
|
|
4009
|
+
}
|
|
4004
4010
|
}
|
|
4005
4011
|
};
|
|
4006
4012
|
func.datasource.get_currentRecordId = function (
|
|
@@ -4573,10 +4579,10 @@ func.utils.clean_returned_datasource = function (SESSION_ID, DS) {
|
|
|
4573
4579
|
if (!_session.DS_GLB[DS]) return;
|
|
4574
4580
|
|
|
4575
4581
|
var obj = _.cloneDeep(_session.DS_GLB[DS]);
|
|
4576
|
-
if (obj.data_system) {
|
|
4577
|
-
|
|
4578
|
-
|
|
4579
|
-
}
|
|
4582
|
+
// if (obj.data_system) {
|
|
4583
|
+
// if (obj.data_system["SYS_OBJ_DS_DATA"])
|
|
4584
|
+
// delete obj.data_system["SYS_OBJ_DS_DATA"]["SYS_OBJ_DS_DATA"];
|
|
4585
|
+
// }
|
|
4580
4586
|
|
|
4581
4587
|
delete obj.screen_params;
|
|
4582
4588
|
|
|
@@ -4590,10 +4596,10 @@ func.utils.clean_returned_datasource = function (SESSION_ID, DS) {
|
|
|
4590
4596
|
console.error(e);
|
|
4591
4597
|
}
|
|
4592
4598
|
|
|
4593
|
-
if (obj.data_system) {
|
|
4594
|
-
|
|
4595
|
-
|
|
4596
|
-
}
|
|
4599
|
+
// if (obj.data_system) {
|
|
4600
|
+
// if (obj.data_system["SYS_OBJ_DS_DATA"])
|
|
4601
|
+
// delete obj.data_system["SYS_OBJ_DS_DATA"]["SYS_OBJ_DS_DATA"];
|
|
4602
|
+
// }
|
|
4597
4603
|
delete obj.pre_init_fields;
|
|
4598
4604
|
delete obj.oninit_triggers_to_run;
|
|
4599
4605
|
delete obj.raw_data;
|