From e927a7b09dbb569165258ed0f583d54155da1a42 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 10 Aug 2017 12:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=92=E4=BB=B6=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E5=90=8E=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84BUG=20=E6=96=B0=E5=A2=9Edropdown?=
 =?UTF-8?q?=E4=B8=8D=E6=B6=88=E5=A4=B1=E7=9A=84BUG=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=82=B9=E5=87=BB=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E5=A4=84=E8=8F=9C=E5=8D=95=E9=9A=90=E8=97=8F=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                             | 1 +
 application/admin/controller/Addon.php | 7 +++++--
 public/assets/js/backend/index.js      | 8 ++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e3ef3960..adb19223 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /nbproject/
+/addons/
 .idea
 composer.lock
 *.log
diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php
index 0526109b..804e2e9d 100644
--- a/application/admin/controller/Addon.php
+++ b/application/admin/controller/Addon.php
@@ -122,7 +122,9 @@ class Addon extends Backend
         try
         {
             Service::install($name, $force);
-            $this->success("安装成功", null, ['addon' => get_addon_info($name)]);
+            $info = get_addon_info($name);
+            $info['config'] = get_addon_config($name) ? 1 : 0;
+            $this->success("安装成功", null, ['addon' => $info]);
         }
         catch (AddonException $e)
         {
@@ -251,7 +253,8 @@ class Addon extends Backend
 
                     //导入SQL
                     Service::importsql($name);
-
+                    
+                    $info['config'] = get_addon_config($name) ? 1 : 0;
                     $this->success("插件安装成功，你需要手动启用该插件，使之生效", null, ['addon' => $info]);
                 }
                 catch (Exception $e)
diff --git a/public/assets/js/backend/index.js b/public/assets/js/backend/index.js
index 6bafb087..7d5624b7 100755
--- a/public/assets/js/backend/index.js
+++ b/public/assets/js/backend/index.js
@@ -14,6 +14,14 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
                 e.stopPropagation();
             });
 
+            //修复在移除窗口时下拉框不隐藏的BUG
+            $(window).on("blur", function () {
+                $("[data-toggle='dropdown']").parent().removeClass("open");
+                if ($("body").hasClass("sidebar-open")) {
+                    $(".sidebar-toggle").trigger("click");
+                }
+            });
+
             //快捷搜索
             $(".menuresult").width($("form.sidebar-form > .input-group").width());
             var isAndroid = /(android)/i.test(navigator.userAgent);