Merge branch 'liuqiang' into v3

src/views/department/MyFile.vue

@@ -1235,6 +1235,7 @@ export default {
                     getInfo(clickRow.value.docId).then((res)=>{
                     // console.log('res',res);
                     clickRow.value = res.data
+                    console.log('thisRole.value',thisRole.value);
                     if(clickRow.value.isFiled === "Y" || !canEditArr.includes(copyFileType.value) || !toRaw(thisRole.value).some(item=>item == "edit")){
                         //归档了或者不允许编辑的格式 就是预览
                         if(thisFolderRole.value &&thisFolderRole.value.roles&& thisFolderRole.value.roles.l0800){
@@ -1621,8 +1622,9 @@ export default {
             } else {
                 thisFolderRole.value = null
             }
-            console.log('row',row);
-            console.log('rowthisFolderRole',thisFolderRole.value);
+            thisRole.value = row.dirRole?row.dirRole.split(','):[]
+            // console.log('row',row);
+            // console.log('rowthisFolderRole',thisFolderRole.value);
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
              const query = `${newDirId.value}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=9999&pageNum=1`

src/views/highSearch/HighSearch.vue

@@ -152,7 +152,7 @@ const doSearch = async () => {
       return;
     }
     listData.value = res.data;
-    total.value = res.data.length;
+    total.value = res.total;
     noData.value = false;
     if (res.data.length < size.value) {
       beEnd.value = true;
@@ -178,7 +178,7 @@ const setScroll = async () => {
   console.log(res);
   if (res.data.length > 0) {
     // 如果返回的有数据
-    total.value += res.data.length;
+    // total.value += res.total;
     noData.value = false;
     res.data.forEach((item) => listData.value.push(item));
     if (res.data.length < size.value) {

src/views/publicment/MyFile.vue

@@ -700,7 +700,7 @@ export default {
         })
         let ordinaryFolder = ref([ {
             img: ImgFile.previewIcon,
-            name: "预览"
+            name: "打开"
         },
         {
             img: ImgFile.collect,
@@ -1595,8 +1595,9 @@ export default {
             } else {
                 thisFolderRole.value = null
             }
-            console.log('row',row);
-            console.log('rowthisFolderRole',thisFolderRole.value);
+            thisRole.value = row.dirRole?row.dirRole.split(','):[]
+            // console.log('row',row);
+            // console.log('rowthisFolderRole',thisFolderRole.value);
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
              const query = `${newDirId.value}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=9999&pageNum=1`