From b412b7c12a97cb8ffbc481c2669ea9526a2a003b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 7 Jul 2020 22:33:23 +0800
Subject: [PATCH] update

---
 test_mini/app.js                    |  4 ++--
 test_mini/project.config.json       |  1 +
 test_server/examtest/serializers.py | 13 ++++++++++++-
 test_server/examtest/views.py       |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/test_mini/app.js b/test_mini/app.js
index 2f65e82..0adcdb0 100644
--- a/test_mini/app.js
+++ b/test_mini/app.js
@@ -57,9 +57,9 @@ App({
   globalData: {
     userInfo: {},
     userinfo: {}, // 服务器传回的消费者信息
-    host: 'https://apitest.ahctc.cn',
+    //host: 'https://apitest.ahctc.cn',
     mediahost: 'https://apitest.ahctc.cn',
-    //host: 'http://127.0.0.1:8000',
+    host: 'http://127.0.0.1:8000',
     //mediahost: 'http://127.0.0.1:8000',
     token : '',
   }
diff --git a/test_mini/project.config.json b/test_mini/project.config.json
index 24ffefc..81b520a 100644
--- a/test_mini/project.config.json
+++ b/test_mini/project.config.json
@@ -21,6 +21,7 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
+		"useIsolateContext": true,
 		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
diff --git a/test_server/examtest/serializers.py b/test_server/examtest/serializers.py
index 1dc3b21..7f7ca1e 100644
--- a/test_server/examtest/serializers.py
+++ b/test_server/examtest/serializers.py
@@ -140,10 +140,21 @@ class PaperDetailSerializer(serializers.ModelSerializer):
     create_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", required=False, read_only=True)
     update_time = serializers.DateTimeField(format="%Y-%m-%d %H:%M:%S", required=False, read_only=True)
     workscope_name = serializers.StringRelatedField(source='workscope', read_only=True)
-    questions = PaperQuestionsDetailSerializer(source='paperquestions_set', many=True, read_only=True)
+    questions = serializers.SerializerMethodField()
     class Meta:
         model = Paper
         fields = '__all__'
+    
+    def get_questions(self, instance):
+        queryset = instance.questions.all().order_by('type')
+        return PaperQuestionsDetailSerializer(queryset, many=True).data
+    
+    # @staticmethod
+    # def setup_eager_loading(queryset):
+    #     """ Perform necessary eager loading of data. """
+    #     queryset = queryset.prefetch_related(
+    #         'questions',)
+    #     return queryset
 
 class PaperQuestionsCreateSerializer(serializers.ModelSerializer):
     class Meta:
diff --git a/test_server/examtest/views.py b/test_server/examtest/views.py
index 40dc793..3a54ba9 100644
--- a/test_server/examtest/views.py
+++ b/test_server/examtest/views.py
@@ -317,7 +317,7 @@ class PaperViewSet(ModelViewSet):
     ordering = ['id']
     filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     filterset_fields = ['workscope']
-    search_fields = ('^name',)
+    search_fields = ('name',)
     
     def get_serializer_class(self):
         if self.action=='list':