@xuda.io/xuda-dbs-plugin-xuda 1.0.111 → 1.0.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-dbs-plugin-xuda",
-  "version": "1.0.111",
+  "version": "1.0.112",
   "description": "Xuda Database Socket for Xuda's proprietary structure powered by CouchDB",
   "scripts": {
     "pub": "npm version patch --force && npm publish --access public"

package/server.js

@@ -187,9 +187,335 @@ const get_cast_val = async function (source, attributeP, typeP, valP) {
     }
   );
 };
+
+const get_opt = function (e, table_obj) {
+  var limit = 99999;
+  var skip = 0;
+
+  if (e.limit) {
+    limit = Number(e.limit);
+  }
+
+  if (e.skip) {
+    skip = JSON.parse(e.skip);
+  }
+
+  var fields = [];
+  if (e.fields) {
+    for (const [key, val] of Object.entries(
+      typeof e.fields === "string" ? e.fields.split(",") : e.fields
+    )) {
+      fields.push(val);
+    }
+  } else {
+    for (const [key, val] of Object.entries(table_obj.tableFields)) {
+      fields.push(val.data.field_id);
+    }
+  }
+
+  var data = {};
+  var from = e.filter_from ? JSON.parse(e.filter_from) : {};
+  var to = e.filter_to ? JSON.parse(e.filter_to) : {};
+  var sort = [];
+  for (const [key, val] of Object.entries(from)) {
+    var field_name = key;
+
+    sort.push(field_name);
+
+    if (val === to[key]) {
+      data[field_name] = val;
+    } else {
+      data[field_name] = { $gte: val };
+    }
+  }
+
+  for (const [key, val] of Object.entries(to)) {
+    var field_name = key;
+
+    if (val !== from[key]) {
+      data[field_name]["$lte"] = val;
+    }
+  }
+
+  var selector = {};
+
+  if (from && !_.isEmpty(from)) {
+    selector = data;
+  }
+
+  var opt = {
+    selector,
+    limit: limit,
+    skip: skip,
+    fields: fields,
+  };
+
+  if (sort.length) {
+    opt.sort = sort;
+  }
+
+  if (e?.sort_fields?.length) {
+    opt.sort = e.sort_fields;
+    if (opt.sort) {
+      for (const [key, val] of Object.entries(opt.sort)) {
+        var field_name = val.colId;
+        opt.sort[key] = {
+          ["udfData.data." + field_name]: val.sort,
+        };
+      }
+    }
+  }
+
+  if (e.grid_filter_info) {
+    for (const [key, val] of Object.entries(e.grid_filter_info)) {
+      var field_name = key;
+      var condition = "$and";
+      const make_selector = function (val) {
+        var value = "";
+        var operator = "";
+        var value_to = "";
+        var operator_to = "";
+
+        if (val.filterType === "date") {
+          var date = val.dateFrom.substr(0, 10);
+          switch (val.type) {
+            case "equals":
+              operator = "$regex";
+              value = `^${date}`;
+              break;
+
+            case "greaterThan":
+              operator = "$gt";
+              value = `${date}`;
+              break;
+
+            case "lessThan":
+              operator = "$lt";
+              value = `${date}`;
+              break;
+
+            case "blank":
+              operator = "$eq";
+              value = "";
+              break;
+
+            case "inRange":
+              operator = "$gte";
+              value = date;
+              operator_to = "$lte";
+              value_to = val.dateTo.substr(0, 10);
+              break;
+
+            case "notEqual":
+              operator = "$regex";
+              value = `^((?!${date}).)*$`;
+              break;
+
+            case "notBlank":
+              operator = "$ne";
+              value = "";
+              break;
+
+            default:
+              operator = "$regex";
+              value = `^${date}`;
+          }
+        }
+
+        if (val.filterType === "string" || val.filterType === "text") {
+          switch (val.type) {
+            case "contains":
+              operator = "$regex";
+              value = `${val.filter}`;
+              break;
+
+            case "notContains":
+              operator = "$regex";
+              value = `^((?!${val.filter}).)*$`;
+              break;
+
+            case "equals":
+              operator = "$eq";
+              value = `${val.filter}`;
+              break;
+
+            case "notEqual":
+              operator = "$ne";
+              value = `${val.filter}`;
+              break;
+
+            case "startsWith":
+              operator = "$regex";
+              value = `^${val.filter}`;
+              break;
+
+            case "endsWith":
+              operator = "$regex";
+              value = `${val.filter}$`;
+              break;
+
+            case "blank":
+              operator = "$eq";
+              value = "";
+              break;
+
+            case "notBlank":
+              operator = "$ne";
+              value = "";
+              break;
+
+            default:
+              value = "^" + val.filter;
+          }
+        }
+
+        if (val.filterType === "number") {
+          switch (val.type) {
+            case "equals":
+              operator = "$eq";
+              value = val.filter;
+              break;
+
+            case "notEqual":
+              operator = "$ne";
+              value = val.filter;
+              break;
+
+            case "lessThanOrEqual":
+              operator = "$lte";
+              value = val.filter;
+              break;
+
+            case "greaterThanOrEqual":
+              operator = "$gte";
+              value = val.filter;
+              break;
+
+            case "lessThan":
+              operator = "$lt";
+              value = val.filter;
+              break;
+
+            case "greaterThan":
+              operator = "$gt";
+              value = val.filter;
+              break;
+
+            case "blank":
+              operator = "$eq";
+              value = 0;
+              break;
+
+            case "notBlank":
+              operator = "$ne";
+              value = 0;
+              break;
+
+            case "inRange":
+              operator = "$gte";
+              value = val.filter;
+              operator_to = "$lte";
+              value_to = val.filterTo;
+              break;
+
+            default:
+              operator = "$eq";
+              value = val.filter;
+          }
+        }
+        if (!opt.selector[field_name]) {
+          opt.selector[field_name] = {};
+        }
+        if (!opt.selector[field_name][condition]) {
+          opt.selector[field_name][condition] = [];
+        }
+        opt.selector[field_name][condition].push({
+          [operator]: value,
+        });
+
+        if (operator_to) {
+          opt.selector[field_name][condition].push({
+            [operator_to]: value_to,
+          });
+        }
+      };
+
+      if (!val.condition1) {
+        make_selector(val);
+      } else {
+        condition = "$" + val.operator.toLowerCase();
+        make_selector(val.condition1);
+        make_selector(val.condition2);
+      }
+    }
+  }
+
+  if (e.total_fields_info) {
+    fields = [];
+    for (const [key, val] of Object.entries(JSON.parse(e.total_fields_info))) {
+      var field_name = val.field_id;
+
+      fields.push(field_name);
+    }
+    opt.fields = fields;
+  }
+  // fix names
+
+  for (const [key, val] of Object.entries(opt.fields)) {
+    opt.fields[key] = "udfData.data." + val;
+  }
+  if (!e?.sort_fields?.length) {
+    // added 2021 09 10
+    if (opt.sort) {
+      for (const [key, val] of Object.entries(opt.sort)) {
+        opt.sort[key] = {
+          ["udfData.data." + val]: e.sortOrder === "des" ? "desc" : "asc",
+        };
+      }
+    }
+  }
+
+  var selector_new = {};
+
+  for (const [key, val] of Object.entries(opt.selector)) {
+    selector_new["udfData.data." + key] = val;
+  }
+
+  if (e.viewDbQuery) {
+    for (const [key, val] of Object.entries(table_obj.tableFields)) {
+      if (e.viewDbQuery.includes(val.id)) {
+        const replacer = new RegExp(val.id, "g");
+        e.viewDbQuery = e.viewDbQuery.replace(
+          replacer,
+          "udfData.data." + val.data.field_id
+        );
+      }
+    }
+
+    let viewDbQuery = JSON.parse(e.viewDbQuery.replace(/\\/g, ""));
+
+    for (const [key, val] of Object.entries(viewDbQuery)) {
+      selector_new[key] = val;
+    }
+  }
+
+  opt.selector = selector_new;
+  opt.selector["udfData.udffileid"] = e.table_id;
+  opt.selector.stat = e.archived ? 4 : 3;
+
+  opt.fields.push("_id");
+  opt.fields.push("_rev");
+
+  if (e.selector) {
+    opt.selector = { ...e.selector, ...opt.selector };
+  }
+
+  return opt;
+};
+
 const query_db = async function (e, db, app_id_reference, table_obj) {
   var key = undefined;
-
+  var opt = get_opt(e, table_obj);
   const runtime_get_mango_data = async function () {
     const done = async function (body) {
       const raw_data = async function () {
@@ -224,7 +550,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
           });
         }
 
-        return { code: 1, data: { rows: rows, total_rows: rows.length } };
+        return { code: 1, data: { rows: rows, total_rows: rows.length, opt } };
       };
       const count_data = async function () {
         var rows = [];
@@ -269,7 +595,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
           // no index
           rows.push({ key: "", value: body.docs.length });
         }
-        return { code: 1, data: { rows: rows, total_rows: rows.length } };
+        return { code: 1, data: { rows: rows, total_rows: rows.length, opt } };
       };
 
       const totals = async function () {
@@ -382,84 +708,73 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
       return raw_data();
     };
 
-    var limit = 99999;
-    var skip = 0;
+    // var limit = 99999;
+    // var skip = 0;
 
-    if (e.limit) {
-      limit = Number(e.limit);
-    }
+    // if (e.limit) {
+    //   limit = Number(e.limit);
+    // }
 
-    if (e.skip) {
-      skip = JSON.parse(e.skip);
-    }
+    // if (e.skip) {
+    //   skip = JSON.parse(e.skip);
+    // }
 
-    var fields = [];
-    if (e.fields) {
-      for (const [key, val] of Object.entries(
-        typeof e.fields === "string" ? e.fields.split(",") : e.fields
-      )) {
-        fields.push(val);
-      }
-    } else {
-      for (const [key, val] of Object.entries(table_obj.tableFields)) {
-        fields.push(val.data.field_id);
-      }
-    }
+    // var fields = [];
+    // if (e.fields) {
+    //   for (const [key, val] of Object.entries(
+    //     typeof e.fields === "string" ? e.fields.split(",") : e.fields
+    //   )) {
+    //     fields.push(val);
+    //   }
+    // } else {
+    //   for (const [key, val] of Object.entries(table_obj.tableFields)) {
+    //     fields.push(val.data.field_id);
+    //   }
+    // }
 
-    var data = {};
-    var from = e.filter_from ? JSON.parse(e.filter_from) : {};
-    var to = e.filter_to ? JSON.parse(e.filter_to) : {};
-    var sort = [];
-    for (const [key, val] of Object.entries(from)) {
-      var field_name = key;
+    // var data = {};
+    // var from = e.filter_from ? JSON.parse(e.filter_from) : {};
+    // var to = e.filter_to ? JSON.parse(e.filter_to) : {};
+    // var sort = [];
+    // for (const [key, val] of Object.entries(from)) {
+    //   var field_name = key;
 
-      sort.push(field_name);
+    //   sort.push(field_name);
 
-      if (val === to[key]) {
-        data[field_name] = val;
-      } else {
-        data[field_name] = { $gte: val };
-      }
-    }
+    //   if (val === to[key]) {
+    //     data[field_name] = val;
+    //   } else {
+    //     data[field_name] = { $gte: val };
+    //   }
+    // }
 
-    for (const [key, val] of Object.entries(to)) {
-      var field_name = key;
+    // for (const [key, val] of Object.entries(to)) {
+    //   var field_name = key;
 
-      if (val !== from[key]) {
-        data[field_name]["$lte"] = val;
-      }
-    }
+    //   if (val !== from[key]) {
+    //     data[field_name]["$lte"] = val;
+    //   }
+    // }
 
-    var selector = {};
+    // var selector = {};
 
-    if (from && !_.isEmpty(from)) {
-      selector = data;
-    }
+    // if (from && !_.isEmpty(from)) {
+    //   selector = data;
+    // }
 
-    var opt = {
-      selector,
-      limit: limit,
-      skip: skip,
-      fields: fields,
-    };
+    // var opt = {
+    //   selector,
+    //   limit: limit,
+    //   skip: skip,
+    //   fields: fields,
+    // };
 
-    if (sort.length) {
-      opt.sort = sort;
-    }
+    // if (sort.length) {
+    //   opt.sort = sort;
+    // }
 
-    if (e?.sort_fields?.length) {
-      opt.sort = e.sort_fields;
-      if (opt.sort) {
-        for (const [key, val] of Object.entries(opt.sort)) {
-          var field_name = val.colId;
-          opt.sort[key] = {
-            ["udfData.data." + field_name]: val.sort,
-          };
-        }
-      }
-    }
-    // if (e.sort_fields && JSON.parse(e.sort_fields).length) {
-    //   opt.sort = JSON.parse(e.sort_fields);
+    // if (e?.sort_fields?.length) {
+    //   opt.sort = e.sort_fields;
     //   if (opt.sort) {
     //     for (const [key, val] of Object.entries(opt.sort)) {
     //       var field_name = val.colId;
@@ -469,218 +784,219 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
     //     }
     //   }
     // }
+    // // if (e.sort_fields && JSON.parse(e.sort_fields).length) {
+    // //   opt.sort = JSON.parse(e.sort_fields);
+    // //   if (opt.sort) {
+    // //     for (const [key, val] of Object.entries(opt.sort)) {
+    // //       var field_name = val.colId;
+    // //       opt.sort[key] = {
+    // //         ["udfData.data." + field_name]: val.sort,
+    // //       };
+    // //     }
+    // //   }
+    // // }
+
+    // if (e.grid_filter_info) {
+    //   for (const [key, val] of Object.entries(e.grid_filter_info)) {
+    //     var field_name = key;
+    //     var condition = "$and";
+    //     const make_selector = function (val) {
+    //       var value = "";
+    //       var operator = "";
+    //       var value_to = "";
+    //       var operator_to = "";
+
+    //       if (val.filterType === "date") {
+    //         var date = val.dateFrom.substr(0, 10);
+    //         switch (val.type) {
+    //           case "equals":
+    //             operator = "$regex";
+    //             value = `^${date}`;
+    //             break;
+
+    //           case "greaterThan":
+    //             operator = "$gt";
+    //             value = `${date}`;
+    //             break;
+
+    //           case "lessThan":
+    //             operator = "$lt";
+    //             value = `${date}`;
+    //             break;
+
+    //           case "blank":
+    //             operator = "$eq";
+    //             value = "";
+    //             break;
+
+    //           case "inRange":
+    //             operator = "$gte";
+    //             value = date;
+    //             operator_to = "$lte";
+    //             value_to = val.dateTo.substr(0, 10);
+    //             break;
+
+    //           case "notEqual":
+    //             operator = "$regex";
+    //             value = `^((?!${date}).)*$`;
+    //             break;
+
+    //           case "notBlank":
+    //             operator = "$ne";
+    //             value = "";
+    //             break;
+
+    //           default:
+    //             operator = "$regex";
+    //             value = `^${date}`;
+    //         }
+    //       }
+
+    //       if (val.filterType === "string" || val.filterType === "text") {
+    //         switch (val.type) {
+    //           case "contains":
+    //             operator = "$regex";
+    //             value = `${val.filter}`;
+    //             break;
+
+    //           case "notContains":
+    //             operator = "$regex";
+    //             value = `^((?!${val.filter}).)*$`;
+    //             break;
+
+    //           case "equals":
+    //             operator = "$eq";
+    //             value = `${val.filter}`;
+    //             break;
+
+    //           case "notEqual":
+    //             operator = "$ne";
+    //             value = `${val.filter}`;
+    //             break;
+
+    //           case "startsWith":
+    //             operator = "$regex";
+    //             value = `^${val.filter}`;
+    //             break;
+
+    //           case "endsWith":
+    //             operator = "$regex";
+    //             value = `${val.filter}$`;
+    //             break;
+
+    //           case "blank":
+    //             operator = "$eq";
+    //             value = "";
+    //             break;
+
+    //           case "notBlank":
+    //             operator = "$ne";
+    //             value = "";
+    //             break;
+
+    //           default:
+    //             value = "^" + val.filter;
+    //         }
+    //       }
+
+    //       if (val.filterType === "number") {
+    //         switch (val.type) {
+    //           case "equals":
+    //             operator = "$eq";
+    //             value = val.filter;
+    //             break;
+
+    //           case "notEqual":
+    //             operator = "$ne";
+    //             value = val.filter;
+    //             break;
+
+    //           case "lessThanOrEqual":
+    //             operator = "$lte";
+    //             value = val.filter;
+    //             break;
+
+    //           case "greaterThanOrEqual":
+    //             operator = "$gte";
+    //             value = val.filter;
+    //             break;
+
+    //           case "lessThan":
+    //             operator = "$lt";
+    //             value = val.filter;
+    //             break;
+
+    //           case "greaterThan":
+    //             operator = "$gt";
+    //             value = val.filter;
+    //             break;
+
+    //           case "blank":
+    //             operator = "$eq";
+    //             value = 0;
+    //             break;
+
+    //           case "notBlank":
+    //             operator = "$ne";
+    //             value = 0;
+    //             break;
+
+    //           case "inRange":
+    //             operator = "$gte";
+    //             value = val.filter;
+    //             operator_to = "$lte";
+    //             value_to = val.filterTo;
+    //             break;
+
+    //           default:
+    //             operator = "$eq";
+    //             value = val.filter;
+    //         }
+    //       }
+    //       if (!opt.selector[field_name]) {
+    //         opt.selector[field_name] = {};
+    //       }
+    //       if (!opt.selector[field_name][condition]) {
+    //         opt.selector[field_name][condition] = [];
+    //       }
+    //       opt.selector[field_name][condition].push({
+    //         [operator]: value,
+    //       });
+
+    //       if (operator_to) {
+    //         opt.selector[field_name][condition].push({
+    //           [operator_to]: value_to,
+    //         });
+    //       }
+    //     };
+
+    //     if (!val.condition1) {
+    //       make_selector(val);
+    //     } else {
+    //       condition = "$" + val.operator.toLowerCase();
+    //       make_selector(val.condition1);
+    //       make_selector(val.condition2);
+    //     }
+    //   }
+    // }
 
-    if (e.grid_filter_info) {
-      for (const [key, val] of Object.entries(e.grid_filter_info)) {
-        var field_name = key;
-        var condition = "$and";
-        const make_selector = function (val) {
-          var value = "";
-          var operator = "";
-          var value_to = "";
-          var operator_to = "";
-
-          if (val.filterType === "date") {
-            var date = val.dateFrom.substr(0, 10);
-            switch (val.type) {
-              case "equals":
-                operator = "$regex";
-                value = `^${date}`;
-                break;
-
-              case "greaterThan":
-                operator = "$gt";
-                value = `${date}`;
-                break;
-
-              case "lessThan":
-                operator = "$lt";
-                value = `${date}`;
-                break;
-
-              case "blank":
-                operator = "$eq";
-                value = "";
-                break;
-
-              case "inRange":
-                operator = "$gte";
-                value = date;
-                operator_to = "$lte";
-                value_to = val.dateTo.substr(0, 10);
-                break;
-
-              case "notEqual":
-                operator = "$regex";
-                value = `^((?!${date}).)*$`;
-                break;
-
-              case "notBlank":
-                operator = "$ne";
-                value = "";
-                break;
-
-              default:
-                operator = "$regex";
-                value = `^${date}`;
-            }
-          }
-
-          if (val.filterType === "string" || val.filterType === "text") {
-            switch (val.type) {
-              case "contains":
-                operator = "$regex";
-                value = `${val.filter}`;
-                break;
-
-              case "notContains":
-                operator = "$regex";
-                value = `^((?!${val.filter}).)*$`;
-                break;
-
-              case "equals":
-                operator = "$eq";
-                value = `${val.filter}`;
-                break;
-
-              case "notEqual":
-                operator = "$ne";
-                value = `${val.filter}`;
-                break;
-
-              case "startsWith":
-                operator = "$regex";
-                value = `^${val.filter}`;
-                break;
-
-              case "endsWith":
-                operator = "$regex";
-                value = `${val.filter}$`;
-                break;
-
-              case "blank":
-                operator = "$eq";
-                value = "";
-                break;
-
-              case "notBlank":
-                operator = "$ne";
-                value = "";
-                break;
-
-              default:
-                value = "^" + val.filter;
-            }
-          }
-
-          if (val.filterType === "number") {
-            switch (val.type) {
-              case "equals":
-                operator = "$eq";
-                value = val.filter;
-                break;
-
-              case "notEqual":
-                operator = "$ne";
-                value = val.filter;
-                break;
-
-              case "lessThanOrEqual":
-                operator = "$lte";
-                value = val.filter;
-                break;
-
-              case "greaterThanOrEqual":
-                operator = "$gte";
-                value = val.filter;
-                break;
-
-              case "lessThan":
-                operator = "$lt";
-                value = val.filter;
-                break;
-
-              case "greaterThan":
-                operator = "$gt";
-                value = val.filter;
-                break;
-
-              case "blank":
-                operator = "$eq";
-                value = 0;
-                break;
-
-              case "notBlank":
-                operator = "$ne";
-                value = 0;
-                break;
-
-              case "inRange":
-                operator = "$gte";
-                value = val.filter;
-                operator_to = "$lte";
-                value_to = val.filterTo;
-                break;
-
-              default:
-                operator = "$eq";
-                value = val.filter;
-            }
-          }
-          if (!opt.selector[field_name]) {
-            opt.selector[field_name] = {};
-          }
-          if (!opt.selector[field_name][condition]) {
-            opt.selector[field_name][condition] = [];
-          }
-          opt.selector[field_name][condition].push({
-            [operator]: value,
-          });
-
-          if (operator_to) {
-            opt.selector[field_name][condition].push({
-              [operator_to]: value_to,
-            });
-          }
-        };
-
-        if (!val.condition1) {
-          make_selector(val);
-        } else {
-          condition = "$" + val.operator.toLowerCase();
-          make_selector(val.condition1);
-          make_selector(val.condition2);
-        }
-      }
-    }
-
-    if (e.total_fields_info) {
-      fields = [];
-      for (const [key, val] of Object.entries(
-        JSON.parse(e.total_fields_info)
-      )) {
-        var field_name = val.field_id;
+    // if (e.total_fields_info) {
+    //   fields = [];
+    //   for (const [key, val] of Object.entries(
+    //     JSON.parse(e.total_fields_info)
+    //   )) {
+    //     var field_name = val.field_id;
 
-        fields.push(field_name);
-      }
-      opt.fields = fields;
-    }
-    // fix names
+    //     fields.push(field_name);
+    //   }
+    //   opt.fields = fields;
+    // }
+    // // fix names
 
-    for (const [key, val] of Object.entries(opt.fields)) {
-      opt.fields[key] = "udfData.data." + val;
-    }
-    if (!e?.sort_fields?.length) {
-      // added 2021 09 10
-      if (opt.sort) {
-        for (const [key, val] of Object.entries(opt.sort)) {
-          opt.sort[key] = {
-            ["udfData.data." + val]: e.sortOrder === "des" ? "desc" : "asc",
-          };
-        }
-      }
-    }
-    // if (!e.sort_fields || !JSON.parse(e.sort_fields).length) {
+    // for (const [key, val] of Object.entries(opt.fields)) {
+    //   opt.fields[key] = "udfData.data." + val;
+    // }
+    // if (!e?.sort_fields?.length) {
     //   // added 2021 09 10
     //   if (opt.sort) {
     //     for (const [key, val] of Object.entries(opt.sort)) {
@@ -690,41 +1006,51 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
     //     }
     //   }
     // }
+    // // if (!e.sort_fields || !JSON.parse(e.sort_fields).length) {
+    // //   // added 2021 09 10
+    // //   if (opt.sort) {
+    // //     for (const [key, val] of Object.entries(opt.sort)) {
+    // //       opt.sort[key] = {
+    // //         ["udfData.data." + val]: e.sortOrder === "des" ? "desc" : "asc",
+    // //       };
+    // //     }
+    // //   }
+    // // }
+
+    // var selector_new = {};
+
+    // for (const [key, val] of Object.entries(opt.selector)) {
+    //   selector_new["udfData.data." + key] = val;
+    // }
 
-    var selector_new = {};
-
-    for (const [key, val] of Object.entries(opt.selector)) {
-      selector_new["udfData.data." + key] = val;
-    }
-
-    if (e.viewDbQuery) {
-      for (const [key, val] of Object.entries(table_obj.tableFields)) {
-        if (e.viewDbQuery.includes(val.id)) {
-          const replacer = new RegExp(val.id, "g");
-          e.viewDbQuery = e.viewDbQuery.replace(
-            replacer,
-            "udfData.data." + val.data.field_id
-          );
-        }
-      }
+    // if (e.viewDbQuery) {
+    //   for (const [key, val] of Object.entries(table_obj.tableFields)) {
+    //     if (e.viewDbQuery.includes(val.id)) {
+    //       const replacer = new RegExp(val.id, "g");
+    //       e.viewDbQuery = e.viewDbQuery.replace(
+    //         replacer,
+    //         "udfData.data." + val.data.field_id
+    //       );
+    //     }
+    //   }
 
-      let viewDbQuery = JSON.parse(e.viewDbQuery.replace(/\\/g, ""));
+    //   let viewDbQuery = JSON.parse(e.viewDbQuery.replace(/\\/g, ""));
 
-      for (const [key, val] of Object.entries(viewDbQuery)) {
-        selector_new[key] = val;
-      }
-    }
+    //   for (const [key, val] of Object.entries(viewDbQuery)) {
+    //     selector_new[key] = val;
+    //   }
+    // }
 
-    opt.selector = selector_new;
-    opt.selector["udfData.udffileid"] = e.table_id;
-    opt.selector.stat = e.archived ? 4 : 3;
+    // opt.selector = selector_new;
+    // opt.selector["udfData.udffileid"] = e.table_id;
+    // opt.selector.stat = e.archived ? 4 : 3;
 
-    opt.fields.push("_id");
-    opt.fields.push("_rev");
+    // opt.fields.push("_id");
+    // opt.fields.push("_rev");
 
-    if (e.selector) {
-      opt.selector = { ...e.selector, ...opt.selector };
-    }
+    // if (e.selector) {
+    //   opt.selector = { ...e.selector, ...opt.selector };
+    // }
 
     // xuda
 
@@ -797,9 +1123,9 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
       skip = e.skipP;
     }
 
-    var opt = undefined;
+    var view_opt = undefined;
     if (key) {
-      opt = {
+      view_opt = {
         key: key,
         include_docs: !e.ids && view !== "db_index_reduce",
         limit: limit,
@@ -807,7 +1133,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
       };
     } else {
       if (e.reduce) {
-        opt = {
+        view_opt = {
           startkey: e.startkey ? JSON.parse(e.startkey) : "",
           endkey: e.endkey ? JSON.parse(e.endkey) : "",
           include_docs: false,
@@ -817,7 +1143,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
           descending: e.desc,
         };
       } else {
-        opt = {
+        view_opt = {
           startkey: e.startkey ? JSON.parse(e.startkey) : "",
           endkey: e.endkey ? JSON.parse(e.endkey) : "",
           include_docs: !e.ids,
@@ -829,7 +1155,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
     }
 
     try {
-      const body = await db.view(`xuda`, view, opt);
+      const body = await db.view(`xuda`, view, view_opt);
       if (e.reduce) {
         let rows = [];
 
@@ -865,7 +1191,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
 
           rows.push({ id: crypto.randomUUID(), value: obj });
         }
-        return { code: 1, data: { rows } };
+        return { code: 1, data: { rows, opt } };
       }
 
       var rows = [];
@@ -906,7 +1232,7 @@ const query_db = async function (e, db, app_id_reference, table_obj) {
       //   { sort: opt.sort, group: {} }
       // );}
 
-      return { code: 1, data: { rows: rows, total_rows: rows.length } };
+      return { code: 1, data: { rows: rows, total_rows: rows.length, opt } };
     } catch (err) {
       return { code: -1, data: err.message };
     }