tools-for-js 1.2.2 → 1.2.3
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/README.md +2 -1
- package/lib/utils/array.js +7 -6
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -49,4 +49,5 @@ import { API } from 'tools-for-js'
|
|
|
49
49
|
| 按指定长度分段字符串 | splitString |
|
|
50
50
|
| 将对象转换为查询字符串 | objectToQs |
|
|
51
51
|
| 计算数据分页 | getPagination |
|
|
52
|
-
| 根据
|
|
52
|
+
| 根据 key 值排序,相同时则根据时间 timeKey 值排序 | sortByKeyAndTime |
|
|
53
|
+
| 根据 key 获取对象值 | getValByKey |
|
package/lib/utils/array.js
CHANGED
|
@@ -177,7 +177,7 @@ var arrayToTree = exports.arrayToTree = function arrayToTree(array, config) {
|
|
|
177
177
|
var getValueFromArray = exports.getValueFromArray = function getValueFromArray(list, labelVal) {
|
|
178
178
|
var label = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'label';
|
|
179
179
|
var value = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'value';
|
|
180
|
-
list =
|
|
180
|
+
list = (0, _common.deepCopy)(list);
|
|
181
181
|
var res = list.find(function (item) {
|
|
182
182
|
return item[label] == labelVal;
|
|
183
183
|
}) || {};
|
|
@@ -217,7 +217,8 @@ var randomNumEnum = exports.randomNumEnum = function randomNumEnum(array, num) {
|
|
|
217
217
|
var getPagination = exports.getPagination = function getPagination(list, params) {
|
|
218
218
|
var page = params.page,
|
|
219
219
|
pageSize = params.pageSize;
|
|
220
|
-
|
|
220
|
+
list = (0, _common.deepCopy)(list);
|
|
221
|
+
return list.slice((page - 1) * pageSize, page * pageSize);
|
|
221
222
|
};
|
|
222
223
|
|
|
223
224
|
/*******
|
|
@@ -240,12 +241,12 @@ var sortByKeyAndTime = exports.sortByKeyAndTime = function sortByKeyAndTime(list
|
|
|
240
241
|
order = _ref3$order === void 0 ? 'asc' : _ref3$order,
|
|
241
242
|
_ref3$timeOrder = _ref3.timeOrder,
|
|
242
243
|
timeOrder = _ref3$timeOrder === void 0 ? 'desc' : _ref3$timeOrder;
|
|
243
|
-
|
|
244
|
-
return
|
|
244
|
+
list = (0, _common.deepCopy)(list);
|
|
245
|
+
return list.sort(function (a, b) {
|
|
245
246
|
var a_val = (0, _object.getValByKey)(a, key);
|
|
246
|
-
var a_time = new Date((0, _object.getValByKey)(a, timeKey));
|
|
247
|
+
var a_time = +new Date((0, _object.getValByKey)(a, timeKey));
|
|
247
248
|
var b_val = (0, _object.getValByKey)(b, key);
|
|
248
|
-
var b_time = new Date((0, _object.getValByKey)(b, timeKey));
|
|
249
|
+
var b_time = +new Date((0, _object.getValByKey)(b, timeKey));
|
|
249
250
|
if (a_val === b_val) {
|
|
250
251
|
return timeOrder === 'desc' ? b_time - a_time : a_time - b_time;
|
|
251
252
|
}
|