Merge pull request #9607 from abpframework/liangshiwei/sweetalert2

Switch to SweetAlert2

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert/SweetalertScriptContributor.cs → framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert2/Sweetalert2ScriptContributor.cs

@@ -3,14 +3,14 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Core;
 using Volo.Abp.Modularity;
 
-namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert
+namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert2
 {
     [DependsOn(typeof(CoreScriptContributor))]
-    public class SweetalertScriptContributor : BundleContributor
+    public class Sweetalert2ScriptContributor : BundleContributor
     {
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
-            context.Files.AddIfNotContains("/libs/sweetalert/sweetalert.min.js");
+            context.Files.AddIfNotContains("/libs/sweetalert2/sweetalert2.all.min.js");
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs

@@ -9,7 +9,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Packages.Lodash;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Luxon;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.MalihuCustomScrollbar;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Select2;
-using Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert2;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Timeago;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Toastr;
 using Volo.Abp.Modularity;
@@ -24,7 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling
         typeof(JQueryFormScriptContributor),
         typeof(Select2ScriptContributor),
         typeof(DatatablesNetBs4ScriptContributor),
-        typeof(SweetalertScriptContributor),
+        typeof(Sweetalert2ScriptContributor),
         typeof(ToastrScriptBundleContributor),
         typeof(MalihuCustomScrollbarPluginScriptBundleContributor),
         typeof(LuxonScriptContributor),
@@ -44,9 +44,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling
                 "/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js",
                 "/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js",
                 "/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js",
-                "/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js",
+                "/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js",
                 "/libs/abp/aspnetcore-mvc-ui-theme-shared/toastr/abp-toastr.js"
             });
         }
     }
-}
+}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js → framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js

@@ -1,6 +1,6 @@
 var abp = abp || {};
 (function ($) {
-    if (!sweetAlert || !$) {
+    if (!Swal || !$) {
         return;
     }
 
@@ -27,7 +27,8 @@
             confirm: {
                 icon: 'warning',
                 title: 'Are you sure?',
-                buttons: ['Cancel', 'Yes']
+                showCancelButton: true,
+                reverseButtons: true
             }
         }
     };
@@ -51,7 +52,7 @@
         );
 
         return $.Deferred(function ($dfd) {
-            sweetAlert(opts).then(function () {
+            Swal.fire(opts).then(function () {
                 $dfd.resolve();
             });
         });
@@ -73,7 +74,7 @@
         return showMessage('error', message, title);
     };
 
-    abp.message.confirm = function (message, titleOrCallback, callback, closeOnEsc) {
+    abp.message.confirm = function (message, titleOrCallback, callback) {
 
         var userOpts = {
             text: message
@@ -86,8 +87,6 @@
             userOpts.title = titleOrCallback;
         };
 
-        userOpts.closeOnEsc = closeOnEsc;
-
         var opts = $.extend(
             {},
             abp.libs.sweetAlert.config['default'],
@@ -96,10 +95,10 @@
         );
 
         return $.Deferred(function ($dfd) {
-            sweetAlert(opts).then(function (isConfirmed) {
-                callback && callback(isConfirmed);
-                $dfd.resolve(isConfirmed);
-            });
+            Swal.fire(opts).then(result  => {
+                callback && callback(result.value);
+                $dfd.resolve(result.value);
+            })
         });
     };
 
@@ -107,7 +106,8 @@
         var l = abp.localization.getResource('AbpUi');
 
         abp.libs.sweetAlert.config.confirm.title = l('AreYouSure');
-        abp.libs.sweetAlert.config.confirm.buttons = [l('Cancel'), l('Yes')];
+        abp.libs.sweetAlert.config.confirm.showCancelButton = true;
+        abp.libs.sweetAlert.config.confirm.reverseButtons = true;
     });
 
-})(jQuery);
+})(jQuery);

npm/packs/aspnetcore.mvc.ui.theme.shared/package.json

@@ -16,7 +16,7 @@
     "@abp/luxon": "~4.4.2",
     "@abp/malihu-custom-scrollbar-plugin": "~4.4.2",
     "@abp/select2": "~4.4.2",
-    "@abp/sweetalert": "~4.4.2",
+    "@abp/sweetalert2": "~4.4.2",
     "@abp/timeago": "~4.4.2",
     "@abp/toastr": "~4.4.2"
   },

npm/packs/sweetalert/abp.resourcemapping.js

@@ -1,5 +0,0 @@
-module.exports = {
-    mappings: {
-        "@node_modules/sweetalert/dist/*.*": "@libs/sweetalert/"
-    }
-}

npm/packs/sweetalert2/abp.resourcemapping.js

@@ -0,0 +1,5 @@
+module.exports = {
+    mappings: {
+        "@node_modules/sweetalert2/dist/*.*": "@libs/sweetalert2/"
+    }
+}

npm/packs/sweetalert/package.json → npm/packs/sweetalert2/package.json

@@ -1,12 +1,12 @@
 {
   "version": "4.4.2",
-  "name": "@abp/sweetalert",
+  "name": "@abp/sweetalert2",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
     "@abp/core": "~4.4.2",
-    "sweetalert": "^2.1.2"
+    "sweetalert2": "^11.0.18"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }