更改下载方法名
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -154,7 +154,7 @@ class WindowAPI:
|
||||
)
|
||||
return result[0] if result else ''
|
||||
|
||||
def save_file_from_url(self, url, default_filename='download.bin'):
|
||||
def save_file_from_url_new(self, url, default_filename='download.bin'):
|
||||
"""弹窗选择保存位置,从 url 下载文件并保存。根据文件后缀动态设置保存类型。"""
|
||||
if not url or not url.strip():
|
||||
return {'success': False, 'error': '下载地址为空'}
|
||||
@@ -360,7 +360,7 @@ def main():
|
||||
)
|
||||
api = WindowAPI(window)
|
||||
window.expose(api.close, api.minimize, api.maximize, api.toggle_maximize, generate_images, api.save_image, api.save_image_to_folder, api.select_folder, api.select_brand_xlsx_files, api.select_brand_folder,
|
||||
api.save_file_from_url, api.save_template_xlsx,api.save_template_zip,api.upload_file_to_java,api.open_external_url,api.enqueue_json,api.get_detail_del)
|
||||
api.save_file_from_url_new, api.save_template_xlsx,api.save_template_zip,api.upload_file_to_java,api.open_external_url,api.enqueue_json,api.get_detail_del)
|
||||
webview.start(
|
||||
debug=True,
|
||||
storage_path=cache_path,
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<link rel="modulepreload" crossorigin href="/assets/pywebview-V_UIajJm.js">
|
||||
<link rel="modulepreload" crossorigin href="/assets/brand-1nUVsWrm.js">
|
||||
<link rel="stylesheet" crossorigin href="/assets/pywebview-Q4glvYu5.css">
|
||||
<link rel="stylesheet" crossorigin href="/assets/delete-brand-_jGFWTAn.css">
|
||||
<link rel="stylesheet" crossorigin href="/assets/delete-brand-DLyg-H8J.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
||||
@@ -927,7 +927,7 @@
|
||||
}
|
||||
var zipUrl = task.result_paths.zip_url;
|
||||
var filename = 'brand_task_' + taskId + '.zip';
|
||||
if (api && api.save_file_from_url) {
|
||||
if (api && api.save_file_from_url_new) {
|
||||
a.style.pointerEvents = 'none';
|
||||
var done = function(ret) {
|
||||
if (ret && ret.success) {
|
||||
@@ -938,7 +938,7 @@
|
||||
a.style.pointerEvents = '';
|
||||
};
|
||||
try {
|
||||
var ret = api.save_file_from_url(zipUrl, filename);
|
||||
var ret = api.save_file_from_url_new(zipUrl, filename);
|
||||
if (ret && typeof ret.then === 'function') {
|
||||
ret.then(done).catch(function(err) { showToast('保存失败:' + (err && err.message || err)); a.style.pointerEvents = ''; });
|
||||
} else {
|
||||
|
||||
@@ -995,7 +995,7 @@
|
||||
}
|
||||
var zipUrl = task.result_paths.zip_url;
|
||||
var filename = 'brand_task_' + taskId + '.zip';
|
||||
if (api && api.save_file_from_url) {
|
||||
if (api && api.save_file_from_url_new) {
|
||||
a.style.pointerEvents = 'none';
|
||||
var done = function(ret) {
|
||||
if (ret && ret.success) {
|
||||
@@ -1006,7 +1006,7 @@
|
||||
a.style.pointerEvents = '';
|
||||
};
|
||||
try {
|
||||
var ret = api.save_file_from_url(zipUrl, filename);
|
||||
var ret = api.save_file_from_url_new(zipUrl, filename);
|
||||
if (ret && typeof ret.then === 'function') {
|
||||
ret.then(done).catch(function(err) { showToast('保存失败:' + (err && err.message || err)); a.style.pointerEvents = ''; });
|
||||
} else {
|
||||
|
||||
@@ -877,7 +877,7 @@
|
||||
}
|
||||
var zipUrl = task.result_paths.zip_url;
|
||||
var filename = 'brand_task_' + taskId + '.zip';
|
||||
if (api && api.save_file_from_url) {
|
||||
if (api && api.save_file_from_url_new) {
|
||||
a.style.pointerEvents = 'none';
|
||||
var done = function(ret) {
|
||||
if (ret && ret.success) {
|
||||
@@ -888,7 +888,7 @@
|
||||
a.style.pointerEvents = '';
|
||||
};
|
||||
try {
|
||||
var ret = api.save_file_from_url(zipUrl, filename);
|
||||
var ret = api.save_file_from_url_new(zipUrl, filename);
|
||||
if (ret && typeof ret.then === 'function') {
|
||||
ret.then(done).catch(function(err) { showToast('保存失败:' + (err && err.message || err)); a.style.pointerEvents = ''; });
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user