Merge branch 'liuqiang' into v3

src/components/ImgPreview/ImgPreview.vue

@@ -15,6 +15,7 @@
     draggable
     title="预览"
     v-if="copyFileType === '.mp4'"
+    :close-on-click-modal="false"
     :before-close="closeImgPreview"
   >
     <video
@@ -30,6 +31,7 @@
     width="40%"
     title="预览"
     draggable
+    :close-on-click-modal="false"
     v-if="copyFileType === '.mp3'"
     :before-close="closeImgPreview"
   >

src/views/department/MyFile.vue

@@ -32,6 +32,7 @@
                                     <template #dropdown>
                                         <el-dropdown-menu>
                                             <el-dropdown-item @click="restName(item, index)">重命名</el-dropdown-item>
+                                            <el-dropdown-item v-if="item.dirType == '2'" @click="upFirstFoler(item)">编辑</el-dropdown-item>
                                             <el-dropdown-item v-if="item.dirType == '1'" @click="delName(item, index)">删除</el-dropdown-item>
                                         </el-dropdown-menu>
                                     </template>
@@ -69,7 +70,7 @@
                 <div v-if="editOnline">
                     <!-- 众多功能 -->
                     <div class="manyUse">
-                        <div v-if="isDept&&(thisRole.some(item=>item == 'upload') || thisFolder.dirType == '1')"
+                        <div v-if="thisRole.some(item=>item == 'upload') || (thisFolder.dirType == '1' && 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="">
@@ -116,7 +117,7 @@
                             </div>
                         </div>
                         <template v-for="(item, index) in useMenu" :key="index">
-                            <div :class="{ 'isCheck': (haveCheck && isDept) }"
+                            <div :class="{ 'isCheck': ((haveCheck && isDept) || thisRole.some(item=>item == 'delete')) }"
                                 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)">
                                 <div style="margin-left: 5px;">
@@ -499,10 +500,10 @@ export default {
             //     img: ImgFile.clipboard,
             //     name: "粘贴"
             // },
-            {
-                img: ImgFile.share,
-                name: "分享给"
-            },
+            // {
+            //     img: ImgFile.share,
+            //     name: "分享给"
+            // },
             {
                 img: ImgFile.trash,
                 name: "删除"
@@ -1563,6 +1564,10 @@ export default {
             }
             console.log('isDept',isDept.value);
         }
+        //修改文件夹权限
+        const upFirstFoler = (item)=>{
+            console.log('upFirstFoler',item);
+        }
         onMounted(() => {
             getAllTop()
             getSpaceList()
@@ -1786,7 +1791,8 @@ export default {
             tableTotal,
             spaceName,
             getUserInfo,
-            isDept
+            isDept,
+            upFirstFoler
         }
     },
     watch: {

src/views/publicment/MyFile.vue

@@ -69,7 +69,7 @@
                 <div v-if="editOnline">
                     <!-- 众多功能 -->
                     <div class="manyUse">
-                        <div v-if="isDept&&(thisRole.some(item=>item == 'upload') || thisFolder.dirType == '1')"
+                        <div v-if="thisRole.some(item=>item == 'upload') || (thisFolder.dirType == '1' && 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="">
@@ -116,7 +116,7 @@
                             </div>
                         </div>
                         <template v-for="(item, index) in useMenu" :key="index">
-                            <div :class="{ 'isCheck': (haveCheck && isDept) }"
+                            <div :class="{ 'isCheck': ((haveCheck && isDept) || thisRole.some(item=>item == 'delete')) }"
                                 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)">
                                 <div style="margin-left: 5px;">
@@ -499,10 +499,10 @@ export default {
             //     img: ImgFile.clipboard,
             //     name: "粘贴"
             // },
-            {
-                img: ImgFile.share,
-                name: "分享给"
-            },
+            // {
+            //     img: ImgFile.share,
+            //     name: "分享给"
+            // },
             {
                 img: ImgFile.trash,
                 name: "删除"
@@ -1573,6 +1573,10 @@ export default {
             }
             console.log('isDept',isDept.value);
         }
+        //修改文件夹权限
+        const upFirstFoler = (item)=>{
+            console.log('upFirstFoler',item);
+        }
         onMounted(() => {
             getAllTop()
             getSpaceList()
@@ -1796,7 +1800,8 @@ export default {
             tableTotal,
             spaceName,
             getUserInfo,
-            isDept
+            isDept,
+            upFirstFoler
         }
     },
     watch: {