owl-cli 6.174.0 → 6.176.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.
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
//#import session.js
|
|
3
3
|
//#import $@projectCode:services/modelService.jsx
|
|
4
4
|
//#import @handlers/include/checklogin.jsx
|
|
5
|
+
//#import $owl_mall_u:services/modelService.jsx
|
|
6
|
+
|
|
5
7
|
|
|
6
8
|
|
|
7
9
|
;(function(){
|
|
@@ -33,6 +35,14 @@
|
|
|
33
35
|
var historyObjs = [];
|
|
34
36
|
for(var i=0;i<objs.length;i++){
|
|
35
37
|
var obj = objs[i];
|
|
38
|
+
var userId = obj.owl_lastModifiedUserId;
|
|
39
|
+
var user = owl_mall_uService.get(userId);
|
|
40
|
+
if(user){
|
|
41
|
+
obj.owl_lastModifiedUserName = user.realName || user.nickName || user.name || user.loginId;
|
|
42
|
+
}
|
|
43
|
+
if(userId==='0'){
|
|
44
|
+
obj.owl_lastModifiedUserName = "系统管理员";
|
|
45
|
+
}
|
|
36
46
|
var finalObj = obj;
|
|
37
47
|
if(roleId!='0' || orgId!='0'){
|
|
38
48
|
finalObj = JSON.parse(JSON.stringify(obj));
|
|
@@ -553,12 +553,13 @@ var @projectCodeService = (function (pigeon) {
|
|
|
553
553
|
data['_t'] = spec['_t']
|
|
554
554
|
try {
|
|
555
555
|
var meta = spec['#meta'];
|
|
556
|
-
|
|
557
|
-
f.updateParentPath(data);
|
|
558
|
-
}
|
|
556
|
+
|
|
559
557
|
|
|
560
558
|
EventBusService.fire(spec['_t'] + '_add_before', {data: data, env: env})
|
|
561
559
|
data.id = f.getId(data)
|
|
560
|
+
if(meta.isTree){
|
|
561
|
+
f.updateParentPath(data);
|
|
562
|
+
}
|
|
562
563
|
pigeon.lock(f.getLock(data))
|
|
563
564
|
f.saveUniqueFields(data, env)
|
|
564
565
|
pigeon.saveObject(data.id, data)
|