baogq
/
ATJ_MES_WEB_ZY
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复更多操作部分浏览器不兼容情况

Browse Source
master
RuoYi 5 years ago committed by Limy
parent 152a800659
commit dcb16833fc
5 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File

33
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
Unescape Escape View File

@ -260,24 +260,21 @@ var table = {
// 浮动提示框特效 // 浮动提示框特效
$(".table [data-toggle='tooltip']").tooltip(); $(".table [data-toggle='tooltip']").tooltip();
// 气泡弹出框特效 // 气泡弹出框特效（移到元素时）
$('.table [data-toggle="popover"]').each(function() { $(document).on("mouseenter", '.table [data-toggle="popover"]', function() {
$(this).popover({ trigger: "manual", html: true, animation: false, container: "body", placement: "left" var _this = this;
}).on("mouseenter", $(this).popover("show");
function() { $(".popover").on("mouseleave", function() {
var _this = this; $(_this).popover('hide');
$(this).popover("show"); });
$(".popover").on("mouseleave", function() { })
$(_this).popover('hide');
}); // 气泡弹出框特效（离开元素时）
}).on("mouseleave", $(document).on("mouseleave", '.table [data-toggle="popover"]', function() {
function() { var _this = this;
var _this = this; setTimeout(function() {
setTimeout(function() { if (!$(".popover:hover").length) $(_this).popover("hide");
if (!$(".popover:hover").length) }, 100);
$(_this).popover("hide");
}, 100);
});
}); });
}, },
// 表格销毁 // 表格销毁

2
ruoyi-admin/src/main/resources/templates/index.html
Unescape Escape View File

@ -147,7 +147,7 @@
</ul> </ul>
</li> </li>
<li> <li>
<a href="#"><i class="fa fa-sitemap"></i> <span class="nav-label">四层菜单 </span><span class="fa arrow"></span></a> <a href="#"><i class="fa fa-sitemap"></i>四层菜单<span class="fa arrow"></span></a>
<ul class="nav nav-second-level collapse"> <ul class="nav nav-second-level collapse">
<li> <li>
<a href="#" id="damian">三级菜单1<span class="fa arrow"></span></a> <a href="#" id="damian">三级菜单1<span class="fa arrow"></span></a>

2
ruoyi-admin/src/main/resources/templates/system/role/role.html
Unescape Escape View File

@ -118,7 +118,7 @@
var more = []; var more = [];
more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authDataScope(" + row.roleId + ")'><i class='fa fa-check-square-o'></i>数据权限</a> "); more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authDataScope(" + row.roleId + ")'><i class='fa fa-check-square-o'></i>数据权限</a> ");
more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authUser(" + row.roleId + ")'><i class='fa fa-user'></i>分配用户</a>"); more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authUser(" + row.roleId + ")'><i class='fa fa-user'></i>分配用户</a>");
actions.push('<a class="btn btn-info btn-xs" role="button" data-toggle="popover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>'); actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
return actions.join(''); return actions.join('');
} }
}] }]

2
ruoyi-admin/src/main/resources/templates/system/user/user.html
Unescape Escape View File

@ -169,7 +169,7 @@
var more = []; var more = [];
more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> "); more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>"); more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
actions.push('<a class="btn btn-info btn-xs" role="button" data-toggle="popover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>'); actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
return actions.join(''); return actions.join('');
} }
}] }]

2
ruoyi-quartz/src/main/resources/templates/monitor/job/job.html
Unescape Escape View File

@ -130,7 +130,7 @@
more.push("<a class='btn btn-default btn-xs " + statusFlag + "' href='javascript:void(0)' onclick='run(" + row.jobId + ")'><i class='fa fa-play-circle-o'></i> 执行一次</a> "); more.push("<a class='btn btn-default btn-xs " + statusFlag + "' href='javascript:void(0)' onclick='run(" + row.jobId + ")'><i class='fa fa-play-circle-o'></i> 执行一次</a> ");
more.push("<a class='btn btn-default btn-xs " + detailFlag + "' href='javascript:void(0)' onclick='$.operate.detail(" + row.jobId + ")'><i class='fa fa-search'></i>任务详细</a> "); more.push("<a class='btn btn-default btn-xs " + detailFlag + "' href='javascript:void(0)' onclick='$.operate.detail(" + row.jobId + ")'><i class='fa fa-search'></i>任务详细</a> ");
more.push("<a class='btn btn-default btn-xs " + detailFlag + "' href='javascript:void(0)' onclick='jobLog(" + row.jobId + ")'><i class='fa fa-list'></i>调度日志</a>"); more.push("<a class='btn btn-default btn-xs " + detailFlag + "' href='javascript:void(0)' onclick='jobLog(" + row.jobId + ")'><i class='fa fa-list'></i>调度日志</a>");
actions.push('<a class="btn btn-info btn-xs" role="button" data-toggle="popover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>'); actions.push('<a class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
return actions.join(''); return actions.join('');
} }
}] }]

Write Preview
Loading…
Cancel
Save