liuQiang 2 gadi atpakaļ
vecāks
revīzija
ee577a86cd

+ 9 - 2
src/views/collect/index.vue

@@ -205,7 +205,14 @@
                   src="@/assets/images/fileBox.png"
                   alt=""
                 />
-                <span>{{ item.docDir.dirName }}</span>
+                <el-tooltip
+                  class="box-item"
+                  effect="dark"
+                  :content="item.docDir.dirName"
+                  placement="top"
+                >
+                  <span>{{ item.docDir.dirName }}</span>
+                </el-tooltip>
               </div>
             </div>
           </el-scrollbar>
@@ -229,7 +236,7 @@
                   :content="item.docInfo.fileName"
                   placement="top"
                 >
-                <span>{{ item.docInfo.fileName }}</span>
+                  <span>{{ item.docInfo.fileName }}</span>
                 </el-tooltip>
               </div>
             </div>

+ 18 - 4
src/views/myfile/MyFile.vue

@@ -149,7 +149,14 @@
                                             <img v-else @click.stop="delCollect(scope.row,true)" src="../../assets/images/yellowstar.png" alt="">
                                             <img src="../../assets/images/fileBox.png" style="width: 20px;height: 24px;"
                                                 alt="">
-                                            {{ scope.row.dirName }}
+                                                 <el-tooltip
+                                                    class="box-item"
+                                                    effect="dark"
+                                                    :content="scope.row.dirName"
+                                                    placement="top"
+                                                >
+                                                   {{ scope.row.dirName }}
+                                                </el-tooltip>
                                         </span>
                                     </template>
                                 </el-table-column>
@@ -206,7 +213,14 @@
                                             </el-icon>
                                             <img v-else @click.stop="delCollect(scope.row,false)" src="../../assets/images/yellowstar.png" alt="">
                                             <img :src="getImage(scope.row.fileType)" alt="">
-                                            {{ scope.row.fileName }}
+                                                  <el-tooltip
+                                                    class="box-item"
+                                                    effect="dark"
+                                                    :content="scope.row.fileName"
+                                                    placement="top"
+                                                >
+                                                   {{ scope.row.fileName }}
+                                                </el-tooltip>
                                         </span>
                                         </template>
                                     </el-table-column>
@@ -1121,10 +1135,10 @@ export default {
         }
         //对mouseCli数组进行筛选,实现菜单的区分显示
         const filterMouseCli = () => {
-            const canPreviewArray = ['.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.pdf', '.rtf', '.txt', '.djvu', '.xps', 'csv', 'fods', 'ods', 'ots', 'xls', 'xlsm', 'xlsx', 'xlt', 'xltm', 'xltx', 'fodp', 'odp', 'otp', 'pot', 'potm', 'potx', 'pps', 'ppsm', 'ppsx', 'ppt', 'pptm', 'pptx']
+            const canPreviewArray = ['.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.pdf', '.rtf', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.pot', '.potm', '.potx', '.pps', '.ppsm', '.ppsx', '.ppt', '.pptm', '.pptx']
             const typeArr = ['.png', '.jpg', '.jpeg', '.JPG', '.mp3', '.mp4']
             const imgTypeArr = ['.png', '.jpg', '.jpeg', '.JPG']
-            const canEditArr = ['.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', 'csv', 'fods', 'ods', 'ots', 'xls', 'xlsm', 'xlsx', 'xlt', 'xltm', 'xltx', 'fodp', 'odp', 'otp']
+            const canEditArr = ['.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp']
             let arr = []
             if (!(typeArr.includes(copyFileType.value) || canPreviewArray.includes(copyFileType.value))) {
                 arr = mouseCli.value.filter(item => item.name !== "预览")

+ 4 - 0
src/views/myfile/modalComponebts/FileCollect.vue

@@ -79,6 +79,10 @@ export default {
             collectForm.value.name = fname
         }
         function tagBlur() {
+            if(!newTag.value){
+                ElMessage({ message: '标签名不能为空', type: 'error' })
+                return
+            }
             collect.addNewTag({ labelName: newTag.value, orderNum: sortNum.value + 1 }).then(res => {
                 if (res.code === 200) {
                     ElMessage({