diff --git a/dashboard/src2/components/SiteActionCell.vue b/dashboard/src2/components/SiteActionCell.vue index 86a0c52..a70e44e 100644 --- a/dashboard/src2/components/SiteActionCell.vue +++ b/dashboard/src2/components/SiteActionCell.vue @@ -101,7 +101,9 @@ function onDeactivateSite() { variant: 'solid', theme: 'red', onClick({ hide }) { - return site.deactivate.submit().then(hide); + toast.success('停用请求已提交'); + hide(); + site.deactivate.submit(); } } }); @@ -119,7 +121,9 @@ function onActivateSite() { label: '激活', variant: 'solid', onClick({ hide }) { - return site.activate.submit().then(hide); + toast.success('激活请求已提交'); + hide(); + site.activate.submit(); } } }); @@ -159,22 +163,23 @@ function onDropSite() { import('./ChurnFeedbackDialog.vue') ); - return site.archive.submit({ force: values.force }).then(() => { - hide(); + toast.success('删除请求已提交'); + hide(); + site.archive.submit({ force: values.force }); + setTimeout(() => { if (val) { renderDialog( h(FeedbackDialog, { team: site.pg.team, onUpdated() { router.replace({ name: 'Site List' }); - toast.success('站点删除成功'); } }) ); } else { router.replace({ name: 'Site List' }); } - }); + }, 1000); } } }); @@ -204,9 +209,9 @@ function onMigrateSite() { if (values.confirmSiteName !== site.pg.name) { throw new Error('站点名称不匹配'); } - return site.migrate - .submit({ skip_failing_patches: values.skipFailingPatches }) - .then(hide); + toast.success('更新请求已提交'); + hide(); + site.migrate.submit({ skip_failing_patches: values.skipFailingPatches }); } } }); @@ -232,7 +237,9 @@ function onSiteReset() { if (values.confirmSiteName !== site.pg.name) { throw new Error('站点名称不匹配。'); } - return site.reinstall.submit().then(hide); + toast.success('重置请求已提交'); + hide(); + site.reinstall.submit(); } } }); @@ -244,23 +251,15 @@ function onScheduleBackup() { message: '您确定要计划备份吗?这将创建一个现场备份。', onSuccess({ hide }) { - toast.promise( - site.backup.submit({ - with_files: true - }), - { - loading: '正在计划备份...', - success: () => { - hide(); - router.push({ - name: 'Site Jobs', - params: { name: site.name } - }); - return '备份计划成功'; - }, - error: e => getToastErrorMessage(e) - } - ); + toast.success('备份请求已提交'); + hide(); + site.backup.submit({ with_files: true }); + setTimeout(() => { + router.push({ + name: 'Site Jobs', + params: { name: site.name } + }); + }, 1000); } }); } @@ -283,14 +282,9 @@ function onTransferSite() { label: '转移', variant: 'solid', onClick: ({ hide, values }) => { - return site.sendTransferRequest - .submit({ team_mail_id: values.email, reason: values.reason || '' }) - .then(() => { - hide(); - toast.success( - `转移请求已成功发送至 ${values.email}。` - ); - }); + toast.success(`转移请求已提交至 ${values.email}`); + hide(); + site.sendTransferRequest.submit({ team_mail_id: values.email, reason: values.reason || '' }); } } }); @@ -304,7 +298,9 @@ function onClearCache() { label: '清除缓存', variant: 'solid', onClick: ({ hide }) => { - return site.clearSiteCache.submit().then(hide); + toast.success('清除缓存请求已提交'); + hide(); + site.clearSiteCache.submit(); } } });