删除提示 搜索显示全路劲

src/views/department/MyFile.vue

@@ -517,7 +517,7 @@ import level1 from "@/assets/images/level1.png";
 import level2 from "@/assets/images/level2.png";
 import level3 from "@/assets/images/level3.png";
 import level4 from "@/assets/images/level4.png";
-import { ElMessage ,ElLoading } from 'element-plus'
+import { ElMessage ,ElLoading ,ElMessageBox} from 'element-plus'
 import ImgPreview from '@/components/ImgPreview/ImgPreview.vue'
 import ScanFile from '@/components/ScanFile/ScanFile.vue'
 import MoveTo from '@/components/MoveTo/MoveTo.vue'
@@ -1143,19 +1143,34 @@ export default {
                 anyP.value = false
             }
             if (row.name == '删除') {
-            const has =  delFileFn(clickRowId.value) 
-              if(has){
-                  return
-              }
-                myfile.delMenu(clickRowId.value).then(res => {
-                    if (res.code === 200) {
-                        ElMessage({
-                            type: "success",
-                            message: "删除成功"
-                        })
-                        refreshFile()
+            ElMessageBox.confirm(
+                    `是否确认删除名为"${clickRow.value.fileName}"的文件?`,
+                    '系统提示',
+                    {
+                    confirmButtonText: '确认',
+                    cancelButtonText: '取消',
+                    type: 'warning',
                     }
-                })
+                )
+                    .then(() => {
+                        const has =  delFileFn(clickRowId.value) 
+                        if(has){
+                            return
+                        }
+                            myfile.delMenu(clickRowId.value).then(res => {
+                                if (res.code === 200) {
+                                    ElMessage({
+                                        type: "success",
+                                        message: "删除成功"
+                                    })
+                                    // getAllTop()
+                                    refreshFile()
+                                }
+                            })
+                    })
+                    .catch(() => {
+                    return
+                    })
             }
             if (row.name === '复制到...') {
                 copyOrMove.value = 0
@@ -1407,83 +1422,82 @@ export default {
             rename.value = true
         }
        async function getMenu(row, num,canDo) {
-            // console.log('delMoreFile',delMoreFile.value);
-            // if(delMoreFile.value[0].dirType === "2") return ElMessage({
-            //     message: "删除失败，组织目录不可删除",
-            //     type: "error"
-            // })
             if (row.name === '删除') {
                 if(!canDo) return
-                const datas = delMoreFile.value.map(item=>{
-                    return item.docId
-                })
-                let candel = false
-               await datas.forEach(item=>{
-                   if(delFileFn(item)){//删除的这批里面有打开的
-                        // ElMessage({
-                        //     message: "相关文件已被打开，请关闭后重试",
-                        //     type: "error"
-                        // })
-                        candel = true
-                        return
-                   } 
-                })
-                if(candel)return
-                const filesStr = datas.join(',')
-                loadingPreview.value = true
-                delInfo(filesStr).then(res=>{
-                    if (res.code === 200) {
-                            ElMessage({
-                                message: "删除成功",
-                                type: "success"
-                            })
-                            // getAllTop()
-                            loadingPreview.value = false
-                            refreshFile() 
-                        }
-                })
-                const isFile = ref(false)
-                  delMoreFolder.value.map(i => {//多选删除
-                       documents.delDocument(i.dirId).then(res => {
-                        if (res.code === 200) {
-                            ElMessage({
-                                message: "删除成功",
-                                type: "success"
-                            })
-                            if(!thisFolder.value?.dirId){
-                                delFolderDataFn(i)
-                            }
-                            // getAllTop()
-                            refreshFile()
-                        } else {
-                            ElMessage({
-                                message: "删除失败，目录应不为空",
-                                type: "error"
-                            })
-                        }
+                 ElMessageBox.confirm(
+                    '是否确认删除文件?',
+                    '系统提示',
+                    {
+                    confirmButtonText: '确认',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    }
+                )
+                    .then(async () => {
+                        const datas = delMoreFile.value.map(item=>{
+                            return item.docId
+                        })
+                        let candel = false
+                        await datas.forEach(item=>{
+                        if(delFileFn(item)){//删除的这批里面有打开的
+                                candel = true
+                                return
+                        } 
+                        })
+                        if(candel)return
+                        const filesStr = datas.join(',')
+                        loadingPreview.value = true
+                        // console.log('filesStr',filesStr);
+                        delInfo(filesStr).then(res=>{
+                            if (res.code === 200) {
+                                    ElMessage({
+                                        message: "删除成功",
+                                        type: "success"
+                                    })
+                                    // getAllTop()
+                                    loadingPreview.value = false
+                                    refreshFile() 
+                                }
+                        })
+                    })
+                    .catch(() => {
+                    return false
                     })
-                })
             }
         }
         function delName(row, num) {
             row = row ? row : clickRow.value
-            documents.delDocument(row.dirId).then(res => {
-                if (res.code === 200) {
-                    // 如果当前打开的是要删除的这个文件夹
-                    if(thisFolder.value.dirId === row.dirId){
-                        getAllTop()
-                        pathLabelData.value = []
-                    }else{
-                        getFirstFolder()
+            ElMessageBox.confirm(
+                `是否确认删除名为"${row.dirName}"的文件夹?`,
+                '系统提示',
+                {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+                }
+            )
+                .then(() => {
+                    documents.delDocument(row.dirId).then(res => {
+                    if (res.code === 200) {
+                        // 如果当前打开的是要删除的这个文件夹
+                        if(thisFolder.value.dirId === row.dirId){
+                            getAllTop()
+                            pathLabelData.value = []
+                        }else{
+                            getFirstFolder()
+                        }
+                        getSpaceList()
+                        ElMessage({
+                            message: "删除成功",
+                            type: "success"
+                        })
+                        delFolder(row)
                     }
-                    getSpaceList()
-                    ElMessage({
-                        message: "删除成功",
-                        type: "success"
                     })
-                    delFolder(row)
-                }
-            })
+                })
+                .catch(() => {
+                return false
+                })
         }
         const delFolder = (row)=>{
             delFolderDataFn(row)
@@ -2278,7 +2292,17 @@ export default {
 
         }
         const delFolderMenu = ()=>{
-             documents.delDocument(clickRow.value.dirId).then(res => {
+             ElMessageBox.confirm(
+                `是否确认删除名为"${clickRow.value.dirName}"的文件夹?`,
+                '系统提示',
+                {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+                }
+            )
+                .then(() => {
+                documents.delDocument(clickRow.value.dirId).then(res => {
                 if (res.code === 200) {
                     ElMessage({
                         message: "删除成功",
@@ -2296,6 +2320,10 @@ export default {
                     })
                 }
             })
+                })
+                .catch(() => {
+                return false
+                })
         }
         watch(() => folder.value, async(newValue, oldValue) => {
             // console.log('iFrameData 发生改变了', newValue, oldValue);

src/views/myfile/MyFile.vue

@@ -554,7 +554,7 @@ import level1 from "@/assets/images/level1.png";
 import level2 from "@/assets/images/level2.png";
 import level3 from "@/assets/images/level3.png";
 import level4 from "@/assets/images/level4.png";
-import { ElMessage, ElLoading } from 'element-plus'
+import { ElMessage, ElLoading ,ElMessageBox} from 'element-plus'
 import ImgPreview from '@/components/ImgPreview/ImgPreview.vue'
 import ScanFile from '@/components/ScanFile/ScanFile.vue'
 import MoveTo from '@/components/MoveTo/MoveTo.vue'
@@ -1197,20 +1197,34 @@ export default {
                 anyP.value = false
             }
             if (row.name == '删除') {
-              const has =  delFileFn(clickRowId.value) 
-              if(has){
-                  return
-              }
-                myfile.delMenu(clickRowId.value).then(res => {
-                    if (res.code === 200) {
-                        ElMessage({
-                            type: "success",
-                            message: "删除成功"
-                        })
-                        // getAllTop()
-                        refreshFile()
+                  ElMessageBox.confirm(
+                    `是否确认删除名为"${clickRow.value.fileName}"的文件?`,
+                    '系统提示',
+                    {
+                    confirmButtonText: '确认',
+                    cancelButtonText: '取消',
+                    type: 'warning',
                     }
-                })
+                )
+                    .then(() => {
+                        const has =  delFileFn(clickRowId.value) 
+                        if(has){
+                            return
+                        }
+                            myfile.delMenu(clickRowId.value).then(res => {
+                                if (res.code === 200) {
+                                    ElMessage({
+                                        type: "success",
+                                        message: "删除成功"
+                                    })
+                                    // getAllTop()
+                                    refreshFile()
+                                }
+                            })
+                    })
+                    .catch(() => {
+                    return
+                    })
             }
             if (row.name === '复制到...') {
                 copyOrMove.value = 0
@@ -1542,73 +1556,46 @@ export default {
                     // openScan.value = true
                     return
                 } 
-                const datas = delMoreFile.value.map(item=>{
-                    return item.docId
-                })
-                let candel = false
-               await datas.forEach(item=>{
-                   if(delFileFn(item)){//删除的这批里面有打开的
-                        // ElMessage({
-                        //     message: "相关文件已被打开，请关闭后重试",
-                        //     type: "error"
-                        // })
-                        candel = true
-                        return
-                   } 
-                })
-                if(candel)return
-                const filesStr = datas.join(',')
-                loadingPreview.value = true
-                // console.log('filesStr',filesStr);
-                delInfo(filesStr).then(res=>{
-                    if (res.code === 200) {
-                            ElMessage({
-                                message: "删除成功",
-                                type: "success"
-                            })
-                            // getAllTop()
-                            loadingPreview.value = false
-                            refreshFile() 
-                        }
-                })
-                const isFile = ref(false)
-                const folderData = delMoreFolder.value.map(item=>item.dirId)
-                // const str = folderData.join(',')
-                // documents.delDocument(str).then(res => {
-                //     if (res.code === 200) {
-                //             ElMessage({
-                //                 message: "删除成功",
-                //                 type: "success"
-                //             })
-                //             // getAllTop()
-                //             refreshFile()
-                //         } else {
-                //             ElMessage({
-                //                 message: "删除失败，目录应不为空",
-                //                 type: "error"
-                //             })
-                //         }
-                //     })
-                delMoreFolder.value.map(i => {//多选删除
-                       documents.delDocument(i.dirId).then(res => {
-                        if (res.code === 200) {
-                            ElMessage({
-                                message: "删除成功",
-                                type: "success"
-                            })
-                            if(!thisFolder.value?.dirId){
-                                delFolderDataFn(i)
-                            }
-                            // getAllTop()
-                            refreshFile()
-                        } else {
-                            ElMessage({
-                                message: "删除失败，目录应不为空",
-                                type: "error"
-                            })
-                        }
+                  ElMessageBox.confirm(
+                    '是否确认删除文件?',
+                    '系统提示',
+                    {
+                    confirmButtonText: '确认',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    }
+                )
+                    .then(async () => {
+                        const datas = delMoreFile.value.map(item=>{
+                            return item.docId
+                        })
+                        let candel = false
+                        await datas.forEach(item=>{
+                        if(delFileFn(item)){//删除的这批里面有打开的
+                                candel = true
+                                return
+                        } 
+                        })
+                        if(candel)return
+                        const filesStr = datas.join(',')
+                        loadingPreview.value = true
+                        // console.log('filesStr',filesStr);
+                        delInfo(filesStr).then(res=>{
+                            if (res.code === 200) {
+                                    ElMessage({
+                                        message: "删除成功",
+                                        type: "success"
+                                    })
+                                    // getAllTop()
+                                    loadingPreview.value = false
+                                    refreshFile() 
+                                }
+                        })
                     })
-                })
+                    .catch(() => {
+                    return false
+                    })
+                
                 // delMoreFile.value.map(i => {//多选删除
                 //       myfile.delMenu(i.docId).then(res => {
                 //         if (res.code === 200) {
@@ -1629,23 +1616,38 @@ export default {
         }
         function delName(row, num) {
             row = row ? row : clickRow.value
-            documents.delDocument(row.dirId).then(res => {
-                if (res.code === 200) {
-                    // 如果当前打开的是要删除的这个文件夹
-                    if(thisFolder.value.dirId === row.dirId){
-                        getAllTop()
-                        pathLabelData.value = []
-                    }else{
-                        getFirstFolder()
+              ElMessageBox.confirm(
+                `是否确认删除名为"${row.dirName}"的文件夹?`,
+                '系统提示',
+                {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+                }
+            )
+                .then(() => {
+                    documents.delDocument(row.dirId).then(res => {
+                    if (res.code === 200) {
+                        // 如果当前打开的是要删除的这个文件夹
+                        if(thisFolder.value.dirId === row.dirId){
+                            getAllTop()
+                            pathLabelData.value = []
+                        }else{
+                            getFirstFolder()
+                        }
+                        getSpaceList()
+                        ElMessage({
+                            message: "删除成功",
+                            type: "success"
+                        })
+                        delFolder(row)
                     }
-                    getSpaceList()
-                    ElMessage({
-                        message: "删除成功",
-                        type: "success"
                     })
-                    delFolder(row)
-                }
-            })
+                })
+                .catch(() => {
+                return false
+                })
+            
         }
         const delFolder = (row)=>{
             delFolderDataFn(row)
@@ -2429,7 +2431,17 @@ export default {
 
         }
         const delFolderMenu = ()=>{
-             documents.delDocument(clickRow.value.dirId).then(res => {
+            ElMessageBox.confirm(
+                `是否确认删除名为"${clickRow.value.dirName}"的文件夹?`,
+                '系统提示',
+                {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+                }
+            )
+                .then(() => {
+                documents.delDocument(clickRow.value.dirId).then(res => {
                 if (res.code === 200) {
                     ElMessage({
                         message: "删除成功",
@@ -2447,6 +2459,11 @@ export default {
                     })
                 }
             })
+                })
+                .catch(() => {
+                return false
+                })
+             
         }
         watch(() => folder.value, async(newValue, oldValue) => {
             // console.log('iFrameData 发生改变了', newValue, oldValue);

src/views/publicment/MyFile.vue

@@ -511,7 +511,7 @@ import level1 from "@/assets/images/level1.png";
 import level2 from "@/assets/images/level2.png";
 import level3 from "@/assets/images/level3.png";
 import level4 from "@/assets/images/level4.png";
-import { ElMessage ,ElLoading } from 'element-plus'
+import { ElMessage ,ElLoading ,ElMessageBox} from 'element-plus'
 import ImgPreview from '@/components/ImgPreview/ImgPreview.vue'
 import ScanFile from '@/components/ScanFile/ScanFile.vue'
 import MoveTo from '@/components/MoveTo/MoveTo.vue'
@@ -1124,19 +1124,34 @@ export default {
                 anyP.value = false
             }
             if (row.name == '删除') {
-            const has =  delFileFn(clickRowId.value) 
-              if(has){
-                  return
-              }
-                myfile.delMenu(clickRowId.value).then(res => {
-                    if (res.code === 200) {
-                        ElMessage({
-                            type: "success",
-                            message: "删除成功"
-                        })
-                        refreshFile()
+             ElMessageBox.confirm(
+                    `是否确认删除名为"${clickRow.value.fileName}"的文件?`,
+                    '系统提示',
+                    {
+                    confirmButtonText: '确认',
+                    cancelButtonText: '取消',
+                    type: 'warning',
                     }
-                })
+                )
+                    .then(() => {
+                        const has =  delFileFn(clickRowId.value) 
+                        if(has){
+                            return
+                        }
+                            myfile.delMenu(clickRowId.value).then(res => {
+                                if (res.code === 200) {
+                                    ElMessage({
+                                        type: "success",
+                                        message: "删除成功"
+                                    })
+                                    // getAllTop()
+                                    refreshFile()
+                                }
+                            })
+                    })
+                    .catch(() => {
+                    return
+                    })
             }
             if (row.name === '复制到...') {
                 copyOrMove.value = 0
@@ -1384,76 +1399,80 @@ export default {
             // })
             if (row.name === '删除') {
                 if(!canDo) return
-                const datas = delMoreFile.value.map(item=>{
-                    return item.docId
-                })
-                let candel = false
-               await datas.forEach(item=>{
-                   if(delFileFn(item)){//删除的这批里面有打开的
-                        // ElMessage({
-                        //     message: "相关文件已被打开，请关闭后重试",
-                        //     type: "error"
-                        // })
-                        candel = true
-                        return
-                   } 
-                })
-                if(candel)return
-                const filesStr = datas.join(',')
-                loadingPreview.value = true
-                delInfo(filesStr).then(res=>{
-                    if (res.code === 200) {
-                            ElMessage({
-                                message: "删除成功",
-                                type: "success"
-                            })
-                            // getAllTop()
-                            loadingPreview.value = false
-                            refreshFile() 
-                        }
-                })
-                const isFile = ref(false)
-                  delMoreFolder.value.map(i => {//多选删除
-                       documents.delDocument(i.dirId).then(res => {
-                        if (res.code === 200) {
-                            ElMessage({
-                                message: "删除成功",
-                                type: "success"
-                            })
-                            if(!thisFolder.value?.dirId){
-                                delFolderDataFn(i)
-                            }
-                            // getAllTop()
-                            refreshFile()
-                        } else {
-                            ElMessage({
-                                message: "删除失败，目录应不为空",
-                                type: "error"
-                            })
-                        }
+                ElMessageBox.confirm(
+                    '是否确认删除文件?',
+                    '系统提示',
+                    {
+                    confirmButtonText: '确认',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    }
+                )
+                    .then(async () => {
+                        const datas = delMoreFile.value.map(item=>{
+                            return item.docId
+                        })
+                        let candel = false
+                        await datas.forEach(item=>{
+                        if(delFileFn(item)){//删除的这批里面有打开的
+                                candel = true
+                                return
+                        } 
+                        })
+                        if(candel)return
+                        const filesStr = datas.join(',')
+                        loadingPreview.value = true
+                        // console.log('filesStr',filesStr);
+                        delInfo(filesStr).then(res=>{
+                            if (res.code === 200) {
+                                    ElMessage({
+                                        message: "删除成功",
+                                        type: "success"
+                                    })
+                                    // getAllTop()
+                                    loadingPreview.value = false
+                                    refreshFile() 
+                                }
+                        })
+                    })
+                    .catch(() => {
+                    return false
                     })
-                })
             }
         }
         function delName(row, num) {
             row = row ? row : clickRow.value
-            documents.delDocument(row.dirId).then(res => {
-                if (res.code === 200) {
-                    // 如果当前打开的是要删除的这个文件夹
-                    if(thisFolder.value.dirId === row.dirId){
-                        getAllTop()
-                        pathLabelData.value = []
-                    }else{
-                        getFirstFolder()
+            ElMessageBox.confirm(
+                `是否确认删除名为"${row.dirName}"的文件夹?`,
+                '系统提示',
+                {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+                }
+            )
+                .then(() => {
+                    documents.delDocument(row.dirId).then(res => {
+                    if (res.code === 200) {
+                        // 如果当前打开的是要删除的这个文件夹
+                        if(thisFolder.value.dirId === row.dirId){
+                            getAllTop()
+                            pathLabelData.value = []
+                        }else{
+                            getFirstFolder()
+                        }
+                        getSpaceList()
+                        ElMessage({
+                            message: "删除成功",
+                            type: "success"
+                        })
+                        delFolder(row)
                     }
-                    getSpaceList()
-                    ElMessage({
-                        message: "删除成功",
-                        type: "success"
                     })
-                    delFolder(row)
-                }
-            })
+                })
+                .catch(() => {
+                return false
+                })
         }
         const delFolder = (row)=>{
             delFolderDataFn(row)
@@ -2259,7 +2278,17 @@ export default {
 
         }
         const delFolderMenu = ()=>{
-             documents.delDocument(clickRow.value.dirId).then(res => {
+             ElMessageBox.confirm(
+                `是否确认删除名为"${clickRow.value.dirName}"的文件夹?`,
+                '系统提示',
+                {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning',
+                }
+            )
+                .then(() => {
+                documents.delDocument(clickRow.value.dirId).then(res => {
                 if (res.code === 200) {
                     ElMessage({
                         message: "删除成功",
@@ -2277,6 +2306,10 @@ export default {
                     })
                 }
             })
+                })
+                .catch(() => {
+                return false
+                })
         }
         watch(() => folder.value, async(newValue, oldValue) => {
             // console.log('iFrameData 发生改变了', newValue, oldValue);

src/views/search/index.vue

@@ -69,9 +69,13 @@
             </el-table-column>
             <el-table-column prop="dir.dirPath" label="文件夹" width="200">
               <template #default="scope">
-                <div class="folder">
+                <el-tooltip class="box-item" effect="dark" placement="top"
+                    :show-after="1000" :content="scope.row.dir?.dirPath">
+                <div class="folder">   
                   {{ scope.row.dir ? scope.row.dir.dirPath : "" }}
                 </div>
+                </el-tooltip>
+
               </template>
             </el-table-column>
           </el-table>