From afccbee42c0246cd43cc291e8ab1ed7276f6f751 Mon Sep 17 00:00:00 2001
From: zxm <154040976@qq.com>
Date: Sun, 7 May 2023 14:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=B8=83=E5=B1=80=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/ftl/system/user/add.ftl    | 376 +++++++++---------
 .../resources/ftl/system/user/userList.ftl    |  20 +-
 .../src/main/resources/plugin/lenos/main.css  |   2 +-
 3 files changed, 205 insertions(+), 193 deletions(-)
diff --git a/len-sys/src/main/resources/ftl/system/user/add.ftl b/len-sys/src/main/resources/ftl/system/user/add.ftl
index 4076574..dde176b 100644
--- a/len-sys/src/main/resources/ftl/system/user/add.ftl
+++ b/len-sys/src/main/resources/ftl/system/user/add.ftl
@@ -2,199 +2,199 @@
 
 <body>
 <div class="x-body">
-    <form id="useradd" class="layui-form layui-form-pane" style="padding-left: 20px">
-        <div>
-            <#--头像-->
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">头像上传</legend>
-                </fieldset>
-
-                <#--上传组件-->
-                <@lenInclude path="/system/base/upload.ftl" id="uploadFile"></@lenInclude>
-                <input id="photo" name="photo" type="hidden">
-
-                <div class="layui-input-inline">
-                    <div id="showImage" style="margin-top: 20px;margin-left: 50px">
-                        <img src="${re.contextPath}/plugin/x-admin/images/bg.png" width="100px" height="100px"
-                             class="layui-upload-img layui-circle">
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">基础信息</legend>
-                </fieldset>
-            </div>
-
-            <#--用户名-->
-            <div class="layui-form-item">
-                <label for="uname" class="layui-form-label">
-                    用户名<span class="x-red">*</span>
-                </label>
-                <div class="layui-input-inline">
-                    <input type="text" id="uname" name="username"
-                           autocomplete="off" class="layui-input" lay-verify="username">
-                </div>
-                <div id="ms" class="layui-form-mid layui-word-aux">
-                    <span class="x-red">*</span><span id="ums">将会成为您唯一的登入名</span>
-                </div>
-            </div>
-
-
-            <div class="layui-form-item">
-                <#--真实姓名-->
-                <@lenInclude  path="/system/base/lineInput.ftl"
-                for="realName"
-                label="真实姓名"
-                id="realName"
-                name="realName"/>
-
-                <#--年龄-->
-                <@lenInclude  path="/system/base/lineInput.ftl"
-                for="age"
-                label="年龄"
-                id="age"
-                name="age"/>
-            </div>
-
-
-            <div class="layui-form-item">
-                <#--密码-->
-                <@lenInclude  path="/system/base/lineInput.ftl"
-                for="password"
-                label="密码"
-                id="password"
-                name="password"
-                require="true"
-                type="password"
-                verify="password"/>
-
-                <#--确认密码-->
-                <@lenInclude  path="/system/base/lineInput.ftl"
-                for="repass"
-                label="确认密码"
-                id="repass"
-                name="repass"
-                require="true"
-                type="password"
-                verify="repass"/>
-            </div>
-
-            <#--邮箱-->
-            <#-- <@lenInclude  path="/system/base/blockInput.ftl"
-             for="email"
-             label="邮箱"
-             id="email"
-             name="email"
-             require="true"
-             verify="email"/>-->
-
-            <#--邮箱-->
-            <div>
-                <label for="email" class="layui-form-label">
-                    <span class="x-red"></span>邮箱
-                </label>
-                <div class="layui-input-block">
-                    <input type="email" id="email" style="width: 93%" name="email"
-                           autocomplete="off" class="layui-input">
-
-                </div>
-            </div>
-
-            <#--角色-->
-            <div class="layui-form-item">
-                <label class="layui-form-label">角色选择</label>
-                <div class="layui-input-block">
-                    <#list boxJson as json>
-                        <input type="checkbox" name="role" title="${json.name}" lay-filter="check" value="${json.id}">
-                    </#list>
-                </div>
-            </div>
-            <div style="height: 60px"></div>
+  <form id="useradd" class="layui-form layui-form-pane" style="padding-left: 20px">
+    <div>
+        <#--头像-->
+      <div class="layui-form-item">
+        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+          <legend style="font-size:16px;">头像上传</legend>
+        </fieldset>
+
+          <#--上传组件-->
+          <@lenInclude path="/system/base/upload.ftl" id="uploadFile"></@lenInclude>
+        <input id="photo" name="photo" type="hidden">
+
+        <div class="layui-input-inline">
+          <div id="showImage" style="margin-top: 20px;margin-left: 50px">
+            <img src="${re.contextPath}/plugin/x-admin/images/bg.png" width="100px" height="100px"
+                 class="layui-upload-img layui-circle">
+          </div>
         </div>
-        <@lenInclude path="system/base/formBtn.ftl"></@lenInclude>
-    </form>
+      </div>
+
+      <div class="layui-form-item">
+        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+          <legend style="font-size:16px;">基础信息</legend>
+        </fieldset>
+      </div>
+
+        <#--用户名-->
+      <div class="layui-form-item">
+        <label for="uname" class="layui-form-label">
+          用户名<span class="x-red">*</span>
+        </label>
+        <div class="layui-input-inline">
+          <input type="text" id="uname" name="username"
+                 autocomplete="off" class="layui-input" lay-verify="username">
+        </div>
+        <div id="ms" class="layui-form-mid layui-word-aux">
+          <span class="x-red">*</span><span id="ums">将会成为您唯一的登入名</span>
+        </div>
+      </div>
+
+
+      <div class="layui-form-item">
+          <#--真实姓名-->
+          <@lenInclude  path="/system/base/lineInput.ftl"
+          for="realName"
+          label="真实姓名"
+          id="realName"
+          name="realName"/>
+
+          <#--年龄-->
+          <@lenInclude  path="/system/base/lineInput.ftl"
+          for="age"
+          label="年龄"
+          id="age"
+          name="age"/>
+      </div>
+
+
+      <div class="layui-form-item">
+          <#--密码-->
+          <@lenInclude  path="/system/base/lineInput.ftl"
+          for="password"
+          label="密码"
+          id="password"
+          name="password"
+          require="true"
+          type="password"
+          verify="password"/>
+
+          <#--确认密码-->
+          <@lenInclude  path="/system/base/lineInput.ftl"
+          for="repass"
+          label="确认密码"
+          id="repass"
+          name="repass"
+          require="true"
+          type="password"
+          verify="repass"/>
+      </div>
+
+        <#--邮箱-->
+        <#-- <@lenInclude  path="/system/base/blockInput.ftl"
+         for="email"
+         label="邮箱"
+         id="email"
+         name="email"
+         require="true"
+         verify="email"/>-->
+
+        <#--邮箱-->
+      <div>
+        <label for="email" class="layui-form-label">
+          <span class="x-red"></span>邮箱
+        </label>
+        <div class="layui-input-block">
+          <input type="email" id="email" style="width: 93%" name="email"
+                 autocomplete="off" class="layui-input">
+
+        </div>
+      </div>
+
+        <#--角色-->
+      <div class="layui-form-item">
+        <label class="layui-form-label">角色选择</label>
+        <div class="layui-input-block">
+            <#list boxJson as json>
+              <input type="checkbox" name="role" title="${json.name}" lay-filter="check" value="${json.id}">
+            </#list>
+        </div>
+      </div>
+      <div style="height: 60px"></div>
+    </div>
+      <@lenInclude path="system/base/formBtn.ftl"></@lenInclude>
+  </form>
 </div>
 
 
 <script>
 
-	layui.use(['form', 'layer', 'upload'], function () {
-		$ = layui.jquery;
-		var form = layui.form;
-
-		/**
-		 * 校验
-		 */
-		form.verify({
-			username: function (value) {
-				if (value.trim() === "") {
-					return "用户名不能为空";
-				}
-				if (/[\u4e00-\u9fa5]/.test(value)) { // 正则表达式检测非中文字符
-					return "用户名不能为中文";
-				}
-				if (!/(.+){3,12}$/.test(value)) {
-					return "用户名必须3到12位";
-				}
-
-			}
-			, password: [/(.+){6,12}$/, '密码必须6到12位']
-			, repass: function (value) {
-				if ($('#password').val() !== $('#repass').val()) {
-					return '两次密码不一致';
-				}
-			}
-			, email: function (value) {
-				if (value !== "") {
-					if (!/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(value)) {
-						return "邮箱格式不正确";
-					}
-				}
-			}
-		});
-
-		/**
-		 * 头像上传
-		 */
-		$('#uploadFile').uploadFile({
-			before: function (obj) {
-				var imgObj = $('#showImage');
-				imgObj.find('img').remove();
-				obj.preview(function (index, file, result) {
-					imgObj.append('<img src="' + result + '" alt="' + file.name + '" width="100px" height="100px" class="layui-upload-img layui-circle">');
-				});
-			}, done: function (res) {
-				$("#photo").val(res.msg);
-			}
-		});
-
-		/**
-		 * 关闭
-		 */
-		$('#close').click(function () {
-			parent.layer.close(parent.layer.getFrameIndex(window.name));
-		});
-
-		/**
-		 * 保存
-		 */
-		form.on('submit(add)', function (data) {
-			var r = document.getElementsByName("role");
-			const role = Array.from(document.getElementsByName("role"))
-				.filter(item => item.checked).map(item => item.value)
-			if (role.length === 0) {
-				Len.error('请选择角色');
-				return false;
-			}
-			data.field.role = role;
-			Len.layerAjax('addUser', data.field, 'userList');
-			return false;
-		});
-
-		form.render();
-	});
+  layui.use(['form', 'layer', 'upload'], function () {
+    $ = layui.jquery;
+    var form = layui.form;
+
+    /**
+     * 校验
+     */
+    form.verify({
+      username: function (value) {
+        if (value.trim() === "") {
+          return "用户名不能为空";
+        }
+        if (/[\u4e00-\u9fa5]/.test(value)) { // 正则表达式检测非中文字符
+          return "用户名不能为中文";
+        }
+        if (!/(.+){3,12}$/.test(value)) {
+          return "用户名必须3到12位";
+        }
+
+      }
+      , password: [/(.+){6,12}$/, '密码必须6到12位']
+      , repass: function (value) {
+        if ($('#password').val() !== $('#repass').val()) {
+          return '两次密码不一致';
+        }
+      }
+      , email: function (value) {
+        if (value !== "") {
+          if (!/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(value)) {
+            return "邮箱格式不正确";
+          }
+        }
+      }
+    });
+
+    /**
+     * 头像上传
+     */
+    $('#uploadFile').uploadFile({
+      before: function (obj) {
+        var imgObj = $('#showImage');
+        imgObj.find('img').remove();
+        obj.preview(function (index, file, result) {
+          imgObj.append('<img src="' + result + '" alt="' + file.name
+              + '" width="100px" height="100px" class="layui-upload-img layui-circle">');
+        });
+      }, done: function (res) {
+        $("#photo").val(res.msg);
+      }
+    });
+
+    /**
+     * 关闭
+     */
+    $('#close').click(function () {
+      parent.layer.close(parent.layer.getFrameIndex(window.name));
+    });
+
+    /**
+     * 保存
+     */
+    form.on('submit(add)', function (data) {
+      const role = Array.from(document.getElementsByName("role"))
+      .filter(item => item.checked).map(item => item.value)
+      if (role.length === 0) {
+        Len.error('请选择角色');
+        return false;
+      }
+      data.field.role = role;
+      Len.layerAjax('addUser', data.field, 'userList');
+      return false;
+    });
+
+    form.render();
+  });
 </script>
 </body>
diff --git a/len-sys/src/main/resources/ftl/system/user/userList.ftl b/len-sys/src/main/resources/ftl/system/user/userList.ftl
index a0d4a3a..c93e83b 100644
--- a/len-sys/src/main/resources/ftl/system/user/userList.ftl
+++ b/len-sys/src/main/resources/ftl/system/user/userList.ftl
@@ -5,13 +5,24 @@
     <div class="search-select">
         <@lenInclude path="/system/base/queryBox.ftl" name="用户名" id="uname" ></@lenInclude>
         <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
+        <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
+        <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
+        <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
+        <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
+        <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
+        <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
+        <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
+        <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
+        <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
     </div>
+	<div style="text-align: center;background-color: #f8f8f8;padding-bottom: 10px">
+		<#include "/system/base/searth.ftl">
+	</div>
 </div>
 
 <#--按钮-->
-<div class="layui-col-md12 len-button">
-    <div class="layui-btn-group  user-bar">
-        <#include "/system/base/searth.ftl">
+<div class="layui-col-md15 len-button" style="width:100%;background: #7979f6;display: flex;justify-content: space-between;flex-wrap: wrap;">
+    <div class="layui-btn-group  user-bar" style="flex: 1;">
         <@lenInclude path="/system/base/btn.ftl" hasPermission="user:select"
         type="add" name="新建" icon="&#xe608;"></@lenInclude>
         <@lenInclude path="/system/base/btn.ftl" hasPermission="user:select"
@@ -21,10 +32,11 @@
         <@lenInclude path="/system/base/btn.ftl" hasPermission="user:repass"
         type="changePwd" name="修改密码" icon="&#xe605;"></@lenInclude>
     </div>
+
 </div>
 
 <#--表格-->
-<table id="userList" width="100%" lay-filter="user"></table>
+<table id="userList" width="100%" lay-filter="user" style="background-color: red;"></table>
 
 <#--toobar-->
 <script type="text/html" id="bar">
diff --git a/len-sys/src/main/resources/plugin/lenos/main.css b/len-sys/src/main/resources/plugin/lenos/main.css
index b52bde5..2dc3690 100644
--- a/len-sys/src/main/resources/plugin/lenos/main.css
+++ b/len-sys/src/main/resources/plugin/lenos/main.css
@@ -68,7 +68,7 @@ html {
     padding: 10px 0;
     position: relative;
     z-index: 99;
-    height: auto;
+    min-height: 30px;
     background-color: #f8f8f8;
 }
 
-- 
Gitee

