vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Packages Releases Activity

Merge pull request #6259 from m-meier/fix-6257 

fix(FileUpload): fix broken choose button in basic mode, fixes #6257,…
pull/6161/head^2
Tuğçe Küçükoğlu 2024-08-21 13:55:10 +03:00 committed by GitHub
parent f3e1fdc0f7 0c5bf84aa4
commit d30738ba9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/primevue/src/fileupload/FileUpload.vue
View File

@ -58,10 +58,7 @@
<Message v-for="msg of messages" :key="msg" severity="error" @close="onMessageClose" :unstyled="unstyled" :pt="ptm('pcMessages')">{{ msg }}</Message> <Message v-for="msg of messages" :key="msg" severity="error" @close="onMessageClose" :unstyled="unstyled" :pt="ptm('pcMessages')">{{ msg }}</Message>
<Button :label="chooseButtonLabel" :class="chooseButtonClass" :style="style" :disabled="disabled" :unstyled="unstyled" @mouseup="onBasicUploaderClick" @keydown.enter="choose" @focus="onFocus" @blur="onBlur" v-bind="ptm('pcButton')"> <Button :label="chooseButtonLabel" :class="chooseButtonClass" :style="style" :disabled="disabled" :unstyled="unstyled" @mouseup="onBasicUploaderClick" @keydown.enter="choose" @focus="onFocus" @blur="onBlur" v-bind="ptm('pcButton')">
<template #icon="iconProps"> <template #icon="iconProps">
<slot v-if="!hasFiles || auto" name="uploadicon"> <slot name="chooseicon">
<component :is="uploadIcon ? 'span' : 'UploadIcon'" :class="[iconProps.class, uploadIcon]" aria-hidden="true" v-bind="ptm('pcButton')['icon']" />
</slot>
<slot v-else name="chooseicon">
<component :is="chooseIcon ? 'span' : 'PlusIcon'" :class="[iconProps.class, chooseIcon]" aria-hidden="true" v-bind="ptm('pcButton')['icon']" /> <component :is="chooseIcon ? 'span' : 'PlusIcon'" :class="[iconProps.class, chooseIcon]" aria-hidden="true" v-bind="ptm('pcButton')['icon']" />
</slot> </slot>
</template> </template>
@ -71,7 +68,7 @@
{{ basicFileChosenLabel }} {{ basicFileChosenLabel }}
</span> </span>
</slot> </slot>
<input v-if="!hasFiles" ref="fileInput" type="file" :accept="accept" :disabled="disabled" :multiple="multiple" @change="onFileSelect" @focus="onFocus" @blur="onBlur" v-bind="ptm('input')" /> <input ref="fileInput" type="file" :accept="accept" :disabled="disabled" :multiple="multiple" @change="onFileSelect" @focus="onFocus" @blur="onBlur" v-bind="ptm('input')" />
</div> </div>
</template> </template>
@ -108,7 +105,7 @@ export default {
if (this.hasFiles) this.uploader(); if (this.hasFiles) this.uploader();
}, },
onBasicUploaderClick(event) { onBasicUploaderClick(event) {
if (event.button === 0 && !this.hasFiles) this.$refs.fileInput.click(); if (event.button === 0) this.$refs.fileInput.click();
}, },
onFileSelect(event) { onFileSelect(event) {
if (event.type !== 'drop' && this.isIE11() && this.duplicateIEEvent) { if (event.type !== 'drop' && this.isIE11() && this.duplicateIEEvent) {
@ -117,6 +114,10 @@ export default {
return; return;
} }
if (this.isBasic && this.hasFiles) {
this.files = [];
}
this.messages = []; this.messages = [];
this.files = this.files || []; this.files = this.files || [];
let files = event.dataTransfer ? event.dataTransfer.files : event.target.files; let files = event.dataTransfer ? event.dataTransfer.files : event.target.files;