github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修复多表格无法设置实例配置问题

pull/195/head
RuoYi 2020-07-31 16:16:11 +08:00
parent 2eb5752cc1
commit 6d5b261c7d
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -11,7 +11,7 @@ var table = {
// 设置实例配置 // 设置实例配置
set: function(id) { set: function(id) {
if($.common.getLength(table.config) > 1) { if($.common.getLength(table.config) > 1) {
var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find(".table").attr("id") : id; var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find("table.table").attr("id") : id;
if ($.common.isNotEmpty(tableId)) { if ($.common.isNotEmpty(tableId)) {
table.options = table.get(tableId); table.options = table.get(tableId);
} }

2
ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html
View File

@ -15,7 +15,6 @@
.cropped { .cropped {
width: 200px; width: 200px;
height: 345px;
border: 1px #ddd solid; border: 1px #ddd solid;
box-shadow: 0px 0px 12px #ddd; box-shadow: 0px 0px 12px #ddd;
} }
@ -236,6 +235,7 @@ function submitHandler() {
$(window).resize(function() { $(window).resize(function() {
$('.imageBox').height($(window).height() - 80); $('.imageBox').height($(window).height() - 80);
$('.cropped').height($(window).height() - 40);
}).resize(); }).resize();
if (!HTMLCanvasElement.prototype.toBlob) { if (!HTMLCanvasElement.prototype.toBlob) {

1
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
View File

@ -292,7 +292,6 @@ public class VelocityUtils
public static String getPermissionPrefix(String moduleName, String businessName) public static String getPermissionPrefix(String moduleName, String businessName)
{ {
return StringUtils.format("{}:{}", moduleName, businessName); return StringUtils.format("{}:{}", moduleName, businessName);
} }
/** /**