@xuda.io/xuda-worker-bundle-min 1.3.803 → 1.3.805

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.
Files changed (2) hide show
  1. package/index.js +39 -10
  2. package/package.json +1 -1
package/index.js CHANGED
@@ -214,7 +214,7 @@ func.common.db = async function (
214
214
  serviceP,
215
215
  dataP,
216
216
  opt = {},
217
- db_driver
217
+ dsSession
218
218
  ) {
219
219
  return new Promise(async function (resolve, reject) {
220
220
  var _session = SESSION_OBJ[SESSION_ID];
@@ -279,15 +279,44 @@ func.common.db = async function (
279
279
  return str.replace(/[^a-zA-Z0-9]/g, "");
280
280
  }
281
281
  const get_rep_id = function () {
282
- let _data = _.cloneDeep(dataP);
282
+ // let _data = _.cloneDeep(dataP);
283
+
284
+ // delete _data.fields;
285
+ // delete _data.viewSourceDesc;
286
+ // delete _data.skip;
287
+ // delete _data.limit;
288
+ // delete _data.count;
289
+ // delete _data.reduce;
290
+ // delete _data.prog_id;
291
+ // delete _data.sortModel;
292
+
293
+ // if (dsSession && _session.DS_GLB[dsSession]) {
294
+ // if (_session.DS_GLB[dsSession].refreshed) {
295
+ // delete _data.filterModel;
296
+ // }
297
+ // }
298
+
299
+ let _data = {};
300
+ const fields_to_delete = [
301
+ "fields",
302
+ "viewSourceDesc",
303
+ "skip",
304
+ "limit",
305
+ "count",
306
+ "reduce",
307
+ "prog_id",
308
+ "sortModel",
309
+ ];
283
310
 
284
- delete _data.fields;
285
- delete _data.viewSourceDesc;
286
- delete _data.skip;
287
- delete _data.limit;
288
- delete _data.count;
289
- delete _data.reduce;
290
- delete _data.prog_id;
311
+ for (let [key, val] of Object.entries(dataP)) {
312
+ if (
313
+ typeof val !== "undefined" &&
314
+ !fields_to_delete.includes(key) &&
315
+ !_session?.DS_GLB?.[dsSession].refreshed
316
+ ) {
317
+ _data[key] = val;
318
+ }
319
+ }
291
320
 
292
321
  return cleanString(_data);
293
322
  };
@@ -1897,7 +1926,7 @@ func.datasource.prepare = async function (
1897
1926
  let _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceNoP];
1898
1927
  console.log("DATASOURCE_REFRESH", dataSourceNoP);
1899
1928
  IS_DATASOURCE_REFRESH = true;
1900
-
1929
+ _ds.refreshed = true;
1901
1930
  try {
1902
1931
  if (!_ds.v) _ds.v = {};
1903
1932
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@xuda.io/xuda-worker-bundle-min",
3
- "version": "1.3.803",
3
+ "version": "1.3.805",
4
4
  "description": "xuda framework min",
5
5
  "main": "index.js",
6
6
  "scripts": {