@steedos/filters 2.2.53-beta.2 → 2.2.53-beta.5

package/lib/filter.js

@@ -186,7 +186,9 @@ var SteedosFilter = /*#__PURE__*/function () {
       "contains": this.createStringFuncFormatter("contains"),
       "notcontains": this.createStringFuncFormatter("not contains"),
       "notstartswith": this.createStringFuncFormatter("not startswith"),
-      "notendswith": this.createStringFuncFormatter("not endswith")
+      "notendswith": this.createStringFuncFormatter("not endswith"),
+      "in": this.createBinaryOperationFormatter("in"),
+      "notin": this.createBinaryOperationFormatter("notin")
     });
   }
 
@@ -270,7 +272,7 @@ var SteedosFilter = /*#__PURE__*/function () {
 
       var fieldName = criteria[0],
           value = criteria[2];
-      return formatter(DevExpressOData.serializePropName(fieldName), DevExpressOData.serializeValue(value, this.protocolVersion));
+      return formatter(DevExpressOData.serializePropName(fieldName), op === 'in' || op === 'notin' ? value : DevExpressOData.serializeValue(value, this.protocolVersion));
     }
   }, {
     key: "compileCore",

package/lib/format.js

@@ -208,17 +208,17 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
 
             if (["=", "in"].indexOf(option) > -1) {
               if (value.length) {
-                _.each(value, function (v) {
-                  return sub_selector.push([field, "=", v], "or");
-                });
+                sub_selector.push([field, "in", "(".concat(JSON.stringify(value).replace(/\"/g, "'").slice(1).slice(0, -1), ")")], "and"); // _.each(value, function (v) {
+                //     return sub_selector.push([field, "=", v], "or");
+                // });
               } else {
                 // 空数组返回空值
                 sub_selector.push([field, "=", "__badQueryForEmptyArray"], "and");
               }
             } else if (["<>", "notin"].indexOf(option) > -1) {
-              _.each(value, function (v) {
-                return sub_selector.push([field, "<>", v], "and");
-              });
+              sub_selector.push([field, "notin", "(".concat(JSON.stringify(value).replace(/\"/g, "'").slice(1).slice(0, -1), ")")], "and"); // _.each(value, function (v) {
+              //     return sub_selector.push([field, "<>", v], "and");
+              // });
             } else if (["notcontains", "notstartswith", "notendswith"].indexOf(option) > -1) {
               _.each(value, function (v) {
                 return sub_selector.push([field, option, v], "and");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos/filters",
   "private": false,
-  "version": "2.2.53-beta.2",
+  "version": "2.2.53-beta.5",
   "description": "filters lib for steedos",
   "main": "lib/index.js",
   "files": [
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d6d2230d72af49a72fc546093b553463cd2f0e9d"
+  "gitHead": "f6f9a871edfa2e09d6d8376f2d6e4dc2b15d18c3"
 }