From c87a7f9f3c86d05127260d66e93dbae9ab9c8fbc Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 20 Jan 2022 10:43:23 +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

优化fieldlist触发事件
---
 application/admin/view/addon/config.html |  2 +-
 public/assets/js/require-form.js         | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/application/admin/view/addon/config.html b/application/admin/view/addon/config.html
index b9283054..3abf772b 100644
--- a/application/admin/view/addon/config.html
+++ b/application/admin/view/addon/config.html
@@ -28,7 +28,7 @@
                     <table class="table table-striped table-config">
                         <tbody>
                         {foreach name="$addon.config" id="item"}
-                        {if ((!isset($item['group']) || $item['group']=='') && $key=='other') || (isset($item['group']) && $item['group']==$groupName)}
+                        {if ((!isset($item['group']) || $item['group']=='') && $groupName=='other') || (isset($item['group']) && $item['group']==$groupName)}
                         <tr data-favisible="{$item.visible|default=''|htmlentities}" data-name="{$item.name}">
                             <td width="15%">{$item.title}</td>
                             <td>
diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js
index 11be38aa..409c0755 100755
--- a/public/assets/js/require-form.js
+++ b/public/assets/js/require-form.js
@@ -351,10 +351,13 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
                             }
                             obj.attr("fieldlist-item", true);
                             obj.insertAfter($(tagName + "[fieldlist-item]", container).length > 0 ? $(tagName + "[fieldlist-item]:last", container) : $(tagName + ":first", container));
-                            //兼容旧版本事件
-                            $(".btn-append,.append", container).trigger("fa.event.appendfieldlist", obj);
-                            //新版本事件
-                            container.trigger("fa.event.appendfieldlist", obj);
+                            if ($(".btn-append,.append", container).length > 0) {
+                                //兼容旧版本事件
+                                $(".btn-append,.append", container).trigger("fa.event.appendfieldlist", obj);
+                            } else {
+                                //新版本事件
+                                container.trigger("fa.event.appendfieldlist", obj);
+                            }
                             return obj;
                         };
                         var fieldlist = $(".fieldlist", form);