From 2401cd3ba1d6f61fbc099da9504ebb96dc6395da Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Fri, 21 Jan 2022 11:36:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=92=E4=BB=B6=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Addon/stubs/config.stub |  6 +++++-
 application/admin/controller/Addon.php            |  7 ++++++-
 application/admin/view/addon/config.html          | 10 +++++-----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/application/admin/command/Addon/stubs/config.stub b/application/admin/command/Addon/stubs/config.stub
index 034d7376..dafbec93 100644
--- a/application/admin/command/Addon/stubs/config.stub
+++ b/application/admin/command/Addon/stubs/config.stub
@@ -8,12 +8,16 @@ return [
         'title'   => '用户名',
         //类型
         'type'    => 'string',
+        //分组
+        'group'    => '',
+        //动态显示
+        'visible'    => '',
         //数据字典
         'content' => [
         ],
         //值
         'value'   => '',
-        //验证规则 
+        //验证规则
         'rule'    => 'required',
         //错误消息
         'msg'     => '',
diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php
index 365b60f8..720c977c 100644
--- a/application/admin/controller/Addon.php
+++ b/application/admin/controller/Addon.php
@@ -96,8 +96,13 @@ class Addon extends Backend
         $tips = [];
         $groupList = [];
         foreach ($config as $index => &$item) {
+            //如果有设置分组
+            if (isset($item['group']) && $item['group']) {
+                if (!in_array($item['group'], $groupList)) {
+                    $groupList["custom" . (count($groupList) + 1)] = $item['group'];
+                }
+            }
             if ($item['name'] == '__tips__') {
-                $groupList = $item['content'] ? $item['content'] : [];
                 $tips = $item;
                 unset($config[$index]);
             }
diff --git a/application/admin/view/addon/config.html b/application/admin/view/addon/config.html
index 8b96f6f2..f996c61a 100644
--- a/application/admin/view/addon/config.html
+++ b/application/admin/view/addon/config.html
@@ -9,8 +9,8 @@
     {/if}
 
     <div class="panel panel-default panel-intro">
-        {if $groupList}
-        <div class="panel-heading">
+        {if count($groupList)>1}
+        <div class="panel-heading mb-3">
             <ul class="nav nav-tabs nav-group">
                 <li class="active"><a href="#all" data-toggle="tab">全部</a></li>
                 {foreach name="groupList" id="tab"}
@@ -20,15 +20,15 @@
         </div>
         {/if}
 
-        <div class="panel-body {if !$groupList}no-padding{/if}">
+        <div class="panel-body no-padding">
             <div id="myTabContent" class="tab-content">
                 {foreach name="groupList" id="group" key="groupName"}
                 <div class="tab-pane fade active in" id="tab-{$groupName}">
 
-                    <table class="table table-striped table-config">
+                    <table class="table table-striped table-config mb-0">
                         <tbody>
                         {foreach name="$addon.config" id="item"}
-                        {if ((!isset($item['group']) || $item['group']=='') && $groupName=='other') || (isset($item['group']) && $item['group']==$groupName)}
+                        {if ((!isset($item['group']) || $item['group']=='') && $groupName=='other') || (isset($item['group']) && $item['group']==$group)}
                         <tr data-favisible="{$item.visible|default=''|htmlentities}" data-name="{$item.name}" class="{if $item.visible??''}hidden{/if}">
                             <td width="15%">{$item.title}</td>
                             <td>