@xuda.io/xuda-worker-bundle-min 1.3.822 → 1.3.824
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 +12 -10
- package/package.json +1 -1
package/index.js
CHANGED
|
@@ -2185,9 +2185,11 @@ func.datasource.execute = async function (
|
|
|
2185
2185
|
if (_ds.prog_id === "system") {
|
|
2186
2186
|
//TBD tree_obj.menuType === "globals"
|
|
2187
2187
|
_ds.currentRecordId = "dataset";
|
|
2188
|
-
await func.datasource.render_fields_dataset(
|
|
2189
|
-
|
|
2190
|
-
|
|
2188
|
+
await func.datasource.render_fields_dataset(
|
|
2189
|
+
SESSION_ID,
|
|
2190
|
+
dataSourceSession,
|
|
2191
|
+
_session.url_params
|
|
2192
|
+
);
|
|
2191
2193
|
|
|
2192
2194
|
return await callback_datasource();
|
|
2193
2195
|
}
|
|
@@ -2705,7 +2707,7 @@ func.datasource.execute = async function (
|
|
|
2705
2707
|
_ds.rows_processed = 0;
|
|
2706
2708
|
_ds.viewRangeExp_rows_deleted = 0;
|
|
2707
2709
|
|
|
2708
|
-
let rows = _ds
|
|
2710
|
+
let rows = _ds?.data_feed?.rows?.length;
|
|
2709
2711
|
|
|
2710
2712
|
_ds.data_feed.rows_changed = [];
|
|
2711
2713
|
_ds.data_feed.rows_deleted = [];
|
|
@@ -3275,9 +3277,9 @@ func.datasource.render_fields_dataset = async function (
|
|
|
3275
3277
|
var fieldId = val.data.field_id;
|
|
3276
3278
|
|
|
3277
3279
|
if (val.data.type === "virtual" || _ds.set_mode === "C") {
|
|
3278
|
-
if (typeof data?.
|
|
3280
|
+
if (typeof data?.[fieldId] !== "undefined") {
|
|
3279
3281
|
// supports x=x+1
|
|
3280
|
-
data_feed[fieldId] = await get_value(fieldId, data
|
|
3282
|
+
data_feed[fieldId] = await get_value(fieldId, data[fieldId]);
|
|
3281
3283
|
continue;
|
|
3282
3284
|
}
|
|
3283
3285
|
|
|
@@ -3297,10 +3299,10 @@ func.datasource.render_fields_dataset = async function (
|
|
|
3297
3299
|
continue;
|
|
3298
3300
|
}
|
|
3299
3301
|
if (val.data.type === "table" || val.data.type === "datasource") {
|
|
3300
|
-
if (typeof data
|
|
3302
|
+
if (typeof data[fieldId] === "undefined") {
|
|
3301
3303
|
throw "field do not exist in data: " + fieldId;
|
|
3302
3304
|
}
|
|
3303
|
-
data_feed[fieldId] = await get_value(fieldId, data
|
|
3305
|
+
data_feed[fieldId] = await get_value(fieldId, data[fieldId]);
|
|
3304
3306
|
}
|
|
3305
3307
|
} catch (err) {
|
|
3306
3308
|
func.utils.debug_report(SESSION_ID, "Datasource", err, "E", null, _ds);
|
|
@@ -3506,12 +3508,12 @@ func.datasource.render_fields_form = async function (
|
|
|
3506
3508
|
continue;
|
|
3507
3509
|
}
|
|
3508
3510
|
if (val.data.type === "table" || val.data.type === "datasource") {
|
|
3509
|
-
if (typeof data
|
|
3511
|
+
if (typeof data[fieldId] === "undefined") {
|
|
3510
3512
|
throw "field do not exist in data: " + fieldId;
|
|
3511
3513
|
}
|
|
3512
3514
|
_ds.data_feed.rows[row_idx][fieldId] = await get_value(
|
|
3513
3515
|
fieldId,
|
|
3514
|
-
data
|
|
3516
|
+
data[fieldId]
|
|
3515
3517
|
);
|
|
3516
3518
|
// _ds.data_feed.rows[data.id][fieldId] = await get_value(
|
|
3517
3519
|
// fieldId,
|