Merge branch 'FileManager' into master_v2
This commit is contained in:
commit
f9207cd6eb
|
@ -156,7 +156,7 @@
|
|||
</q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
v-if="!uploading && !iswujie"
|
||||
v-if="!uploading &&!iswujie"
|
||||
no-caps
|
||||
icon="upload"
|
||||
:label="$t('upload file')"
|
||||
|
@ -192,6 +192,7 @@
|
|||
($q.platform.is.ipad && $store.state.landspace ? '61' : '68') +
|
||||
'vh',
|
||||
}"
|
||||
class="q-mb-md"
|
||||
v-show="!uploading"
|
||||
:rows="files"
|
||||
:columns="columns"
|
||||
|
@ -350,7 +351,7 @@
|
|||
:label="$t('select file') + ':'"
|
||||
:accept="uploader_accept"
|
||||
@start="onStartUpload"
|
||||
@finish="onFailed"
|
||||
@finish="onfinish"
|
||||
>
|
||||
</q-uploader>
|
||||
<q-space />
|
||||
|
@ -804,9 +805,9 @@ export default defineComponent({
|
|||
console.log(e);
|
||||
}
|
||||
};
|
||||
let iswujie = ref(false);
|
||||
let iswujie=ref(false)
|
||||
if ((window as any).$wujie) {
|
||||
iswujie.value = true;
|
||||
iswujie.value=true
|
||||
}
|
||||
// 后缀名限制
|
||||
// watch(
|
||||
|
@ -899,7 +900,7 @@ export default defineComponent({
|
|||
prompt: {
|
||||
model: "",
|
||||
isValid: (val: string) =>
|
||||
!!val && val.trim().length > 0 && val.indexOf(".") != 0,
|
||||
!!val && val.trim().length > 0&& val.indexOf(".") != 0 ,
|
||||
type: "text",
|
||||
},
|
||||
ok: {
|
||||
|
@ -1079,10 +1080,8 @@ export default defineComponent({
|
|||
onStartUpload() {
|
||||
loading.value = true;
|
||||
},
|
||||
async onFailed(info: any) {
|
||||
let file_list: any = await _request_list_files(path.value);
|
||||
async onfinish(info: any) {
|
||||
setTimeout(() => {
|
||||
if (files.value.length != file_list.files.length) {
|
||||
$q.notify({
|
||||
type: "positive",
|
||||
message: $t.t("file upload") + $t.t("finish") + "!",
|
||||
|
@ -1091,7 +1090,6 @@ export default defineComponent({
|
|||
});
|
||||
loading.value = false;
|
||||
uploading.value = false;
|
||||
}
|
||||
}, 500);
|
||||
},
|
||||
copyFile(file: FileEntity) {
|
||||
|
|
Loading…
Reference in New Issue