From f8b69f01c87a8980379631d84d75ed8171352c22 Mon Sep 17 00:00:00 2001
From: Argo-Surface <Argo@163.com>
Date: Thu, 22 Nov 2018 15:55:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=84=9A=E6=9C=AC=EF=BC=9A?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84event?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/lib/longbow/longbow.common.js     | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js b/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js
index 3c6d782f..f775df06 100644
--- a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js
+++ b/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js
@@ -145,24 +145,22 @@
             var loadingHandler = null;
             if (options.loading && options.modal) {
                 var $modal = $(options.modal);
-                if (!$modal.hasClass('event')) {
-                    $modal.on('shown.bs.modal', function () {
-                        var $this = $(this);
-                        if (loadingHandler !== null) {
-                            window.clearTimeout(loadingHandler);
-                            loadingHandler = null;
-                        }
-                        if ($this.hasClass(loadFlag)) return;
-                        $this.modal('hide');
-                    });
-                }
+                $modal.on('shown.bs.modal', function () {
+                    var $this = $(this);
+                    if (loadingHandler !== null) {
+                        window.clearTimeout(loadingHandler);
+                        loadingHandler = null;
+                    }
+                    if ($this.hasClass(loadFlag)) return;
+                    $this.modal('hide');
+                });
                 loadingHandler = window.setTimeout(function () { $(options.modal).addClass(loadFlag).modal('show'); }, 300);
-                setTimeout(function () {
+                var loadTimeoutHandler = setTimeout(function () {
                     $(options.modal).find('.close').removeClass('d-none');
+                    clearTimeout(loadTimeoutHandler);
                 }, options.loadingTimeout);
             }
 
-
             var data = options.method === 'get' ? options.data : JSON.stringify(options.data);
             var url = options.id !== '' ? options.url + '/' + options.id : options.url;
             if (options.query) {