Merge pull request 'fix: 图检审批左右键异常处理' (#248) from 20240420keydown into test

Reviewed-on: #248

src/store/modules/task.ts

@@ -2,7 +2,9 @@ import { getApprovalList } from '@/api/task/task'
 import { store } from '@/store'
 import { defineStore } from 'pinia'
 import type { TaskState } from '/#/task'
+import { createDiscreteApi } from 'naive-ui'
 
+const {message} = createDiscreteApi(['message'])
 export const useTaskStore = defineStore({
   id: 'task-store',
   state: (): TaskState => ({
@@ -42,13 +44,13 @@ export const useTaskStore = defineStore({
       const len = this.approvalList.length
 
       if (this.currentIndex === len - 1)
-        return
+        return message.error('已经到达最后一个')
 
       this.setActive(++this.currentIndex)
     },
     back() {
       if (this.currentIndex === 0)
-        return
+        return message.error('已经到达第一个')
    
       this.setActive(--this.currentIndex)
     },

src/views/task/content/Content.vue

@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import {
   computed,
-  nextTick,
   onMounted,
   onUnmounted,
   reactive,
@@ -112,8 +111,6 @@ const fullscreenStylestwo = computed<any>(() => ({
   zIndex: isFullScreen.value ? '160' : '',
 }))
 onMounted(() => {
-  window.addEventListener('keydown', handleKeydown)
-
   if (route.query.id) {
     taskId.value = route.query.id
     packageId.value = route.query.packageid
@@ -123,40 +120,14 @@ onMounted(() => {
   }
 })
 
-let lastKeyPressTime = 0
-let keyPressTimer = null
 function changeimgbigshow() {
   imgbigshow.value = !imgbigshow.value
 }
-const doubleClickInterval = 300 // 可以自定义间隔时间，单位是毫秒
 // 键盘左右箭头快捷切换
-function handleKeydown(event) {
+useKeydown('right', forwardHandler)
-  if (event.key === 'ArrowLeft') {
+useKeydown('left', backHandler)
-    backHandler()
+useKeydown('p p', () => {
-  }
+  const item = taskDetailInfo.value
-  // 在这里执行左箭头的逻辑
-  else if (event.key === 'ArrowRight') {
-    forwardHandler()
-  }
-  // 在这里执行右箭头的逻辑
-  else if (event.keyCode === 67) {
-    isFullScreen.value = false
-
-    // batchModalRef.value.closeModal()
-  }
-  else if (event.keyCode === 27) {
-    overTask.value = null
-    overTasktwo.value = null
-  }
-  else if (event.key === 'p' || event.key === 'P') {
-    // 获取当前时间
-    const now = Date.now()
-
-    // 如果两次按键时间间隔小于我们设定的双击间隔，则认为是双击
-    if (now - lastKeyPressTime < doubleClickInterval) {
-      // 清除已经设置的定时器（如果有的话）
-      clearTimeout(keyPressTimer)
-      const item = taskDetailInfo.value
       if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
         overTask.value = null
         return
@@ -166,32 +137,10 @@ function handleKeydown(event) {
         overTask.value = item
       // 执行想要的操作
       approvalHandler()
-
+})
-      // 重置上次按键时间
+useKeydown('x x', () => {
-      lastKeyPressTime = 0
+  const item = taskDetailInfo.value
-    }
+  if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
-    else {
-      // 如果不是双击，则更新上次按键时间，并开始一个新的计时器
-      lastKeyPressTime = now
-
-      // 通过定时器重置上次按键时间
-      // 这可以防止如果用户只按了一次键，也会触发双击的情况
-      clearTimeout(keyPressTimer)
-      keyPressTimer = setTimeout(() => {
-        lastKeyPressTime = 0
-      }, doubleClickInterval)
-    }
-  }
-  else if (event.key === 'x' || event.key === 'X') {
-    // 获取当前时间
-    const now = Date.now()
-
-    // 如果两次按键时间间隔小于我们设定的双击间隔，则认为是双击
-    if (now - lastKeyPressTime < doubleClickInterval) {
-      // 清除已经设置的定时器（如果有的话）
-      clearTimeout(keyPressTimer)
-      const item = taskDetailInfo.value
-      if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
         overTask.value = null
         return
       }
@@ -201,23 +150,8 @@ function handleKeydown(event) {
       // 执行想要的操作
       const modal = unref(notPassModalRef)! as any
       modal.showModal([taskDetailInfo.value])
+})
 
-      // 重置上次按键时间
-      lastKeyPressTime = 0
-    }
-    else {
-      // 如果不是双击，则更新上次按键时间，并开始一个新的计时器
-      lastKeyPressTime = now
-
-      // 通过定时器重置上次按键时间
-      // 这可以防止如果用户只按了一次键，也会触发双击的情况
-      clearTimeout(keyPressTimer)
-      keyPressTimer = setTimeout(() => {
-        lastKeyPressTime = 0
-      }, doubleClickInterval)
-    }
-  }
-}
 
 function setBatch(value: boolean) {
   // if (totalCount.value === 0)
@@ -484,7 +418,6 @@ function showActionsModal() {
 
 onUnmounted(() => {
   taskStore.reset()
-  window.removeEventListener('keydown', handleKeydown)
    window.removeEventListener('scroll', checkBottom)
 })