重命名formitem

修复流水下错误

Author: Chise1

fast_tmp/amis/crud.py

@@ -2,7 +2,7 @@
 
 from fast_tmp.amis.base import BaseAmisModel, _Action
 from fast_tmp.amis.column import Column, Operation
-from fast_tmp.amis.forms.filter import FilterModel
+from fast_tmp.amis.forms import FilterModel
 
 
 class CRUD(BaseAmisModel):

fast_tmp/amis/formitem.py

@@ -13,7 +13,7 @@
 
 from pydantic import BaseModel
 
-from .column import AbstractControl, Column, SelectOption
+from .column import AbstractControl, Column, ColumnInline, SelectOption
 from .forms import Form
 from .style import FormWidgetSize, Mode
 
@@ -411,3 +411,34 @@ class SubForm(FormItem):
     form: Form
     addButtonText: Optional[str]  # 自定义新增一项的文本
     showErrorMsg: Optional[bool]  # 是否在左下角显示报错信息
+
+
+class InputTable(FormItem):
+    """
+    表格
+    """
+
+    type = "table"
+    addable: Optional[bool]  # 是否可新增
+    editable: Optional[bool]  # 是否可编辑
+    removable: Optional[bool]  # 是否可删除
+    showAddBtn: Optional[bool]  # 是否显示添加按钮
+    addApi: Optional[str]
+    updateApi: Optional[str]
+    deleteApi: Optional[str]
+    addBtnLabel: Optional[str]  # 增加按钮名称
+    addBtnIcon: Optional[str]  # "plus"	增加按钮图标
+    copyBtnLabel: Optional[str]  # 复制按钮文字
+    copyBtnIcon: Optional[str]  # "copy"	复制按钮图标
+    editBtnLabel: Optional[str]  # ""	编辑按钮名称
+    editBtnIcon: Optional[str]  # "pencil"	编辑按钮图标
+    deleteBtnLabel: Optional[str]  # ""	删除按钮名称
+    deleteBtnIcon: Optional[str]  # "minus"	删除按钮图标
+    confirmBtnLabel: Optional[str]  # ""	确认编辑按钮名称
+    confirmBtnIcon: Optional[str]  # "check"	确认编辑按钮图标
+    cancelBtnLabel: Optional[str]  # ""	取消编辑按钮名称
+    cancelBtnIcon: Optional[str]  # "times"	取消编辑按钮图标
+    needConfirm: Optional[bool]  # true	是否需要确认操作，，可用来控控制表格的操作交互
+    canAccessSuperData: Optional[bool]  # false	是否可以访问父级数据，也就是表单中的同级数据，通常需要跟 strictMode 搭配使用
+    strictMode: Optional[bool]  # true	为了性能，默认其他表单项项值变化不会让当前表格更新，有时候为了同步获取其他表单项字段，需要开启这个。
+    columns: Optional[List[ColumnInline]]  # 列信息

fast_tmp/amis/forms/__init__.py

@@ -1,5 +1,7 @@
 from typing import List, Optional
 
+from pydantic import BaseModel
+
 from fast_tmp.amis.base import BaseAmisModel
 from fast_tmp.amis.column import AbstractControl
 
@@ -16,3 +18,10 @@ class Form(BaseAmisModel):
     primaryField: Optional[str]  # 设置主键"id"
     body: List[AbstractControl]
 
+
+class FilterModel(BaseModel):
+    title: str = "过滤"
+    body: List[dict]
+    actions: List[dict] = [
+        {"type": "submit", "level": "primary", "label": "查询"}
+    ]  # type submit label  https://aisuda.bce.baidu.com/amis/zh-CN/components/crud#%E6%95%B0%E6%8D%AE%E6%BA%90%E6%8E%A5%E5%8F%A3%E6%95%B0%E6%8D%AE%E7%BB%93%E6%9E%84%E8%A6%81%E6%B1%82

fast_tmp/amis/forms/filter.py

@@ -12,8 +12,7 @@
 from fast_tmp.amis.column import Operation
 from fast_tmp.amis.crud import CRUD
 from fast_tmp.amis.enums import ButtonLevelEnum
-from fast_tmp.amis.forms import Form
-from fast_tmp.amis.forms.filter import FilterModel
+from fast_tmp.amis.forms import FilterModel, Form
 from fast_tmp.amis.frame import Dialog
 from fast_tmp.amis.page import Page
 from fast_tmp.exceptions import FieldsError, NotFoundError, PermError
@@ -106,7 +105,7 @@ def get_create_dialogation_button(self, request: Request) -> List[_Action]:
                         name=f"新增{self.name}",
                         title=f"新增{self.name}",
                         # fixme 你的field字段传实例了吗？
-                        body=[(i.get_formItem(request)) for i in formitems.values()],
+                        body=[(i.get_formitem(request)) for i in formitems.values()],
                         api=f"post:{self.prefix}/create",
                     ),
                 ),
@@ -132,7 +131,7 @@ def get_del_one_button(self):
         )
 
     def get_update_one_button(self, request: Request):
-        body = [i.get_formItem(request) for i in self.get_update_fields().values()]
+        body = [i.get_formitem(request) for i in self.get_update_fields().values()]
         return DialogAction(
             label="修改",
             level=ButtonLevelEnum.link,

fast_tmp/site/__init__.py

@@ -94,7 +94,7 @@ def get_column_inline(self, request: Request) -> Column:
         """
 
     @abstractmethod
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         """
         获取内联修改的column
         """
@@ -118,7 +118,7 @@ def get_column(self, request: Request) -> Column:
             self._column = Column(name=self.name, label=self.label)
         return self._column
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
             self._control = FormItem(type=self._control_type, name=self.name, label=self.label)
             if not self._field.null:  # type: ignore

fast_tmp/site/base.py

@@ -53,7 +53,7 @@ class IntControl(BaseAdminControl):
 class DecimalControl(BaseAdminControl):
     _control_type = FormItemEnum.input_number
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
             self._control = NumberItem(
                 type=self._control_type, name=self.name, label=self.label, big=True
@@ -76,9 +76,9 @@ def orm_2_amis(self, value: Any) -> Any:
 class IntEnumControl(BaseAdminControl):
     _control_type = FormItemEnum.select
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
-            super().get_formItem(request)
+            super().get_formitem(request)
             d = self._control.dict(exclude_none=True)
             d.pop("type")
             if self._field.null:  # type: ignore
@@ -139,9 +139,9 @@ class StrEnumControl(IntEnumControl):
 class DateTimeControl(BaseAdminControl):
     _control_type = FormItemEnum.input_datetime
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
-            super().get_formItem(request)
+            super().get_formitem(request)
             self._control = DatetimeItem.from_orm(self._control)
         return self._control
 
@@ -165,9 +165,9 @@ def orm_2_amis(self, value: datetime.datetime) -> Any:
 class DateControl(BaseAdminControl):
     _control_type = FormItemEnum.date
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
-            super().get_formItem(request)
+            super().get_formitem(request)
             self._control = DateItem.from_orm(self._control)
         return self._control
 
@@ -192,9 +192,9 @@ def orm_2_amis(self, value: datetime.date) -> Any:
 class TimeControl(BaseAdminControl):
     _control_type = FormItemEnum.time
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
-            super().get_formItem(request)
+            super().get_formitem(request)
             self._control = TimeItem.from_orm(self._control)
         return self._control
 
@@ -228,9 +228,9 @@ def amis_2_orm(self, value: Any) -> Any:
     def orm_2_amis(self, value: Any) -> Any:
         return json.dumps(value)
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
-            super().get_formItem(request)
+            super().get_formitem(request)
             self._control.validations = "isJson"
         return self._control
 
@@ -291,7 +291,7 @@ def prefetch(self) -> Optional[str]:
     def get_column_inline(self, request: Request) -> Column:
         raise AttributeError("foreignkey field can not be used in column inline.")
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
             self._control = PickerItem(
                 name=self.name,
@@ -363,7 +363,7 @@ def get_column(self, request: Request) -> Column:
     def get_column_inline(self, request: Request) -> Column:
         raise AttributeError("foreignkey field can not be used in column inline.")
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
             self._control = SelectItem(
                 name=self.name,
@@ -445,7 +445,7 @@ async def get_selects(
             data = await queryset
             return {"options": [{"value": i.pk, "label": str(i)} for i in data]}
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
             self._control = TransferItem(
                 name=self.name,
@@ -505,7 +505,7 @@ def orm_2_amis(self, value: Any) -> Any:
 class FileControl(BaseAdminControl):
     _control_type = FormItemEnum.input_file
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
             self._control = FileItem(
                 name=self.name,
@@ -530,7 +530,7 @@ def amis_2_orm(self, value: Any) -> Any:
 class ImageControl(BaseAdminControl):
     _control_type = FormItemEnum.input_image
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
             self._control = ImageItem(
                 name=self.name,
@@ -562,7 +562,7 @@ def amis_2_orm(self, value: Any) -> Any:
 class RichTextControl(BaseAdminControl):
     _control_type = FormItemEnum.input_rich_text
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
             self._control = RichTextItem(type=self._control_type, name=self.name, label=self.label)
             if not self._field.null:  # type: ignore
@@ -633,7 +633,7 @@ async def set_value(self, request: Request, obj: Model, value: Any):
                 raise TmpValueError("password can not be none.")
             await super().set_value(request, obj, make_password(value))
 
-    def get_formItem(self, request: Request) -> FormItem:
+    def get_formitem(self, request: Request) -> FormItem:
         if not self._control:
             self._control = FormItem(type=self._control_type, name=self.name, label=self.label)
             if not self._field.null:  # type: ignore

fast_tmp/site/field.py

@@ -10,7 +10,7 @@ def make_filter_by_str(request: Request, name: str, field: BaseAdminControl) ->
     """
     根据字符串自动生成model对应field的搜索功能
     """
-    control = field.get_formItem(request)
+    control = field.get_formitem(request)
     filter_info = control.dict(exclude_none=True)
     filter_info["name"] = name
     filter_info["label"] = name