必填的项增加星号

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

@@ -322,6 +322,11 @@
 }
 
 /** 表单验证 样式布局 **/
+.control-label.is-required:before {
+  content: '* ';
+  color: red;
+}
+
 label.error {
 	position: absolute;
 	right: 18px;

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

@@ -394,7 +394,7 @@ var table = {
             			var index = layer.load(2, {shade: false});
             			$.modal.disable();
             			var formData = new FormData();
-            			formData.append("file", $('#file')[0].files[0]);
+            			formData.append("file", layero.find('#file')[0].files[0]);
             			formData.append("updateSupport", $("input[name='updateSupport']").is(':checked'));
             			$.ajax({
             				url: table.options.importUrl,

ruoyi-admin/src/main/resources/templates/demo/modal/form.html

@@ -9,7 +9,7 @@
             <div class="row">
             	<div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>用户名称：</label>
+                        <label class="col-sm-4 control-label is-required">用户名称：</label>
                         <div class="col-sm-8">
                             <input name="userName" placeholder="请输入用户名称" class="form-control" type="text">
                         </div>
@@ -17,7 +17,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>归属部门：</label>
+                        <label class="col-sm-4 control-label is-required">归属部门：</label>
                         <div class="col-sm-8">
                             <div class="input-group">
                             	<input name="deptName" type="text" placeholder="请选择归属部门" class="form-control">
@@ -30,7 +30,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>手机号码：</label>
+                        <label class="col-sm-4 control-label is-required">手机号码：</label>
                         <div class="col-sm-8">
                             <input name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text">
                         </div>
@@ -38,7 +38,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>邮箱：</label>
+                        <label class="col-sm-4 control-label is-required">邮箱：</label>
                         <div class="col-sm-8">
                             <input name="email" class="form-control" type="text" placeholder="请输入邮箱">
                         </div>
@@ -48,7 +48,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>登录账号：</label>
+                        <label class="col-sm-4 control-label is-required">登录账号：</label>
                         <div class="col-sm-8">
                             <input name="loginName" placeholder="请输入登录账号" class="form-control" type="text">
                         </div>
@@ -56,7 +56,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>登录密码：</label>
+                        <label class="col-sm-4 control-label is-required">登录密码：</label>
                         <div class="col-sm-8">
                             <input name="password" placeholder="请输入登录密码" class="form-control" type="password">
                         </div>

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

@@ -13,7 +13,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">用户姓名：</label>
+				<label class="col-sm-3 control-label">用户姓名：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="userName" id="userName" required>
 				</div>

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

@@ -11,7 +11,7 @@
 				<div class="form-control-static" th:text="${user.userCode}"></div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">用户姓名：</label>
+				<label class="col-sm-3 control-label">用户姓名：</label>
 				<div class="col-sm-8">
 				    <div class="form-control-static" th:text="${user.userName}"></div>
 				</div>

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

@@ -14,7 +14,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">用户姓名：</label>
+				<label class="col-sm-3 control-label">用户姓名：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="userName" id="userName" th:field="*{userName}" required>
 				</div>

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

@@ -77,12 +77,12 @@
         });
         
 		initChildTable = function(index, row, $detail) {
-			var cur_table = $detail.html('<table style="table-layout:fixed"></table>').find('table');
-    	    $(cur_table).bootstrapTable({
+			var childTable = $detail.html('<table style="table-layout:fixed"></table>').find('table');
+    	    $(childTable).bootstrapTable({
     	        url: prefix + "/list",
     	        method: 'post',
     	        sidePagination: "server",
-    	        contentType: "application/x-www-form-urlencoded",   // 编码类型
+    	        contentType: "application/x-www-form-urlencoded",
     	        queryParams : {
                     userName: '测试8'
 				},

ruoyi-admin/src/main/resources/templates/system/config/add.html

@@ -7,19 +7,19 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-config-add" name="form-config-add">
         <div class="form-group">	
-            <label class="col-sm-3 control-label">参数名称：</label>
+            <label class="col-sm-3 control-label is-required">参数名称：</label>
             <div class="col-sm-8">
                 <input id="configName" name="configName" class="form-control" type="text" required>
             </div>
         </div>
         <div class="form-group">	
-            <label class="col-sm-3 control-label">参数键名：</label>
+            <label class="col-sm-3 control-label is-required">参数键名：</label>
             <div class="col-sm-8">
                 <input id="configKey" name="configKey" class="form-control" type="text" required>
             </div>
         </div>
         <div class="form-group">	
-            <label class="col-sm-3 control-label">参数键值：</label>
+            <label class="col-sm-3 control-label is-required">参数键值：</label>
             <div class="col-sm-8">
                 <input id="configValue" name="configValue" class="form-control" type="text" required>
             </div>

ruoyi-admin/src/main/resources/templates/system/config/edit.html

@@ -8,19 +8,19 @@
         <form class="form-horizontal m" id="form-config-edit" th:object="${config}">
             <input id="configId" name="configId" th:field="*{configId}"  type="hidden">
             <div class="form-group">	
-                <label class="col-sm-3 control-label">参数名称：</label>
+                <label class="col-sm-3 control-label is-required">参数名称：</label>
                 <div class="col-sm-8">
                     <input id="configName" name="configName" th:field="*{configName}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">	
-                <label class="col-sm-3 control-label">参数键名：</label>
+                <label class="col-sm-3 control-label is-required">参数键名：</label>
                 <div class="col-sm-8">
                     <input id="configKey" name="configKey" th:field="*{configKey}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">	
-                <label class="col-sm-3 control-label">参数键值：</label>
+                <label class="col-sm-3 control-label is-required">参数键值：</label>
                 <div class="col-sm-8">
                     <input id="configValue" name="configValue" th:field="*{configValue}" class="form-control" type="text" required>
                 </div>

ruoyi-admin/src/main/resources/templates/system/dept/add.html

@@ -8,7 +8,7 @@
 		<form class="form-horizontal m" id="form-dept-add">
 			<input id="treeId" name="parentId" type="hidden" th:value="${dept.deptId}"   />
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">上级部门：</label>
+				<label class="col-sm-3 control-label">上级部门：</label>
 				<div class="col-sm-8">
 				    <div class="input-group">
 						<input class="form-control" type="text" onclick="selectDeptTree()" id="treeName" readonly="true" th:value="${dept.deptName}">
@@ -17,13 +17,13 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">部门名称：</label>
+				<label class="col-sm-3 control-label is-required">部门名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="deptName" id="deptName" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">显示排序：</label>
+				<label class="col-sm-3 control-label is-required">显示排序：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="orderNum" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/dept/edit.html

@@ -9,7 +9,7 @@
 			<input name="deptId" type="hidden" th:field="*{deptId}" />
 			<input id="treeId" name="parentId" type="hidden" th:field="*{parentId}" />
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">上级部门：</label>
+				<label class="col-sm-3 control-label">上级部门：</label>
 				<div class="col-sm-8">
 				    <div class="input-group">
 						<input class="form-control" type="text" id="treeName" onclick="selectDeptTree()" readonly="true" th:field="*{parentName}">
@@ -18,13 +18,13 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">部门名称：</label>
+				<label class="col-sm-3 control-label is-required">部门名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="deptName" th:field="*{deptName}" id="deptName" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">显示排序：</label>
+				<label class="col-sm-3 control-label is-required">显示排序：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="orderNum" th:field="*{orderNum}" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/dict/data/add.html

@@ -7,13 +7,13 @@
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-dict-add">
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">字典标签：</label>
+				<label class="col-sm-3 control-label is-required">字典标签：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictLabel" id="dictLabel" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">字典键值：</label>
+				<label class="col-sm-3 control-label is-required">字典键值：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictValue" id="dictValue" required>
 				</div>
@@ -31,7 +31,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">字典排序：</label>
+				<label class="col-sm-3 control-label is-required">字典排序：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictSort" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/dict/data/edit.html

@@ -8,13 +8,13 @@
 		<form class="form-horizontal m" id="form-dict-edit" th:object="${dict}">
 			<input name="dictCode"  type="hidden"  th:field="*{dictCode}" />
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">字典标签：</label>
+				<label class="col-sm-3 control-label is-required">字典标签：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictLabel" id="dictLabel" th:field="*{dictLabel}" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">字典键值：</label>
+				<label class="col-sm-3 control-label is-required">字典键值：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictValue" id="dictValue" th:field="*{dictValue}" required>
 				</div>
@@ -32,7 +32,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">字典排序：</label>
+				<label class="col-sm-3 control-label is-required">字典排序：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictSort" th:field="*{dictSort}" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/dict/type/add.html

@@ -7,13 +7,13 @@
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-dict-add">
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">字典名称：</label>
+				<label class="col-sm-3 control-label is-required">字典名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictName" id="dictName" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">字典类型：</label>
+				<label class="col-sm-3 control-label is-required">字典类型：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictType" id="dictType" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/dict/type/edit.html

@@ -8,13 +8,13 @@
 		<form class="form-horizontal m" id="form-dict-edit" th:object="${dict}">
 			<input id="dictId" name="dictId"  type="hidden" th:field="*{dictId}" />
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">字典名称：</label>
+				<label class="col-sm-3 control-label is-required">字典名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictName" id="dictName" th:field="*{dictName}" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">字典类型：</label>
+				<label class="col-sm-3 control-label is-required">字典类型：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictType" id="dictType" th:field="*{dictType}" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/menu/add.html

@@ -8,7 +8,7 @@
 		<form class="form-horizontal m" id="form-menu-add">
 			<input id="treeId" name="parentId" type="hidden" th:value="${menu.menuId}" />
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">上级菜单：</label>
+				<label class="col-sm-3 control-label">上级菜单：</label>
 				<div class="col-sm-8">
 				    <div class="input-group">
 					    <input class="form-control" type="text" onclick="selectMenuTree()" id="treeName" readonly="true" th:value="${menu.menuName}">
@@ -17,7 +17,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">菜单类型：</label>
+				<label class="col-sm-3 control-label is-required">菜单类型：</label>
 				<div class="col-sm-8">
 					<label class="radio-box"> <input type="radio" name="menuType" value="M" /> 目录 </label> 
 					<label class="radio-box"> <input type="radio" name="menuType" value="C" /> 菜单 </label> 
@@ -25,7 +25,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">菜单名称：</label>
+				<label class="col-sm-3 control-label is-required">菜单名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="menuName" id="menuName" required>
 				</div>
@@ -53,7 +53,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">显示排序：</label>
+				<label class="col-sm-3 control-label is-required">显示排序：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="orderNum" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/menu/edit.html

@@ -9,7 +9,7 @@
 			<input name="menuId"   type="hidden" th:field="*{menuId}"   />
 			<input id="treeId" name="parentId" type="hidden" th:field="*{parentId}" />
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">上级菜单：</label>
+				<label class="col-sm-3 control-label">上级菜单：</label>
 				<div class="col-sm-8">
 				    <div class="input-group">
 						<input class="form-control" type="text" onclick="selectMenuTree()" id="treeName" readonly="true" th:value="${menu.parentName == null ? '无' : menu.parentName}">
@@ -18,7 +18,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">菜单类型：</label>
+				<label class="col-sm-3 control-label is-required">菜单类型：</label>
 				<div class="col-sm-8">
 					<label class="radio-box"> <input type="radio" th:field="*{menuType}" name="menuType" value="M" /> 目录 </label> 
 					<label class="radio-box"> <input type="radio" th:field="*{menuType}" name="menuType" value="C" /> 菜单 </label> 
@@ -26,7 +26,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">菜单名称：</label>
+				<label class="col-sm-3 control-label is-required">菜单名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="menuName" id="menuName" th:field="*{menuName}" required>
 				</div>
@@ -54,7 +54,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">显示排序：</label>
+				<label class="col-sm-3 control-label is-required">显示排序：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="orderNum" th:field="*{orderNum}" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/notice/add.html

@@ -8,7 +8,7 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-notice-add">
 			<div class="form-group">	
-				<label class="col-sm-2 control-label">公告标题：</label>
+				<label class="col-sm-2 control-label is-required">公告标题：</label>
 				<div class="col-sm-10">
 					<input id="noticeTitle" name="noticeTitle" class="form-control" type="text" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/notice/edit.html

@@ -9,7 +9,7 @@
         <form class="form-horizontal m" id="form-notice-edit" th:object="${notice}">
             <input id="noticeId" name="noticeId" th:field="*{noticeId}"  type="hidden">
             <div class="form-group">	
-                <label class="col-sm-2 control-label">公告标题：</label>
+                <label class="col-sm-2 control-label is-required">公告标题：</label>
                 <div class="col-sm-10">
                     <input id="noticeTitle" name="noticeTitle" th:field="*{noticeTitle}" class="form-control" type="text" required>
                 </div>

ruoyi-admin/src/main/resources/templates/system/post/add.html

@@ -7,19 +7,19 @@
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-post-add">
 			<div class="form-group">
-				<label class="col-sm-3 control-label">岗位名称：</label>
+				<label class="col-sm-3 control-label is-required">岗位名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="postName" id="postName" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">岗位编码：</label>
+				<label class="col-sm-3 control-label is-required">岗位编码：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="postCode" id="postCode" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">显示顺序：</label>
+				<label class="col-sm-3 control-label is-required">显示顺序：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="postSort" id="postSort" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/post/edit.html

@@ -8,19 +8,19 @@
 		<form class="form-horizontal m" id="form-post-edit" th:object="${post}">
 			<input id="postId" name="postId" type="hidden" th:field="*{postId}"/>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">岗位名称：</label>
+				<label class="col-sm-3 control-label is-required">岗位名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="postName" id="postName" th:field="*{postName}" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">岗位编码：</label>
+				<label class="col-sm-3 control-label is-required">岗位编码：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="postCode" id="postCode" th:field="*{postCode}" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">显示顺序：</label>
+				<label class="col-sm-3 control-label is-required">显示顺序：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="postSort" id="postSort" th:field="*{postSort}" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/role/add.html

@@ -8,20 +8,20 @@
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
 		<form class="form-horizontal m" id="form-role-add">
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">角色名称：</label>
+				<label class="col-sm-3 control-label is-required">角色名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="roleName" id="roleName" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">权限字符：</label>
+				<label class="col-sm-3 control-label is-required">权限字符：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="roleKey" id="roleKey" required>
 					<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 控制器中定义的权限字符，如：@RequiresRoles("")</span>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">显示顺序：</label>
+				<label class="col-sm-3 control-label is-required">显示顺序：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="roleSort" id="roleSort" required>
 				</div>

ruoyi-admin/src/main/resources/templates/system/role/dataScope.html

@@ -9,7 +9,7 @@
 		<form class="form-horizontal m" id="form-role-edit" th:object="${role}">
 			<input id="roleId" name="roleId" type="hidden" th:field="*{roleId}"/>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">角色名称：</label>
+				<label class="col-sm-3 control-label">角色名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="roleName" id="roleName" th:field="*{roleName}" readonly="true"/>
 				</div>

ruoyi-admin/src/main/resources/templates/system/role/edit.html

@@ -9,20 +9,20 @@
 		<form class="form-horizontal m" id="form-role-edit" th:object="${role}">
 			<input id="roleId" name="roleId" type="hidden" th:field="*{roleId}"/>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">角色名称：</label>
+				<label class="col-sm-3 control-label is-required">角色名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="roleName" id="roleName" th:field="*{roleName}" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">权限字符：</label>
+				<label class="col-sm-3 control-label is-required">权限字符：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="roleKey" id="roleKey" th:field="*{roleKey}" required>
 					<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 控制器中定义的权限字符，如：@RequiresRoles("")</span>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">显示顺序：</label>
+				<label class="col-sm-3 control-label is-required">显示顺序：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="roleSort" id="roleSort" th:field="*{roleSort}" required>
 				</div>

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

@@ -12,7 +12,7 @@
             <div class="row">
             	<div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>用户名称：</label>
+                        <label class="col-sm-4 control-label is-required">用户名称：</label>
                         <div class="col-sm-8">
                             <input name="userName" placeholder="请输入用户名称" class="form-control" type="text" maxlength="30" required>
                         </div>
@@ -20,7 +20,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>归属部门：</label>
+                        <label class="col-sm-4 control-label is-required">归属部门：</label>
                         <div class="col-sm-8">
                             <div class="input-group">
                             	<input name="deptName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择归属部门" class="form-control" required>
@@ -33,7 +33,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>手机号码：</label>
+                        <label class="col-sm-4 control-label is-required">手机号码：</label>
                         <div class="col-sm-8">
                             <input id="phonenumber" name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="11" required>
                         </div>
@@ -41,7 +41,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>邮箱：</label>
+                        <label class="col-sm-4 control-label is-required">邮箱：</label>
                         <div class="col-sm-8">
                             <input id="email" name="email" class="form-control email" type="text" maxlength="20" placeholder="请输入邮箱" required>
                         </div>
@@ -51,7 +51,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>登录账号：</label>
+                        <label class="col-sm-4 control-label is-required">登录账号：</label>
                         <div class="col-sm-8">
                             <input id="loginName" name="loginName" placeholder="请输入登录账号" class="form-control" type="text" maxlength="30" required>
                         </div>
@@ -59,7 +59,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>登录密码：</label>
+                        <label class="col-sm-4 control-label is-required">登录密码：</label>
                         <div class="col-sm-8">
                             <input name="password" placeholder="请输入登录密码" class="form-control" type="password" th:value="${@config.getKey('sys.user.initPassword')}" required>
                         </div>

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

@@ -13,7 +13,7 @@
             <div class="row">
             	<div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>用户名称：</label>
+                        <label class="col-sm-4 control-label is-required">用户名称：</label>
                         <div class="col-sm-8">
                             <input name="userName" placeholder="请输入用户名称" class="form-control" type="text" maxlength="30" th:field="*{userName}" required>
                         </div>
@@ -21,7 +21,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>归属部门：</label>
+                        <label class="col-sm-4 control-label is-required">归属部门：</label>
                         <div class="col-sm-8">
                             <div class="input-group">
                                 <input class="form-control" type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}" required>
@@ -34,7 +34,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>手机号码：</label>
+                        <label class="col-sm-4 control-label is-required">手机号码：</label>
                         <div class="col-sm-8">
                             <input name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="11" th:field="*{phonenumber}" required>
                         </div>
@@ -42,7 +42,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>邮箱：</label>
+                        <label class="col-sm-4 control-label is-required">邮箱：</label>
                         <div class="col-sm-8">
                             <input name="email" class="form-control email" type="text" maxlength="20" placeholder="请输入邮箱" th:field="*{email}" required>
                         </div>
@@ -52,7 +52,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>登录账号：</label>
+                        <label class="col-sm-4 control-label is-required">登录账号：</label>
                         <div class="col-sm-8">
                             <input class="form-control" type="text" readonly="true" th:field="*{loginName}"/>
                         </div>

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

@@ -8,7 +8,7 @@
 		<form class="form-horizontal m" id="form-user-resetPwd">
 			<input name="userId"  type="hidden"  th:value="${user.userId}" />
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">登录名称：</label>
+				<label class="col-sm-3 control-label">登录名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" readonly="true" name="loginName" th:value="${user.loginName}"/>
 				</div>

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

@@ -8,7 +8,7 @@
 		<form class="form-horizontal m" id="form-user-resetPwd">
 			<input name="userId"  type="hidden"  th:value="${user.userId}" />
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">登录名称：</label>
+				<label class="col-sm-3 control-label">登录名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" readonly="true" name="loginName" th:value="${user.loginName}"/>
 				</div>

ruoyi-generator/src/main/resources/templates/tool/gen/edit.html

@@ -30,7 +30,7 @@
 				            <div class="row mt20">
 				            	<div class="col-sm-6">
 				                    <div class="form-group">
-				                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>表名称：</label>
+				                        <label class="col-sm-4 control-label is-required">表名称：</label>
 				                        <div class="col-sm-8">
 				                            <input name="tableName" class="form-control" type="text" placeholder="请输入表名称" maxlength="200" th:field="*{tableName}" required>
 				                        </div>
@@ -38,7 +38,7 @@
 				                </div>
 				                <div class="col-sm-6">
 				                    <div class="form-group">
-				                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>表描述：</label>
+				                        <label class="col-sm-4 control-label is-required">表描述：</label>
 				                        <div class="col-sm-8">
 				                            <input name="tableComment" class="form-control" type="text" placeholder="请输入表描述" maxlength="500" th:field="*{tableComment}" required>
 				                        </div>
@@ -48,7 +48,7 @@
 				            <div class="row">
 				                <div class="col-sm-6">
 				                    <div class="form-group">
-				                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>实体类名称：</label>
+				                        <label class="col-sm-4 control-label is-required">实体类名称：</label>
 				                        <div class="col-sm-8">
 				                            <input name="className" class="form-control" type="text" placeholder="请输入实体类名称" maxlength="100" th:field="*{className}" required>
 				                        </div>
@@ -56,7 +56,7 @@
 				                </div>
 				                <div class="col-sm-6">
 				                    <div class="form-group">
-				                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>作者：</label>
+				                        <label class="col-sm-4 control-label is-required">作者：</label>
 				                        <div class="col-sm-8">
 				                            <input name="functionAuthor" class="form-control" type="text" placeholder="请输入作者" maxlength="50" th:field="*{functionAuthor}" required>
 				                        </div>
@@ -87,7 +87,7 @@
 					            <div class="row mt20">
 					            	<div class="col-sm-6">
 					                    <div class="form-group">
-					                        <label class="col-sm-4 control-label"><span style="color: red; ">*</span>生成模板：</label>
+					                        <label class="col-sm-4 control-label is-required">生成模板：</label>
 					                        <div class="col-sm-8">
 					                            <select class='form-control' id="tplCategory" name='tplCategory' style="width: 100%">
 												    <option value="crud" th:field="*{tplCategory}">单表（增删改查）</option>
@@ -98,7 +98,7 @@
 					                </div>
 					                <div class="col-sm-6">
 					                    <div class="form-group">
-					                        <label class="col-sm-4 control-label" title="生成在哪个java包下，例如 com.ruoyi.system"><span style="color: red; ">*</span>生成包路径：<i class="fa fa-question-circle-o"></i></label>
+					                        <label class="col-sm-4 control-label is-required" title="生成在哪个java包下，例如 com.ruoyi.project.system">生成包路径：<i class="fa fa-question-circle-o"></i></label>
 					                        <div class="col-sm-8">
 					                            <input name="packageName" class="form-control" type="text" placeholder="请输入生成包路径" maxlength="100" th:field="*{packageName}" required>
 					                        </div>
@@ -108,7 +108,7 @@
 					            <div class="row">
 					                <div class="col-sm-6">
 					                    <div class="form-group">
-					                        <label class="col-sm-4 control-label" title="可理解为子系统名，例如 system"><span style="color: red; ">*</span>生成模块名：<i class="fa fa-question-circle-o"></i></label>
+					                        <label class="col-sm-4 control-label is-required" title="可理解为子系统名，例如 system">生成模块名：<i class="fa fa-question-circle-o"></i></label>
 					                        <div class="col-sm-8">
 					                            <input name="moduleName" class="form-control" type="text" placeholder="请输入生成模块名" maxlength="30" th:field="*{moduleName}" required>
 					                        </div>
@@ -116,7 +116,7 @@
 					                </div>
 					                <div class="col-sm-6">
 					                    <div class="form-group">
-					                        <label class="col-sm-4 control-label" title="可理解为功能英文名，例如 user"><span style="color: red; ">*</span>生成业务名：<i class="fa fa-question-circle-o"></i></label>
+					                        <label class="col-sm-4 control-label is-required" title="可理解为功能英文名，例如 user">生成业务名：<i class="fa fa-question-circle-o"></i></label>
 					                        <div class="col-sm-8">
 					                            <input name="businessName" class="form-control" type="text" placeholder="请输入生成业务名" maxlength="50" th:field="*{businessName}" required>
 					                        </div>
@@ -126,7 +126,7 @@
 					            <div class="row">
 					                <div class="col-sm-6">
 					                    <div class="form-group">
-					                        <label class="col-sm-4 control-label" title="用作类描述，例如 用户"><span style="color: red; ">*</span>生成功能名：<i class="fa fa-question-circle-o"></i></label>
+					                        <label class="col-sm-4 control-label is-required" title="用作类描述，例如 用户">生成功能名：<i class="fa fa-question-circle-o"></i></label>
 					                        <div class="col-sm-8">
 					                            <input name="functionName" class="form-control" type="text" placeholder="请输入生成功能名" maxlength="50" th:field="*{functionName}" required>
 					                        </div>
@@ -138,7 +138,7 @@
 					            <div class="row">
 					                <div class="col-sm-6">
 					                    <div class="form-group">
-					                        <label class="col-sm-4 control-label" title="树显示的编码字段名， 如：dept_id"><span style="color: red; ">*</span>树编码字段：<i class="fa fa-question-circle-o"></i></label>
+					                        <label class="col-sm-4 control-label is-required" title="树显示的编码字段名， 如：dept_id">树编码字段：<i class="fa fa-question-circle-o"></i></label>
 					                        <div class="col-sm-8">
 					                            <select class='form-control' id="treeCode" name='params[treeCode]' style="width: 100%">
 					                                <option value="">---请选择---</option>
@@ -149,7 +149,7 @@
 					                </div>
 					                <div class="col-sm-6">
 					                    <div class="form-group">
-					                        <label class="col-sm-4 control-label" title="树显示的父编码字段名， 如：parent_Id"><span style="color: red; ">*</span>树父编码字段：<i class="fa fa-question-circle-o"></i></label>
+					                        <label class="col-sm-4 control-label is-required" title="树显示的父编码字段名， 如：parent_Id">树父编码字段：<i class="fa fa-question-circle-o"></i></label>
 					                        <div class="col-sm-8">
 					                            <select class='form-control' id="treeParentCode" name='params[treeParentCode]' style="width: 100%">
 												    <option value="">---请选择---</option>
@@ -162,7 +162,7 @@
 					            <div class="row">
 					                <div class="col-sm-6">
 					                    <div class="form-group">
-					                        <label class="col-sm-4 control-label" title="树节点的显示名称字段名， 如：dept_name"><span style="color: red; ">*</span>树名称字段：<i class="fa fa-question-circle-o"></i></label>
+					                        <label class="col-sm-4 control-label is-required" title="树节点的显示名称字段名， 如：dept_name">树名称字段：<i class="fa fa-question-circle-o"></i></label>
 					                        <div class="col-sm-8">
 					                            <select class='form-control' id="treeName" name='params[treeName]' style="width: 100%">
 												    <option value="">---请选择---</option>

ruoyi-generator/src/main/resources/vm/html/add.html.vm

@@ -38,7 +38,7 @@
             </div>
 #elseif($column.htmlType == "input")
             <div class="form-group">    
-                <label class="col-sm-3 control-label">${comment}：</label>
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
                 <div class="col-sm-8">
                     <input name="${field}" class="form-control" type="text"#if($column.required) required#end>
                 </div>

ruoyi-generator/src/main/resources/vm/html/edit.html.vm

@@ -38,7 +38,7 @@
             </div>
 #elseif($column.htmlType == "input")
             <div class="form-group">    
-                <label class="col-sm-3 control-label">${comment}：</label>
+                <label class="col-sm-3 control-label#if($column.required) is-required#end">${comment}：</label>
                 <div class="col-sm-8">
                     <input name="${field}" th:field="*{${field}}" class="form-control" type="text"#if($column.required) required#end>
                 </div>

ruoyi-quartz/src/main/resources/templates/monitor/job/add.html

@@ -8,7 +8,7 @@
 		<form class="form-horizontal m" id="form-job-add">
 		    <input type="hidden" name="createBy" th:value="${@permission.getPrincipalProperty('loginName')}">
 			<div class="form-group">
-				<label class="col-sm-3 control-label">任务名称：</label>
+				<label class="col-sm-3 control-label is-required">任务名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="jobName" id="jobName" required>
 				</div>
@@ -22,7 +22,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">调用目标字符串：</label>
+				<label class="col-sm-3 control-label is-required">调用目标字符串：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="invokeTarget" id="invokeTarget" required>
 				    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> Bean调用示例：ryTask.ryParams('ry')</span>
@@ -31,7 +31,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">cron表达式：</label>
+				<label class="col-sm-3 control-label is-required">cron表达式：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="cronExpression" id="cronExpression" required>
 				</div>

ruoyi-quartz/src/main/resources/templates/monitor/job/edit.html

@@ -9,7 +9,7 @@
 			<input id="jobId" name="jobId" type="hidden" th:field="*{jobId}"/>
 			<input type="hidden" name="updateBy" th:value="${@permission.getPrincipalProperty('loginName')}">
 			<div class="form-group">
-				<label class="col-sm-3 control-label">任务名称：</label>
+				<label class="col-sm-3 control-label is-required">任务名称：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="jobName" id="jobName" th:field="*{jobName}" required>
 				</div>
@@ -23,7 +23,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">调用目标字符串：</label>
+				<label class="col-sm-3 control-label is-required">调用目标字符串：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="invokeTarget" id="invokeTarget" th:field="*{invokeTarget}" required>
 				    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> Bean调用示例：ryTask.ryParams('ry')</span>
@@ -32,7 +32,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label ">cron表达式：</label>
+				<label class="col-sm-3 control-label is-required">cron表达式：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="cronExpression" id="cronExpression" th:field="*{cronExpression}" required>
 				</div>