innov
/
BootstrapAdmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(#I18F5S): 修复关闭弹窗后 Tooltip 依然存在 

#Comment
comment #I18F5S

#Issue
close https://gitee.com/LongbowEnterprise/dashboard/issues?id=I18F5S
This commit is contained in:
Argo Zhang 2020-01-15 14:14:54 +08:00
parent 62d4051ec8
commit 3562d92a9a
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/admin/Bootstrap.Admin/wwwroot/lib/longbow/longbow.validate.js
View File

@ -104,9 +104,32 @@
}
});
if (this.options.modal) {
// 关闭 modal 时移除所有验证信息
$(this.options.modal).on('show.bs.modal', function (e) {
that.reset();
});
// bs bug 弹窗内控件值更改后再次点击关闭按钮是 hide.bs.modal 事件不被触发
// 兼容 键盘事件 ESC
var dismissTooltip = function (e) {
// 移除残留 tooltip
var $modal = $(that.options.modal)
$modal.find('[aria-describedby]').each(function (index, ele) {
var tooltipId = $(ele).attr('aria-describedby');
var $tooltip = $('#' + tooltipId);
if ($tooltip.length === 1) {
$tooltip.tooltip('dispose');
}
});
};
$(this.options.modal).on('click', '[data-dismiss="modal"]', dismissTooltip);
$(this.options.modal).on('keydown', function (event) {
// ESC
if (event.which === 27) {
event.preventDefault();
dismissTooltip(event);
}
});
}
};
@ -278,6 +301,17 @@
$(function () {
if ($.isFunction($.validator)) {
$.validator.addMethod("equalTo", function (value, element, param) {
var target = $(param);
if (this.settings.onfocusout && target.not(".validate-equalTo-blur").length) {
target.addClass("validate-equalTo-blur").on("blur.validate-equalTo", function () {
var validator = $(element).parents('[data-toggle="LgbValidate"]').data('lgb.Validate');
validator.validElement(element);
});
}
return value === target.val();
});
$.validator.addMethod("ip", function (value, element) {
return this.optional(element) || /^(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])$/.test(value);
}, "请填写正确的IP地址");