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] 修复插件安装后不显示配置按钮的BUG 新增dropdown不消失的BUG 新增移动端点击空白处菜单隐藏的功能
---
.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 e3ef396..adb1922 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 0526109..804e2e9 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 6bafb08..7d5624b 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);
--
libgit2 0.24.0