|
|
@@ -202,7 +202,7 @@ export default {
|
|
|
"dirType":2,
|
|
|
"isEncrypt":"Y",
|
|
|
"encryptLevel":FolderRole.levelCode,
|
|
|
- "users":users.value,
|
|
|
+ "users":thisType.dirType === "1"?boserForm.value.users:users.value,
|
|
|
"dirRole":thisRole.length?thisRole.join(','):''
|
|
|
}
|
|
|
console.log('query',query);
|
|
|
@@ -215,8 +215,8 @@ export default {
|
|
|
"dirType":boserForm.value.dirType,
|
|
|
"isEncrypt":boserForm.value.isEncrypt,
|
|
|
"encryptLevel":(boserForm.value.isEncrypt == "Y" && boserForm.value.dirType == "2")?boserForm.value.encryptLevel:null,
|
|
|
- "users":users.value,
|
|
|
- "dirRole":thisRole.length?thisRole.join(','):''
|
|
|
+ "users":thisType.dirType === "1"?boserForm.value.users:users.value,
|
|
|
+ "dirRole":thisType.dirType === "1"?boserForm.value.memberRoles.join(','):thisRole.join(',')
|
|
|
}
|
|
|
}
|
|
|
console.log('free0query',query);
|
|
|
@@ -244,7 +244,9 @@ export default {
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
- let query ={
|
|
|
+ let query = {}
|
|
|
+ if(free === 1){
|
|
|
+ query ={
|
|
|
"dirName": boserForm.value.dirName,
|
|
|
"parentId": drId - 0,
|
|
|
"spaceId": spId - 0,
|
|
|
@@ -255,6 +257,20 @@ export default {
|
|
|
"isEncrypt":boserForm.value.isEncrypt,
|
|
|
"encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null
|
|
|
}
|
|
|
+ }else{
|
|
|
+ query ={
|
|
|
+ "dirName": boserForm.value.dirName,
|
|
|
+ "parentId": newdrid - 0,
|
|
|
+ "spaceId": newspid - 0,
|
|
|
+ 'dirId':upFolderData.dirId,
|
|
|
+ "dirType":thisType.dirType=='2'?'2':boserForm.value.dirType,
|
|
|
+ "dirRole":boserForm.value.memberRoles.join(','),
|
|
|
+ "users":boserForm.value.users,
|
|
|
+ "isEncrypt":boserForm.value.isEncrypt,
|
|
|
+ "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
console.log('query',query);
|
|
|
documents.editFolerDocument(
|
|
|
query
|