diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 27c2f4a..35fc069 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -164,9 +164,9 @@ class CustomField(CommonAModel): field_name = models.CharField('字段名称', max_length=50) sort = models.IntegerField('排序', default=0, help_text='工单基础字段在表单中排序为:流水号0,标题20,状态id40,状态名41,创建人80,创建时间100,更新时间120.前端展示工单信息的表单可以根据这个id顺序排列') default_value = models.CharField('默认值', null=True, blank=True, max_length=100, help_text='前端展示时,可以将此内容作为表单中的该字段的默认值') - description = models.CharField('描述', max_length=100, blank=True, default='', help_text='字段的描述信息,可用于显示在字段的下方对该字段的详细描述') - placeholder = models.CharField('占位符', max_length=100, blank=True, default='', help_text='用户工单详情表单中作为字段的占位符显示') - field_template = models.TextField('文本域模板', default='', blank=True, help_text='文本域类型字段前端显示时可以将此内容作为字段的placeholder') + description = models.CharField('描述', max_length=100, blank=True, null=True, help_text='字段的描述信息,可用于显示在字段的下方对该字段的详细描述') + placeholder = models.CharField('占位符', max_length=100, blank=True, null=True, help_text='用户工单详情表单中作为字段的占位符显示') + field_template = models.TextField('文本域模板', null=True, blank=True, help_text='文本域类型字段前端显示时可以将此内容作为字段的placeholder') boolean_field_display = models.JSONField('布尔类型显示名', default=dict, blank=True, help_text='当为布尔类型时候,可以支持自定义显示形式。{"1":"是","0":"否"}或{"1":"需要","0":"不需要"},注意数字也需要引号') diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py index 5dba5df..f3d055d 100644 --- a/hb_server/apps/wf/serializers.py +++ b/hb_server/apps/wf/serializers.py @@ -42,18 +42,24 @@ class FieldChoiceSerializer(serializers.Serializer): id = serializers.Field(label='ID') name = serializers.CharField(label='名称') + def to_internal_value(self, data): + return data + + class CustomFieldSerializer(serializers.ModelSerializer): class Meta: model = CustomField fields = '__all__' class CustomFieldCreateUpdateSerializer(serializers.ModelSerializer): - field_choice = FieldChoiceSerializer(label='选项列表', many=True, required=False, write_only=True) + + field_choice = FieldChoiceSerializer(label='选项列表', many=True, required=False) class Meta: model = CustomField fields = ['workflow', 'field_type', 'field_key', 'field_name', 'sort', 'default_value', 'description', 'placeholder', 'field_template', 'boolean_field_display', 'field_choice', 'label', 'is_hidden'] + class TicketSimpleSerializer(serializers.ModelSerializer): class Meta: