@xuda.io/xuda-worker-bundle-min 1.3.782 → 1.3.784

package/index.js

@@ -1667,7 +1667,7 @@ func.datasource.create = async function (
         parentDataSourceNo: IS_DATASOURCE_REFRESH
           ? _ds.parentDataSourceNo
           : null,
-        IS_DATASOURCE_REFRESH: IS_DATASOURCE_REFRESH,
+        IS_DATASOURCE_REFRESH,
       },
       args
     );
@@ -1927,6 +1927,7 @@ func.datasource.prepare = async function (
   // init_v();
 
   if (IS_DATASOURCE_REFRESH) {
+    debugger;
     if (!static_refreshP) await set_parameters(); // do only on new datasource or refresh
     return func.datasource.execute(SESSION_ID, dataSourceSession, true);
   }
@@ -5619,251 +5620,251 @@ func.utils.ws_worker.functions = {
       service: params.service,
     });
   },
-  datasource_get_grid_data: async function (params, promise_queue_id) {
-    var SESSION_ID = params.session_id;
-    var _session = SESSION_OBJ[SESSION_ID];
-    if (!_session.DS_GLB) {
-      if (typeof show_log !== "undefined" && show_log)
-        console.log(
-          "DATASOURCE GET SESSION_ID: " + SESSION_ID,
-          params.dssession + " NOT EXIST!"
-        );
-      return;
-    }
-
-    const get_count = async function () {
-      const json = await func.db.get_query(
-        SESSION_ID,
-        _ds._dataSourceTableId,
-        v.couchView,
-        params.dssession,
-        v.viewSourceDesc,
-        "read grid",
-
-        // null,
-        null,
-        null,
-        null,
-        true,
-        null,
-        sort_fields,
-        sort_dir,
-        grid_filter_info,
-        null
-      );
-
-      if (json.error) {
-        return worker_post_message({
-          promise_queue_id,
-          params: { error: true },
-          worker_id: ws_worker_id,
-          session_id: SESSION_ID,
-          process_pid: params.process_pid,
-          service: params.service,
-        });
-      }
-      var rows = json.rows.length ? json.rows[0].value : 0;
-      _ds.rows_found = rows;
-      return json;
-    };
-
-    const get_query = async function () {
-      const json = await func.db.get_query(
-        SESSION_ID,
-        _ds._dataSourceTableId,
-        v.couchView,
-        params.dssession,
-        v.viewSourceDesc,
-        "read grid",
-        null,
-        v.progDataSource.dataSourceReduce,
-        from,
-        to - from,
-        false,
-        null,
-        sort_fields,
-        sort_dir,
-        grid_filter_info
-      );
-
-      if (json.error) {
-        if (db_driver === "pouchdb") {
-          return callback({ error: true });
-        } else {
-          return worker_post_message({
-            promise_queue_id,
-            params: { error: true },
-            worker_id: ws_worker_id,
-            session_id: SESSION_ID,
-            process_pid: params.process_pid,
-            service: params.service,
-          });
-        }
-      }
-
-      var rows = json.rows.length;
-      if (!params.req_from_grid) {
-        _ds.rows_found = rows;
-      } else {
-        rows = _ds.rows_found;
-      }
-
-      _ds.data_feed = {};
-      _ds.data_feed.rows = {};
-      _ds.data_feed.sort = {};
-      _ds.data_feed.groupBy = {};
+  // datasource_get_grid_data: async function (params, promise_queue_id) {
+  //   var SESSION_ID = params.session_id;
+  //   var _session = SESSION_OBJ[SESSION_ID];
+  //   if (!_session.DS_GLB) {
+  //     if (typeof show_log !== "undefined" && show_log)
+  //       console.log(
+  //         "DATASOURCE GET SESSION_ID: " + SESSION_ID,
+  //         params.dssession + " NOT EXIST!"
+  //       );
+  //     return;
+  //   }
 
-      await func.datasource.process_view_grid(
-        SESSION_ID,
-        params.dssession,
-        json,
-        rows
-      );
+  //   const get_count = async function () {
+  //     const json = await func.db.get_query(
+  //       SESSION_ID,
+  //       _ds._dataSourceTableId,
+  //       v.couchView,
+  //       params.dssession,
+  //       v.viewSourceDesc,
+  //       "read grid",
+
+  //       // null,
+  //       null,
+  //       null,
+  //       null,
+  //       true,
+  //       null,
+  //       sort_fields,
+  //       sort_dir,
+  //       grid_filter_info,
+  //       null
+  //     );
 
-      obj.meta.rows_found = _ds.rows_found;
-      obj.data = _ds.data_feed;
+  //     if (json.error) {
+  //       return worker_post_message({
+  //         promise_queue_id,
+  //         params: { error: true },
+  //         worker_id: ws_worker_id,
+  //         session_id: SESSION_ID,
+  //         process_pid: params.process_pid,
+  //         service: params.service,
+  //       });
+  //     }
+  //     var rows = json.rows.length ? json.rows[0].value : 0;
+  //     _ds.rows_found = rows;
+  //     return json;
+  //   };
+
+  //   const get_query = async function () {
+  //     const json = await func.db.get_query(
+  //       SESSION_ID,
+  //       _ds._dataSourceTableId,
+  //       v.couchView,
+  //       params.dssession,
+  //       v.viewSourceDesc,
+  //       "read grid",
+  //       null,
+  //       v.progDataSource.dataSourceReduce,
+  //       from,
+  //       to - from,
+  //       false,
+  //       null,
+  //       sort_fields,
+  //       sort_dir,
+  //       grid_filter_info
+  //     );
 
-      if (db_driver === "pouchdb") {
-        callback(obj);
-      } else {
-        worker_post_message({
-          promise_queue_id,
-          params: obj,
-          worker_id: ws_worker_id,
-          session_id: SESSION_ID,
-          process_pid: params.process_pid,
-          service: params.service,
-        });
+  //     if (json.error) {
+  //       if (db_driver === "pouchdb") {
+  //         return callback({ error: true });
+  //       } else {
+  //         return worker_post_message({
+  //           promise_queue_id,
+  //           params: { error: true },
+  //           worker_id: ws_worker_id,
+  //           session_id: SESSION_ID,
+  //           process_pid: params.process_pid,
+  //           service: params.service,
+  //         });
+  //       }
+  //     }
 
-        // console.log(json);
-      }
-    };
-    var from = Number(params.from);
-    var to = Number(params.to);
-    var obj = {
-      meta: {},
-      data: {
-        sort: {},
-        rows: {},
-      },
-    };
-    var sort_fields = [],
-      sort_dir,
-      grid_filter_info = [];
+  //     var rows = json.rows.length;
+  //     if (!params.req_from_grid) {
+  //       _ds.rows_found = rows;
+  //     } else {
+  //       rows = _ds.rows_found;
+  //     }
 
-    if (params.sort_fields) {
-      sort_fields = params.sort_fields;
-      sort_dir = params.sort_dir;
-    }
+  //     _ds.data_feed = {};
+  //     _ds.data_feed.rows = {};
+  //     _ds.data_feed.sort = {};
+  //     _ds.data_feed.groupBy = {};
 
-    if (params.grid_filter_info) {
-      grid_filter_info = params.grid_filter_info;
-    }
+  //     await func.datasource.process_view_grid(
+  //       SESSION_ID,
+  //       params.dssession,
+  //       json,
+  //       rows
+  //     );
 
-    var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[params.dssession];
-    var v = _ds.v;
+  //     obj.meta.rows_found = _ds.rows_found;
+  //     obj.data = _ds.data_feed;
+
+  //     if (db_driver === "pouchdb") {
+  //       callback(obj);
+  //     } else {
+  //       worker_post_message({
+  //         promise_queue_id,
+  //         params: obj,
+  //         worker_id: ws_worker_id,
+  //         session_id: SESSION_ID,
+  //         process_pid: params.process_pid,
+  //         service: params.service,
+  //       });
+
+  //       // console.log(json);
+  //     }
+  //   };
+  //   var from = Number(params.from);
+  //   var to = Number(params.to);
+  //   var obj = {
+  //     meta: {},
+  //     data: {
+  //       sort: {},
+  //       rows: {},
+  //     },
+  //   };
+  //   var sort_fields = [],
+  //     sort_dir,
+  //     grid_filter_info = [];
+
+  //   if (params.sort_fields) {
+  //     sort_fields = params.sort_fields;
+  //     sort_dir = params.sort_dir;
+  //   }
 
-    let db_driver;
-    if (_ds._dataSourceTableId) {
-      let file_ret = await func.utils.FILES_OBJ.get(
-        SESSION_ID,
-        _ds._dataSourceTableId
-      );
-      db_driver = file_ret.properties.db_driver || "xuda";
-    }
-    if (params.req_from_grid) {
-      const count_ret = await get_count();
-    }
-    return await get_query();
-  },
-  datasource_get_grid_totals: async function (params, promise_queue_id) {
-    var SESSION_ID = params.session_id;
-    var _session = SESSION_OBJ[SESSION_ID];
-    if (_session.DS_GLB) {
-      if (typeof show_log !== "undefined" && show_log)
-        console.log(
-          "DATASOURCE GET GRID TOTALS SESSION_ID: " + SESSION_ID,
-          APP_OBJ[_session.app_id].app_name,
-          params.dssession
-        );
+  //   if (params.grid_filter_info) {
+  //     grid_filter_info = params.grid_filter_info;
+  //   }
 
-      var grid_filter_info = [],
-        total_fields_info = [];
+  //   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[params.dssession];
+  //   var v = _ds.v;
 
-      if (params.total_fields_info) {
-        total_fields_info = params.total_fields_info;
-      }
+  //   let db_driver;
+  //   if (_ds._dataSourceTableId) {
+  //     let file_ret = await func.utils.FILES_OBJ.get(
+  //       SESSION_ID,
+  //       _ds._dataSourceTableId
+  //     );
+  //     db_driver = file_ret.properties.db_driver || "xuda";
+  //   }
+  //   if (params.req_from_grid) {
+  //     const count_ret = await get_count();
+  //   }
+  //   return await get_query();
+  // },
+  // datasource_get_grid_totals: async function (params, promise_queue_id) {
+  //   var SESSION_ID = params.session_id;
+  //   var _session = SESSION_OBJ[SESSION_ID];
+  //   if (_session.DS_GLB) {
+  //     if (typeof show_log !== "undefined" && show_log)
+  //       console.log(
+  //         "DATASOURCE GET GRID TOTALS SESSION_ID: " + SESSION_ID,
+  //         APP_OBJ[_session.app_id].app_name,
+  //         params.dssession
+  //       );
+
+  //     var grid_filter_info = [],
+  //       total_fields_info = [];
+
+  //     if (params.total_fields_info) {
+  //       total_fields_info = params.total_fields_info;
+  //     }
 
-      if (params.grid_filter_info) {
-        grid_filter_info = params.grid_filter_info;
-      }
+  //     if (params.grid_filter_info) {
+  //       grid_filter_info = params.grid_filter_info;
+  //     }
 
-      const _ds = _session.DS_GLB[params.dssession];
-      const v = _ds.v;
+  //     const _ds = _session.DS_GLB[params.dssession];
+  //     const v = _ds.v;
 
-      let db_driver;
-      if (_ds._dataSourceTableId) {
-        let file_ret = await func.utils.FILES_OBJ.get(
-          SESSION_ID,
-          _ds._dataSourceTableId
-        );
-        db_driver = file_ret.properties.db_driver || "xuda";
-      }
+  //     let db_driver;
+  //     if (_ds._dataSourceTableId) {
+  //       let file_ret = await func.utils.FILES_OBJ.get(
+  //         SESSION_ID,
+  //         _ds._dataSourceTableId
+  //       );
+  //       db_driver = file_ret.properties.db_driver || "xuda";
+  //     }
 
-      // count
-      const json = await func.db.get_query(
-        SESSION_ID,
-        _ds._dataSourceTableId,
-        v.couchView,
-        params.dssession,
-        v.viewSourceDesc,
-        "read grid",
-        null,
-        null,
-        null,
-        null,
-        false,
-        null,
-        null,
-        null,
-        grid_filter_info,
-        total_fields_info
-      );
+  //     // count
+  //     const json = await func.db.get_query(
+  //       SESSION_ID,
+  //       _ds._dataSourceTableId,
+  //       v.couchView,
+  //       params.dssession,
+  //       v.viewSourceDesc,
+  //       "read grid",
+  //       null,
+  //       null,
+  //       null,
+  //       null,
+  //       false,
+  //       null,
+  //       null,
+  //       null,
+  //       grid_filter_info,
+  //       total_fields_info
+  //     );
 
-      if (json.error) {
-        if (db_driver === "pouchdb") {
-          return { error: true };
-        } else {
-          return worker_post_message({
-            promise_queue_id,
-            params: { error: true },
-            worker_id: ws_worker_id,
-            session_id: SESSION_ID,
-            process_pid: params.process_pid,
-            service: params.service,
-          });
-        }
-      }
-      if (db_driver === "pouchdb") {
-        return json;
-      } else {
-        worker_post_message({
-          // fx_to_execute: callback,
-          params: json,
-          worker_id: ws_worker_id,
-          session_id: SESSION_ID,
-          process_pid: params.process_pid,
-          service: params.service,
-        });
-      }
-    } else {
-      if (typeof show_log !== "undefined" && show_log)
-        console.log(
-          "DATASOURCE GET SESSION_ID: " + SESSION_ID,
-          params.dssession + " NOT EXIST!"
-        );
-    }
-  },
+  //     if (json.error) {
+  //       if (db_driver === "pouchdb") {
+  //         return { error: true };
+  //       } else {
+  //         return worker_post_message({
+  //           promise_queue_id,
+  //           params: { error: true },
+  //           worker_id: ws_worker_id,
+  //           session_id: SESSION_ID,
+  //           process_pid: params.process_pid,
+  //           service: params.service,
+  //         });
+  //       }
+  //     }
+  //     if (db_driver === "pouchdb") {
+  //       return json;
+  //     } else {
+  //       worker_post_message({
+  //         // fx_to_execute: callback,
+  //         params: json,
+  //         worker_id: ws_worker_id,
+  //         session_id: SESSION_ID,
+  //         process_pid: params.process_pid,
+  //         service: params.service,
+  //       });
+  //     }
+  //   } else {
+  //     if (typeof show_log !== "undefined" && show_log)
+  //       console.log(
+  //         "DATASOURCE GET SESSION_ID: " + SESSION_ID,
+  //         params.dssession + " NOT EXIST!"
+  //       );
+  //   }
+  // },
   // datasource_get_value: async function (params, promise_queue_id) {
   //   var SESSION_ID = params.session_id;
   //   var _session = SESSION_OBJ[SESSION_ID];

package/package.json

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