Bladeren bron

添加右键操作提醒 用户选择清除bug,文件夹删除bug

liuQiang 1 jaar geleden
bovenliggende
commit
6e394bfd41

BIN
src/assets/images/mouseRight.png


+ 36 - 9
src/views/department/MyFile.vue

@@ -78,7 +78,8 @@
                 <div v-if="editOnline">
                     <!-- 众多功能 -->
                     <div class="manyUse">
-                        <div v-if="thisRole.some(item=>item == 'upload') || isDept"
+                        <div class="useMenu">
+                            <div v-if="thisRole.some(item=>item == 'upload') || isDept"
                             style="display: flex;width: 92px;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;">
                             <div style="margin-left: 5px;">
                                 <img src="../../assets/images/upload.png" style="width: 24px;height: 24px;" alt="">
@@ -127,7 +128,7 @@
                         <template v-for="(item, index) in useMenu" :key="index">
                             <div :class="{ 'isCheck': (haveCheck && thisRole.some(item=>item == 'delete')||haveCheck && isDept) }"
                                 style="display: flex;width: 82px;opacity:0.5;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;cursor: pointer;"
-                                @click="getMenu(item, index)">
+                                @click="getMenu(item, index,(haveCheck && thisRole.some(item=>item == 'delete')||haveCheck && isDept))">
                                 <div style="margin-left: 5px;">
                                     <img :src="item.img" style="width: 24px;height: 24px;" alt="">
                                 </div>
@@ -136,6 +137,11 @@
                                 </div>
                             </div>
                         </template>
+                        </div>
+                       <div class="tip">
+                        <img src="@/assets/images/mouseRight.png" alt="">
+                        <span>使用右键进行文件操作</span>
+                       </div>
                     </div>
                     <!-- 面包屑功能栏 -->
                     <div class="breadBox">
@@ -586,10 +592,10 @@ export default {
                 img: ImgFile.textbox,
                 name: "重命名"
             },
-            {
-                img: ImgFile.goon,
-                name: "发送"
-            },
+            // {
+            //     img: ImgFile.goon,
+            //     name: "发送"
+            // },
             {
                 img: ImgFile.share,
                 name: "分享"
@@ -1121,18 +1127,25 @@ export default {
             selectedBox.value = row.dirId
             rename.value = true
         }
-        function getMenu(row, num) {
+        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 = []
                 const isFile = ref(false)
                 delMoreFile.value.map(i => {//多选删除
                     if (i.parentId) {//文件
+                    // console.log('file');
                         isFile.value = true
                     } else {//文件夹
                         datas.push(i.docId)
                     }
                 })
-                if(folderId.value.dirType === '2'){
+                if(folderId.value.dirType === '2' && !isFile.value){
                     return  ElMessage({
                                 message: "删除失败,组织目录不可删除",
                                 type: "error"
@@ -1156,6 +1169,7 @@ export default {
                         isFile.value = false
                     })
                 } else {
+                    console.log('delFolder');
                     myfile.delMenu(datas.toString()).then(res => {
                         if (res.code === 200) {
                             ElMessage({
@@ -2183,8 +2197,21 @@ p {
     /* background-color: gray; */
     line-height: 48px;
     display: flex;
-    justify-content: flex-start;
+    justify-content:space-between;
     align-items: center;
+    .useMenu{
+        height: 100%;
+        display: flex;
+        align-items: center;
+        line-height: 48px;
+    }
+    .tip{
+        display: flex;
+        align-items: center;
+        margin-right: 24px;
+        color: #2E6BC8;
+        font-size: 14px;
+    }
 }
 
 .el-dropdown-link {

+ 2 - 1
src/views/department/components/createTasnsfer.vue

@@ -74,8 +74,9 @@ function filterNode(value, data) {
 function cleanPeople() {
   treeRef.value.setCheckedKeys([]);
   chooseTagData.value = [];
+  emit("setUsers", toRaw(chooseTagData.value));
   setTimeout(() => {
-    antherClean()
+    // antherClean()
   })
 }
 function antherClean() {

+ 21 - 2
src/views/myfile/MyFile.vue

@@ -92,7 +92,8 @@
                 <div v-if="editOnline">
                     <!-- 众多功能 -->
                     <div class="manyUse">
-                        <div v-if="thisFolder.dirType == '1'"
+                        <div class="useMenu">
+                            <div v-if="thisFolder.dirType == '1'"
                             style="display: flex;width: 92px;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;">
                             <div style="margin-left: 5px;">
                                 <img src="../../assets/images/upload.png" style="width: 24px;height: 24px;" alt="">
@@ -162,6 +163,11 @@
                                 </div>
                             </div>
                         </template>
+                        </div>
+                        <div class="tip">
+                            <img src="@/assets/images/mouseRight.png" alt="">
+                            <span>使用右键进行文件操作</span>
+                       </div>
                     </div>
                     <!-- 面包屑功能栏 -->
                     <div class="breadBox">
@@ -2302,8 +2308,21 @@ p {
     /* background-color: gray; */
     line-height: 48px;
     display: flex;
-    justify-content: flex-start;
+    justify-content:space-between;
     align-items: center;
+    .useMenu{
+        height: 100%;
+        display: flex;
+        align-items: center;
+        line-height: 48px;
+    }
+    .tip{
+        display: flex;
+        align-items: center;
+        margin-right: 24px;
+        color: #2E6BC8;
+        font-size: 14px;
+    }
 }
 
 .el-dropdown-link {

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

@@ -76,7 +76,8 @@
                 <div v-if="editOnline">
                     <!-- 众多功能 -->
                     <div class="manyUse">
-                        <div v-if="thisRole.some(item=>item == 'upload') || isDept"
+                        <div class="useMenu">
+                            <div v-if="thisRole.some(item=>item == 'upload') || isDept"
                             style="display: flex;width: 92px;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;">
                             <div style="margin-left: 5px;">
                                 <img src="../../assets/images/upload.png" style="width: 24px;height: 24px;" alt="">
@@ -125,7 +126,7 @@
                         <template v-for="(item, index) in useMenu" :key="index">
                             <div :class="{ 'isCheck': (haveCheck && thisRole.some(item=>item == 'delete')||haveCheck && isDept) }"
                                 style="display: flex;width: 82px;opacity:0.5;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;cursor: pointer;"
-                                @click="getMenu(item, index)">
+                                @click="getMenu(item, index,(haveCheck && thisRole.some(item=>item == 'delete')||haveCheck && isDept))">
                                 <div style="margin-left: 5px;">
                                     <img :src="item.img" style="width: 24px;height: 24px;" alt="">
                                 </div>
@@ -134,6 +135,11 @@
                                 </div>
                             </div>
                         </template>
+                        </div>
+                        <div class="tip">
+                            <img src="@/assets/images/mouseRight.png" alt="">
+                            <span>使用右键进行文件操作</span>
+                       </div>
                     </div>
                     <!-- 面包屑功能栏 -->
                     <div class="breadBox">
@@ -1123,8 +1129,13 @@ export default {
             selectedBox.value = row.dirId
             rename.value = true
         }
-        function getMenu(row, num) {
+        function getMenu(row, num,canDo) {
+            if(delMoreFile.value[0].dirType === "2") return ElMessage({
+                message: "删除失败,组织目录不可删除",
+                type: "error"
+            })
             if (row.name === '删除') {
+                if(!canDo) return
                 const datas = []
                 const isFile = ref(false)
                 delMoreFile.value.map(i => {//多选删除
@@ -1134,7 +1145,7 @@ export default {
                         datas.push(i.docId)
                     }
                 })
-                if(folderId.value.dirType === '2'){
+                if(folderId.value.dirType === '2'&& !isFile.value){
                 return  ElMessage({
                             message: "删除失败,组织目录不可删除",
                             type: "error"
@@ -2200,8 +2211,21 @@ p {
     /* background-color: gray; */
     line-height: 48px;
     display: flex;
-    justify-content: flex-start;
+    justify-content:space-between;
     align-items: center;
+    .useMenu{
+        height: 100%;
+        display: flex;
+        align-items: center;
+        line-height: 48px;
+    }
+    .tip{
+        display: flex;
+        align-items: center;
+        margin-right: 24px;
+        color: #2E6BC8;
+        font-size: 14px;
+    }
 }
 
 .el-dropdown-link {

+ 2 - 1
src/views/publicment/components/createTasnsfer.vue

@@ -74,8 +74,9 @@ function filterNode(value, data) {
 function cleanPeople() {
   treeRef.value.setCheckedKeys([]);
   chooseTagData.value = [];
+  emit("setUsers", toRaw(chooseTagData.value));
   setTimeout(() => {
-    antherClean()
+    // antherClean()
   })
 }
 function antherClean() {