From 682063c2633cb0909d0e34f95e2be2257071f9bb Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Sat, 20 Apr 2024 12:36:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E9=94=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Search/Search.vue              |  2 ++
 src/hooks/event/useKeydown.ts                 | 14 +++++++++++
 .../components/Header/ShortcutModal.vue       |  2 +-
 src/layout/components/Header/UserSettings.vue | 23 +++++++++++++++++-
 src/layout/components/Header/index.vue        |  2 +-
 src/views/final/aside/Aside.vue               |  2 ++
 src/views/final/comp/FilterModal.vue          |  5 ++--
 src/views/final/comp/NewFilterModal.vue       |  3 +++
 src/views/home/aside/Aside.vue                |  3 ++-
 .../home/aside/comp/modals/FilterModal.vue    |  6 +++--
 .../home/aside/comp/modals/NewFilterModal.vue |  3 +++
 src/views/task/content/Content.vue            | 21 +++++++++++-----
 src/views/task/modal/NewFilterModal.vue       |  3 +++
 src/views/worksheet/content/Content.vue       | 24 ++++++++++++-------
 14 files changed, 91 insertions(+), 22 deletions(-)
 create mode 100644 src/hooks/event/useKeydown.ts

diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index f422b1b..218c1d8 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -26,6 +26,8 @@ const inputHandler = debounce((keyword) => {
 
 // 搜索
 async function handlerSearch(value) {
+  // 快捷键触发不做接口请求
+  if(value === '/') return
   const res = await getSearchList({
     search: value,
   })
diff --git a/src/hooks/event/useKeydown.ts b/src/hooks/event/useKeydown.ts
new file mode 100644
index 0000000..93dddf7
--- /dev/null
+++ b/src/hooks/event/useKeydown.ts
@@ -0,0 +1,14 @@
+import { inject, onMounted, onUnmounted, ref } from "vue"
+
+export const useKeydown = (key,handler) => {
+    const mousetrap = inject('mousetrap') as any
+    const event = ref()
+    onMounted(() => {
+        event.value = mousetrap.bind(key, handler)
+        
+    })
+    onUnmounted(() => {
+        event.value.unbind(key, handler)
+    })
+
+}
\ No newline at end of file
diff --git a/src/layout/components/Header/ShortcutModal.vue b/src/layout/components/Header/ShortcutModal.vue
index 2b32541..0dd7e7c 100644
--- a/src/layout/components/Header/ShortcutModal.vue
+++ b/src/layout/components/Header/ShortcutModal.vue
@@ -76,7 +76,7 @@ defineExpose({
               </tr>
               <tr>
                 <td><div class="key" data-key="g a" /></td>
-                <td>进入“AI工单”主页</td>
+                <td>进入“图检审批”主页</td>
               </tr>
               <tr>
                 <td><div class="key" data-key="g e" /></td>
diff --git a/src/layout/components/Header/UserSettings.vue b/src/layout/components/Header/UserSettings.vue
index 7cd5944..4b85d96 100644
--- a/src/layout/components/Header/UserSettings.vue
+++ b/src/layout/components/Header/UserSettings.vue
@@ -5,6 +5,18 @@ import { useUser } from "@/store/modules/user";
 import { getImgUrl } from "@/utils/urlUtils";
 import defaultAvatar from "@/assets/icons/avatar.svg";
 
+/**
+ * 用户权限菜单
+ */
+interface IUserMenu {
+  id: number,
+  name: string,
+  resKey: string,
+  resUrl: string
+  icon: string,
+  level: number,
+  parentId: number
+}
 const emit = defineEmits<{
   (e: "logout"): void
 }>();
@@ -16,7 +28,10 @@ const userStore = useUser();
 const useInfo = userStore.getUserInfo;
 
 const aiDisabled = ref(false);
+const userMenus = computed<IUserMenu[]>(() => {
+  return userStore.getUserInfo.frontmenuTList
 
+})
 function handleSelect(row) {
   userStore.updateTenantId(row.key);
   location.reload();
@@ -25,24 +40,30 @@ function handleSelect(row) {
 function logIt(e) {
   return false;
 }
-
+function hasPerm(resKey) {
+  return userMenus.value.some(i => i.resKey === resKey)
+}
 // 一键查看
 function goHome(e) {
+  if (!hasPerm('home_main')) return
   router.push({ name: "home" });
 }
 
 // 任务审批
 function goTask(e) {
+  if (!hasPerm('task-main')) return
   router.push({ name: "task-main" });
 }
 
 // AI工单
 function goWorksheet(e) {
+  if (!hasPerm('worksheet-main')) return
   router.push({ name: "worksheet-main" });
 }
 
 // 任务终审
 function goFinal(e) {
+  if (!hasPerm('final-main')) return
   router.push({ name: "final-main" });
 }
 
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index d637dac..5906d7c 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -170,7 +170,7 @@ export default defineComponent({
       mousetrap.bind('n r', quillHandler)
       mousetrap.bind('n t', quillHandler)
       mousetrap.bind('n n', recycleHandler)
-      mousetrap.bind('m m', searchHandler)
+      mousetrap.bind('/', searchHandler)
     })
 
     const defaultAvatarSrc = ref(defaultAvatar)
diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue
index 80bc3cb..035df9f 100644
--- a/src/views/final/aside/Aside.vue
+++ b/src/views/final/aside/Aside.vue
@@ -24,6 +24,7 @@ import { asideMap } from '@/config/final'
 import type { AsideConfig } from '/#/api'
 import emitter from '@/utils/mitt'
 import { getFilterList } from '@/api/home/main'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 const emit = defineEmits(['inputChange',])
 const finalStore = useFinal()
@@ -336,6 +337,7 @@ function updateComponent(key, e) {
 defineExpose({
   showSearch,
 });
+useKeydown('s', () => setShowSearch(true))
 </script>
 
 <template>
diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index 82f0cf5..0c771b7 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -20,6 +20,7 @@ import { deleteCondition, getConditionList, sort } from '@/api/home/filter'
 import type { FilterSearchParam } from '/#/api'
 
 import SvgIcon from '@/components/Icon/SvgIcon.vue'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 defineOptions({ name: 'FilterModal' })
 
@@ -242,7 +243,7 @@ function handleClick() {
   // show.value = false;
   closeModal()
 }
-
+useKeydown('n t', handleClick)
 let sortTable: Sortable | null = null
 const tableRef = ref<InstanceType<typeof NDataTable>>()
 
@@ -391,7 +392,7 @@ function handleOk() {
 
           <div v-else class="wrapper-form">
             <div class="del_btn">
-              <NButton icon-placement="left" size="medium" @click="deleteSelection">
+              <NButton icon-placement="left" size="medium" @click="deleteSelection()">
                 <template #icon>
                   <SvgIcon name="delete-history" size="16" />
                 </template>
diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index 2d30431..65abfcf 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -193,6 +193,9 @@ watch(
 
 function showModal() {
   show.value = true
+  setTimeout(() => {
+    formValue.name = ''
+  }, 300);
 }
 
 function closeModal() {
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index 04e198b..e498ba0 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -25,6 +25,7 @@ import { asideMap } from '@/config/aside'
 import type { AsideConfig } from '/#/api'
 import emitter from '@/utils/mitt'
 import { getFilterList } from '@/api/home/main'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 const configStore = useConfig()
 
@@ -285,7 +286,7 @@ function handleOk(item: any) {
     filterHandler('')
   }
 }
-
+useKeydown('s', () => setShowSearch(true))
 // watch(asideValue, (newVal) => {
 //   console.log("asideValue处理后", newVal);
 //   configStore.setAsideValue(newVal)
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index d0b3fad..cd76aa1 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -18,6 +18,7 @@ import Action from '../Action.vue'
 import { deleteCondition, getConditionList, sort } from '@/api/home/filter'
 import type { FilterSearchParam } from '/#/api'
 import SvgIcon from '@/components/Icon/SvgIcon.vue'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 defineOptions({ name: 'FilterModal' })
 const props = defineProps({
@@ -26,6 +27,7 @@ const props = defineProps({
     default: () => 0,
   },
 })
+
 const emit = defineEmits<{
   (e: 'showNewFilter'): void
   (e: 'editFilter', filter: any): void
@@ -54,7 +56,7 @@ interface RowData {
   updateby: string
   updatetime: string
 }
-
+useKeydown('n t', handleClick)
 function sortData(row) {
   console.log('sortData', row)
   if (row.order == 'descend') {
@@ -438,7 +440,7 @@ function handleOk() {
 
           <div v-else class="wrapper-form">
             <div class="del_btn">
-              <n-button icon-placement="left" size="medium" @click="deleteSelection">
+              <n-button icon-placement="left" size="medium" @click="deleteSelection()">
                 <template #icon>
                   <SvgIcon name="delete-history" size="16" />
                 </template>
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 2bcb5d2..26f6de9 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -216,6 +216,9 @@ function showModal() {
   const list = generateAllData(configStore.systemConfig)
   typeOptions.value = list
   show.value = true
+  setTimeout(() => {
+    formValue.name = ''
+  }, 300);
 }
 
 function closeModal() {
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 823ec18..2366e97 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -34,6 +34,7 @@ import { isEmpty } from '@/utils'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { hideDownload } from '@/utils/image'
 import bgLoading from '@/assets/images/bg-loading.png'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 const emit = defineEmits(['setAsideItemName'])
 
@@ -492,6 +493,7 @@ function immersionHandler() {
   // taskStore.updateImmersion()
   toggleFullScreen()
 }
+useKeydown('k k', immersionHandler)
 // 切换全屏状态
 function toggleFullScreen() {
   isFullScreen.value = !isFullScreen.value
@@ -728,13 +730,20 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') {
               style="cursor: pointer"
               @click="immersionHandler"
             />
-            <SvgIcon
+            <n-tooltip
               v-else
-              size="20"
-              name="immersion-model"
-              style="cursor: pointer"
-              @click="immersionHandler"
-            />
+              placement="bottom"
+            >
+              <template #trigger>
+                <SvgIcon
+                  size="20"
+                  name="immersion-model"
+                  style="cursor: pointer"
+                  @click="immersionHandler"
+                />
+              </template>
+              <span>沉浸模式</span>
+            </n-tooltip>
           </div>
         </div>
         <div v-show="showActions" class="batch">
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index fde0df0..e15bcf7 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -193,6 +193,9 @@ watch(
 
 function showModal() {
   show.value = true
+  setTimeout(() => {
+    formValue.name = ''
+  }, 300);
 }
 
 function closeModal() {
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index ae31440..2304627 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -27,6 +27,7 @@ import { hideDownload } from '@/utils/image'
 import emitter from '@/utils/mitt'
 import type { ApprovalParam, SimilarityPictureSortParam } from '/#/api'
 import bgLoading from '@/assets/images/bg-loading.png'
+import { useKeydown } from '@/hooks/event/useKeydown'
 
 const batch = ref(false) // 批量审批状态
 const selectItems = ref<any[]>([])
@@ -338,7 +339,7 @@ function onEsc(event: KeyboardEvent) {
     else keyXLastTime = currentKTime
   }
 }
-
+useKeydown('k k', immersionHandler)
 onUnmounted(() => {
   workStore.reset()
   document.removeEventListener('keydown', onEsc)
@@ -590,13 +591,20 @@ defineExpose({
               style="cursor: pointer"
               @click="immersionHandler"
             />
-            <SvgIcon
-              v-else
-              size="20"
-              name="immersion-model"
-              style="cursor: pointer"
-              @click="immersionHandler"
-            />
+            <n-tooltip  
+              v-else 
+              placement="bottom"
+              >
+              <template #trigger>
+                <SvgIcon
+                  size="20"
+                  name="immersion-model"
+                  style="cursor: pointer"
+                  @click="immersionHandler"
+                />
+              </template>
+              <span>沉浸模式</span>
+            </n-tooltip>
           </div>
         </div>