Merge branch 'liuqiang' into v3

src/utils/index.js

@@ -21,7 +21,7 @@ export function formatDate(cellValue) {
  * @param {string} fileType
  */
 export const canPreviewFile = (fileType)=>{
-    const array = ['.doc', ".wps",'.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.pdf', '.rtf', '.txt', '.djvu', '.xps','.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx','.fodp', '.odp', '.otp', '.pot', '.potm', '.potx', '.pps', '.ppsm', '.ppsx', '.ppt', '.pptm', '.pptx']
+    const array = ['.doc','.dps','.et', ".wps",'.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.pdf', '.rtf', '.txt', '.djvu', '.xps','.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx','.fodp', '.odp', '.otp', '.pot', '.potm', '.potx', '.pps', '.ppsm', '.ppsx', '.ppt', '.pptm', '.pptx']
     if(array.includes(fileType)){
       return true
     }
@@ -59,9 +59,9 @@ export const rightMenuRole = (role,arr)=>{
 export const publicRightMenuRole = (role,arr)=>{
   // console.log('role',role);
   // console.log('arr',arr);
-  if(!role.some(item=>item == "download")){
-    arr = arr.filter(item => item.name !== "下载")
-  }
+  // if(!role.some(item=>item == "download")){
+  //   arr = arr.filter(item => item.name !== "下载")
+  // }
   if(!role.some(item=>item == "edit")){
     arr = arr.filter(item => item.name !== "在线编辑")
   }

src/views/department/MyFile.vue

@@ -1218,7 +1218,7 @@ export default {
             }else{
                 row =thisFolder.value
             }
-            if(row.isEncrypt === "Y"){
+            if(row.isEncrypt === "Y" && row.encryptLevel){
                 getLeveldetailFn(row.encryptLevel)
             }else{
                 thisFolderRole.value = {}

src/views/department/modalComponebts/CreateFloder.vue

@@ -96,12 +96,12 @@ export default {
         },
         thisRole: {
             type: Object,
-            required: true,
+            // required: true,
             default: ()=>{},
         },
         upFolderData: {
             type: Object,
-            required: true,
+            // required: true,
             default: ()=>{},
         },
         refreshFile: Function,
@@ -193,15 +193,17 @@ export default {
                     })
                 } else {
                     let query = {}
-                    if(FolderRole.levelCode){
+                    if(FolderRole.levelCode || thisRole.length){
                         //父级有权限自动继承 没有就用添加的值
                         query={
                             "dirName": boserForm.value.dirName,
                             "parentId": newdrid - 0,
                             "spaceId": newspid - 0,
-                            "dirType":boserForm.value.dirType,
+                            "dirType":2,
                             "isEncrypt":"Y",
-                            "encryptLevel":FolderRole.levelCode
+                            "encryptLevel":FolderRole.levelCode || boserForm.value.encryptLevel,
+                            "users":users.value,
+                            "dirRole":thisRole.length?thisRole.join(','):''
                         }
                         console.log('query',query);
                         console.log('FolderRole',FolderRole);
@@ -212,7 +214,9 @@ export default {
                             "spaceId": newspid - 0,
                             "dirType":boserForm.value.dirType,
                             "isEncrypt":boserForm.value.isEncrypt,
-                            "encryptLevel":(boserForm.value.isEncrypt == "Y" && boserForm.value.dirType == "2")?boserForm.value.encryptLevel:null
+                            "encryptLevel":(boserForm.value.isEncrypt == "Y" && boserForm.value.dirType == "2")?boserForm.value.encryptLevel:null,
+                            "users":users.value,
+                            "dirRole":thisRole.length?thisRole.join(','):''
                         }
                     }
                     if(thisRole.length){

src/views/myfile/MyFile.vue

@@ -1827,7 +1827,7 @@ export default {
             getAllTop()
         }
         const upBefore = (file)=>{
-            // console.log('file',file.size);
+            console.log('file',file);
             const maxSize = (maxFileSize.value-0)*1024*1024
             // console.log('maxSize',maxSize);
             if(file.size>maxSize){

src/views/publicment/MyFile.vue

@@ -761,7 +761,7 @@ export default {
             thisFolder.value = row
             // console.log('row2',row);
             //  topPath.value = row.dirPath
-            if(row.isEncrypt === "Y"){
+            if(row.isEncrypt === "Y" && row.encryptLevel){
                 getLeveldetailFn(row.encryptLevel)
             }else{
                 thisFolderRole.value = {}

src/views/publicment/modalComponebts/CreateFloder.vue

@@ -96,12 +96,12 @@ export default {
         },
         thisRole: {
             type: Object,
-            required: true,
+            // required: true,
             default: ()=>{},
         },
         upFolderData: {
             type: Object,
-            required: true,
+            // required: true,
             default: ()=>{},
         },
         refreshFile: Function,
@@ -192,15 +192,17 @@ export default {
                     })
                 } else {
                     let query = {}
-                    if(FolderRole.levelCode){
+                    if(FolderRole.levelCode || thisRole.length){
                         //父级有权限自动继承 没有就用添加的值
                         query={
                             "dirName": boserForm.value.dirName,
                             "parentId": newdrid - 0,
                             "spaceId": newspid - 0,
-                            "dirType":boserForm.value.dirType,
+                            "dirType":2,
                             "isEncrypt":"Y",
-                            "encryptLevel":FolderRole.levelCode
+                            "encryptLevel":FolderRole.levelCode || boserForm.value.encryptLevel,
+                            "users":users.value,
+                            "dirRole":thisRole.length?thisRole.join(','):''
                         }
                         console.log('query',query);
                         console.log('FolderRole',FolderRole);
@@ -211,7 +213,9 @@ export default {
                             "spaceId": newspid - 0,
                             "dirType":boserForm.value.dirType,
                             "isEncrypt":boserForm.value.isEncrypt,
-                            "encryptLevel":(boserForm.value.isEncrypt == "Y" && boserForm.value.dirType == "2")?boserForm.value.encryptLevel:null
+                            "encryptLevel":(boserForm.value.isEncrypt == "Y" && boserForm.value.dirType == "2")?boserForm.value.encryptLevel:null,
+                            "users":users.value,
+                            "dirRole":thisRole.length?thisRole.join(','):''
                         }
                     }
                     if(thisRole.length){