diff --git a/Bootstrap.Admin/wwwroot/css/theme.css b/Bootstrap.Admin/wwwroot/css/theme.css index e181c87c..381f14e6 100644 --- a/Bootstrap.Admin/wwwroot/css/theme.css +++ b/Bootstrap.Admin/wwwroot/css/theme.css @@ -783,4 +783,8 @@ input.pending { label[for] { cursor: pointer; -} \ No newline at end of file +} + +.form-inline .form-group .toggle { + display: block; +} diff --git a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js b/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js index 6251a372..ed76dd39 100644 --- a/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js +++ b/Bootstrap.Admin/wwwroot/lib/longbow/longbow.common.js @@ -219,6 +219,9 @@ if ($.isFunction(swal)) { swal($.extend({ showConfirmButton: false, showCancelButton: false, timer: 1000, title: '未设置', type: "success" }, options)); } + else { + window.log('缺少 swal 脚本引用'); + } }, getUID: function (prefix) { if (!prefix) prefix = 'lgb'; @@ -549,6 +552,8 @@ $('[data-toggle="tooltip"]').tooltip(); $('[data-toggle="popover"]').popover(); $('[data-toggle="lgbinfo"]').lgbInfo(); - $('.date').lgbDatePicker(); + $('.date').lgbDatePicker().on('show hide', function (e) { + e.stopPropagation(); + }); }); })(jQuery); \ No newline at end of file diff --git a/Bootstrap.Client/wwwroot/css/theme.css b/Bootstrap.Client/wwwroot/css/theme.css index e181c87c..381f14e6 100644 --- a/Bootstrap.Client/wwwroot/css/theme.css +++ b/Bootstrap.Client/wwwroot/css/theme.css @@ -783,4 +783,8 @@ input.pending { label[for] { cursor: pointer; -} \ No newline at end of file +} + +.form-inline .form-group .toggle { + display: block; +} diff --git a/Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js b/Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js index 6251a372..ed76dd39 100644 --- a/Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js +++ b/Bootstrap.Client/wwwroot/lib/longbow/longbow.common.js @@ -219,6 +219,9 @@ if ($.isFunction(swal)) { swal($.extend({ showConfirmButton: false, showCancelButton: false, timer: 1000, title: '未设置', type: "success" }, options)); } + else { + window.log('缺少 swal 脚本引用'); + } }, getUID: function (prefix) { if (!prefix) prefix = 'lgb'; @@ -549,6 +552,8 @@ $('[data-toggle="tooltip"]').tooltip(); $('[data-toggle="popover"]').popover(); $('[data-toggle="lgbinfo"]').lgbInfo(); - $('.date').lgbDatePicker(); + $('.date').lgbDatePicker().on('show hide', function (e) { + e.stopPropagation(); + }); }); })(jQuery); \ No newline at end of file