Skip to content

升级前端至最新版本 pear-admin-layui-4.0.6; layui-2.11.2; #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

升级前端至最新版本 pear-admin-layui-4.0.6; layui-2.11.2; #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bd16811
升级前端至最新版本 pear-admin-layui-4.0.6
qnnp-me Oct 3, 2025
4b619bf
升级前端至最新版本 pear-admin-layui-4.0.6
qnnp-me Oct 3, 2025
667eca6
feat(admin): 添加规则打开方式功能
qnnp-me Oct 3, 2025
99032f3
refactor(role):重构角色管理表格组件
qnnp-me Oct 3, 2025
038b874
feat(table): 更新表格组件样式与视图
qnnp-me Oct 5, 2025
59a121f
chore(index): 更新首页配置文件
qnnp-me Oct 5, 2025
aab41fa
fix(rule):修复规则删除后表格未刷新的问题
qnnp-me Oct 5, 2025
47af4ea
fix(rule):修复规则删除后表格未刷新的问题
qnnp-me Oct 5, 2025
5ea5171
优化菜单管理表单为条件渲染
qnnp-me Oct 5, 2025
0e4a3a3
refactor(admin):重构后台管理静态资源路径
qnnp-me Oct 5, 2025
3059fcc
fix(admin):修复菜单页面加载动画及标签页样式问题
qnnp-me Oct 5, 2025
e354abf
chore(admin): 更新管理员模块配置
qnnp-me Oct 5, 2025
36d94de
chore(admin): 更新管理员模块配置
qnnp-me Oct 5, 2025
453fb31
style(css): 调整全局样式和组件样式
qnnp-me Oct 7, 2025
850b9bc
feat(database): 更新安装脚本优化菜单样式
qnnp-me Oct 9, 2025
33787bb
feat(auth): 更新登录相关样式与脚本
qnnp-me Oct 10, 2025
c7fa7e2
feat(permission): 更新权限控制逻辑
qnnp-me Oct 10, 2025
c1d04e5
chore(TableController): 一键菜单的时候检查是否设置了鉴权中间件
qnnp-me Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions src/plugin/admin/app/controller/RuleController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ function get(Request $request): Response
$item['name'] = $item['title'];
$item['value'] = $item['id'];
$item['icon'] = $item['icon'] ? "layui-icon {$item['icon']}" : '';
$item['openType'] = $item['open_type'] ?? '_iframe';
$item['isParent'] = !!$item['pid'];
$formatted_items[] = $item;
}

Expand All @@ -89,6 +91,9 @@ function get(Request $request): Response
}
$this->removeNotContain($tree_items, 'type', $types);
$menus = $this->empty_filter(Tree::arrayValues($tree_items));
if ($request->get('original')){
return json($menus);
}
return $this->json(0, 'ok', $menus);
}

Expand Down
51 changes: 27 additions & 24 deletions src/plugin/admin/app/controller/TableController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ public function crud(Request $request): Response
$table_basename = strpos($table_name, $prefix) === 0 ? substr($table_name, strlen($prefix)) : $table_name;
$inflector = InflectorFactory::create()->build();
$model_class = $inflector->classify($inflector->singularize($table_basename));
$base_path = '/plugin/admin/app';
$base_path = '/app/admin';
if ($request->method() === 'GET') {
return raw_view('table/crud', [
'table' => $table_name,
Expand All @@ -419,6 +419,10 @@ public function crud(Request $request): Response
return $this->json(1, '控制器和model不能为空');
}

if (str_starts_with($controller_file, $base_path) && !config('middleware.admin')) {
return $this->json(1, "请先设置鉴权中间件：config('middleware.admin')");
}

$controller_info = pathinfo($controller_file);
$model_info = pathinfo($model_file);
$controller_path = Util::filterPath($controller_info['dirname'] ?? '');
Expand Down Expand Up @@ -525,6 +529,7 @@ public function crud(Request $request): Response
$menu->title = $title;
$menu->icon = $icon;
$menu->href = "$url_path_base/index";
$menu->open_type = '_iframe';
$menu->save();

$roles = admin('roles');
Expand Down Expand Up @@ -757,10 +762,10 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $
$html
<div class="layui-form-item layui-inline">
<label class="layui-form-label"></label>
<button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="table-query">
<button class="layui-btn layui-btn-md layui-btn-primary" lay-submit lay-filter="table-query">
<i class="layui-icon layui-icon-search"></i>查询
</button>
<button type="reset" class="pear-btn pear-btn-md" lay-submit lay-filter="table-reset">
<button type="reset" class="layui-btn layui-btn-md" lay-submit lay-filter="table-reset">
<i class="layui-icon layui-icon-refresh"></i>重置
</button>
</div>
Expand All @@ -784,8 +789,7 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $
<head>
<meta charset="utf-8">
<title>浏览页面</title>
<link rel="stylesheet" href="/app/admin/component/pear/css/pear.css" />
<link rel="stylesheet" href="/app/admin/admin/css/reset.css" />
<link rel="stylesheet" href="/app/admin/css/style.css" />
</head>
<body class="pear-container">

Expand All @@ -801,24 +805,24 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $

<!-- 表格顶部工具栏 -->
<script type="text/html" id="table-toolbar">
<button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add" permission="$code_base.insert">
<button class="layui-btn layui-btn-primary layui-btn-md" lay-event="add" permission="$code_base.insert">
<i class="layui-icon layui-icon-add-1"></i>新增
</button>
<button class="pear-btn pear-btn-danger pear-btn-md" lay-event="batchRemove" permission="$code_base.delete">
<button class="layui-btn layui-btn-danger layui-btn-md" lay-event="batchRemove" permission="$code_base.delete">
<i class="layui-icon layui-icon-delete"></i>删除
</button>
</script>

<!-- 表格行工具栏 -->
<script type="text/html" id="table-bar">
<button class="pear-btn pear-btn-xs tool-btn" lay-event="edit" permission="$code_base.update">编辑</button>
<button class="pear-btn pear-btn-xs tool-btn" lay-event="remove" permission="$code_base.delete">删除</button>
<button class="layui-btn layui-btn-xs tool-btn" lay-event="edit" permission="$code_base.update">编辑</button>
<button class="layui-btn layui-btn-xs tool-btn" lay-event="remove" permission="$code_base.delete">删除</button>
</script>

<script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
<script src="/app/admin/component/pear/pear.js"></script>
<script src="/app/admin/admin/js/permission.js"></script>
<script src="/app/admin/admin/js/common.js"></script>
<script src="/app/admin/js/permission.js"></script>
<script src="/app/admin/js/common.js"></script>

<script>

Expand Down Expand Up @@ -905,7 +909,7 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $
title: "新增",
shade: 0.1,
maxmin: true,
area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
area: [common.isModile()?"100%":"750px", common.isModile()?"100%":"625px"],
content: INSERT_URL
});
}
Expand All @@ -918,7 +922,7 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $
title: "修改",
shade: 0.1,
maxmin: true,
area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
area: [common.isModile()?"100%":"750px", common.isModile()?"100%":"625px"],
content: UPDATE_URL + "?" + PRIMARY_KEY + "=" + value
});
}
Expand Down Expand Up @@ -999,9 +1003,9 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $
<head>
<meta charset="UTF-8">
<title>新增页面</title>
<link rel="stylesheet" href="/app/admin/component/pear/css/pear.css" />
<link rel="stylesheet" href="/app/admin/css/style.css" />
<link rel="stylesheet" href="/app/admin/component/jsoneditor/css/jsoneditor.css" />
<link rel="stylesheet" href="/app/admin/admin/css/reset.css" />
<link rel="stylesheet" href="/app/admin/css/form-box.css" />
</head>
<body>

Expand All @@ -1015,11 +1019,11 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $

<div class="bottom">
<div class="button-container">
<button type="submit" class="pear-btn pear-btn-primary pear-btn-md" lay-submit=""
<button type="submit" class="layui-btn layui-btn-primary layui-btn-md" lay-submit=""
lay-filter="save">
提交
</button>
<button type="reset" class="pear-btn pear-btn-md">
<button type="reset" class="layui-btn layui-btn-md">
重置
</button>
</div>
Expand All @@ -1030,7 +1034,7 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $
<script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
<script src="/app/admin/component/pear/pear.js"></script>
<script src="/app/admin/component/jsoneditor/jsoneditor.js"></script>
<script src="/app/admin/admin/js/permission.js"></script>
<script src="/app/admin/js/permission.js"></script>

<script>

Expand Down Expand Up @@ -1088,10 +1092,9 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $
<head>
<meta charset="UTF-8">
<title>更新页面</title>
<link rel="stylesheet" href="/app/admin/component/pear/css/pear.css" />
<link rel="stylesheet" href="/app/admin/css/style.css" />
<link rel="stylesheet" href="/app/admin/component/jsoneditor/css/jsoneditor.css" />
<link rel="stylesheet" href="/app/admin/admin/css/reset.css" />

<link rel="stylesheet" href="/app/admin/css/form-box.css" />
</head>
<body>

Expand All @@ -1105,10 +1108,10 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $

<div class="bottom">
<div class="button-container">
<button type="submit" class="pear-btn pear-btn-primary pear-btn-md" lay-submit="" lay-filter="save">
<button type="submit" class="layui-btn layui-btn-primary layui-btn-md" lay-submit="" lay-filter="save">
提交
</button>
<button type="reset" class="pear-btn pear-btn-md">
<button type="reset" class="layui-btn layui-btn-md">
重置
</button>
</div>
Expand All @@ -1119,7 +1122,7 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $
<script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
<script src="/app/admin/component/pear/pear.js"></script>
<script src="/app/admin/component/jsoneditor/jsoneditor.js"></script>
<script src="/app/admin/admin/js/permission.js"></script>
<script src="/app/admin/js/permission.js"></script>

<script>

Expand Down
1 change: 1 addition & 0 deletions src/plugin/admin/app/model/Rule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* @property string $updated_at 更新时间
* @property string $href url
* @property integer $type 类型
* @property integer $open_type 菜单打开方式
* @property integer $weight 排序
*/
class Rule extends Base
Expand Down
17 changes: 8 additions & 9 deletions src/plugin/admin/app/view/account/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
<head>
<meta charset="UTF-8">
<title></title>
<link rel="stylesheet" href="/app/admin/component/layui/css/layui.css?v=2.8.12" />
<link rel="stylesheet" href="/app/admin/component/pear/css/pear.css" />
<link rel="stylesheet" href="/app/admin/admin/css/reset.css" />
<link rel="stylesheet" href="/app/admin/css/style.css" />
</head>
<body class="pear-container">
<style>
Expand Down Expand Up @@ -48,10 +46,10 @@
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<button type="submit" class="pear-btn pear-btn-primary pear-btn-md" lay-submit="" lay-filter="saveBaseInfo">
<button type="submit" class="layui-btn layui-btn-primary layui-btn-md" lay-submit="" lay-filter="saveBaseInfo">
提交
</button>
<button type="reset" class="pear-btn pear-btn-md">
<button type="reset" class="layui-btn layui-btn-md">
重置
</button>
</div>
Expand Down Expand Up @@ -83,10 +81,10 @@
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<button type="submit" class="pear-btn pear-btn-primary pear-btn-md" lay-submit="" lay-filter="savePassword">
<button type="submit" class="layui-btn layui-btn-primary layui-btn-md" lay-submit="" lay-filter="savePassword">
提交
</button>
<button type="reset" class="pear-btn pear-btn-md">
<button type="reset" class="layui-btn layui-btn-md">
重置
</button>
</div>
Expand All @@ -104,10 +102,11 @@

<script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
<script src="/app/admin/component/pear/pear.js"></script>
<script src="/app/admin/admin/js/permission.js"></script>
<script src="/app/admin/js/common.js"></script>
<script src="/app/admin/js/permission.js"></script>
<script>

layui.use(["form", "popup"], function () {
layui.use([], function () {
let form = layui.form;
let $ = layui.$;
$.ajax({
Expand Down
10 changes: 5 additions & 5 deletions src/plugin/admin/app/view/account/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title>登录</title>
<!-- 样 式 文 件 -->
<link rel="stylesheet" href="/app/admin/component/pear/css/pear.css" />
<link rel="stylesheet" href="/app/admin/admin/css/pages/login.css" />
<link rel="stylesheet" href="/app/admin/css/style.css" />
<link rel="stylesheet" href="/app/admin/css/login.css" />
</head>
<!-- 代 码 结 构 -->
<body background="/app/admin/admin/images/background.svg" style="background-size: cover;">
Expand All @@ -26,7 +25,7 @@
<img class="codeImage" width="120px"/>
</div>
<div class="layui-form-item">
<button type="submit" class="pear-btn pear-btn-primary login" lay-submit lay-filter="login">
<button type="submit" class="layui-btn login layui-btn-primary" lay-submit lay-filter="login">
登 入
</button>
</div>
Expand All @@ -42,8 +41,9 @@
<!-- 资 源 引 入 -->
<script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
<script src="/app/admin/component/pear/pear.js"></script>
<script src="/app/admin/js/common.js"></script>
<script>
layui.use(['form', 'button', 'popup', 'layer', 'theme', 'admin'], function() {
layui.use(["popup"], function() {

var $ = layui.$, layer = layui.layer, form = layui.form;
function switchCaptcha() {
Expand Down
23 changes: 11 additions & 12 deletions src/plugin/admin/app/view/admin/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<head>
<meta charset="utf-8">
<title>浏览页面</title>
<link rel="stylesheet" href="/app/admin/component/pear/css/pear.css" />
<link rel="stylesheet" href="/app/admin/admin/css/reset.css" />
<link rel="stylesheet" href="/app/admin/css/style.css" />
</head>
<body class="pear-container">

Expand Down Expand Up @@ -55,10 +54,10 @@

<div class="layui-form-item layui-inline">
<label class="layui-form-label"></label>
<button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="table-query">
<button class="layui-btn layui-btn-md layui-btn-primary" lay-submit lay-filter="table-query">
<i class="layui-icon layui-icon-search"></i>查询
</button>
<button type="reset" class="pear-btn pear-btn-md" lay-submit lay-filter="table-reset">
<button type="reset" class="layui-btn layui-btn-md" lay-submit lay-filter="table-reset">
<i class="layui-icon layui-icon-refresh"></i>重置
</button>
</div>
Expand All @@ -79,26 +78,26 @@

<!-- 表格顶部工具栏 -->
<script type="text/html" id="table-toolbar">
<button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add" permission="app.admin.admin.insert">
<button class="layui-btn layui-btn-primary layui-btn-md" lay-event="add" permission="app.admin.admin.insert">
<i class="layui-icon layui-icon-add-1"></i>新增
</button>
<button class="pear-btn pear-btn-danger pear-btn-md" lay-event="batchRemove" permission="app.admin.admin.delete">
<button class="layui-btn layui-btn-danger layui-btn-md" lay-event="batchRemove" permission="app.admin.admin.delete">
<i class="layui-icon layui-icon-delete"></i>删除
</button>
</script>

<!-- 表格行工具栏 -->
<script type="text/html" id="table-bar">
{{# if(d.show_toolbar){ }}
<button class="pear-btn pear-btn-xs tool-btn" lay-event="edit" permission="app.admin.admin.update">编辑</button>
<button class="pear-btn pear-btn-xs tool-btn" lay-event="remove" permission="app.admin.admin.delete">删除</button>
<button class="layui-btn layui-btn-xs tool-btn" lay-event="edit" permission="app.admin.admin.update">编辑</button>
<button class="layui-btn layui-btn-xs tool-btn" lay-event="remove" permission="app.admin.admin.delete">删除</button>
{{# } }}
</script>

<script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
<script src="/app/admin/component/pear/pear.js"></script>
<script src="/app/admin/admin/js/permission.js"></script>
<script src="/app/admin/admin/js/common.js"></script>
<script src="/app/admin/js/permission.js"></script>
<script src="/app/admin/js/common.js"></script>
<script>

// 相关常量
Expand Down Expand Up @@ -333,7 +332,7 @@
type: 2,
title: "新增",
shade: 0.1,
area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
area: [common.isModile()?"100%":"750px", common.isModile()?"100%":"625px"],
content: INSERT_URL
});
}
Expand All @@ -345,7 +344,7 @@
type: 2,
title: "修改",
shade: 0.1,
area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
area: [common.isModile()?"100%":"750px", common.isModile()?"100%":"625px"],
content: UPDATE_URL + "?" + PRIMARY_KEY + "=" + value
});
}
Expand Down
Loading