owl-cli 7.34.0 → 7.37.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.
|
@@ -699,7 +699,7 @@ var @projectCodeService = (function (pigeon) {
|
|
|
699
699
|
throw {msg: '对象不存在!id=' + data.id, code: 'notFound'}
|
|
700
700
|
}
|
|
701
701
|
if (obj._v != data._v) {
|
|
702
|
-
throw {code: 'concurrentupdate', msg: '对象已经修改过，本次修改被拒绝。old._v=' + obj._v + ',new._v=' + data._v,id
|
|
702
|
+
throw {code: 'concurrentupdate', msg: '对象已经修改过，本次修改被拒绝。old._v=' + obj._v + ',new._v=' + data._v+ ", id=" + obj.id}
|
|
703
703
|
}
|
|
704
704
|
var oldObj = JSON.parse(JSON.stringify(obj))
|
|
705
705
|
//深度合并
|
|
@@ -1107,10 +1107,39 @@ var @projectCodeService = (function (pigeon) {
|
|
|
1107
1107
|
}
|
|
1108
1108
|
else if(typeof(v)=='object' && Array.isArray(v)){
|
|
1109
1109
|
var range={}
|
|
1110
|
-
|
|
1111
|
-
|
|
1112
|
-
|
|
1110
|
+
if(v.length==2){
|
|
1111
|
+
range[k] = {
|
|
1112
|
+
'gte':v[0],
|
|
1113
|
+
'lte':v[1]
|
|
1114
|
+
}
|
|
1115
|
+
}
|
|
1116
|
+
else if(v.length==1){
|
|
1117
|
+
range[k] = {
|
|
1118
|
+
'gte':v[0]
|
|
1119
|
+
}
|
|
1120
|
+
}
|
|
1121
|
+
else if(v.length==3){
|
|
1122
|
+
range[k] = {
|
|
1123
|
+
'lte':v[0]
|
|
1124
|
+
}
|
|
1113
1125
|
}
|
|
1126
|
+
else if(v.length==4){
|
|
1127
|
+
range[k] = {
|
|
1128
|
+
'gt':v[0],
|
|
1129
|
+
'lt':v[1]
|
|
1130
|
+
}
|
|
1131
|
+
}
|
|
1132
|
+
else if(v.length==5){
|
|
1133
|
+
range[k] = {
|
|
1134
|
+
'gt': v[0]
|
|
1135
|
+
}
|
|
1136
|
+
}
|
|
1137
|
+
else if(v.length==6) {
|
|
1138
|
+
range[k] = {
|
|
1139
|
+
'lt': v[0]
|
|
1140
|
+
}
|
|
1141
|
+
}
|
|
1142
|
+
|
|
1114
1143
|
if(isNotClause){
|
|
1115
1144
|
must_not.push({range:range});
|
|
1116
1145
|
}else{
|