owl-cli 6.8.0 → 6.10.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.
|
@@ -103,16 +103,16 @@ function expandSectionPermission(permissions){
|
|
|
103
103
|
if(sections_same_org){
|
|
104
104
|
for(var j=0; j<sections_same_org.length; j++){
|
|
105
105
|
var sec = sections_same_org[j];
|
|
106
|
-
if(sec.sectionKey
|
|
107
|
-
same_org[sec.sectionKey] = sec
|
|
106
|
+
if(sec.sectionKey){
|
|
107
|
+
same_org[sec.sectionKey] = sec;
|
|
108
108
|
}
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
if(sections_sub_org){
|
|
112
112
|
for(var j=0; j<sections_sub_org.length; j++){
|
|
113
113
|
var sec = sections_sub_org[j];
|
|
114
|
-
if(sec.sectionKey
|
|
115
|
-
sub_org[sec.sectionKey] = sec
|
|
114
|
+
if(sec.sectionKey ){
|
|
115
|
+
sub_org[sec.sectionKey] = sec;
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
118
|
}
|
|
@@ -126,10 +126,10 @@ function expandSectionPermission(permissions){
|
|
|
126
126
|
|
|
127
127
|
function expandFieldPermission(permissions){
|
|
128
128
|
var same_org = {
|
|
129
|
-
"*":"allowed"
|
|
129
|
+
"*":{read:"allowed"}
|
|
130
130
|
}
|
|
131
131
|
var sub_org = {
|
|
132
|
-
"*":"allowed"
|
|
132
|
+
"*":{read:"allowed"}
|
|
133
133
|
}
|
|
134
134
|
for(var i=0; i<permissions.length; i++){
|
|
135
135
|
var p = permissions[i];
|
|
@@ -140,7 +140,7 @@ function expandFieldPermission(permissions){
|
|
|
140
140
|
if(f.sectionKey && f.sectionKey!='main'){
|
|
141
141
|
fieldKey = f.sectionKey + "." + f.fieldKey;
|
|
142
142
|
}
|
|
143
|
-
same_org[fieldKey] = f
|
|
143
|
+
same_org[fieldKey] = f;
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
146
|
if(p.fields_sub_org){
|
|
@@ -150,7 +150,7 @@ function expandFieldPermission(permissions){
|
|
|
150
150
|
if(f.sectionKey && f.sectionKey!='main'){
|
|
151
151
|
fieldKey = f.sectionKey + "." + f.fieldKey;
|
|
152
152
|
}
|
|
153
|
-
sub_org[fieldKey] = f
|
|
153
|
+
sub_org[fieldKey] = f;
|
|
154
154
|
}
|
|
155
155
|
}
|
|
156
156
|
}
|
|
@@ -163,6 +163,17 @@ function filterFields(data,permissions,orgId){
|
|
|
163
163
|
//根据权限，将没有权限的字段删除掉
|
|
164
164
|
var section_permissions = expandSectionPermission(permissions);
|
|
165
165
|
var field_permissions = expandFieldPermission(permissions);
|
|
166
|
+
var ef_section_permissions = null;
|
|
167
|
+
var ef_field_permissions = null;
|
|
168
|
+
if(data._orgId === orgId){
|
|
169
|
+
ef_section_permissions = section_permissions.same_org;
|
|
170
|
+
ef_field_permissions = field_permissions.same_org;
|
|
171
|
+
}
|
|
172
|
+
else{
|
|
173
|
+
ef_section_permissions = section_permissions.sub_org;
|
|
174
|
+
ef_field_permissions = field_permissions.sub_org;
|
|
175
|
+
}
|
|
176
|
+
|
|
166
177
|
var valid_fields = ['_orgId','_orgIds',"_v", "del"];
|
|
167
178
|
var curSectionKey = '';
|
|
168
179
|
for(var k in data){
|
|
@@ -170,18 +181,9 @@ function filterFields(data,permissions,orgId){
|
|
|
170
181
|
continue;
|
|
171
182
|
}
|
|
172
183
|
else{
|
|
173
|
-
var ef_section_permissions = null;
|
|
174
|
-
var ef_field_permissions = null;
|
|
175
|
-
if(data._orgId === orgId){
|
|
176
|
-
ef_section_permissions = section_permissions.same_org;
|
|
177
|
-
ef_field_permissions = field_permissions.same_org;
|
|
178
|
-
}
|
|
179
|
-
else{
|
|
180
|
-
ef_section_permissions = section_permissions.sub_org;
|
|
181
|
-
ef_field_permissions = field_permissions.sub_org;
|
|
182
|
-
}
|
|
183
184
|
if(typeof data[k] === 'object'){
|
|
184
|
-
if((ef_section_permissions[k] && ef_section_permissions[k].read === 'denied') ||
|
|
185
|
+
if((ef_section_permissions[k] && ef_section_permissions[k].read === 'denied') ||
|
|
186
|
+
((!ef_section_permissions[k] || !ef_section_permissions[k].read) && (ef_section_permissions["*"] && ef_section_permissions["*"].read === 'denied'))){
|
|
185
187
|
delete data[k];
|
|
186
188
|
}
|
|
187
189
|
var section = data[k];
|
|
@@ -190,7 +192,8 @@ function filterFields(data,permissions,orgId){
|
|
|
190
192
|
var r = section[i];
|
|
191
193
|
for(var fk in r){
|
|
192
194
|
var rk = k+ "." + fk;
|
|
193
|
-
if((ef_field_permissions[rk] && ef_field_permissions[rk].read === 'denied') ||
|
|
195
|
+
if((ef_field_permissions[rk] && ef_field_permissions[rk].read === 'denied') ||
|
|
196
|
+
((!ef_field_permissions[rk] || !ef_field_permissions[rk].read) && (ef_field_permissions[k+".*"] && ef_field_permissions[k+".*"].read === 'denied'))){
|
|
194
197
|
delete r[rk];
|
|
195
198
|
}
|
|
196
199
|
}
|