清楚未使用代码

Author: Chise1

fast_tmp/site/__init__.py

@@ -426,7 +426,7 @@ async def select_options(
         """
         外键的枚举获取值以及多对多获取对象列表
         """
-        return await self.select_defs[name](request, pk, perPage, page, None)
+        return await self.select_defs[name](request, pk, perPage, page, None)  # todo: 增加select的搜索功能
 
     async def check_perm(self, request: Request, codename: str):
         user = request.user

fast_tmp/site/field.py

@@ -262,7 +262,7 @@ async def get_selects(
         pk: Optional[str],
         perPage: Optional[int],
         page: Optional[int],
-        filter: Any = None,
+        filter: Any = None,  # todo 考虑支持页面选项搜索
     ) -> List[dict]:
         """
         多对多或多对一的时候，用于选择项的读取
@@ -281,22 +281,22 @@ async def get_selects(
         filter: Any = None,
     ):
         field_model_all = self._field.related_model.all()  # type: ignore
-        if filter:
-            if isinstance(filter, dict):
-                field_model_all = self._field.related_model.filter(**filter)  # type: ignore
-            else:
-                field_model_all = self._field.related_model.filter(filter)  # type: ignore
-        if perPage is not None and page is not None:
-            field_model = field_model_all.limit(perPage).offset((page - 1) * perPage)
-            count = await field_model_all.count()
-            data = await field_model
-            return ListDataWithPage(
-                total=count,
-                items=[{"value": i.pk, "label": str(i)} for i in data],
-            )
-        else:
-            data = await field_model_all
-            return {"options": [{"value": i.pk, "label": str(i)} for i in data]}
+        # if filter:
+        #     if isinstance(filter, dict):
+        #         field_model_all = self._field.related_model.filter(**filter)  # type: ignore
+        #     else:
+        #         field_model_all = self._field.related_model.filter(filter)  # type: ignore
+        # if perPage is not None and page is not None:
+        #     field_model = field_model_all.limit(perPage).offset((page - 1) * perPage)
+        #     count = await field_model_all.count()
+        #     data = await field_model
+        #     return ListDataWithPage(
+        #         total=count,
+        #         items=[{"value": i.pk, "label": str(i)} for i in data],
+        #     )
+        # else:
+        data = await field_model_all
+        return {"options": [{"value": i.pk, "label": str(i)} for i in data]}
 
     def prefetch(self) -> Optional[str]:
         return "select"
@@ -360,7 +360,7 @@ def get_column(self, request: Request) -> Column:
                             title=self.label,
                             body=CRUD(
                                 api="get:"
-                                + self._field.model.__name__  # type: ignore
+                                + self._field.model.__name__.lower()  # type: ignore
                                 + f"/select/{self.name}?pk=$pk",
                                 columns=[
                                     Column(label="主键", name="pk"),
@@ -386,11 +386,11 @@ async def get_selects(
             queryset = related_model.filter(**{self._field.related_name: pk})  # type: ignore
         else:
             queryset = related_model.all()
-        if filter:
-            if isinstance(filter, dict):
-                queryset = queryset.filter(**filter)
-            else:
-                queryset = queryset(filter)
+        # if filter:
+        #     if isinstance(filter, dict):
+        #         queryset = queryset.filter(**filter)
+        #     else:
+        #         queryset = queryset(filter)
         if pk is not None:
             count = await queryset.count()
             data = await queryset

task.md

@@ -15,6 +15,7 @@
 13. 增加token解析的更新时间，这样可以检查密码是否过期（根据用户的更新时间和生成token的时间进行比较而判断）
 14. 测试字段报错检查
 15. 对时间类，如果是auto_now_add为true是否要必填？
+16. 对外键和多对多的control需要支持搜索和过滤功能
 
 # admin管理页面缺少功能
 

tests/test_field.py

@@ -31,12 +31,8 @@ async def test_dec(self):
 
 
 class TestIntEnumControl(BaseSite):
-    async def test_intenum(self):
+    async def test_select(self):
         await self.login()
-        response = await self.client.get("/admin/intenumfield/schema")
-        assert response.status_code == 200
-        data = response.json()
-        assert data["status"] == 0
         # 写入一个测试用的外键
         await For(name="xx").save()
         foreign_data = (await self.client.get("/admin/intenumfield/select/foreignkey_1")).json()
@@ -46,6 +42,13 @@ async def test_intenum(self):
         )
         # self.assertEqual()
 
+    async def test_intenum(self):
+        await self.login()
+        response = await self.client.get("/admin/intenumfield/schema")
+        assert response.status_code == 200
+        data = response.json()
+        assert data["status"] == 0
+
         # 测试写入数据
         role_data = {
             "int_enum_2": "two",

tests/testmodels.py

@@ -192,4 +192,4 @@ class IntEnumField(Model):
     datetime_2 = fields.DatetimeField(default=datetime.datetime.now)
     datetime_3 = fields.DatetimeField(default=datetime.datetime.fromtimestamp(0))
     datetime_4 = fields.DatetimeField()
-    foreignkey_1 = fields.ForeignKeyField("fast_tmp.For", null=True, related_name="foreignkey_1s")
+    foreignkey_1 = fields.ForeignKeyField("fast_tmp.For", null=True, related_name="foreignkey_1s")