@xuda.io/xuda-dbs-plugin-xuda 1.0.181 → 1.0.183

package/package.json

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

package/studio.mjs

@@ -298,7 +298,7 @@ const get_opt = function (e, table_obj) {
   if (e.filterModel && JSON.parse(e.filterModel)) {
     debugger;
     for (const [key, val] of Object.entries(JSON.parse(e.filterModel))) {
-      var field_name = key;
+      var field_name = "udfData.data." + key;
       var condition = "$and";
       const make_selector = function (val) {
         var value = "";
@@ -454,19 +454,20 @@ const get_opt = function (e, table_obj) {
           }
         }
         if (!opt.selector[condition]) {
-          opt.selector[condition] = {};
+          opt.selector[condition] = [];
         }
-        if (!opt.selector[condition][field_name]) {
-          opt.selector[condition][field_name] = [];
-        }
-        opt.selector[condition][field_name].push({
-          [operator]: value,
-        });
+        // if (!opt.selector[condition][field_name]) {
+        //   opt.selector[condition][field_name] = [];
+        // }
+        opt.selector[condition].push({ [field_name]: { [operator]: value } });
 
         if (operator_to) {
-          opt.selector[condition][field_name].push({
-            [operator_to]: value_to,
+          opt.selector[condition].push({
+            [field_name]: { [operator_to]: value_to },
           });
+          // opt.selector[condition][field_name].push({
+          //   [operator_to]: value_to,
+          // });
         }
       };
 
@@ -494,6 +495,7 @@ const get_opt = function (e, table_obj) {
   for (const [key, val] of Object.entries(opt.fields)) {
     opt.fields[key] = "udfData.data." + val;
   }
+
   if (!e?.sortModel || !JSON.parse(e.sortModel).length) {
     // added 2021 09 10
     if (opt.sort) {
@@ -508,6 +510,10 @@ const get_opt = function (e, table_obj) {
   var selector_new = {};
 
   for (const [key, val] of Object.entries(opt.selector)) {
+    if (key.substring(0) === "$") {
+      selector_new[+key] = val;
+      continue;
+    }
     selector_new["udfData.data." + key] = val;
   }