From 681cecc52b003fb865982284fccdd48b4b5105b8 Mon Sep 17 00:00:00 2001 From: wangruidong <940853815@qq.com> Date: Thu, 28 Mar 2024 16:03:17 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8=E7=9A=84=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/api/mixin.py | 8 ++++++++ apps/terminal/api/component/storage.py | 2 ++ 2 files changed, 10 insertions(+) diff --git a/apps/common/api/mixin.py b/apps/common/api/mixin.py index e8266d928..7db2056ac 100644 --- a/apps/common/api/mixin.py +++ b/apps/common/api/mixin.py @@ -214,3 +214,11 @@ class CommonApiMixin( def is_swagger_request(self): return getattr(self, 'swagger_fake_view', False) or \ getattr(self, 'raw_action', '') == 'metadata' + + def get_queryset(self): + queryset = super().get_queryset() + + if 'name' in self.ordering_fields: + self.ordering = ('name',) + + return queryset diff --git a/apps/terminal/api/component/storage.py b/apps/terminal/api/component/storage.py index 9f0b2a94f..a45d42df9 100644 --- a/apps/terminal/api/component/storage.py +++ b/apps/terminal/api/component/storage.py @@ -37,6 +37,7 @@ class BaseStorageViewSetMixin: class CommandStorageViewSet(BaseStorageViewSetMixin, viewsets.ModelViewSet): search_fields = ('name', 'type') + ordering = ('name',) queryset = CommandStorage.objects.all() serializer_class = CommandStorageSerializer filterset_class = CommandStorageFilter @@ -114,6 +115,7 @@ class ReplayStorageFilterSet(BaseFilterSet): class ReplayStorageViewSet(BaseStorageViewSetMixin, viewsets.ModelViewSet): search_fields = ('name', 'type', 'is_default') + ordering = ('name',) queryset = ReplayStorage.objects.all() serializer_class = ReplayStorageSerializer filterset_class = ReplayStorageFilterSet