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

Reviewed-on: #243

src/store/modules/workOrder.ts

@@ -1,9 +1,10 @@
 import { getPackageList } from '@/api/work/work'
 import { store } from '@/store'
-import { useMessage } from 'naive-ui'
 import { defineStore } from 'pinia'
+import { createDiscreteApi } from 'naive-ui'
 import type { OrderState, PackageListItem } from '/#/workorder'
 
+const { message } = createDiscreteApi(['message'])
 export const useWorkOrderStore = defineStore({
   id: 'work-order',
   state: (): OrderState => ({
@@ -32,18 +33,14 @@ export const useWorkOrderStore = defineStore({
     },
     forward() {
       const len = this.packageList.length
-      const message = useMessage()
-
       if (this.currentIndex === len - 1)
-        message.error('已经到达最后一个')
+        return message.error('已经到达最后一个')
 
       this.setActive(++this.currentIndex)
     },
     back() {
-      const message = useMessage()
-
       if (this.currentIndex === 0)
-        message.error('已经到达第一个')
+        return message.error('已经到达第一个')
 
       this.setActive(--this.currentIndex)
     },

src/views/worksheet/aside/WorkSheetList.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
-import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import { reactive, ref, watch } from 'vue'
-import { throttle } from 'lodash-es'
 import { useInfiniteScroll } from '@vueuse/core'
 import { useMessage } from 'naive-ui'
 import ApprovalModal from '../modal/ApprovalModal.vue'
@@ -162,43 +161,7 @@ defineExpose({
   search,
 })
 
-const onKeydown = throttle((event) => {
-  const eles = ['INPUT', 'TEXTAREA']
-  if (eles.includes(event.target.tagName))
-    return
-
-  if (event.defaultPrevented)
-    return // 如果已取消默认操作，则不应执行任何操作
-
-  const handled = false
-  if (event.key !== undefined) {
-    // 使用 KeyboardEvent.key 处理事件，并将 handled 设置为 true。
-  }
-  else if (event.keyCode !== undefined) {
-    // 使用 KeyboardEvent.keyCode 处理事件并将 handled 设置为 true。
-  }
 
-  if (handled) {
-    // 如果事件已处理，则禁止“双重操作”
-    event.preventDefault()
-  }
-  if (event.key === 'ArrowLeft') {
-    const prev = data.value[workStore.currentIndex - 1]?.id
-    if (prev)
-      selectHandler(prev, workStore.currentIndex - 1)
-  }
-  if (event.key === 'ArrowRight') {
-    const next = data.value[workStore.currentIndex + 1]?.id
-    if (next)
-      selectHandler(next, workStore.currentIndex + 1)
-  }
-}, 500)
-onMounted(() => {
-  document.addEventListener('keydown', onKeydown, true)
-})
-onUnmounted(() => {
-  document.removeEventListener('keydown', onKeydown)
-})
 </script>
 
 <template>

src/views/worksheet/content/Content.vue

@@ -342,6 +342,8 @@ function onEsc(event: KeyboardEvent) {
 useKeydown('k k', () => {
   isFullScreen.value = true
 })
+useKeydown('right', forwardHandler)
+useKeydown('left', backHandler)
 onUnmounted(() => {
   workStore.reset()
   document.removeEventListener('keydown', onEsc)