owl-cli 6.129.0 → 6.131.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.
|
@@ -5,58 +5,85 @@
|
|
|
5
5
|
//#import @handlers/include/checklogin.jsx
|
|
6
6
|
|
|
7
7
|
;(function(){
|
|
8
|
-
|
|
8
|
+
try{
|
|
9
|
+
var spec = @spec;
|
|
9
10
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
11
|
+
var env = checklogin();
|
|
12
|
+
if(!env){
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
var shopId = env.shopId;
|
|
16
|
+
var warehouseId = env.warehouseId;
|
|
17
|
+
var m = shopId;
|
|
17
18
|
|
|
18
19
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
var orgId = env.orgId;
|
|
21
|
+
var roleId = env.roleId;
|
|
22
|
+
var orgIds = env.orgIds;
|
|
22
23
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
24
|
+
var params = JSON.parse($body);
|
|
25
|
+
var id = params.id;
|
|
26
|
+
var ids = params.ids;
|
|
27
|
+
if(!ids){
|
|
28
|
+
ids = [id];
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
var tableId = 'owl_' + spec._t;
|
|
32
|
+
var permissions = getPermissions(roleId,tableId);
|
|
29
33
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
34
|
+
for(var i=0;i<ids.length; i++){
|
|
35
|
+
var id = ids[i];
|
|
36
|
+
var oldObj = @projectCodeService.get(id,true);
|
|
37
|
+
if(!oldObj){
|
|
38
|
+
$.log("object not found:" + id);
|
|
39
|
+
var ret = {
|
|
40
|
+
state: 'err',
|
|
41
|
+
msg:'object not found, id=' + id
|
|
42
|
+
}
|
|
43
|
+
out.print(JSON.stringify(ret));
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
if(roleId!=='internal' && roleId!='0'){
|
|
47
|
+
//检查是否有权限修改
|
|
48
|
+
checkPermission(oldObj,permissions,orgId,"del");
|
|
41
49
|
}
|
|
42
|
-
out.print(JSON.stringify(ret));
|
|
43
|
-
return;
|
|
44
|
-
}
|
|
45
|
-
if(roleId!=='internal' ){
|
|
46
|
-
//检查是否有权限修改
|
|
47
|
-
checkPermission(oldObj,permissions,orgId,"del");
|
|
48
50
|
}
|
|
49
|
-
}
|
|
50
51
|
|
|
51
52
|
|
|
52
|
-
|
|
53
|
-
|
|
53
|
+
for(var i=0;i<ids.length; i++) {
|
|
54
|
+
var id = ids[i];
|
|
54
55
|
@projectCodeService.del(id);
|
|
55
|
-
|
|
56
|
+
}
|
|
56
57
|
|
|
57
58
|
|
|
58
|
-
|
|
59
|
-
|
|
59
|
+
var ret = {
|
|
60
|
+
state: 'ok'
|
|
61
|
+
}
|
|
62
|
+
out.print(JSON.stringify(ret));
|
|
60
63
|
}
|
|
61
|
-
|
|
64
|
+
catch(e){
|
|
65
|
+
var ret = {
|
|
66
|
+
state:'err',
|
|
67
|
+
msg:getErrorMsg(e)
|
|
68
|
+
}
|
|
69
|
+
out.print(JSON.stringify(ret));
|
|
70
|
+
}
|
|
71
|
+
|
|
62
72
|
})();
|
|
73
|
+
|
|
74
|
+
function getErrorMsg(e){
|
|
75
|
+
if(typeof e === 'string'){
|
|
76
|
+
return e;
|
|
77
|
+
}
|
|
78
|
+
var msg = e.msg || e.message || e.toString();
|
|
79
|
+
var beginIdx = msg.indexOf(':');
|
|
80
|
+
if(beginIdx===-1){
|
|
81
|
+
return msg;
|
|
82
|
+
}
|
|
83
|
+
var endIdx = msg.indexOf('(',beginIdx);
|
|
84
|
+
if(endIdx===-1){
|
|
85
|
+
return msg;
|
|
86
|
+
}
|
|
87
|
+
return msg.substring(beginIdx+1,endIdx);
|
|
88
|
+
|
|
89
|
+
}
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
var roleId = env.roleId
|
|
33
33
|
if(orgId && oldObj && oldObj._orgIds){
|
|
34
34
|
//检查是否有权限修改
|
|
35
|
-
if(roleId!=='internal' && orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
|
|
35
|
+
if(roleId!=='internal' && roleId!='0' && orgId!='0' && oldObj._orgIds.indexOf(orgId)===-1){
|
|
36
36
|
var ret = {
|
|
37
37
|
state:'err',
|
|
38
38
|
code: 'no permission',
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
modelObject.m = env.m;
|
|
55
55
|
|
|
56
56
|
//如果检查不通过，则会抛出异常
|
|
57
|
-
if(roleId!=='internal'){
|
|
57
|
+
if(roleId!=='internal' && roleId!='0'){
|
|
58
58
|
checkPermission(modelObject,permissions,orgId,"add");
|
|
59
59
|
}
|
|
60
60
|
modelObject.owl_createUserId = env.loginUserId;
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
}
|
|
82
82
|
modelObject._orgIds = _orgIds;
|
|
83
83
|
diffResult = diff(oldObj,modelObject,"");
|
|
84
|
-
if(roleId!=='internal') {
|
|
84
|
+
if(roleId!=='internal' && roleId!='0') {
|
|
85
85
|
checkUpdatePermission(modelObject, diffResult, permissions, orgId);
|
|
86
86
|
}
|
|
87
87
|
var merged = merge(oldObj,modelObject,permissions,orgId);
|