@xuda.io/xuda-worker-bundle-min 1.3.264 → 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 +37 -33
- package/package.json +1 -1
package/index.js
CHANGED
|
@@ -141,8 +141,6 @@ const DATASOURCE_PROPERTIES_ARR = [
|
|
|
141
141
|
"rowid",
|
|
142
142
|
];
|
|
143
143
|
|
|
144
|
-
// glb.GLOBAL_VARS = func.common.get_global_vars();
|
|
145
|
-
|
|
146
144
|
glb.MOBILE_ARR = [
|
|
147
145
|
"component",
|
|
148
146
|
"web_app",
|
|
@@ -1185,7 +1183,7 @@ func.datasource.create = async function (
|
|
|
1185
1183
|
old_dataSource_vars.sortOrder = _ds.sortOrder;
|
|
1186
1184
|
old_dataSource_vars.sortOrderTypeExp = _ds.sortOrderTypeExp;
|
|
1187
1185
|
if (_ds.data_system) {
|
|
1188
|
-
old_dataSource_vars.
|
|
1186
|
+
old_dataSource_vars.SYS_OBJ_WIN_MODE = _ds.data_system.SYS_OBJ_WIN_MODE;
|
|
1189
1187
|
old_dataSource_vars.SYS_OBJ_WIN_UI = _ds.data_system.SYS_OBJ_WIN_UI;
|
|
1190
1188
|
old_dataSource_vars.SYS_STR_WIN_ID = _ds.data_system.SYS_STR_WIN_ID;
|
|
1191
1189
|
old_dataSource_vars.SYS_STR_WIN_NAME = _ds.data_system.SYS_STR_WIN_NAME;
|
|
@@ -1197,7 +1195,7 @@ func.datasource.create = async function (
|
|
|
1197
1195
|
var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP];
|
|
1198
1196
|
|
|
1199
1197
|
if (_ds.data_system) {
|
|
1200
|
-
_ds.data_system.
|
|
1198
|
+
_ds.data_system.SYS_OBJ_WIN_MODE = old_dataSource_vars.SYS_OBJ_WIN_MODE;
|
|
1201
1199
|
_ds.data_system.SYS_OBJ_WIN_UI = old_dataSource_vars.SYS_OBJ_WIN_UI;
|
|
1202
1200
|
_ds.data_system.SYS_STR_WIN_ID = old_dataSource_vars.SYS_STR_WIN_ID;
|
|
1203
1201
|
_ds.data_system.SYS_STR_WIN_NAME = old_dataSource_vars.SYS_STR_WIN_NAME;
|
|
@@ -3981,28 +3979,34 @@ func.datasource.set_system_vars = async function (SESSION_ID, dsSessionP) {
|
|
|
3981
3979
|
_ds.data_system = {};
|
|
3982
3980
|
}
|
|
3983
3981
|
|
|
3984
|
-
(
|
|
3985
|
-
|
|
3986
|
-
|
|
3987
|
-
first_row_id: _ds.firstRecordId,
|
|
3988
|
-
last_row_id: _ds.lastRecordId,
|
|
3989
|
-
query_from_segments_json: _ds.filter_from,
|
|
3990
|
-
query_to_segments_json: _ds.filter_from,
|
|
3991
|
-
locate_query_from_segments_json: _ds.locate_from,
|
|
3992
|
-
locate_query_to_segments_json: _ds.locate_to,
|
|
3993
|
-
first_row_segments_json: _ds.firstRecordKey_object,
|
|
3994
|
-
last_row_segments_json: _ds.lastRecordKey_object,
|
|
3995
|
-
rowid: _ds.currentRecordId,
|
|
3996
|
-
});
|
|
3997
|
-
|
|
3998
|
-
if (!_ds.data_system["SYS_OBJ_DS_DATA"] && dsSessionP == 0) {
|
|
3999
|
-
_ds.data_system["SYS_OBJ_DS_DATA"] = {
|
|
4000
|
-
value: _.cloneDeep(_ds.data_system),
|
|
4001
|
-
};
|
|
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;
|
|
4002
3985
|
}
|
|
4003
|
-
|
|
4004
|
-
|
|
4005
|
-
|
|
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
|
+
}
|
|
4006
4010
|
}
|
|
4007
4011
|
};
|
|
4008
4012
|
func.datasource.get_currentRecordId = function (
|
|
@@ -4575,10 +4579,10 @@ func.utils.clean_returned_datasource = function (SESSION_ID, DS) {
|
|
|
4575
4579
|
if (!_session.DS_GLB[DS]) return;
|
|
4576
4580
|
|
|
4577
4581
|
var obj = _.cloneDeep(_session.DS_GLB[DS]);
|
|
4578
|
-
if (obj.data_system) {
|
|
4579
|
-
|
|
4580
|
-
|
|
4581
|
-
}
|
|
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
|
+
// }
|
|
4582
4586
|
|
|
4583
4587
|
delete obj.screen_params;
|
|
4584
4588
|
|
|
@@ -4592,10 +4596,10 @@ func.utils.clean_returned_datasource = function (SESSION_ID, DS) {
|
|
|
4592
4596
|
console.error(e);
|
|
4593
4597
|
}
|
|
4594
4598
|
|
|
4595
|
-
if (obj.data_system) {
|
|
4596
|
-
|
|
4597
|
-
|
|
4598
|
-
}
|
|
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
|
+
// }
|
|
4599
4603
|
delete obj.pre_init_fields;
|
|
4600
4604
|
delete obj.oninit_triggers_to_run;
|
|
4601
4605
|
delete obj.raw_data;
|