若依 2.4

2018-09-03 08:45:08 +08:00
parent a4c1912ab2
commit 4fe158fa94
112 changed files with 1687 additions and 4035 deletions
--- a/src/main/resources/templates/system/menu/menu.html
+++ b/src/main/resources/templates/system/menu/menu.html
@ -62,7 +62,7 @@
 		            field: 'menuName',
 		            width: '20%',
 		            formatter: function(value, row, index) {
-		                if (row.icon == null || row == "") {
+		                if ($.common.isEmpty(row.icon)) {
 		                    return row.menuName;
 		                } else {
 		                    return '<i class="' + row.icon + '"></i> <span class="nav-label">' + row.menuName + '</span>';