owl-cli 6.147.0 → 6.148.0
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.
|
@@ -13,19 +13,30 @@ function buildSort(sort){
|
|
|
13
13
|
return {};
|
|
14
14
|
}
|
|
15
15
|
var result = [];
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
if(Array.isArray(sort)){
|
|
17
|
+
sort.forEach(function(sortField){
|
|
18
|
+
//sortField = ["pos","asc"]
|
|
19
19
|
var sortItem = {};
|
|
20
|
-
sortItem[
|
|
21
|
-
result.push(sortItem);
|
|
22
|
-
}
|
|
23
|
-
else if(direction === 'descend'){
|
|
24
|
-
var sortItem = {};
|
|
25
|
-
sortItem[k] = [{"order":"desc"}]
|
|
20
|
+
sortItem[sortField[0]] = {"order":sortField[1]}
|
|
26
21
|
result.push(sortItem);
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
else{
|
|
25
|
+
for(var k in sort){
|
|
26
|
+
var direction = sort[k];
|
|
27
|
+
if(direction === 'ascend'){
|
|
28
|
+
var sortItem = {};
|
|
29
|
+
sortItem[k] = {"order":"asc"}
|
|
30
|
+
result.push(sortItem);
|
|
31
|
+
}
|
|
32
|
+
else if(direction === 'descend'){
|
|
33
|
+
var sortItem = {};
|
|
34
|
+
sortItem[k] = {"order":"desc"}
|
|
35
|
+
result.push(sortItem);
|
|
36
|
+
}
|
|
27
37
|
}
|
|
28
38
|
}
|
|
39
|
+
|
|
29
40
|
return result;
|
|
30
41
|
}
|
|
31
42
|
;(function(){
|
|
@@ -34,6 +45,7 @@ function buildSort(sort){
|
|
|
34
45
|
if(!env){
|
|
35
46
|
return;
|
|
36
47
|
}
|
|
48
|
+
var meta = spec['#meta'];
|
|
37
49
|
var shopId = env.shopId;
|
|
38
50
|
var warehouseId = env.warehouseId;
|
|
39
51
|
var loginId = env.loginId;
|
|
@@ -56,8 +68,15 @@ function buildSort(sort){
|
|
|
56
68
|
// $.log("searchArgs=" + JSON.stringify(searchArgs));
|
|
57
69
|
delete searchArgs.recycleBin;
|
|
58
70
|
// $.log("recycleBin=" + recycleBin);
|
|
71
|
+
var defaultSort = meta.defaultSort;
|
|
72
|
+
var effectiveSort = [];
|
|
73
|
+
if(sort && sort.length>0){
|
|
74
|
+
effectiveSort = buildSort(sort);
|
|
75
|
+
}
|
|
76
|
+
else if(defaultSort && defaultSort.length>0){
|
|
77
|
+
effectiveSort = buildSort(defaultSort);
|
|
78
|
+
}
|
|
59
79
|
|
|
60
|
-
var effectiveSort = buildSort(sort);
|
|
61
80
|
if(!page){
|
|
62
81
|
page = 1;
|
|
63
82
|
}
|
|
@@ -67,9 +86,11 @@ function buildSort(sort){
|
|
|
67
86
|
pageSize = Number(pageSize);
|
|
68
87
|
var from = page * pageSize-pageSize;
|
|
69
88
|
|
|
70
|
-
|
|
89
|
+
|
|
71
90
|
var isPublic = meta && meta.isPublic;
|
|
72
91
|
|
|
92
|
+
|
|
93
|
+
|
|
73
94
|
var mfilters = null;
|
|
74
95
|
if(isPublic || orgId=='0'){
|
|
75
96
|
delete searchArgs["_orgIds"];
|
|
@@ -1183,9 +1183,7 @@ var @projectCodeService = (function (pigeon) {
|
|
|
1183
1183
|
var query = f.buildQuery(mfilters,searchArgs,keyword,isRecycleBin,meta_fields);
|
|
1184
1184
|
// var effectiveSort = [{owl_createTime:{order:"desc"}}];
|
|
1185
1185
|
var effectiveSort = [];
|
|
1186
|
-
|
|
1187
|
-
effectiveSort = sort;
|
|
1188
|
-
} var effectiveSort = [{owl_createTime:{order:"desc"}}];
|
|
1186
|
+
var effectiveSort = [{owl_createTime:{order:"desc"}}];
|
|
1189
1187
|
if(sort){
|
|
1190
1188
|
effectiveSort = sort;
|
|
1191
1189
|
}
|