Merge branch 'master' of gitee.com:y_project/RuoYi

ruoyi-admin/src/main/resources/static/css/style.css

@@ -3254,7 +3254,7 @@ body.body-small .footer.fixed {
 
 .content-tabs .roll-nav, .page-tabs-list {
     position: absolute;
-    width: 40px;
+    width: 30px;
     height: 38px;
     text-align: center;
     color: #999;
@@ -3285,9 +3285,9 @@ body.body-small .footer.fixed {
 }
 
 nav.page-tabs {
-    margin-left: 40px;
+    margin-left: 30px;
     width: 100000px;
-    height: 40px;
+    height: 38px;
     overflow: hidden;
 }
 

ruoyi-admin/src/main/resources/static/ruoyi/index.js

@@ -216,6 +216,8 @@ $(function() {
         dataIndex = $(this).data('index'),
         menuName = $.trim($(this).text()),
         flag = true;
+        $(".nav ul li").removeClass("active");
+        $(this).parent("li").addClass("active");
         if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false;
 
         // 选项卡菜单已存在

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

@@ -271,8 +271,7 @@
             },
             // 导入数据
             importExcel: function(formId) {
-            	var currentId = $.common.isEmpty(formId) ? 'importForm' : formId;
-            	$.form.reset(currentId);
+            	var currentId = $.common.isEmpty(formId) ? 'importTpl' : formId;
             	layer.open({
             		type: 1,
             		area: ['400px', '230px'],
@@ -281,7 +280,7 @@
             		maxmin: true,
             		shade: 0.3,
             		title: '导入' + $.table._option.modalName + '数据',
-            		content: $('#' + currentId),
+            		content: $('#' + currentId).html(),
             		btn: ['<i class="fa fa-check"></i> 导入', '<i class="fa fa-remove"></i> 取消'],
             		// 弹层外区域关闭
             		shadeClose: true,

ruoyi-admin/src/main/resources/templates/demo/operate/table.html

@@ -108,7 +108,8 @@
     </script>
 </body>
 <!-- 导入区域 -->
-<form id="importForm" enctype="multipart/form-data" class="mt20 mb10" style="display: none;">
+<script id="importTpl" type="text/template">
+<form enctype="multipart/form-data" class="mt20 mb10">
 	<div class="col-xs-offset-1">
 		<input type="file" id="file" name="file"/>
 		<div class="mt10 pt5">
@@ -120,4 +121,5 @@
 		</font>
 	</div>
 </form>
+</script>
 </html>

ruoyi-admin/src/main/resources/templates/system/user/user.html

@@ -244,7 +244,9 @@
 		}
 	</script>
 </body>
-<form id="importForm" enctype="multipart/form-data" class="mt20 mb10" style="display: none;">
+<!-- 导入区域 -->
+<script id="importTpl" type="text/template">
+<form enctype="multipart/form-data" class="mt20 mb10">
 	<div class="col-xs-offset-1">
 		<input type="file" id="file" name="file"/>
 		<div class="mt10 pt5">
@@ -256,4 +258,5 @@
 		</font>
 	</div>
 </form>
+</script>
 </html>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -176,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			<if test="remark != null and remark != ''">remark = #{remark},</if>
+ 			<if test="remark != null">remark = #{remark},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}

sql/ry_20190601.sql

@@ -58,7 +58,7 @@ create table sys_user (
   create_time 	    datetime                                   comment '创建时间',
   update_by         varchar(64)     default ''                 comment '更新者',
   update_time       datetime                                   comment '更新时间',
-  remark 		    varchar(500) 	default '' 				   comment '备注',
+  remark 		    varchar(500) 	default null 			   comment '备注',
   primary key (user_id)
 ) engine=innodb auto_increment=100 comment = '用户信息表';