Merge branch 'liuqiang' into v3

src/views/collect/index.vue

@@ -251,7 +251,7 @@
 
 <script setup>
 import Sortable from "sortablejs";
-import { setIcon } from "@/utils/index.js";
+// import { setIcon } from "@/utils/index.js";
 import draggable from "vuedraggable";
 import { onMounted, ref, watch, nextTick } from "vue";
 import { toRaw } from "@vue/reactivity";
@@ -270,64 +270,7 @@ const tabName = ref(""); //新增的标签名
 const changeTabName = ref(""); //修改的标签名
 const tabList = ref([]);
 const isAsc = ref("asc");
-const tableData = [
-  {
-    date: "2016-05-03",
-    name: "Tom",
-    state: "California",
-    city: "Los Angeles",
-    address: "No. 189, Grove St, Los Angeles",
-    zip: "CA 90036",
-  },
-  {
-    date: "2016-05-02",
-    name: "Tom",
-    state: "California",
-    city: "Los Angeles",
-    address: "No. 189, Grove St, Los Angeles",
-    zip: "CA 90036",
-  },
-  {
-    date: "2016-05-04",
-    name: "Tom",
-    state: "California",
-    city: "Los Angeles",
-    address: "No. 189, Grove St, Los Angeles",
-    zip: "CA 90036",
-  },
-  {
-    date: "2016-05-01",
-    name: "Tom",
-    state: "California",
-    city: "Los Angeles",
-    address: "No. 189, Grove St, Los Angeles",
-    zip: "CA 90036",
-  },
-  {
-    date: "2016-05-08",
-    name: "Tom",
-    state: "California",
-    city: "Los Angeles",
-    address: "No. 189, Grove St, Los Angeles",
-    zip: "CA 90036",
-  },
-  {
-    date: "2016-05-06",
-    name: "Tom",
-    state: "California",
-    city: "Los Angeles",
-    address: "No. 189, Grove St, Los Angeles",
-    zip: "CA 90036",
-  },
-  {
-    date: "2016-05-07",
-    name: "Tom",
-    state: "California",
-    city: "Los Angeles",
-    address: "No. 189, Grove St, Los Angeles",
-    zip: "CA 90036",
-  },
-];
+const tableData = [];
 const visible = ref(false); //显示右键菜单
 const top = ref(0);
 const left = ref(0);
@@ -336,6 +279,17 @@ const isChangeTabName = ref(0); //存放修改状标签的id
 const folderArr = ref(); //文件夹数组
 const fileArr = ref(); //文件数组
 const isList = ref(false); //控制显示方式
+//----引入图片----
+import file_DOC from "../../assets/images/fileType/file_DOC.png";
+import file_pdf from "../../assets/images/fileType/file_pdf.png";
+import file_PPT from "../../assets/images/fileType/file_PPT.png";
+import file_TXT from "../../assets/images/fileType/file_TXT.png";
+import file_XLSX from "../../assets/images/fileType/file_XLSX.png";
+import file_pic from "../../assets/images/fileType/file_pic.png";
+import file_audio from "../../assets/images/fileType/file_audio.png";
+import file_video from "../../assets/images/fileType/file_video.png";
+import file_zip from "../../assets/images/fileType/file_zip.png";
+// -------
 onMounted(async () => {
   await getList();
   await getCollectList();
@@ -492,13 +446,16 @@ const tabchange = async (labelId) => {
     isAsc: isAsc.value,
     orderByColumn: "createTime",
   };
+  let res
   if (labelId === "second") {
-    const res = await listFavoriteById(-1);
+     res = await listFavoriteById(-1);
     console.log("res", res);
-    return
+    // return;
+  } else {
+    // 获取当前标签下的数据
+     res = await listFavoriteById(labelId);
   }
-  // 获取当前标签下的数据
-  const res = await listFavoriteById(labelId);
+
   // console.log("----res", res);
   folderArr.value = res.filter((item) => item.isFolder === "Y");
   fileArr.value = res.filter((item) => item.isFolder === "N");
@@ -530,6 +487,44 @@ const sortArr = (field) => {
     return a[field] - b[field];
   };
 };
+
+const setIcon = (fileType) => {
+  switch (fileType) {
+    case ".docx":
+      return file_DOC;
+      break;
+    case ".pdf":
+      return file_pdf;
+      break;
+    case ".ppt":
+      return file_PPT;
+      break;
+    case ".txt":
+      return file_TXT;
+      break;
+    case ".xlsx":
+      return file_XLSX;
+      break;
+    case ".csv":
+      return file_XLSX;
+      break;
+    case ".png":
+      return file_pic;
+      break;
+    case ".mp3":
+      return file_audio;
+      break;
+    case ".mp4":
+      return file_video;
+      break;
+    case ".zip":
+      return file_zip;
+      break;
+    default:
+      return file_DOC;
+      break;
+  }
+};
 </script>
 
 <style lang="scss" scoped>

src/views/myfile/MyFile.vue

@@ -919,7 +919,7 @@ export default {
         // 重命名
         function restName(row, index) {
             // 判断是点击打开还是右键菜单打开
-            row = row ? row : thisFolder.value
+            row = row ? row : clickRow.value
             copyFolderName.value = row.dirName
             selectedBox.value = row.dirId
             rename.value = true
@@ -992,7 +992,7 @@ export default {
             if(row){
                 thisFolder.value = row;
             }else{
-                row =thisFolder.value
+                row =clickRow.value
             }
             console.log('row', toRaw(row));
             topPath.value = row.dirPath
@@ -1147,8 +1147,10 @@ export default {
         const folderRClick = (row, col, e) => {
             e.preventDefault();
             e.stopPropagation();
+            // thisFolder.value = ''   //先清空
             let thisRow = toRaw(row)
-            thisFolder.value = thisRow;
+            // console.log('thisFolder',thisFolder.value);
+            clickRow.value = thisRow
             copyFolderName.value = row.dirName
             //  唤出右键菜单，思路：获取鼠标位置来定位菜单
             folderVisible.value = true;
@@ -1163,9 +1165,9 @@ export default {
         // 文件夹收藏事件
         const collectFolder = () => {
             isFolder.value = 'Y'
-            clickRow.value = thisFolder.value
+            // clickRow.value = thisFolder.value
             // thisFolder.value = ''
-            copyFileName.value = thisFolder.value.dirName
+            copyFileName.value = clickRow.value.dirName
             collects.value = true
         }
         // 左箭头事件
@@ -1227,11 +1229,12 @@ export default {
         }
         //点击收藏后刷新文件
         const refreshFile = ()=>{
-            if(thisFolder.value){//如果点开了文件夹
-            // console.log(111);
+            // console.log('ref',toRaw(thisFolder.value));
+            if(toRaw(thisFolder.value).isFavorite){//如果点开了文件夹
+            console.log(111);
                folderClick()
             }else{
-            // console.log(222);
+            console.log(222);
                 getAllTop()
             }
         }
@@ -1252,8 +1255,9 @@ export default {
                 } 
             }
             const res = await delFavorite(query)
-            //TODO 之后需要重新获取数据
+            //TODO 之后需要重新获取数据 并message提示
             console.log('res',res);
+            refreshFile()
         }
         onMounted(() => {
             getAllTop()

src/views/myfile/modalComponebts/FileCollect.vue

@@ -118,13 +118,13 @@ export default {
                 query = {
                     "isFolder":props.isFolder,
                     "relaId": props.clickRow.dirId,
-                    "labelId": collectForm.value.folders - 0,
+                    "labelId": collectForm.value.folders - 0 || null,
                 }
             }else{
                 query = {
                     "isFolder":props.isFolder,
                     "relaId": props.clickRow.docId,
-                    "labelId": collectForm.value.folders - 0,
+                    "labelId": collectForm.value.folders - 0 || null,
                 }
             }
             collect.addCollect(query).then(res => {