diff --git a/Web/src/components/TransactionDetail.vue b/Web/src/components/TransactionDetail.vue index 6447268..19ad75a 100644 --- a/Web/src/components/TransactionDetail.vue +++ b/Web/src/components/TransactionDetail.vue @@ -255,6 +255,12 @@ const onSubmit = async () => { // 选择分类 const selectClassify = (classify) => { editForm.classify = classify + + if(editForm.id > 0 && editForm.type > 0) { + // 直接保存 + onSubmit() + } + } // 新增分类 diff --git a/Web/src/views/SettingView.vue b/Web/src/views/SettingView.vue index 285940b..b834cea 100644 --- a/Web/src/views/SettingView.vue +++ b/Web/src/views/SettingView.vue @@ -41,7 +41,7 @@ - +
@@ -63,6 +63,7 @@ import { showLoadingToast, showSuccessToast, showToast, closeToast, showConfirmD import { uploadBillFile } from '@/api/billImport' import { useAuthStore } from '@/stores/auth' import { getVapidPublicKey, subscribe, testNotification } from '@/api/notification' +import { updateServiceWorker } from '@/registerServiceWorker' const router = useRouter() const authStore = useAuthStore() @@ -265,25 +266,28 @@ const handleLogView = () => { router.push({ name: 'log' }) } -const handleClearCache = async () => { +const handleReloadFromNetwork = async () => { try { await showConfirmDialog({ title: '提示', - message: '确定要清除缓存吗?此操作不可撤销。', + message: '确定要刷新网络吗?此操作不可撤销。', }) // PWA程序强制页面更新到最新版本 - if ('serviceWorker' in navigator && navigator.serviceWorker.controller) { - navigator.serviceWorker.controller.postMessage({ type: 'SKIP_WAITING' }); + if ('serviceWorker' in navigator) { + updateServiceWorker() + showSuccessToast('正在更新,请稍候...') + // 延迟刷新页面以加载新版本 + setTimeout(() => { + window.location.reload() + }, 1500) } else { - showToast('当前未使用缓存,无需清除') + showToast('当前环境不支持此操作') return } - - showSuccessToast('缓存已清除') } catch (error) { - console.error('取消清除缓存:', error) - showToast('已取消清除缓存') + console.error('取消刷新网络:', error) + showToast('已取消刷新网络') } }