diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js index 0c17190d..dd236579 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js @@ -37,23 +37,6 @@ $(function() { }) } - // 气泡弹出框特效(移到元素时) - $(document).on("mouseenter", '.table [data-toggle="popover"]', function() { - var _this = this; - $(this).popover("show"); - $(".popover").on("mouseleave", function() { - $(_this).popover('hide'); - }); - }) - - // 气泡弹出框特效(离开元素时) - $(document).on("mouseleave", '.table [data-toggle="popover"]', function() { - var _this = this; - setTimeout(function() { - if (!$(".popover:hover").length) $(_this).popover("hide"); - }, 100); - }); - // 取消回车自动提交表单 $(document).on("keypress", ":input:not(textarea):not([type=submit])", function(event) { if (event.keyCode == 13) { @@ -445,7 +428,7 @@ var sub = { } } var item = data[dataIndex]; - var extendObj = $.extend({},item,obj); + var extendObj = $.extend({}, item, obj); params.push({ index: dataIndex, row: extendObj }); } $("#" + table.options.id).bootstrapTable("updateRow", params); diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index b732a11b..f5c0d854 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -202,6 +202,8 @@ var table = { $(optionsIds).on("post-body.bs.table", function (e, args) { // 浮动提示框特效 $(".table [data-toggle='tooltip']").tooltip(); + // 气泡弹出框特效 + $('.table [data-toggle="popover"]').popover(); }); // 选中、取消、全部选中、全部取消(事件) $(optionsIds).on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table", function (e, rowsAfter, rowsBefore) {