Merge branch 'liuqiang' into v3

src/views/department/MyFile.vue

@@ -466,7 +466,7 @@ export default {
         let rename = ref(false)//文件夹重命名
         let spaces = ref(false)//空间扩容父传子
         let folderCase = ref(false)
-        let fileGrid = ref(sessionStorage.getItem('fileGrid') || 0)
+        let fileGrid = ref(sessionStorage.getItem('fileGrid') || 1)
         let folderGrid = ref(true)
         let editOnline = ref(true)
         let searchFire = ref('')
@@ -895,7 +895,7 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                      loadingPreview.value = false
-                    if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+                    if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
                         addFileTab(clickRow.value, 1,1);
                     }else{
                        addFileTab(clickRow.value, 1,0); 
@@ -926,7 +926,7 @@ export default {
                 if (filePreview) {
                     loadingPreview.value = false
                     // addTab(clickRow.value);
-                    if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+                    if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
                         addFileTab(clickRow.value, 0,1);
                     }else{
                        addFileTab(clickRow.value, 0,0); 

src/views/department/modalComponebts/CreateFloder.vue

@@ -212,7 +212,7 @@ export default {
                             "spaceId": newspid - 0,
                             "dirType":boserForm.value.dirType,
                             "isEncrypt":boserForm.value.isEncrypt,
-                            "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null
+                            "encryptLevel":(boserForm.value.isEncrypt == "Y" && boserForm.value.dirType == "2")?boserForm.value.encryptLevel:null
                         }
                     }
                     if(thisRole.length){

src/views/myfile/MyFile.vue

@@ -495,7 +495,7 @@ export default {
         let rename = ref(false)//文件夹重命名
         let spaces = ref(false)//空间扩容父传子
         let folderCase = ref(false)
-        let fileGrid = ref(sessionStorage.getItem('fileGrid') || 0)
+        let fileGrid = ref(sessionStorage.getItem('fileGrid') || 1)
         let folderGrid = ref(true)
         let editOnline = ref(true)
         let searchFire = ref('')
@@ -966,7 +966,7 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                 loadingPreview.value = false
-                if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+                if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
                         addFileTab(clickRow.value, 1,1);
                     }else{
                        addFileTab(clickRow.value, 1,0); 
@@ -1024,7 +1024,7 @@ export default {
                 const filePreview = canPreviewFile(copyFileType.value)
                 if (filePreview) {
                     loadingPreview.value = false
-                    if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+                    if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
 
                         addFileTab(clickRow.value, 0,1);
                     }else{
@@ -1076,7 +1076,7 @@ export default {
             }
         }
         function threeBe(data,newFileData) {
-            if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+            if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
                         addFileTab(newFileData, 1,1);
                     }else{
                        addFileTab(newFileData, 1,0); 

src/views/publicment/MyFile.vue

@@ -462,7 +462,7 @@ export default {
         let rename = ref(false)//文件夹重命名
         let spaces = ref(false)//空间扩容父传子
         let folderCase = ref(false)
-        let fileGrid = ref(sessionStorage.getItem('fileGrid') || 0)
+        let fileGrid = ref(sessionStorage.getItem('fileGrid') || 1)
         let folderGrid = ref(true)
         let editOnline = ref(true)
         let searchFire = ref('')
@@ -906,7 +906,7 @@ export default {
                 // const filePreview = canPreviewFile(copyFileType.value)
                 // if (filePreview) {
                      loadingPreview.value = false
-                     if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+                     if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
                         addFileTab(clickRow.value, 1,1);
                     }else{
                        addFileTab(clickRow.value, 1,0); 
@@ -936,7 +936,7 @@ export default {
                 const filePreview = canPreviewFile(copyFileType.value)
                 if (filePreview) {
                    loadingPreview.value = false
-                if(thisFolderRole.value.roles && thisFolderRole.value.roles.l0800){
+                if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
                         addFileTab(clickRow.value, 0,1);
                     }else{
                        addFileTab(clickRow.value, 0,0); 

src/views/publicment/modalComponebts/CreateFloder.vue

@@ -211,7 +211,7 @@ export default {
                             "spaceId": newspid - 0,
                             "dirType":boserForm.value.dirType,
                             "isEncrypt":boserForm.value.isEncrypt,
-                            "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null
+                            "encryptLevel":(boserForm.value.isEncrypt == "Y" && boserForm.value.dirType == "2")?boserForm.value.encryptLevel:null
                         }
                     }
                     if(thisRole.length){