增加filter字段

Author: Chise1

fast_tmp/amis/formitem.py

@@ -380,7 +380,7 @@ class FileItem(FormItem):
 
 class ImageItem(FormItem):
     type = FormItemEnum.input_image
-
+    multiple: Optional[bool]  # 多选
     receiver: str
 
 
@@ -441,4 +441,4 @@ class InputTable(FormItem):
     needConfirm: Optional[bool]  # true	是否需要确认操作，，可用来控控制表格的操作交互
     canAccessSuperData: Optional[bool]  # false	是否可以访问父级数据，也就是表单中的同级数据，通常需要跟 strictMode 搭配使用
     strictMode: Optional[bool]  # true	为了性能，默认其他表单项项值变化不会让当前表格更新，有时候为了同步获取其他表单项字段，需要开启这个。
-    columns: Optional[List[ColumnInline]]  # 列信息
+    columns: Optional[List[Column]]  # 列信息

fast_tmp/site/field.py

@@ -253,8 +253,11 @@ async def get_selects(
         pk: Optional[str],
         perPage: Optional[int],
         page: Optional[int],
+        filter: Any = None
     ) -> List[dict]:
-        ...
+        """
+        多对多或多对一的时候，用于选择项的读取
+        """
 
 
 class ForeignKeyPickerControl(BaseAdminControl, RelationSelectApi):  # todo 支持搜索功能
@@ -271,8 +274,14 @@ async def get_selects(
         pk: Optional[str],
         perPage: Optional[int],
         page: Optional[int],
+        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()
@@ -333,8 +342,14 @@ async def get_selects(
         pk: Optional[str],
         perPage: Optional[int],
         page: Optional[int],
+        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()
@@ -409,8 +424,8 @@ def get_column(self, request: Request) -> Column:
                             title=self.label,
                             body=CRUD(
                                 api="get:"
-                                + self._field.model.__name__  # type: ignore
-                                + f"/select/{self.name}?pk=$pk",
+                                    + self._field.model.__name__  # type: ignore
+                                    + f"/select/{self.name}?pk=$pk",
                                 columns=[
                                     Column(label="pk", name="pk"),
                                     Column(label="label", name="label"),
@@ -428,12 +443,18 @@ async def get_selects(
         pk: Optional[str],
         perPage: Optional[int],
         page: Optional[int],
+        filter: Any = None
     ):
         related_model = self._field.related_model  # type: ignore
         if pk is not None:
             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 pk is not None:
             count = await queryset.count()
             data = await queryset