From 8b099542e6b61fc0bc8c2938cfc0bc080278b643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Sat, 20 Aug 2022 16:16:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=89=8D=E5=8F=B0=E9=85=8D=E7=BD=AE=E5=92=8C?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/application/dispatch.py | 2 +- backend/dvadmin/system/views/system_config.py | 17 +++++++++++++++++ .../system/config/components/formContent.vue | 18 ++++++++---------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/backend/application/dispatch.py b/backend/application/dispatch.py index 3f19225..7c8c9e6 100644 --- a/backend/application/dispatch.py +++ b/backend/application/dispatch.py @@ -40,7 +40,7 @@ def _get_all_system_config(): from dvadmin.system.models import SystemConfig system_config_obj = ( - SystemConfig.objects.filter(status=True, parent_id__isnull=False) + SystemConfig.objects.filter(parent_id__isnull=False) .values("parent__key", "key", "value", "form_item_type") .order_by("sort") ) diff --git a/backend/dvadmin/system/views/system_config.py b/backend/dvadmin/system/views/system_config.py index cfe7202..3cdb03b 100644 --- a/backend/dvadmin/system/views/system_config.py +++ b/backend/dvadmin/system/views/system_config.py @@ -250,9 +250,26 @@ class InitSettingsViewSet(APIView): authentication_classes = [] permission_classes = [] + def filter_system_config_values(self, data: dict): + """ + 过滤系统初始化配置 + :param data: + :return: + """ + for key in self.request.query_params.get('key', '').split('|'): + if key: + data = dict(filter(lambda x: x[0].startswith(key), data.items())) + return data + def get(self, request): data = dispatch.get_system_config() if not data: dispatch.refresh_system_config() data = dispatch.get_system_config() + # 不返回后端专用配置 + backend_config = [f"{ele.get('parent__key')}.{ele.get('key')}" for ele in + SystemConfig.objects.filter(status=False, parent_id__isnull=False).values('parent__key', + 'key')] + data = dict(filter(lambda x: x[0] not in backend_config, data.items())) + data = self.filter_system_config_values(data=data) return DetailResponse(data=data) diff --git a/web/src/views/system/config/components/formContent.vue b/web/src/views/system/config/components/formContent.vue index 7dcd28f..e91bc9b 100644 --- a/web/src/views/system/config/components/formContent.vue +++ b/web/src/views/system/config/components/formContent.vue @@ -2,10 +2,10 @@
变量标题 - 变量值 + 变量值 变量名 - 状态 - 操作 + 是否前端配置 + 操作 {{item.title}} - +
- +