diff --git a/src/components/BackgroundImageDialog.vue b/src/components/BackgroundImageDialog.vue index 6b6df9c..46d69be 100644 --- a/src/components/BackgroundImageDialog.vue +++ b/src/components/BackgroundImageDialog.vue @@ -1,256 +1,226 @@ - - - - - + + + + + diff --git a/src/components/FileManageDialog.vue b/src/components/FileManageDialog.vue index dfd70ab..e15935b 100644 --- a/src/components/FileManageDialog.vue +++ b/src/components/FileManageDialog.vue @@ -1065,12 +1065,13 @@ export default defineComponent({ setTimeout(() => { if (files.value.length != file_list.files.length) { $q.notify({ - type: "warning", - message: $t.t("file upload") + $t.t("fail") + "!", + type: "positive", + message: $t.t("file upload") + $t.t("finish") + "!", position: "top", timeout: 1500, }); loading.value = false; + uploading.value=false; } }, 500); }, diff --git a/src/components/RecoveryDatabaseDialog.vue b/src/components/RecoveryDatabaseDialog.vue index a6dd0b4..26dbe07 100644 --- a/src/components/RecoveryDatabaseDialog.vue +++ b/src/components/RecoveryDatabaseDialog.vue @@ -1,247 +1,225 @@ - - - - - + + + + + diff --git a/src/components/UpgradeDialog.vue b/src/components/UpgradeDialog.vue index d287d7c..74a1e50 100644 --- a/src/components/UpgradeDialog.vue +++ b/src/components/UpgradeDialog.vue @@ -61,7 +61,6 @@ ref="uploader_software" :url="upload_url_software" method="post" - :headers="generatorFileUploadHeaders" :label="$t('select software upgrade file') + ':'" accept=".zip,.tar,.tar.gz" :hide-upload-btn="true" @@ -76,7 +75,6 @@ ref="uploader_rootfs" :url="upload_url_rootfs" method="post" - :headers="generatorFileUploadHeaders" :label="$t('select rootfs upgrade file') + ':'" accept=".img" :hide-upload-btn="true" @@ -85,6 +83,7 @@ @added="(files) => files && (file_count += files.length)" @removed="(files) => files && (file_count -= files.length)" /> + @@ -92,9 +91,7 @@ - - V: {{ server_version }} - + 0) { - return [ - { - name: HttpProtocol.kHeaderXProductName, - value: HttpProtocol.getProductName($store), - }, - { - name: HttpProtocol.kHeaderXFileLength, - value: files[0].size, - }, - ]; - } - return []; - }, loga(a: any) { console.log(a); }, showDialog() { show_dialog.value = true; - let client = GlobalData.getInstance().getCurrentClient(); - if (client) { - let url = new URL(client.url); - url.port = - GlobalData.getInstance().applicationConfig?.httpserver_port ?? - HttpProtocol.DefaultHttpPort.toString(); - url.pathname = HttpProtocol.RequestUploadFile; - url.protocol = "http:"; - url.searchParams.append("type", HttpProtocol.UploadTypeRootFS); - upload_url_rootfs.value = url.toString(); - - url.searchParams.set("type", HttpProtocol.UploadTypeSoftware); + let url = GlobalData.getInstance().createCurrentRequestUrl(); + if (url) { + url.pathname = "/upload_soft_file"; upload_url_software.value = url.toString(); - try { - client?.getBuildInfo()?.then((build_info) => { - if (build_info) { - server_version.value = build_info.version; - } - }); - // console.log(build_info); - } catch {} + url.pathname = "/upload_root_fs_file"; + upload_url_rootfs.value = url.toString(); } }, resetData() { diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index 2914a8b..f087ade 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -294,6 +294,7 @@ export default { "open left tool bar": "Open Left Tool Bar", "open right tool bar": "Open Right Tool Bar", fail: " Fail", + finish:"Finish", "edit group": "Edit Group", "open window": "Open Window", "close all windows": "Close All Windows", diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index 6c3a6a4..1de7aa9 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -5,6 +5,7 @@ export default { " ": "", title: "MediaPlayerWebApp", failed: "失败", + finish:"完成", fail: "失败", error: "错误", Confirm: "确认",