owl-cli 6.148.0 → 6.150.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.
|
@@ -45,13 +45,14 @@ function buildSort(sort){
|
|
|
45
45
|
if(!env){
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
|
-
|
|
48
|
+
|
|
49
49
|
var shopId = env.shopId;
|
|
50
50
|
var warehouseId = env.warehouseId;
|
|
51
51
|
var loginId = env.loginId;
|
|
52
52
|
var roleId = env.roleId;
|
|
53
53
|
var orgId = env.orgId;
|
|
54
54
|
var spec = @spec;
|
|
55
|
+
var meta = spec['#meta'];
|
|
55
56
|
var tableId = 'owl_' + spec._t;
|
|
56
57
|
var permissions = getPermissions(roleId,tableId);
|
|
57
58
|
var m = shopId;
|
|
@@ -70,7 +71,7 @@ function buildSort(sort){
|
|
|
70
71
|
// $.log("recycleBin=" + recycleBin);
|
|
71
72
|
var defaultSort = meta.defaultSort;
|
|
72
73
|
var effectiveSort = [];
|
|
73
|
-
if(sort
|
|
74
|
+
if(sort){
|
|
74
75
|
effectiveSort = buildSort(sort);
|
|
75
76
|
}
|
|
76
77
|
else if(defaultSort && defaultSort.length>0){
|