diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php index ae5b5f83..8fc7a886 100644 --- a/application/admin/controller/Addon.php +++ b/application/admin/controller/Addon.php @@ -95,19 +95,24 @@ class Addon extends Backend } $tips = []; $groupList = []; + $ungroupList = []; foreach ($config as $index => &$item) { //如果有设置分组 if (isset($item['group']) && $item['group']) { if (!in_array($item['group'], $groupList)) { $groupList["custom" . (count($groupList) + 1)] = $item['group']; } + } elseif ($item['name'] != '__tips__') { + $ungroupList[] = $item['name']; } if ($item['name'] == '__tips__') { $tips = $item; unset($config[$index]); } } - $groupList['other'] = '其它'; + if ($ungroupList) { + $groupList['other'] = '其它'; + } $this->view->assign("groupList", $groupList); $this->view->assign("addon", ['info' => $info, 'config' => $config, 'tips' => $tips]); $configFile = ADDON_PATH . $name . DS . 'config.html'; diff --git a/bower.json b/bower.json index ba0a76d5..4a083438 100755 --- a/bower.json +++ b/bower.json @@ -27,7 +27,7 @@ "fastadmin-cxselect": "~1.4.0", "fastadmin-dragsort": "~1.0.0", "fastadmin-addtabs": "~1.0.8", - "fastadmin-selectpage": "~1.0.6", + "fastadmin-selectpage": "~1.0.12", "fastadmin-layer": "~3.5.1", "bootstrap-slider": "*" }