Просмотр исходного кода

右键菜单分割线,新建文档bug

liuQiang 1 год назад
Родитель
Сommit
de2ff2f0e4
3 измененных файлов с 31 добавлено и 6 удалено
  1. 10 2
      src/views/department/MyFile.vue
  2. 11 2
      src/views/myfile/MyFile.vue
  3. 10 2
      src/views/publicment/MyFile.vue

+ 10 - 2
src/views/department/MyFile.vue

@@ -359,7 +359,7 @@
             </div>
             <div :class="{'setCli':!noMenuItem}" v-if="cliCC" :style="{ left: xz + 'px', top: yz -100 + 'px' }">
                 <template v-for="(item, index) in filterMouseCli()" :key="index">
-                    <p @click="chooseSet(item, index, 1)" :class="{'hasLine':item.name == '删除'||item.name == '重命名' ||item.name == '文字识别','btmLine':item.name == '收藏'}" v-if="!noMenuItem" class="chooseSet shouzhi">
+                    <p @click="chooseSet(item, index, 1)" :class="{'hasLine':item.name == '删除'||item.name == '文字识别','btmLine':(item.name == '收藏' && !noHis)||item.name == '下载'}" v-if="!noMenuItem" class="chooseSet shouzhi">
                         <img :src="item.img" alt="">
                         <span class="shouzhi"></span>{{ item.name }}
                         <span v-if="item.name == '在线编辑' || item.name == '协作' ? true : false"
@@ -795,6 +795,7 @@ export default {
         const hisIfarmeData = ref({
             // src: `${window.location.origin}/fileEdit?clickRowId=7567&canEdit=0&canCopy=0&history=0&fileId=0`,
         })
+        const noHis = ref(false)
         const setHisData = (data)=>{
             hisIfarmeData.value = {
                 // src:`${window.location.origin}/fileEdit?clickRowId=${data.docId}&canEdit=0&canCopy=0&history=1&fileId=${data.fileId}`,
@@ -1096,6 +1097,12 @@ export default {
             // console.log('thisFolder',thisFolder.value);
             isFolder.value = "N"
             clickRow.value = row
+            const canEditArr = ['.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.rtf', '.txt', '.djvu', '.xps', '.wps','.dps','.et', '.pptx','.pdf','.PDF']
+            if(!canEditArr.includes(row.fileType)){
+                noHis.value = true
+            }else{
+                noHis.value = false
+            }
             e.preventDefault();
             e.stopPropagation();
             xz.value = e.pageX
@@ -2800,7 +2807,8 @@ export default {
             setHisData,
             showHis,
             closeHis,
-            hisIfarmeData
+            hisIfarmeData,
+            noHis
         }
     },
     watch: {

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

@@ -408,7 +408,7 @@
             </div>
             <div class="setCli" id="setCli" v-if="cliCC" :style="{ left: xz + 'px', top: yz - 160 + 'px' }">
                 <template v-for="(item, index) in filterMouseCli()" :key="index">
-                    <p @click="chooseSet(item, index, 1)" :class="{'hasLine':item.name == '删除' ||item.name == '文字识别','btmLine':item.name == '收藏'||item.name == '下载'}" class="chooseSet">
+                    <p @click="chooseSet(item, index, 1)" :class="{'hasLine':item.name == '删除' ||item.name == '文字识别','btmLine':(item.name == '收藏' && !noHis)||item.name == '下载'}" class="chooseSet">
                         <img :src="item.img" alt="">
                         {{ item.name }}
                         <span v-if=" item.name == '协作' ? true : false"
@@ -858,6 +858,7 @@ export default {
         const hisIfarmeData = ref({
             // src: `${window.location.origin}/fileEdit?clickRowId=7567&canEdit=0&canCopy=0&history=0&fileId=0`,
         })
+        const noHis = ref(false)
         const setHisData = (data)=>{
             nowTime.value = new Date().getTime()
             historyDocId.value = data.docId
@@ -1201,6 +1202,12 @@ export default {
             console.log('row', row);
             isFolder.value = "N"
             clickRow.value = row
+            const canEditArr = ['.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.rtf', '.txt', '.djvu', '.xps', '.wps','.dps','.et', '.pptx','.pdf','.PDF']
+            if(!canEditArr.includes(row.fileType)){
+                noHis.value = true
+            }else{
+                noHis.value = false
+            }
             e.preventDefault();
             e.stopPropagation();
             xz.value = e.pageX
@@ -1476,6 +1483,7 @@ export default {
             }
         }
         function threeBe(data,newFileData) {
+            addTempId.value = null
             if(thisFolderRole.value && thisFolderRole.value.roles.l0800){
                         addFileTab(newFileData, 1,1);
                     }else{
@@ -3067,7 +3075,8 @@ export default {
             toFull,
             delFull,
             historyDocId,
-            historyFileId
+            historyFileId,
+            noHis
         }
     },
     watch: {

+ 10 - 2
src/views/publicment/MyFile.vue

@@ -353,7 +353,7 @@
             </div>
             <div :class="{'setCli':!noMenuItem}" v-if="cliCC" :style="{ left: xz + 'px', top: yz -100 + 'px' }">
                 <template v-for="(item, index) in filterMouseCli()" :key="index">
-                    <p @click="chooseSet(item, index, 1)" :class="{'hasLine':item.name == '删除'||item.name == '重命名' ||item.name == '文字识别','btmLine':item.name == '收藏'}" v-if="!noMenuItem" class="chooseSet" style="cursor: pointer;">
+                    <p @click="chooseSet(item, index, 1)" :class="{'hasLine':item.name == '删除'||item.name == '文字识别','btmLine':(item.name == '收藏' && !noHis)||item.name == '下载'}" v-if="!noMenuItem" class="chooseSet" style="cursor: pointer;">
                         <img :src="item.img" alt="">
                         {{ item.name }}
                         <span v-if="item.name == '协作' ? true : false"
@@ -791,6 +791,7 @@ export default {
         const hisIfarmeData = ref({
             // src: `${window.location.origin}/fileEdit?clickRowId=7567&canEdit=0&canCopy=0&history=0&fileId=0`,
         })
+        const noHis = ref(false)
         const setHisData = (data)=>{
             hisIfarmeData.value = {
                 // src:`${window.location.origin}/fileEdit?clickRowId=${data.docId}&canEdit=0&canCopy=0&history=1&fileId=${data.fileId}`,
@@ -1078,6 +1079,12 @@ export default {
             console.log('row',row);
             isFolder.value = "N"
             clickRow.value = row
+            const canEditArr = ['.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.rtf', '.txt', '.djvu', '.xps', '.wps','.dps','.et', '.pptx','.pdf','.PDF']
+            if(!canEditArr.includes(row.fileType)){
+                noHis.value = true
+            }else{
+                noHis.value = false
+            }
             e.preventDefault();
             e.stopPropagation();
             xz.value = e.pageX
@@ -2784,7 +2791,8 @@ export default {
             setHisData,
             showHis,
             closeHis,
-            hisIfarmeData
+            hisIfarmeData,
+            noHis
         }
     },
     watch: {