github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-30 08:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clear user's selection upon navigation (#8472)

Browse Source 
* Clear user's selection upon navigation

* Clear selection upon route navigation
This commit is contained in:
ian
2021-10-16 01:46:18 +08:00
committed by GitHub
parent 27fb7bda1e
commit 4fe114dc46
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/modules/files/routes/collection.vue
View File

@@ -193,7 +193,7 @@ import AddFolder from '../components/add-folder.vue';
import SearchInput from '@/views/private/components/search-input';
import FolderPicker from '../components/folder-picker.vue';
import emitter, { Events } from '@/events';
import { useRouter } from 'vue-router';
import { useRouter, onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router';
import { useNotificationsStore, useUserStore, usePermissionsStore } from '@/stores';
import { subDays } from 'date-fns';
import useFolders, { Folder } from '@/composables/use-folders';
@@ -302,6 +302,13 @@ export default defineComponent({
onMounted(() => emitter.on(Events.upload, refresh));
onUnmounted(() => emitter.off(Events.upload, refresh));
onBeforeRouteLeave(() => {
selection.value = [];
});
onBeforeRouteUpdate(() => {
selection.value = [];
});
const { onDragEnter, onDragLeave, onDrop, onDragOver, showDropEffect, dragging } = useFileUpload();
useEventListener(window, 'dragenter', onDragEnter);

8
app/src/modules/users/routes/collection.vue
View File

@@ -168,6 +168,7 @@ import api from '@/api';
import usePreset from '@/composables/use-preset';
import LayoutSidebarDetail from '@/views/private/components/layout-sidebar-detail';
import SearchInput from '@/views/private/components/search-input';
import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router';
import { useUserStore, usePermissionsStore } from '@/stores';
import useNavigation from '../composables/use-navigation';
import { useLayout } from '@/composables/use-layout';
@@ -242,6 +243,13 @@ export default defineComponent({
const { batchEditAllowed, batchDeleteAllowed, createAllowed } = usePermissions();
onBeforeRouteLeave(() => {
selection.value = [];
});
onBeforeRouteUpdate(() => {
selection.value = [];
});
return {
t,
canInviteUsers,