@steedos/filters 2.2.52-beta.7 → 2.2.53-beta.3

package/LICENSE.txt

@@ -6,14 +6,11 @@ To determine under which license you may use a file from the Steedos source code
 please resort to the header of that file.
 
 If the file has no header, the following rules apply
-1. project templates are licensed under MIT, see License.MIT.txt
-2. enterprise features are licensed under Steedos Enterprise Terms, see License.enterprise.txt
-3. source code that is neither (1) nor (2) is licensed under AGPL, see License.AGPL.txt
+1. enterprise features are licensed under Steedos Enterprise Terms, see License.enterprise.txt
+2. source code that is neither (1) is licensed under MIT, see https://opensource.org/licenses/MIT
 
 On request, licenses under different terms are available.
 
-Project templates can be found in the folders steedos-projects/
-
 Source code of enterprise features are files that
 * are in folders named "ee" or start with "ee_", or in subfolders of such folders.
 * contain the strings "ee_" in its filename name.

package/lib/filter.js

@@ -186,7 +186,8 @@ 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")
     });
   }
 
@@ -270,7 +271,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' ? value : DevExpressOData.serializeValue(value, this.protocolVersion));
     }
   }, {
     key: "compileCore",

package/lib/format.js

@@ -70,9 +70,9 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
   }
 
   var utcOffset = userContext.user ? userContext.user.utcOffset : 0;
-  userContext = extendUserContext(userContext, utcOffset); // 2019-03-23T01:00:33.524Z或2019-03-23T01:00:33Z这种格式
+  userContext = extendUserContext(userContext, utcOffset); // 2019-03-23T01:00:33.524Z、2019-03-23T01:00:33Z、2022-06-11T00:00:00.444+08:00这种格式
 
-  var regDate = /^\d{4}-\d{1,2}-\d{1,2}(T|\s)\d{1,2}\:\d{1,2}(\:\d{1,2}(\.\d{1,3})?)?(Z)?$/;
+  var regDate = /^\d{4}-\d{1,2}-\d{1,2}(T|\s)\d{1,2}\:\d{1,2}(\:\d{1,2}(\.\d{1,3})?)?(Z|((\+|\-)\d{1,2}\:\d{1,2}))?$/;
 
   var _filtersLooper, selector;
 
@@ -208,9 +208,9 @@ 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");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos/filters",
   "private": false,
-  "version": "2.2.52-beta.7",
+  "version": "2.2.53-beta.3",
   "description": "filters lib for steedos",
   "main": "lib/index.js",
   "files": [
@@ -13,28 +13,23 @@
     "build": "babel -d lib src/"
   },
   "dependencies": {
-    "@babel/runtime": "^7.5.4",
+    "@babel/runtime": "7.12.18",
     "moment": "^2.24.0",
     "underscore": "^1.9.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.0",
-    "@babel/core": "^7.5.4",
-    "@babel/plugin-proposal-class-properties": "^7.5.0",
-    "@babel/plugin-proposal-json-strings": "^7.2.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-syntax-import-meta": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.5.4",
-    "@babel/register": "^7.4.4",
-    "chai": "^4.2.0",
-    "chai-as-promised": "^7.1.1",
-    "jslint": "^0.12.1",
-    "mocha": "^5.2.0",
-    "sinon-chai": "^3.3.0"
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.8.4",
+    "@babel/plugin-proposal-class-properties": "^7.8.4",
+    "@babel/plugin-proposal-json-strings": "^7.8.4",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-syntax-import-meta": "^7.8.4",
+    "@babel/plugin-transform-runtime": "^7.8.4",
+    "@babel/preset-env": "^7.8.4",
+    "@babel/register": "^7.8.4"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ecf8b1cc86813d63697cca572cde7a4d996643d6"
+  "gitHead": "5782f1171133c05cce158adef71e527d970ef50e"
 }