浏览代码

分享、协作树的回显 右侧显示bug

liuQiang 2 年之前
父节点
当前提交
fa7cbbc68c

+ 19 - 0
src/api/fileActor/fileActor.js

@@ -0,0 +1,19 @@
+import request from '../../utils/request'
+// 获取已协作的人员
+function getActorPeople(data) {
+    return request({
+        url: `/biz/actor/${data}`,
+        method: 'get',
+    })
+}
+// 新增协作人员
+function addActorPeople(data) {
+    return request({
+        url: `/biz/actor/${data}`,
+        method: "post"
+    })
+}
+export default {
+    getActorPeople,
+    addActorPeople,
+}

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

@@ -706,6 +706,7 @@ export default {
         }
         // 文件名表格每一行点击事件
         function handleRowClick(row, col, e) {
+            console.log('row',row);
             isFolder.value = "N"
             clickRow.value = row
             e.preventDefault();
@@ -743,6 +744,7 @@ export default {
                 thanks.value = false
             }
             if (row.name == '协作') {
+                workOrEdit.value = num
                 if (anyP.value) {
                     anyP.value = false
                 } else {

+ 30 - 5
src/views/myfile/modalComponebts/Transfer.vue

@@ -14,15 +14,18 @@
                         </div>
                     </div>
                     <div class="needBag">
-                        <div style="border-bottom: 1px solid gray;">
+                        <div style="border-bottom: 1px solid gray;" class="needBag_top">
                             <span>已选择{{ chooseTagData.length }}人</span>
                             <span style="color: red;font-size: 14px;float: right;">清空</span>
                         </div>
                         <div class="needLog">
-                            <el-tag v-for="(item, index) in chooseTagData" :key="index" class="tagtag"
-                                :closable="lastPeople" @close="handleClose(item)">
-                                {{ item.userName ? item.userName : item.name }}
-                            </el-tag>
+                              <el-scrollbar height="349px">
+                                    <el-tag v-for="(item, index) in chooseTagData" :key="index" class="tagtag"
+                                    :closable="lastPeople" @close="handleClose(item)">
+                                    {{ item.userName ? item.userName : item.name }}
+                                    </el-tag>
+                              </el-scrollbar>
+
                         </div>
                     </div>
                 </div>
@@ -163,6 +166,7 @@ export default {
         }
         // 获取用户树
         function getAllUser() {
+            console.log('feeh',feeh);
             userTree.getUserTree({}).then(res => {
                 console.log('userTree',res);
                 allTreeData.value = [res]
@@ -191,6 +195,17 @@ export default {
                         return item.userId
                     })
                 })
+            }
+            if(feeh === 0){
+                 fileCount.getActor(dees).then(res => {
+                    // 去除数组内部的重复元素
+                    // const uniqueRes = Array.from(new Set(res.map(item => item.userName))).map(id => res.find(item => item.userName === id));
+                    // 现在的 uniqueRes 数组不包含重复元素
+                    chooseTagData.value = res;
+                    backScreen.value = chooseTagData.value.map(item => {
+                        return item.userId
+                    })
+                })
             } else if (!isNewMenus) {
                 fileCount.getActor(dees).then(res => {
                     chooseTagData.value = res
@@ -277,6 +292,16 @@ export default {
     /* border: 1px solid red; */
     overflow-y: auto;
 }
+.needBag_top{
+    padding: 0 10px;
+    height: 30px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+.needLog{
+    height: 100%;
+}
 
 :deep(.el-tag__content) {
     display: block;

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

@@ -292,7 +292,7 @@ const setType = (fileType) => {
       return [".mp3"];
       break;
     case "video":
-      return [".mp4"];
+      return [".mp4",'.qlv'];
       break;
     case "zip":
       return [".zip", "rar", ".7z"];