diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php
index 90ba46cf0..d69901eba 100644
--- a/app/admin/controller/Menu.php
+++ b/app/admin/controller/Menu.php
@@ -44,6 +44,12 @@ class Menu extends Controller
{
$this->title = '系统菜单管理';
$this->type = $this->get['type'] ?? 'index';
+ // 获取顶级菜单ID
+ $this->pid = $this->get['pid'] ?? '';
+
+ // 查询顶级菜单集合
+ $this->menupList = SystemMenu::mk()->where(['pid' => 0, 'status' => 1])->order('sort desc,id asc')->column('id,pid,title', 'id');
+
SystemMenu::mQuery()->layTable();
}
@@ -66,6 +72,14 @@ class Menu extends Controller
}
// 菜单数据树数据变平化
$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) {
if ($vo['url'] !== '#' && !preg_match('/^(https?:)?(\/\/|\\\\)/i', $vo['url'])) {
$vo['url'] = trim(url($vo['url']) . ($vo['params'] ? "?{$vo['params']}" : ''), '\\/');
diff --git a/app/admin/controller/api/Plugs.php b/app/admin/controller/api/Plugs.php
index aabb79164..f0428b2fb 100644
--- a/app/admin/controller/api/Plugs.php
+++ b/app/admin/controller/api/Plugs.php
@@ -46,7 +46,7 @@ class Plugs extends Controller
}
}
}
- // 读取自定义字体图标
+ // 读取 ThinkAdmin 字体图标
if (empty($this->thinkIcons = $this->app->cache->get('ThinkAdminSelfIcons', []))) {
$style = file_get_contents(syspath('public/static/theme/css/iconfont.css'));
if (preg_match_all('#\.(iconfont-[\w-]+):#', $style, $matches)) {
@@ -55,6 +55,18 @@ class Plugs extends Controller
}
}
}
+ // 读取 extra 自定义字体图标
+ if (empty($this->extraIcons = $this->app->cache->get('ThinkAdminExtraIcons', []))) {
+ $extraIconPath = syspath('public/static/extra/icon/iconfont.css');
+ if (file_exists($extraIconPath)) {
+ $style = file_get_contents($extraIconPath);
+ if (preg_match_all('#\.(iconfont-[\w-]+):#', $style, $matches)) {
+ if (count($this->extraIcons = $matches[1]) > 0) {
+ $this->app->cache->set('ThinkAdminExtraIcons', $this->extraIcons, 60);
+ }
+ }
+ }
+ }
$this->field = $this->app->request->get('field', 'icon');
$this->fetch(dirname(__DIR__, 2) . '/view/api/icon.html');
}
diff --git a/app/admin/view/api/icon.html b/app/admin/view/api/icon.html
index 9100e2987..89e74bab7 100644
--- a/app/admin/view/api/icon.html
+++ b/app/admin/view/api/icon.html
@@ -11,6 +11,9 @@
+ {if file_exists(syspath("public/static/extra/icon/iconfont.css"))}
+
+ {/if}