blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

Pre Merge pull request !43 from Mian/menu-edit

Browse Source
This commit is contained in:
Mian 2025-02-09 04:45:03 +00:00 committed by Gitee
commit f0cc9eeeb1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/admin/controller/Menu.php
View File

@ -44,6 +44,13 @@ class Menu extends Controller
{ {
$this->title = '系统菜单管理'; $this->title = '系统菜单管理';
$this->type = $this->get['type'] ?? 'index'; $this->type = $this->get['type'] ?? 'index';
// 获取顶级菜单ID
$this->pid = $this->get['pid'] ?? '';
// 查询顶级菜单集合
$this->menup_list = SystemMenu::mk()->where(['pid' => 0, 'status' => 1])->order('sort desc,id asc')->column('id,pid,title', 'id');
SystemMenu::mQuery()->layTable(); SystemMenu::mQuery()->layTable();
} }
@ -66,6 +73,14 @@ class Menu extends Controller
} }
// 菜单数据树数据变平化 // 菜单数据树数据变平化
$data = DataExtend::arr2table($data); $data = DataExtend::arr2table($data);
// 过滤非当前顶级菜单的下级菜单,并重新索引数组
if ($this->type === 'index' && $this->pid) {
$data = array_values(array_filter($data, function ($item) {
return strpos($item['spp'], ",{$this->pid},") !== false;
}));
}
foreach ($data as &$vo) { foreach ($data as &$vo) {
if ($vo['url'] !== '#' && !preg_match('/^(https?:)?(\/\/|\\\\)/i', $vo['url'])) { if ($vo['url'] !== '#' && !preg_match('/^(https?:)?(\/\/|\\\\)/i', $vo['url'])) {
$vo['url'] = trim(url($vo['url']) . ($vo['params'] ? "?{$vo['params']}" : ''), '\\/'); $vo['url'] = trim(url($vo['url']) . ($vo['params'] ? "?{$vo['params']}" : ''), '\\/');

9
app/admin/controller/api/Plugs.php
View File

@ -55,6 +55,15 @@ class Plugs extends Controller
} }
} }
} }
// 读取extra自定义字体图标
if (empty($this->extraIcons = $this->app->cache->get('ThinkAdminExtraIcons', []))) {
$style = file_get_contents(syspath('public/static/extra/icon/iconfont.css'));
if (preg_match_all('#\.(iconfont-[\w-]+):#', $style, $matches)) {
if (count($this->thinkIcons = $matches[1]) > 0) {
$this->app->cache->set('ThinkAdminExtraIcons', $this->extraIcons, 60);
}
}
}
$this->field = $this->app->request->get('field', 'icon'); $this->field = $this->app->request->get('field', 'icon');
$this->fetch(dirname(__DIR__, 2) . '/view/api/icon.html'); $this->fetch(dirname(__DIR__, 2) . '/view/api/icon.html');
} }

9
app/admin/view/api/icon.html
View File

@ -2,7 +2,7 @@
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{block name="title"}{$title|default=''}{if !empty($title)} · {/if}{:sysconf('site_name')}{/block}</title> <title>{block name="title"}{$title|default=''}{if !empty($title)} . {/if}{:sysconf('site_name')}{/block}</title>
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
@ -10,6 +10,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1">
<link rel="stylesheet" href="__ROOT__/static/theme/css/iconfont.css?at={:date('md')}"> <link rel="stylesheet" href="__ROOT__/static/theme/css/iconfont.css?at={:date('md')}">
<link rel="stylesheet" href="__ROOT__/static/extra/icon/iconfont.css?at={:date('md')}">
<link rel="stylesheet" href="__ROOT__/static/plugs/layui/css/layui.css?v={:date('ymd')}"> <link rel="stylesheet" href="__ROOT__/static/plugs/layui/css/layui.css?v={:date('ymd')}">
<style> <style>
::-webkit-input-placeholder { ::-webkit-input-placeholder {
@ -96,6 +97,12 @@
<body> <body>
<ul> <ul>
{foreach $extraIcons??[] as $icon}
<li>
<i class="iconfont {$icon}"></i>
<div class="icon-title">{$icon}</div>
</li>
{/foreach}
{foreach $layuiIcons??[] as $icon} {foreach $layuiIcons??[] as $icon}
<li> <li>
<i class="layui-icon {$icon}"></i> <i class="layui-icon {$icon}"></i>

10
app/admin/view/menu/index.html
View File

@ -17,12 +17,16 @@
{block name="content"} {block name="content"}
<div class="layui-tab layui-tab-card"> <div class="layui-tab layui-tab-card">
<ul class="layui-tab-title"> <ul class="layui-tab-title">
{foreach ['index'=>lang('系统菜单'),'recycle'=>lang('回 收 站')] as $k=>$v} {foreach ['index'=>lang('全部菜单'),'recycle'=>lang('回 收 站')] as $k=>$v}
{if isset($type) and $type eq $k} {if isset($type) and $type eq $k and isset($pid) and $pid == ''}
<li class="layui-this" data-open="{:url('index')}?type={$k}">{$v}</li> <li class="layui-this" data-open="{:url('index')}?type={$k}">{$v}</li>
{else} {else}
<li data-open="{:url('index')}?type={$k}">{$v}</li> <li data-open="{:url('index')}?type={$k}">{$v}</li>
{/if}{/foreach} {/if}{/foreach}
<!--{foreach $menup_list as $k=>$v}-->
<li data-open="{:url('index')}?type=index&pid={$v.id}" {if isset($pid) and $pid eq $v.id}class="layui-this"{/if} >{$v.title}</li>
<!--{/foreach}-->
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
<table id="MenuTable" data-url="{:request()->url()}" data-target-search="form.form-search"></table> <table id="MenuTable" data-url="{:request()->url()}" data-target-search="form.form-search"></table>
@ -34,7 +38,7 @@
$('#MenuTable').layTable({ $('#MenuTable').layTable({
even: true, height: 'full', page: false, even: true, height: 'full', page: false,
sort: {field: 'sort desc,id', type: 'asc'}, sort: {field: 'sort desc,id', type: 'asc'},
where: {type: '{$type|default="index"}'}, where: {type: '{$type|default="index"}', pid: '{$pid|default=""}'},
filter: function (items) { filter: function (items) {
var type = this.where.type; var type = this.where.type;
return items.filter(function (item) { return items.filter(function (item) {