From 23bfaa530be92bccafbe1651903f16784189e54a Mon Sep 17 00:00:00 2001 From: HibiKier <775757368@qq.com> Date: Thu, 15 Aug 2024 23:52:19 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhenxun/builtin_plugins/help/_utils.py | 2 +- zhenxun/builtin_plugins/init/init_plugin.py | 4 ++++ zhenxun/models/plugin_info.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/zhenxun/builtin_plugins/help/_utils.py b/zhenxun/builtin_plugins/help/_utils.py index 1f162ca4..2de661fb 100644 --- a/zhenxun/builtin_plugins/help/_utils.py +++ b/zhenxun/builtin_plugins/help/_utils.py @@ -47,7 +47,7 @@ class HelpImageBuild: """ if not self._data: self._data = await PluginInfo.filter( - menu_type__not_isnull=True, + menu_type__not="", load_status=True, plugin_type__in=[PluginType.NORMAL, PluginType.HIDDEN], ) diff --git a/zhenxun/builtin_plugins/init/init_plugin.py b/zhenxun/builtin_plugins/init/init_plugin.py index 49ec8dfb..f65913e1 100644 --- a/zhenxun/builtin_plugins/init/init_plugin.py +++ b/zhenxun/builtin_plugins/init/init_plugin.py @@ -48,6 +48,10 @@ async def _handle_setting( setting = extra_data.setting or PluginSetting() if metadata.type == "library": extra_data.plugin_type = PluginType.HIDDEN + if ( + extra_data.plugin_type == PluginType.HIDDEN + and extra_data.plugin_type != "功能" + ): extra_data.menu_type = "" plugin_list.append( PluginInfo( diff --git a/zhenxun/models/plugin_info.py b/zhenxun/models/plugin_info.py index 0eaea950..e5eb1b21 100644 --- a/zhenxun/models/plugin_info.py +++ b/zhenxun/models/plugin_info.py @@ -33,7 +33,7 @@ class PluginInfo(Model): """进群默认开关状态""" limit_superuser = fields.BooleanField(default=False, description="是否限制超级用户") """是否限制超级用户""" - menu_type = fields.CharField(max_length=255, default="功能", description="菜单类型") + menu_type = fields.CharField(max_length=255, default="", description="菜单类型") """菜单类型""" plugin_type = fields.CharEnumField(PluginType, null=True, description="插件类型") """插件类型"""