From 0ae84888d90d859a27d83087dc66ff0f7df4c5c8 Mon Sep 17 00:00:00 2001
From: Argo-Surface <Argo@163.com>
Date: Fri, 23 Nov 2018 11:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=EF=BC=9A?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=85=AC=E5=85=B1=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/lib/longbow/longbow.common.js     | 36 +++++++------------
 .../wwwroot/lib/longbow/longbow.dataentity.js |  9 ++---
 .../wwwroot/lib/longbow/longbow.validate.js   |  1 +
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js b/Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js
index 1ad4ca26..dde988b4 100644
--- a/Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js
+++ b/Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js
@@ -144,24 +144,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) {
@@ -386,7 +384,7 @@
                 if ($.isFunction(op.callback)) op.callback.apply(that, arguments);
                 return console.error(err.toString());
             }).then(function () {
-                if (op.invoke) op.invoke(connection).then(result => console.log(result)).catch(err => console.error(err.toString()));
+                if (op.invoke) op.invoke(connection).then(function (result) { console.log(result); }).catch(function (err) { console.error(err.toString()); });
             });
             return this;
         }
@@ -439,12 +437,6 @@
             "hideMethod": "fadeOut"
         };
 
-        $('[data-toggle="dropdown"].dropdown-select').dropdown('select');
-        $('[data-toggle="tooltip"]').tooltip();
-        $('[data-toggle="popover"]').popover();
-        $('[data-toggle="lgbinfo"]').lgbInfo();
-        $('.date').lgbDatePicker();
-
         $('.collapse').on('shown.bs.collapse', function () {
             $.footer().removeClass('d-none');
         }).on('hidden.bs.collapse', function () {
@@ -454,10 +446,6 @@
         }).on('show.bs.collapse', function () {
             $('footer').addClass('d-none');
         });
-        
-        // fix bug bootstrap-table 1.12.1 showToggle
-        if ($.fn.bootstrapTable) $.fn.bootstrapTable.Constructor.DEFAULTS.icons.toggle = $.fn.bootstrapTable.Constructor.DEFAULTS.icons.toggleOff;
-
 
         $(window).on('resize', function () {
             $.footer();
diff --git a/Bootstrap.Client/wwwroot/lib/longbow/longbow.dataentity.js b/Bootstrap.Client/wwwroot/lib/longbow/longbow.dataentity.js
index 02e4a8fe..8fa7a683 100644
--- a/Bootstrap.Client/wwwroot/lib/longbow/longbow.dataentity.js
+++ b/Bootstrap.Client/wwwroot/lib/longbow/longbow.dataentity.js
@@ -132,12 +132,13 @@
                     }
                     else {
                         swal({
-                            title: "您确定要删除吗？",
+                            title: "删除数据",
+                            text: "您确定要删除选中的所有数据吗",
                             type: "warning",
                             showCancelButton: true,
-                            closeOnConfirm: true,
-                            confirmButtonText: "是的，我要删除",
-                            confirmButtonColor: "#d9534f",
+                            cancelButtonClass: 'btn-secondary',
+                            confirmButtonText: "我要删除",
+                            confirmButtonClass: "btn-danger ml-2",
                             cancelButtonText: "取消"
                         }, function () {
                             setTimeout(function () {
diff --git a/Bootstrap.Client/wwwroot/lib/longbow/longbow.validate.js b/Bootstrap.Client/wwwroot/lib/longbow/longbow.validate.js
index 7f82352a..efaa7c50 100644
--- a/Bootstrap.Client/wwwroot/lib/longbow/longbow.validate.js
+++ b/Bootstrap.Client/wwwroot/lib/longbow/longbow.validate.js
@@ -93,6 +93,7 @@
         }).on('inserted.bs.tooltip', this.options.childClass, function () {
             $('#' + $(this).attr('aria-describedby')).addClass(that.options.errorClass);
         });
+
         if (!this.options.validButtons) return;
         this.$element.find(this.options.validButtons).on('click.lgb.validate', function (e) {
             var valid = that.valid();