@xuda.io/xuda-worker-bundle-min 1.3.664 → 1.3.666
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 +9 -8
- package/package.json +1 -1
package/index.js
CHANGED
|
@@ -1982,7 +1982,8 @@ func.datasource.execute = async function (
|
|
|
1982
1982
|
dataSourceSession,
|
|
1983
1983
|
IS_DATASOURCE_REFRESH
|
|
1984
1984
|
) {
|
|
1985
|
-
var
|
|
1985
|
+
var _session = SESSION_OBJ[SESSION_ID]
|
|
1986
|
+
var _ds = _session.DS_GLB[dataSourceSession];
|
|
1986
1987
|
var args = _ds.args;
|
|
1987
1988
|
// var v = _ds.v;
|
|
1988
1989
|
let tree_obj = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
|
|
@@ -2071,9 +2072,9 @@ func.datasource.execute = async function (
|
|
|
2071
2072
|
// ======================================
|
|
2072
2073
|
// COMPUTE GLOBALS
|
|
2073
2074
|
// ======================================
|
|
2074
|
-
if (_ds.prog_id === "system"
|
|
2075
|
+
if (tree_obj.menuType === "globals") {//_ds.prog_id === "system"
|
|
2075
2076
|
_ds.currentRecordId = "dataset";
|
|
2076
|
-
await func.datasource.render_fields_dataset(SESSION_ID, dataSourceSession);
|
|
2077
|
+
await func.datasource.render_fields_dataset(SESSION_ID, dataSourceSession, { value: _session.url_params });
|
|
2077
2078
|
|
|
2078
2079
|
return await callback_datasource();
|
|
2079
2080
|
}
|
|
@@ -2143,8 +2144,8 @@ func.datasource.execute = async function (
|
|
|
2143
2144
|
SESSION_ID,
|
|
2144
2145
|
"Data source",
|
|
2145
2146
|
err.message +
|
|
2146
|
-
|
|
2147
|
-
|
|
2147
|
+
" https://" +
|
|
2148
|
+
prog_obj.progDataSource.dataSourceDataUrl,
|
|
2148
2149
|
"E"
|
|
2149
2150
|
);
|
|
2150
2151
|
return null;
|
|
@@ -3577,7 +3578,7 @@ func.datasource.del = function (SESSION_ID, dsP) {
|
|
|
3577
3578
|
|
|
3578
3579
|
const perform_delete = async function () {
|
|
3579
3580
|
var response = {
|
|
3580
|
-
success: function (jsonP, ajaxP) {},
|
|
3581
|
+
success: function (jsonP, ajaxP) { },
|
|
3581
3582
|
error: function (status) {
|
|
3582
3583
|
console.error("error datasource:" + status);
|
|
3583
3584
|
},
|
|
@@ -3643,8 +3644,8 @@ func.datasource.del = function (SESSION_ID, dsP) {
|
|
|
3643
3644
|
if (SESSION_OBJ[SESSION_ID].DS_GLB[dsP]) {
|
|
3644
3645
|
delete SCREEN_BLOCKER_OBJ[
|
|
3645
3646
|
SESSION_OBJ[SESSION_ID].DS_GLB[dsP].screenId +
|
|
3646
|
-
|
|
3647
|
-
|
|
3647
|
+
"_" +
|
|
3648
|
+
SESSION_OBJ[SESSION_ID].DS_GLB[dsP].callingScreenId
|
|
3648
3649
|
];
|
|
3649
3650
|
|
|
3650
3651
|
delete_pending_jobs();
|