liuQiang 2 년 전
부모
커밋
a87b4bfc44

+ 1 - 1
src/components/IdentifyFont/IdentifyFont.vue

@@ -199,7 +199,7 @@ const handleAvatarSuccess = (msg, file) => {
     showImg.value = null;
     ElMessage({ message: "识别失败", type: "error" });
   }
-  console.log("textData", textData.value);
+  // console.log("textData", textData.value);
 };
 //文件上传前的钩子
 const beforeUp = (raw) => {

+ 5 - 2
src/components/LeftList/LeftList.vue

@@ -41,6 +41,7 @@ import {
   onMounted,
   defineExpose,
   onDeactivated,
+  onBeforeMount,
 } from "vue";
 import { ElMessage } from "element-plus";
 import documents from "@/api/document/document";
@@ -117,8 +118,8 @@ const checkoutNode = async (node, data) => {
     }
   }
   getLevel2(node);
-  console.log("thisNode", thisNode);
-  console.log("node", node);
+  // console.log("thisNode", thisNode);
+  // console.log("node", node);
   const res = await getDir(data.id);
   let resThis;
   if (thisNode) {
@@ -132,9 +133,11 @@ const setImg = (remark) => {
   return setListImg(remark);
 };
 const getTopDir = async () => {
+  curArr.value = []
   const res = await documents.getTop(props.spaceType);
   console.log("topres", res);
   curArr.value.push(res.dirId);
+  console.log('curArr',curArr.value);
   topId.value = res.dirId
   return;
 };

+ 1 - 1
src/views/collect/index.vue

@@ -358,7 +358,7 @@ const thisTab = ref({}); //当前右键的标签
 const isChangeTabName = ref(0); //存放修改状标签的id
 const folderArr = ref(); //文件夹数组
 const fileArr = ref(); //文件数组
-const isList = ref(sessionStorage.getItem("fileGrid") || 0); //控制显示方式
+const isList = ref(sessionStorage.getItem("fileGrid") || 1); //控制显示方式
 const showPreview = ref(false); //预览
 const fileRightXY = ref({}); //右键菜单坐标
 const showFlieRM = ref(false); //右键菜单显示

+ 6 - 6
src/views/department/MyFile.vue

@@ -813,7 +813,7 @@ export default {
             fileGrid.value = 0 // 变宫格
             pageSize.value = 30+pageSize.value
             if(thisFolder.value.dirId){
-                const query = `${thisFolder.value.dirId}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                const query = `${thisFolder.value.dirId}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=9999&pageNum=${filePageNum.value}`
                 const res = await myfile.getById(query)
                   console.log('filessetScrollres',res);
                 if (res.code === 200) {
@@ -855,7 +855,7 @@ export default {
                 spaceName.value = userMe[0].dirPath
                 let obj = {
                     pageNum: 1,
-                    pageSize: 10,
+                    pageSize: 9999,
                     isAsc: isAsc.value,
                     orderByColumn: "createTime",
                 }
@@ -1504,7 +1504,7 @@ export default {
             // console.log('topPath',toRaw(topPath.value));
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
-            const query = `${newDirId.value}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+            const query = `${newDirId.value}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=9999&pageNum=${filePageNum.value}`
             documents.getALLdocumentByType({
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0,
@@ -2081,7 +2081,7 @@ export default {
 
             // console.log('tableBeEnd.value',tableBeEnd.value);
             filePageNum.value = filePageNum.value+1
-            const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+            const query = `${thisFolder.value.dirId}?pageSize=9999&pageNum=${filePageNum.value}`
             // -------------先禁止掉事件 定时器1秒钟后才能再次触发
             tableBeEnd.value = true
             
@@ -2225,7 +2225,7 @@ export default {
                     }else{
                     pageSize.value = 80
                 }
-                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const query = `${thisFolder.value.dirId}?pageSize=9999&pageNum=${filePageNum.value}`
                  const res = await myfile.getById(query)
                 //  console.log('filessetScrollres',res);
                  if (res.code === 200) {
@@ -2248,7 +2248,7 @@ export default {
                 }
                 fileHeight.value = '38vh'
                  if(!thisFolder.value.dirId)return
-                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const query = `${thisFolder.value.dirId}?pageSize=9999&pageNum=${filePageNum.value}`
                  const res = await myfile.getById(query)
                 //  console.log('filessetScrollres',res);
                  if (res.code === 200) {

+ 1 - 1
src/views/liveChat/index.vue

@@ -459,7 +459,7 @@ const loadPreviousPage = async () => {
   const newMessages = document.querySelectorAll(".message-container");
   const firstNewMessage = newMessages[previousPageData.length];
   // const firstNewMessageTop = mainContainer.offsetHeight + 100;
-  const firstNewMessageTop = mainContainer.offsetHeight-100;
+  const firstNewMessageTop = mainContainer.offsetHeight-10;
   console.log('firstNewMessageTop',firstNewMessageTop);
   mainContainer.scrollTop = firstNewMessageTop;
   chatRecords.data;

+ 11 - 6
src/views/myfile/MyFile.vue

@@ -836,7 +836,7 @@ export default {
             fileGrid.value = 0 // 变宫格
             pageSize.value = 30+pageSize.value
             if(thisFolder.value.dirId){
-                const query = `${thisFolder.value.dirId}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                const query = `${thisFolder.value.dirId}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=9999&pageNum=${filePageNum.value}`
                 const res = await myfile.getById(query)
                 //   console.log('filessetScrollres',res);
                 if (res.code === 200) {
@@ -1334,7 +1334,7 @@ export default {
             console.log('cli', clickFileData.value)
             let obj = {
                 pageNum: 1,
-                pageSize: 10,
+                pageSize: 9999,
                 isAsc: isAsc.value,
                 orderByColumn: "createTime",
             }
@@ -1684,7 +1684,7 @@ export default {
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
             clickFileData.value = row
-            const query = `${newDirId.value}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+            const query = `${newDirId.value}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=9999&pageNum=${filePageNum.value}`
             documents.getALLdocumentByType({
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0,
@@ -1890,6 +1890,11 @@ export default {
             const imgTypeArr = ['.png', '.jpg', '.jpeg', '.JPG','.PNG']
             const canEditArr = ['.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.rtf', '.txt', '.djvu', '.xps', '.wps','.dps','.et', '.pptx']
             let arr = []
+            //如果带有(重命名)-前缀 只允许进行重命名操作
+            const regExp = /^\(重命名\)-/
+            if(regExp.test(clickRow.value.fileName)){
+               return arr = mouseCli.value.filter(item => item.name === "重命名")
+            }
             if (!(typeArr.includes(copyFileType.value) || canPreviewArray.includes(copyFileType.value))) {
                 arr = mouseCli.value.filter(item => item.name !== "预览")
             } else {
@@ -2245,7 +2250,7 @@ export default {
             console.log('setScroll', '到底喽');
             // console.log('tableBeEnd.value',tableBeEnd.value);
             filePageNum.value = filePageNum.value + 1
-            const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+            const query = `${thisFolder.value.dirId}?pageSize=9999&pageNum=${filePageNum.value}`
             // -------------先禁止掉事件 定时器1秒钟后才能再次触发
             tableBeEnd.value = true
 
@@ -2393,7 +2398,7 @@ export default {
                     }else{
                     pageSize.value = 80
                 }
-                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const query = `${thisFolder.value.dirId}?pageSize=9999&pageNum=${filePageNum.value}`
                  const res = await myfile.getById(query)
                 //  console.log('filessetScrollres',res);
                  if (res.code === 200) {
@@ -2416,7 +2421,7 @@ export default {
                 }
                 fileHeight.value = '38vh'
                 if(!thisFolder.value.dirId)return
-                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const query = `${thisFolder.value.dirId}?pageSize=9999&pageNum=${filePageNum.value}`
                  const res = await myfile.getById(query)
                 //  console.log('filessetScrollres',res);
                  if (res.code === 200) {

+ 5 - 5
src/views/publicment/MyFile.vue

@@ -819,7 +819,7 @@ export default {
             fileGrid.value = 0 // 变宫格
             pageSize.value = 30+pageSize.value
             if(thisFolder.value.dirId){
-                const query = `${thisFolder.value.dirId}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                const query = `${thisFolder.value.dirId}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=9999&pageNum=${filePageNum.value}`
                 const res = await myfile.getById(query)
                   console.log('filessetScrollres',res);
                 if (res.code === 200) {
@@ -1482,7 +1482,7 @@ export default {
             // console.log('topPath',toRaw(topPath.value));
             newDirId.value = row.dirId
             newSpaceId.value = row.spaceId
-            const query = `${newDirId.value}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+            const query = `${newDirId.value}?isAsc=${isAsc.value}&orderByColumn=createTime&pageSize=9999&pageNum=${filePageNum.value}`
             documents.getALLdocumentByType({
                 parentId: newDirId.value - 0,
                 spaceId: newSpaceId.value - 0,
@@ -2063,7 +2063,7 @@ export default {
             if(tableBeEnd.value)return
             // console.log('tableBeEnd.value',tableBeEnd.value);
             filePageNum.value = filePageNum.value+1
-            const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+            const query = `${thisFolder.value.dirId}?pageSize=9999&pageNum=${filePageNum.value}`
             // -------------先禁止掉事件 定时器1秒钟后才能再次触发
             tableBeEnd.value = true
             
@@ -2215,7 +2215,7 @@ export default {
                     }else{
                     pageSize.value = 80
                 }
-                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const query = `${thisFolder.value.dirId}?pageSize=9999&pageNum=${filePageNum.value}`
                  const res = await myfile.getById(query)
                 //  console.log('filessetScrollres',res);
                  if (res.code === 200) {
@@ -2238,7 +2238,7 @@ export default {
                 }
                 fileHeight.value = '38vh'
                 if(!thisFolder.value.dirId)return
-                 const query = `${thisFolder.value.dirId}?pageSize=${pageSize.value}&pageNum=${filePageNum.value}`
+                 const query = `${thisFolder.value.dirId}?pageSize=9999&pageNum=${filePageNum.value}`
                  const res = await myfile.getById(query)
                 //  console.log('filessetScrollres',res);
                  if (res.code === 200) {

+ 4 - 1
src/views/search/index.vue

@@ -155,6 +155,7 @@ const previewData = ref()
 const copyFileType = ref()
 const reload = inject("reload");
 const addFileTab = inject("addFileTab");
+const clickPath = inject("clickPath");
 
 const tableData = ref([]);
 // 切换搜索范围
@@ -265,7 +266,9 @@ const fliterListData = (dataList) => {
 };
 // 回退
 const goBack = () => {
-  router.back();
+  // router.back();
+  // 跳到主页
+clickPath(null,{label: "首页",path: "/home"})
 };
 
 //分页