@steedos/filters 3.0.0-beta.2 → 3.0.0-beta.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/date.formatter.js +1 -2
- package/lib/default_date_names.js +2 -3
- package/lib/filter.js +6 -6
- package/lib/format.js +2 -4
- package/lib/formula.js +1 -2
- package/lib/graphql.js +4 -5
- package/lib/index.js +2 -2
- package/lib/utils.js +9 -17
- package/package.json +2 -2
package/lib/date.formatter.js
CHANGED
|
@@ -34,10 +34,9 @@ function getQuarterNames(format) {
|
|
|
34
34
|
function getPeriodNames(format) {
|
|
35
35
|
return PERIODS;
|
|
36
36
|
}
|
|
37
|
-
var _default = {
|
|
37
|
+
var _default = exports["default"] = {
|
|
38
38
|
getMonthNames: getMonthNames,
|
|
39
39
|
getDayNames: getDayNames,
|
|
40
40
|
getQuarterNames: getQuarterNames,
|
|
41
41
|
getPeriodNames: getPeriodNames
|
|
42
|
-
};
|
|
43
|
-
exports["default"] = _default;
|
|
42
|
+
};
|
package/lib/filter.js
CHANGED
|
@@ -10,8 +10,10 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
|
|
|
10
10
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
11
11
|
var _date = require("./date.formatter");
|
|
12
12
|
var _default_date_names = _interopRequireDefault(require("./default_date_names"));
|
|
13
|
-
function ownKeys(
|
|
14
|
-
function _objectSpread(
|
|
13
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
14
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } // const DevExpress = require("devextreme/bundles/modules/core");
|
|
15
|
+
// const DevExpressData = require("devextreme/bundles/modules/data");
|
|
16
|
+
// const DevExpressOData = require("devextreme/bundles/modules/data.odata");
|
|
15
17
|
// const Guid = require("devextreme/core/guid");
|
|
16
18
|
// const EdmLiteral = require("devextreme/data/odata/utils").EdmLiteral;
|
|
17
19
|
|
|
@@ -166,7 +168,7 @@ var SteedosFilter = /*#__PURE__*/function () {
|
|
|
166
168
|
"notin": this.createBinaryOperationFormatter("notin")
|
|
167
169
|
});
|
|
168
170
|
}
|
|
169
|
-
(0, _createClass2["default"])(SteedosFilter, [{
|
|
171
|
+
return (0, _createClass2["default"])(SteedosFilter, [{
|
|
170
172
|
key: "createBinaryOperationFormatter",
|
|
171
173
|
value: function createBinaryOperationFormatter(op) {
|
|
172
174
|
return function (prop, val) {
|
|
@@ -261,7 +263,5 @@ var SteedosFilter = /*#__PURE__*/function () {
|
|
|
261
263
|
return query;
|
|
262
264
|
}
|
|
263
265
|
}]);
|
|
264
|
-
return SteedosFilter;
|
|
265
266
|
}();
|
|
266
|
-
var _default = SteedosFilter;
|
|
267
|
-
exports["default"] = _default;
|
|
267
|
+
var _default = exports["default"] = SteedosFilter;
|
package/lib/format.js
CHANGED
|
@@ -319,7 +319,5 @@ var formatFiltersToODataQuery = function formatFiltersToODataQuery(filters, user
|
|
|
319
319
|
var devFilters = formatFiltersToDev(filters, userContext);
|
|
320
320
|
return new _filter["default"](devFilters, odataProtocolVersion, forceLowerCase).formatFiltersToODataQuery();
|
|
321
321
|
};
|
|
322
|
-
var _formatFiltersToDev = formatFiltersToDev;
|
|
323
|
-
exports.
|
|
324
|
-
var _formatFiltersToODataQuery = formatFiltersToODataQuery;
|
|
325
|
-
exports.formatFiltersToODataQuery = _formatFiltersToODataQuery;
|
|
322
|
+
var _formatFiltersToDev = exports.formatFiltersToDev = formatFiltersToDev;
|
|
323
|
+
var _formatFiltersToODataQuery = exports.formatFiltersToODataQuery = formatFiltersToODataQuery;
|
package/lib/formula.js
CHANGED
package/lib/graphql.js
CHANGED
|
@@ -39,7 +39,7 @@ var generateIndents = function generateIndents(count) {
|
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
*/
|
|
42
|
-
var
|
|
42
|
+
var _reduceGraphqlFieldsQuery = function reduceGraphqlFieldsQuery(fields, indentsCount) {
|
|
43
43
|
if (!indentsCount) {
|
|
44
44
|
indentsCount = 0;
|
|
45
45
|
}
|
|
@@ -50,7 +50,7 @@ var reduceGraphqlFieldsQuery = function reduceGraphqlFieldsQuery(fields, indents
|
|
|
50
50
|
itemQuery += "\n";
|
|
51
51
|
} else {
|
|
52
52
|
indentsCount += 1;
|
|
53
|
-
itemQuery +=
|
|
53
|
+
itemQuery += _reduceGraphqlFieldsQuery(fieldValue, indentsCount);
|
|
54
54
|
indentsCount -= 1;
|
|
55
55
|
}
|
|
56
56
|
return itemQuery;
|
|
@@ -61,7 +61,7 @@ var formatFieldsToGraphqlQuery = function formatFieldsToGraphqlQuery(fields) {
|
|
|
61
61
|
fields = fields.split(",");
|
|
62
62
|
}
|
|
63
63
|
var expandedFields = expandFieldNames(fields);
|
|
64
|
-
return
|
|
64
|
+
return _reduceGraphqlFieldsQuery(expandedFields, 3);
|
|
65
65
|
};
|
|
66
66
|
|
|
67
67
|
/**
|
|
@@ -95,5 +95,4 @@ var formatFiltersToGraphqlQuery = function formatFiltersToGraphqlQuery(objectNam
|
|
|
95
95
|
var graphqlQuery = "\n query {\n ".concat(objectName).concat(filtersWrap).concat(graphqlFields, "\n }\n ");
|
|
96
96
|
return graphqlQuery;
|
|
97
97
|
};
|
|
98
|
-
var _formatFiltersToGraphqlQuery = formatFiltersToGraphqlQuery;
|
|
99
|
-
exports.formatFiltersToGraphqlQuery = _formatFiltersToGraphqlQuery;
|
|
98
|
+
var _formatFiltersToGraphqlQuery = exports.formatFiltersToGraphqlQuery = formatFiltersToGraphqlQuery;
|
package/lib/index.js
CHANGED
|
@@ -58,5 +58,5 @@ Object.keys(_graphql).forEach(function (key) {
|
|
|
58
58
|
}
|
|
59
59
|
});
|
|
60
60
|
});
|
|
61
|
-
function _getRequireWildcardCache(
|
|
62
|
-
function _interopRequireWildcard(
|
|
61
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
62
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
|
package/lib/utils.js
CHANGED
|
@@ -9,7 +9,7 @@ var _moment = _interopRequireDefault(require("moment"));
|
|
|
9
9
|
var t = function t(key) {
|
|
10
10
|
return key;
|
|
11
11
|
};
|
|
12
|
-
var getMonthDays = function getMonthDays(year, month) {
|
|
12
|
+
var getMonthDays = exports.getMonthDays = function getMonthDays(year, month) {
|
|
13
13
|
var days, endDate, millisecond, startDate;
|
|
14
14
|
if (month === 11) {
|
|
15
15
|
return 31;
|
|
@@ -20,8 +20,7 @@ var getMonthDays = function getMonthDays(year, month) {
|
|
|
20
20
|
days = (endDate - startDate) / millisecond;
|
|
21
21
|
return days;
|
|
22
22
|
};
|
|
23
|
-
exports.
|
|
24
|
-
var getNextQuarterFirstDay = function getNextQuarterFirstDay(year, month) {
|
|
23
|
+
var getNextQuarterFirstDay = exports.getNextQuarterFirstDay = function getNextQuarterFirstDay(year, month) {
|
|
25
24
|
if (!year) {
|
|
26
25
|
year = new Date().getFullYear();
|
|
27
26
|
}
|
|
@@ -40,8 +39,7 @@ var getNextQuarterFirstDay = function getNextQuarterFirstDay(year, month) {
|
|
|
40
39
|
}
|
|
41
40
|
return new Date(year, month, 1);
|
|
42
41
|
};
|
|
43
|
-
exports.
|
|
44
|
-
var getLastMonthFirstDay = function getLastMonthFirstDay(year, month) {
|
|
42
|
+
var getLastMonthFirstDay = exports.getLastMonthFirstDay = function getLastMonthFirstDay(year, month) {
|
|
45
43
|
if (!year) {
|
|
46
44
|
year = new Date().getFullYear();
|
|
47
45
|
}
|
|
@@ -58,8 +56,7 @@ var getLastMonthFirstDay = function getLastMonthFirstDay(year, month) {
|
|
|
58
56
|
month--;
|
|
59
57
|
return new Date(year, month, 1);
|
|
60
58
|
};
|
|
61
|
-
exports.
|
|
62
|
-
var getQuarterStartMonth = function getQuarterStartMonth(month) {
|
|
59
|
+
var getQuarterStartMonth = exports.getQuarterStartMonth = function getQuarterStartMonth(month) {
|
|
63
60
|
if (!month) {
|
|
64
61
|
month = new Date().getMonth();
|
|
65
62
|
}
|
|
@@ -72,8 +69,7 @@ var getQuarterStartMonth = function getQuarterStartMonth(month) {
|
|
|
72
69
|
}
|
|
73
70
|
return 9;
|
|
74
71
|
};
|
|
75
|
-
exports.
|
|
76
|
-
var getLastQuarterFirstDay = function getLastQuarterFirstDay(year, month) {
|
|
72
|
+
var getLastQuarterFirstDay = exports.getLastQuarterFirstDay = function getLastQuarterFirstDay(year, month) {
|
|
77
73
|
if (!year) {
|
|
78
74
|
year = new Date().getFullYear();
|
|
79
75
|
}
|
|
@@ -92,8 +88,7 @@ var getLastQuarterFirstDay = function getLastQuarterFirstDay(year, month) {
|
|
|
92
88
|
}
|
|
93
89
|
return new Date(year, month, 1);
|
|
94
90
|
};
|
|
95
|
-
exports.
|
|
96
|
-
var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key, utcOffset) {
|
|
91
|
+
var getBetweenTimeBuiltinValueItem = exports.getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key, utcOffset) {
|
|
97
92
|
// 过滤器between运算符,现算日期/日期时间类型字段的values值
|
|
98
93
|
var currentMonth, currentYear, endValue, firstDay, label, lastDay, lastMonday, lastMonthFinalDay, lastMonthFirstDay, lastQuarterEndDay, lastQuarterStartDay, lastSunday, last_120_days, last_30_days, last_60_days, last_7_days, last_90_days, millisecond, minusDay, monday, month, nextMonday, nextMonthFinalDay, nextMonthFirstDay, nextQuarterEndDay, nextQuarterStartDay, nextSunday, nextYear, next_120_days, next_30_days, next_60_days, next_7_days, next_90_days, now, previousYear, startValue, strEndDay, strFirstDay, strLastDay, strMonday, strStartDay, strSunday, strToday, strTomorrow, strYestday, sunday, thisQuarterEndDay, thisQuarterStartDay, tomorrow, values, week, year, yestday;
|
|
99
94
|
now = new Date();
|
|
@@ -370,12 +365,9 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
|
|
|
370
365
|
values: values
|
|
371
366
|
};
|
|
372
367
|
};
|
|
373
|
-
exports.
|
|
374
|
-
var getBetweenBuiltinValueItem = function getBetweenBuiltinValueItem(key, utcOffset) {
|
|
368
|
+
var getBetweenBuiltinValueItem = exports.getBetweenBuiltinValueItem = function getBetweenBuiltinValueItem(key, utcOffset) {
|
|
375
369
|
return getBetweenTimeBuiltinValueItem(key, utcOffset);
|
|
376
370
|
};
|
|
377
|
-
exports.
|
|
378
|
-
var isBetweenFilterOperation = function isBetweenFilterOperation(operation) {
|
|
371
|
+
var isBetweenFilterOperation = exports.isBetweenFilterOperation = function isBetweenFilterOperation(operation) {
|
|
379
372
|
return operation === "between";
|
|
380
|
-
};
|
|
381
|
-
exports.isBetweenFilterOperation = isBetweenFilterOperation;
|
|
373
|
+
};
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/filters",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "3.0.0-beta.
|
|
4
|
+
"version": "3.0.0-beta.7",
|
|
5
5
|
"description": "filters lib for steedos",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"files": [
|
|
@@ -36,5 +36,5 @@
|
|
|
36
36
|
"publishConfig": {
|
|
37
37
|
"access": "public"
|
|
38
38
|
},
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "b68a33d2fa33b380aa7ec401b63315886f7de861"
|
|
40
40
|
}
|