Browse Source

star收藏

liuQiang 2 years ago
parent
commit
807a38c5a2
2 changed files with 37 additions and 14 deletions
  1. 35 5
      src/views/myfile/MyFile.vue
  2. 2 9
      src/views/myfile/modalComponebts/SpaceBig.vue

+ 35 - 5
src/views/myfile/MyFile.vue

@@ -143,7 +143,7 @@
                                 <el-table-column label="名称" width="180">
                                     <template #default="scope">
                                         <span>
-                                            <el-icon v-if="scope.row.isFavorite == 'N'">
+                                            <el-icon v-if="scope.row.isFavorite == 'N'" @click.stop="collectByStar(scope.row,true)">
                                                 <Star />
                                             </el-icon>
                                             <img v-else @click.stop="delCollect(scope.row,true)" src="../../assets/images/yellowstar.png" alt="">
@@ -154,6 +154,7 @@
                                                     effect="dark"
                                                     :content="scope.row.dirName"
                                                     placement="top"
+                                                    show-after="1000"
                                                 >
                                                    {{ scope.row.dirName }}
                                                 </el-tooltip>
@@ -208,7 +209,7 @@
                                     <el-table-column label="名称" width="200">
                                         <template #default="scope">
                                             <span style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                            <el-icon v-if="scope.row.isFavorite == 'N'">
+                                            <el-icon v-if="scope.row.isFavorite == 'N'" @click.stop="collectByStar(scope.row,false)">
                                                 <Star />
                                             </el-icon>
                                             <img v-else @click.stop="delCollect(scope.row,false)" src="../../assets/images/yellowstar.png" alt="">
@@ -218,6 +219,7 @@
                                                     effect="dark"
                                                     :content="scope.row.fileName"
                                                     placement="top"
+                                                    show-after="1000"
                                                 >
                                                    {{ scope.row.fileName }}
                                                 </el-tooltip>
@@ -380,6 +382,7 @@ import { listVersion } from "@/api/biz/version";
 import useUserStore from "@/store/modules/user";
 import { useRouter, useRoute } from "vue-router";
 import { canPreviewFile } from "@/utils/index.js"
+import fileSpace from '../../api/filespace/fileSpace';
 
 export default {
     setup() {
@@ -729,7 +732,13 @@ export default {
             }
         }
         // 申请扩容
-        function askApply() {
+       async function askApply() {
+            const res =  await fileSpace.querySpace(impSpaceId.value)
+            console.log('res',res);
+            if(res.data){
+                ElMessage({ message: '已存在扩容申请', type: 'error' })
+                return
+            }
             spaces.value = true
         }
         //mouse弹框
@@ -1278,13 +1287,33 @@ export default {
         const refreshFile = ()=>{
             // console.log('ref',toRaw(thisFolder.value));
             if(toRaw(thisFolder.value).isFavorite){//如果点开了文件夹
-            console.log(111);
+            // console.log(111);
                folderClick()
             }else{
-            console.log(222);
+            // console.log(222);
                 getAllTop()
             }
         }
+        //star收藏事件
+        const collectByStar = (row,isfolder)=>{
+            console.log('row',row);
+            if(isfolder){
+                let thisRow = toRaw(row)
+                isFolder.value = 'Y'
+                clickRow.value = thisRow
+                copyFolderName.value = row.dirName
+                copyFileName.value = clickRow.value.dirName
+            }else{
+                isFolder.value = "N"
+                clickRow.value = row
+                copyRow.value = row
+                clickRowId.value = row.docId
+                copyDirId.value = row.dirId
+                copyFileName.value = row.fileName
+            }
+            
+            collects.value = true
+        }
         // 取消文件收藏
         const delCollect = async (row,isfolder)=>{
             const thisRow = toRaw(row)
@@ -1461,6 +1490,7 @@ export default {
             refreshFile,
             delCollect,
             backFolder,
+            collectByStar
         }
     },
     watch: {

+ 2 - 9
src/views/myfile/modalComponebts/SpaceBig.vue

@@ -55,15 +55,8 @@ export default {
             askTo.value = false
             emit("getSpaceC", askTo.value)
         }
-       async function  addSpace() {
-       const res =  await fileSpace.querySpace(spid - 0)
-       console.log('res',res);
-       if(res.data){
-        ElMessage({ message: '已存在扩容申请', type: 'error' })
-        askTo.value = false
-        return
-       }
-           await fileSpace.addSpace({
+        function  addSpace() {
+         fileSpace.addSpace({
                 spaceId: spid - 0,
                 expandCap: spaceForm.value.newCup - 0,
                 expandReason: spaceForm.value.newTalk