bwadmin/pear-admin-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: （步骤备份）更新 Pear Admin 框架版本与 Pear Admin Layui 一致，尝试重写页面

Browse Source
This commit is contained in:
wojiaoyishang
2025-01-19 20:03:18 +08:00
parent 43370ad078
commit d4a1b0ec57
63 changed files with 105722 additions and 2633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/system/user/add.html
+27 -8
View File
@@ -12,25 +12,32 @@
<div class="layui-form-item">
<label class="layui-form-label">账号</label>
<div class="layui-input-block">
<input type="text" name="username" lay-verify="title" autocomplete="off" placeholder="请输入标题"
<input type="text" name="username" lay-verify="title" autocomplete="off" placeholder="用户名"
class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">姓名</label>
<div class="layui-input-block">
<input type="text" name="realName" lay-verify="title" autocomplete="off" placeholder="请输入标题"
<input type="text" name="realName" lay-verify="title" autocomplete="off" placeholder="用户姓名"
class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">密码</label>
<div class="layui-input-block">
<input type="text" name="password" lay-verify="title" autocomplete="off" placeholder="请输入标题"
<input type="password" name="password" lay-verify="title" autocomplete="off" placeholder="用户密码"
class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">部门</label>
<div class="layui-input-block">
<ul id="selectParent" name="deptId" class="dtree" data-id="0"></ul>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">角色</label>
<div class="layui-input-block">
@@ -48,11 +55,11 @@
</div>
<div class="bottom">
<div class="button-container">
<button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit="" lay-filter="user-save">
<button type="submit" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="user-save">
<i class="layui-icon layui-icon-ok"></i>
提交
</button>
<button type="reset" class="pear-btn pear-btn-sm">
<button type="reset" class="layui-btn layui-btn-primary layui-btn-sm">
<i class="layui-icon layui-icon-refresh"></i>
重置
</button>
@@ -61,9 +68,22 @@
</form>
{% include 'system/common/footer.html' %}
<script>
layui.use(['form', 'jquery'], function () {
layui.use(['form', 'jquery', 'dtree'], function () {
let form = layui.form
let $ = layui.jquery
let dtree = layui.dtree
dtree.renderSelect({
elem: '#selectParent',
url: '/system/dept/tree',
method: 'get',
selectInputName: {nodeId: 'deptId', context: 'deptName'},
skin: 'layui',
dataFormat: 'list',
response: {treeId: 'id', parentId: 'parent_id', title: 'dept_name'}
})
form.on('submit(user-save)', function (data) {
let roleIds = ''
$('input[type=checkbox]:checked').each(function () {
@@ -93,7 +113,6 @@
})
})
</script>
<script>
</script>
</body>
</html>
templates/system/user/center.html
+2 -3
View File
@@ -2,7 +2,6 @@
<html>
<head>
<title>个人中心</title>
{% include 'system/common/header.html' %}
<style>
.layui-form-item {
margin-top: 17px !important;
@@ -82,10 +81,10 @@
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<button class="pear-btn pear-btn-primary pear-btn-sm" lay-submit
<button class="layui-btn layui-btn-primary layui-btn-sm" lay-submit
lay-filter="user-update">修改资料
</button>
<button class="pear-btn pear-btn-sm edit-password">更改密码</button>
<button class="layui-btn layui-btn-sm edit-password">更改密码</button>
</div>
</div>
</form>
templates/system/user/edit.html
+7 -8
View File
@@ -1,6 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<head>
<title>用户编辑</title>
{% include 'system/common/header.html' %}
@@ -14,24 +12,25 @@
<label class="layui-form-label">编号</label>
<div class="layui-input-block">
<input type="text" value="{{ user.id }}" name="userId" lay-verify="title"
autocomplete="off" placeholder="请输入标题" class="layui-input">
autocomplete="off" placeholder="用户编号" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">账号</label>
<div class="layui-input-block">
<input type="text" value="{{ user.username }}" name="username" lay-verify="title"
autocomplete="off" placeholder="请输入标题" class="layui-input">
autocomplete="off" placeholder="登录账号" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">姓名</label>
<div class="layui-input-block">
<input type="text" value="{{ user.realname }}" name="realName" lay-verify="title"
autocomplete="off" placeholder="请输入标题"
autocomplete="off" placeholder="用户姓名"
class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">部门</label>
<div class="layui-input-block">
@@ -39,7 +38,6 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">角色</label>
<div class="layui-input-block">
@@ -57,12 +55,12 @@
</div>
<div class="bottom">
<div class="button-container">
<button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit=""
<button type="submit" class="layui-btn layui-btn-sm" lay-submit=""
lay-filter="user-update">
<i class="layui-icon layui-icon-ok"></i>
提交
</button>
<button type="reset" class="pear-btn pear-btn-sm">
<button type="reset" class="layui-btn layui-btn-primary layui-btn-sm">
<i class="layui-icon layui-icon-refresh"></i>
重置
</button>
@@ -86,6 +84,7 @@
response: {treeId: 'id', parentId: 'parent_id', title: 'dept_name'},
selectInitVal: "{{ user.dept_id }}"
})
form.on('submit(user-update)', function (data) {
let roleIds = ''
$('input[type=checkbox]:checked').each(function () {
templates/system/user/edit_password.html
+5 -5
View File
@@ -13,21 +13,21 @@
<label class="layui-form-label">旧密码</label>
<div class="layui-input-block">
<input type="password" name="oldPassword" lay-verify="title" autocomplete="off"
placeholder="请输入标题" class="layui-input">
placeholder="请输入旧密码" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">新密码</label>
<div class="layui-input-block">
<input type="password" name="newPassword" lay-verify="title" autocomplete="off"
placeholder="请输入标题" class="layui-input">
placeholder="请输入新密码" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">确认密码</label>
<div class="layui-input-block">
<input type="password" name="confirmPassword" lay-verify="title" autocomplete="off"
placeholder="请输入标题" class="layui-input">
placeholder="请重复输入新密码" class="layui-input">
</div>
</div>
</div>
@@ -35,12 +35,12 @@
</div>
<div class="bottom">
<div class="button-container">
<button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit=""
<button type="submit" class="layui-btn layui-btn-sm" lay-submit=""
lay-filter="edit-password">
<i class="layui-icon layui-icon-ok"></i>
提交
</button>
<button type="reset" class="pear-btn pear-btn-sm">
<button type="reset" class="layui-btn layui-btn-primary layui-btn-sm">
<i class="layui-icon layui-icon-refresh"></i>
重置
</button>
templates/system/user/main.html
+7 -9
View File
@@ -2,7 +2,6 @@
<html>
<head>
<title>用户管理</title>
{% include 'system/common/header.html' %}
<link rel="stylesheet" href="{{ url_for('static', filename='system/admin/css/other/user.css') }}"/>
</head>
<body class="pear-container">
@@ -19,11 +18,11 @@
<div class="layui-input-inline">
<input type="text" name="username" placeholder="" class="layui-input">
</div>
<button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="user-query">
<button class="layui-btn layui-btn-md layui-btn-primary" lay-submit lay-filter="user-query">
<i class="layui-icon layui-icon-search"></i>
查询
</button>
<button type="reset" class="pear-btn pear-btn-md">
<button type="reset" class="layui-btn layui-btn-md">
<i class="layui-icon layui-icon-refresh"></i>
重置
</button>
@@ -54,12 +53,12 @@
{# 表格操作 #}
<script type="text/html" id="user-toolbar">
{% if authorize("system:user:add") %}
<button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add">
<button class="layui-btn layui-btn-primary layui-btn-sm" lay-event="add">
<i class="pear-icon pear-icon-add"></i>
新增
</button>
{% endif %}
<button class="pear-btn pear-btn-md" lay-event="collasped">
<button class="layui-btn layui-btn-sm" lay-event="collasped">
<i class="pear-icon pear-icon-modular"></i>
高级
</button>
@@ -68,11 +67,11 @@
{# 用户修改操作 #}
<script type="text/html" id="user-bar">
{% if authorize("system:user:edit") %}
<button class="pear-btn pear-btn-primary pear-btn-sm" lay-event="edit"><i class="pear-icon pear-icon-edit"> 编辑</i>
<button class="layui-btn layui-btn-xs" lay-event="edit"><i class="pear-icon pear-icon-edit"> 编辑</i>
</button>
{% endif %}
{% if authorize("system:user:remove") %}
<button class="pear-btn pear-btn-danger pear-btn-sm" lay-event="remove"><i
<button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove"><i
class="pear-icon pear-icon-ashbin"> 删除</i>
</button>
{% endif %}
@@ -94,7 +93,6 @@
</script>
{% endraw %}
{% include 'system/common/footer.html' %}
<script>
layui.use(['table', 'dtree', 'form', 'jquery', 'popup', 'common'], function () {
@@ -108,7 +106,7 @@
// 表格数据
let cols = [
[
{title: 'id', field: 'id', align: 'center'},
{title: '编号', field: 'id', align: 'center'},
{title: '姓名', field: 'realname', align: 'center', width: 110},
{title: '账号', field: 'username', align: 'center'},
{title: '部门', field: 'dept_name', align: 'center'},