mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-21 09:12:14 +00:00
The delay after first upload in file request when the interface wasn't showing was removed
This commit is contained in:
@@ -39,7 +39,7 @@
|
||||
/>
|
||||
</MobileMultiSelectToolbar>
|
||||
|
||||
<ContextMenu v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'">
|
||||
<ContextMenu v-if="canShowUI">
|
||||
<template v-slot:empty-select>
|
||||
<OptionGroup>
|
||||
<OptionUpload :title="$t('upload_files')" type="file" />
|
||||
@@ -80,7 +80,7 @@
|
||||
</template>
|
||||
</ContextMenu>
|
||||
|
||||
<FileActionsMobile v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'">
|
||||
<FileActionsMobile v-if="canShowUI">
|
||||
<!--I am Done-->
|
||||
<button @click="uploadingDone" class="flex shrink-0 items-center mr-2 rounded-xl bg-theme-200 py-1 px-1 pr-3">
|
||||
<MemberAvatar
|
||||
@@ -121,7 +121,7 @@
|
||||
</ButtonUpload>
|
||||
</div>
|
||||
|
||||
<div v-if="['active', 'filled', 'expired'].includes(uploadRequest.data.attributes.status)">
|
||||
<div v-if="['active', 'filled', 'expired'].includes(uploadRequest.data.attributes.status) && fileQueue.length === 0">
|
||||
<div class="relative mx-auto mb-8 w-24 text-center">
|
||||
<VueFolderIcon class="inline-block w-28" />
|
||||
<MemberAvatar
|
||||
@@ -197,7 +197,7 @@ export default {
|
||||
Option,
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['fastPreview', 'clipboard', 'config', 'user', 'uploadRequest']),
|
||||
...mapGetters(['fastPreview', 'clipboard', 'config', 'user', 'uploadRequest', 'fileQueue']),
|
||||
isFolder() {
|
||||
return this.item && this.item.data.type === 'folder'
|
||||
},
|
||||
@@ -217,6 +217,9 @@ export default {
|
||||
filled: this.$t('request_for_upload_unavailable'),
|
||||
expired: this.$t('request_for_upload_unavailable'),
|
||||
}[this.uploadRequest.data.attributes.status]
|
||||
},
|
||||
canShowUI() {
|
||||
return this.uploadRequest && this.uploadRequest.data.attributes.status === 'filling' || this.fileQueue.length > 0
|
||||
}
|
||||
},
|
||||
data() {
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<HeroScreenshot />
|
||||
|
||||
<!--Google Adsense banner-->
|
||||
<div v-if="config.allowedAdsense" v-html="config.adsenseBanner03" class="mb-5 min-h-[120px]"></div>
|
||||
<div v-if="config.allowedAdsense && config.adsenseBanner03" v-html="config.adsenseBanner03" class="mb-5 min-h-[120px]"></div>
|
||||
|
||||
<!--Main Features-->
|
||||
<MainFeatures />
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
<MobileToolbar />
|
||||
|
||||
<!--Google Adsense banner-->
|
||||
<div v-if="config.allowedAdsense" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
|
||||
<div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
|
||||
|
||||
<!--File list & info sidebar-->
|
||||
<div class="flex space-x-3 lg:overflow-hidden">
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
<MobileToolbar />
|
||||
|
||||
<!--Google Adsense banner-->
|
||||
<div v-if="config.allowedAdsense" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
|
||||
<div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
|
||||
|
||||
<!--File list & info sidebar-->
|
||||
<div class="flex space-x-3 lg:overflow-hidden">
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
</ButtonBase>
|
||||
|
||||
<!--Google Adsense banner-->
|
||||
<div v-if="config.allowedAdsense" v-html="config.adsenseBanner02" class="mt-5 min-h-[120px]"></div>
|
||||
<div v-if="config.allowedAdsense && config.adsenseBanner02" v-html="config.adsenseBanner02" class="mt-5 min-h-[120px]"></div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -22,17 +22,17 @@
|
||||
@contextmenu.prevent.capture="contextMenu($event, undefined)"
|
||||
class="transition-transform duration-200 lg:grid lg:flex-grow lg:content-start lg:px-3.5"
|
||||
>
|
||||
<DesktopUploadRequestToolbar v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'" />
|
||||
<MobileUploadRequestToolBar v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling'" />
|
||||
<DesktopUploadRequestToolbar v-if="canShowUI" />
|
||||
<MobileUploadRequestToolBar v-if="canShowUI" />
|
||||
|
||||
<!--Google Adsense banner-->
|
||||
<div v-if="config.allowedAdsense" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
|
||||
<div v-if="config.allowedAdsense && config.adsenseBanner01" v-html="config.adsenseBanner01" class="mb-5 min-h-[120px]"></div>
|
||||
|
||||
<!--File list & info sidebar-->
|
||||
<div class="flex space-x-3 lg:overflow-hidden">
|
||||
<router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
|
||||
|
||||
<InfoSidebarUploadRequest v-if="uploadRequest && uploadRequest.data.attributes.status === 'filling' && isVisibleSidebar" />
|
||||
<InfoSidebarUploadRequest v-if="canShowUI && isVisibleSidebar" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -73,7 +73,10 @@ export default {
|
||||
DragUI,
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['isVisibleSidebar', 'config', 'uploadRequest']),
|
||||
...mapGetters(['isVisibleSidebar', 'config', 'uploadRequest', 'fileQueue']),
|
||||
canShowUI() {
|
||||
return (this.uploadRequest && this.uploadRequest.data.attributes.status === 'filling') || this.fileQueue.length > 0
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user