From 194b967aa4826e3e2e1ec0b8f7c876cca557c5e5 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 13 Apr 2026 09:35:18 +0800 Subject: [PATCH 1/2] Replace ajaxSubmit with abp.ajax in CmsKit Pages and BlogPosts --- .../Pages/CmsKit/BlogPosts/create.js | 25 ++++++++++--------- .../Pages/CmsKit/BlogPosts/update.js | 25 ++++++++++--------- .../Pages/CmsKit/Pages/create.js | 20 +++++++-------- .../Pages/CmsKit/Pages/update.js | 16 +++++++----- 4 files changed, 46 insertions(+), 40 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js index 1b3bd0b7f4..4a1ffc5622 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js @@ -55,19 +55,20 @@ $(function () { await submitCoverImage(); - $formCreate.ajaxSubmit({ - success: function (result) { - if (isTagsEnabled) { - submitEntityTags(result.id); - } - else { - finishSaving(); - } - }, - error: function (result) { - abp.notify.error(result.responseJSON.error.message); - abp.ui.clearBusy(); + abp.ajax({ + url: $formCreate.attr("action"), + data: new FormData($formCreate[0]), + processData: false, + contentType: false + }).done(function (result) { + if (isTagsEnabled) { + submitEntityTags(result.id); } + else { + finishSaving(); + } + }).always(function () { + abp.ui.clearBusy(); }); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js index 96d640127e..a1d8218805 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js @@ -42,19 +42,20 @@ $(function () { await submitCoverImage(); - $formUpdate.ajaxSubmit({ - success: function (result) { - if (isTagsEnabled) { - submitEntityTags($blogPostIdInput.val()); - } - else { - finishSaving(result); - } - }, - error: function (result) { - abp.ui.clearBusy(); - abp.notify.error(result.responseJSON.error.message); + abp.ajax({ + url: $formUpdate.attr("action"), + data: new FormData($formUpdate[0]), + processData: false, + contentType: false + }).done(function (result) { + if (isTagsEnabled) { + submitEntityTags($blogPostIdInput.val()); + } + else { + finishSaving(result); } + }).always(function () { + abp.ui.clearBusy(); }); } else { diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js index ca7ab72cdc..4474e0fbee 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js @@ -36,16 +36,16 @@ $(function () { $("#ViewModel_Style").val(styleEditor.getValue()); $("#ViewModel_Script").val(scriptEditor.getValue()); - $createForm.ajaxSubmit({ - success: function (result) { - abp.notify.success(l('SavedSuccessfully')); - abp.ui.clearBusy(); - location.href = "../Pages"; - }, - error: function (result) { - abp.ui.clearBusy(); - abp.notify.error(result.responseJSON.error.message); - } + abp.ajax({ + url: $createForm.attr("action"), + data: new FormData($createForm[0]), + processData: false, + contentType: false + }).done(function () { + abp.notify.success(l('SavedSuccessfully')); + location.href = "../Pages"; + }).always(function () { + abp.ui.clearBusy(); }); } }); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js index a58e601135..7ce5bb8b1b 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js @@ -34,12 +34,16 @@ $(function () { $("#ViewModel_Style").val(styleEditor.getValue()); $("#ViewModel_Script").val(scriptEditor.getValue()); - $formUpdate.ajaxSubmit({ - success: function (result) { - abp.notify.success(l('SavedSuccessfully')); - abp.ui.clearBusy(); - location.href = "../../Pages"; - } + abp.ajax({ + url: $formUpdate.attr("action"), + data: new FormData($formUpdate[0]), + processData: false, + contentType: false + }).done(function () { + abp.notify.success(l('SavedSuccessfully')); + location.href = "../../Pages"; + }).always(function () { + abp.ui.clearBusy(); }); } }); From 42dff100fbdecd325a675107b7c895b06d705e9b Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 13 Apr 2026 09:41:11 +0800 Subject: [PATCH 2/2] Use fail instead of always to avoid clearing busy state too early --- .../src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js | 2 +- .../src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js index 4a1ffc5622..428a4b15f7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js @@ -67,7 +67,7 @@ $(function () { else { finishSaving(); } - }).always(function () { + }).fail(function () { abp.ui.clearBusy(); }); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js index a1d8218805..3f474b89ff 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js @@ -54,7 +54,7 @@ $(function () { else { finishSaving(result); } - }).always(function () { + }).fail(function () { abp.ui.clearBusy(); }); }