owl-cli 6.133.0 → 6.134.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.
|
@@ -663,14 +663,14 @@ var @projectCodeService = (function (pigeon) {
|
|
|
663
663
|
if (!obj) {
|
|
664
664
|
throw {msg: '对象不存在!id=' + data.id, code: 'notFound'}
|
|
665
665
|
}
|
|
666
|
-
if (obj._v
|
|
666
|
+
if (obj._v !== data._v) {
|
|
667
667
|
throw {code: 'concurrentupdate', msg: '对象已经修改过，本次修改被拒绝。old._v=' + obj._v + ',new._v=' + data._v}
|
|
668
668
|
}
|
|
669
669
|
var oldObj = JSON.parse(JSON.stringify(obj))
|
|
670
670
|
//深度合并
|
|
671
671
|
//obj = deepMerge(obj,data);//深度合并会引起 编辑出现bug
|
|
672
672
|
obj = data
|
|
673
|
-
obj['_v'] = obj['_v'] + 1
|
|
673
|
+
obj['_v'] = Number(obj['_v']) + 1
|
|
674
674
|
f.validate(obj, env)
|
|
675
675
|
data._v = obj._v
|
|
676
676
|
if(obj.__force!=='T'){
|