Merge branch 'al'

patches/naive-ui+2.38.1.patch

@@ -161,3 +161,4 @@ index 4f47aad..6dae078 100644
                          });
                      }
                  }))) : null));
+ 

src/views/final/aside/Aside.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
+import { computed, inject, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
 import { CustomFilterModalVue, FilterModal, NewFilterModal } from '@/views/final/comp'
 import Search from '@/views/home/aside/comp/Search.vue'
 import AdvanceFilter from '@/views/home/aside/comp/AdvanceFilter.vue'
@@ -35,6 +35,8 @@ function showModal(modalRef: any) {
   const modal = unref(modalRef)! as any
   modal.showModal()
 }
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
 
 onMounted(() => {
   nextTick(() => {

src/views/home/aside/Aside.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
+import { computed, inject, nextTick, onBeforeMount, onMounted, reactive, ref, shallowRef, unref, watch } from 'vue'
 import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from './comp/modals'
 import Search from './comp/Search.vue'
 import AdvanceFilter from './comp/AdvanceFilter.vue'
@@ -43,6 +43,8 @@ onMounted(() => {
 })
 
 const collapse = ref(false)
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
 
 function collapseHandler() {
   collapse.value = !collapse.value

src/views/task/aside/Aside.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { debounce } from 'lodash-es'
-import { computed, onMounted, ref, shallowRef, unref, watch } from 'vue'
+import { computed, inject, onMounted, ref, shallowRef, unref, watch } from 'vue'
 import CustomFieldModal from '../modal/CustomFieldModal.vue'
 import AdvanceFilter from '../../home/aside/comp/AdvanceFilter.vue'
 import {
@@ -27,7 +27,8 @@ const showFieldList = ref<any[]>([])
 function collapseHandler() {
   collapse.value = !collapse.value
 }
-
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
 const asideWidth = computed(() => {
   return collapse.value ? 0 : 308
 })

src/views/worksheet/aside/Aside.vue

@@ -8,6 +8,7 @@ import { debounce } from "lodash-es";
 import {
 computed,
 defineOptions,
+inject,
 nextTick,
 onMounted,
 ref,
@@ -29,7 +30,8 @@ const dicts = ref<any>([]);
 function collapseHandler() {
   collapse.value = !collapse.value;
 }
-
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
 const asideWidth = computed(() => {
   return collapse.value ? 0 : 308;
 });