Browse Source

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

RuoYi 4 years ago
parent
commit
6d5b261c7d

+ 1 - 1
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -11,7 +11,7 @@ var table = {
     // 设置实例配置
     set: function(id) {
     	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)) {
                 table.options = table.get(tableId);
             }

+ 1 - 1
ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html

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

+ 0 - 1
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

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