@xuda.io/xuda-worker-bundle-min 1.3.811 → 1.3.813

package/index.js

@@ -279,25 +279,8 @@ func.common.db = async function (
       return str.replace(/[^a-zA-Z0-9]/g, "");
     }
     const get_rep_id = function () {
-      // let _data = _.cloneDeep(dataP);
-
-      // delete _data.fields;
-      // delete _data.viewSourceDesc;
-      // delete _data.skip;
-      // delete _data.limit;
-      // delete _data.count;
-      // delete _data.reduce;
-      // delete _data.prog_id;
-      // delete _data.sortModel;
-
-      // if (dsSession && _session.DS_GLB[dsSession]) {
-      //   if (_session.DS_GLB[dsSession].refreshed) {
-      //     delete _data.filterModel;
-      //   }
-      // }
-
       let _data = {};
-      const fields_to_delete = [
+      const fields_to_skip = [
         "fields",
         "viewSourceDesc",
         "skip",
@@ -306,13 +289,17 @@ func.common.db = async function (
         "reduce",
         "prog_id",
         "sortModel",
+        "filterModelMongo",
+        "filterModelSql",
+        "filterModelUserMongo",
+        "filterModelUserSql",
       ];
 
       for (let [key, val] of Object.entries(dataP)) {
         if (
           typeof val !== "undefined" &&
           val !== null &&
-          !fields_to_delete.includes(key)
+          !fields_to_skip.includes(key)
         ) {
           _data[key] = val;
         }
@@ -352,7 +339,10 @@ func.common.db = async function (
     };
 
     const read_dbs_pouch = async function (db) {
-      if (_session?.DS_GLB?.[dsSession]?.refreshed && dataP.filterModel) {
+      if (
+        _session?.DS_GLB?.[dsSession]?.refreshed &&
+        (dataP.filterModelMongo || dataP.filterModelSql)
+      ) {
         return {
           code: 1,
           data: await func.db.pouch[serviceP](SESSION_ID, data),
@@ -1340,6 +1330,8 @@ glb.REFERENCE_LESS_FUNCTIONS = [
   "loader_off",
   "emit_event",
   "delay",
+  "execute_evaluate_javascript",
+  "execute_native_javascript",
 ];
 
 var CACHE_PROG_UI = {};
@@ -2315,7 +2307,13 @@ func.datasource.execute = async function (
         _ds.v,
         _ds
       );
-
+      const filterModel = {
+        filterModelNative: _ds.progDataSource.filterModelNative,
+        filterModelMongo: _ds.progDataSource.filterModelMongo,
+        filterModelSql: _ds.progDataSource.filterModelSql,
+        filterModelUserMongo: _ds.progDataSource.filterModelUserMongo,
+        filterModelUserSql: _ds.progDataSource.filterModelUserSql,
+      };
       _ds.v.raw_data = await func.db.get_query(
         SESSION_ID,
         _ds._dataSourceTableId,
@@ -2330,7 +2328,7 @@ func.datasource.execute = async function (
         null,
         _ds?.progDataSource?.sortModel,
         null,
-        _ds?.progDataSource?.filterModel
+        filterModel
       );
 
       const ret_rows_found = await func.db.get_query(
@@ -2347,7 +2345,7 @@ func.datasource.execute = async function (
         null,
         null,
         null,
-        _ds?.progDataSource?.filterModel
+        filterModel
       );
       _ds.rows_found = ret_rows_found?.rows?.[0]?.value || 0;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-worker-bundle-min",
-  "version": "1.3.811",
+  "version": "1.3.813",
   "description": "xuda framework min",
   "main": "index.js",
   "scripts": {