LisformWorkflow çalışması
This commit is contained in:
parent
cb77dd2109
commit
8f3932bc6e
6 changed files with 26 additions and 25 deletions
|
|
@ -365,19 +365,6 @@ public class GridOptionsDto : AuditedEntityDto<Guid>
|
|||
}
|
||||
set { SubFormsJson = JsonSerializer.Serialize(value); }
|
||||
}
|
||||
|
||||
[JsonIgnore]
|
||||
public string WorkflowJson { get; set; }
|
||||
public WorkflowDto WorkflowDto
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!string.IsNullOrEmpty(WorkflowJson))
|
||||
return JsonSerializer.Deserialize<WorkflowDto>(WorkflowJson);
|
||||
return new WorkflowDto();
|
||||
}
|
||||
set { WorkflowJson = JsonSerializer.Serialize(value); }
|
||||
}
|
||||
|
||||
[JsonIgnore]
|
||||
public string ExtraFilterJson { get; set; } // Cagrilacak Extra Filters
|
||||
|
|
|
|||
|
|
@ -123,5 +123,18 @@ public class GridOptionsEditDto : GridOptionsDto
|
|||
}
|
||||
set { ExtraFilterJson = JsonSerializer.Serialize(value); }
|
||||
}
|
||||
|
||||
[JsonIgnore]
|
||||
public string WorkflowJson { get; set; }
|
||||
public WorkflowDto WorkflowDto
|
||||
{
|
||||
get
|
||||
{
|
||||
if (!string.IsNullOrEmpty(WorkflowJson))
|
||||
return JsonSerializer.Deserialize<WorkflowDto>(WorkflowJson);
|
||||
return new WorkflowDto();
|
||||
}
|
||||
set { WorkflowJson = JsonSerializer.Serialize(value); }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
public class WorkflowDto
|
||||
{
|
||||
public string ApprovalFieldName { get; set; }
|
||||
public string ApprovalUserFieldName { get; set; }
|
||||
public string ApprovalDateFieldName { get; set; }
|
||||
public string ApprovalStatusFieldName { get; set; }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18730,9 +18730,9 @@
|
|||
},
|
||||
{
|
||||
"resourceName": "Platform",
|
||||
"key": "ListForms.ListFormEdit.Workflow.ApprovalFieldName",
|
||||
"en": "Approval Field Name",
|
||||
"tr": "Onay Alanı Adı"
|
||||
"key": "ListForms.ListFormEdit.Workflow.ApprovalUserFieldName",
|
||||
"en": "Approval User Field Name",
|
||||
"tr": "Onaylayan Kişi Alanı Adı"
|
||||
},
|
||||
{
|
||||
"resourceName": "Platform",
|
||||
|
|
|
|||
|
|
@ -907,7 +907,7 @@ export interface WidgetEditDto {
|
|||
}
|
||||
|
||||
export interface WorkflowDto {
|
||||
approvalFieldName: string
|
||||
approvalUserFieldName: string
|
||||
approvalDateFieldName: string
|
||||
approvalStatusFieldName: string
|
||||
}
|
||||
|
|
|
|||
|
|
@ -296,8 +296,9 @@ export function FormTabWorkflow(
|
|||
}
|
||||
|
||||
const schema = object().shape({
|
||||
approvalFieldName: string(),
|
||||
approvalUserFieldName: string(),
|
||||
approvalDateFieldName: string(),
|
||||
approvalStatusFieldName: string(),
|
||||
})
|
||||
|
||||
const initialValues = useStoreState((s) => s.admin.lists.values)
|
||||
|
|
@ -320,14 +321,14 @@ export function FormTabWorkflow(
|
|||
<Card className="my-2">
|
||||
<div className="grid grid-cols-1 md:grid-cols-3 gap-3">
|
||||
<FormItem
|
||||
label={translate('::ListForms.ListFormEdit.Workflow.ApprovalFieldName')}
|
||||
label={translate('::ListForms.ListFormEdit.Workflow.ApprovalUserFieldName')}
|
||||
invalid={
|
||||
errors.workflowDto?.approvalFieldName &&
|
||||
touched.workflowDto?.approvalFieldName
|
||||
errors.workflowDto?.approvalUserFieldName &&
|
||||
touched.workflowDto?.approvalUserFieldName
|
||||
}
|
||||
errorMessage={errors.workflowDto?.approvalFieldName}
|
||||
errorMessage={errors.workflowDto?.approvalUserFieldName}
|
||||
>
|
||||
<Field type="text" name="workflowDto.approvalFieldName">
|
||||
<Field type="text" name="workflowDto.approvalUserFieldName">
|
||||
{({ field, form }: FieldProps<SelectBoxOption>) => (
|
||||
<Select
|
||||
field={field}
|
||||
|
|
@ -335,7 +336,7 @@ export function FormTabWorkflow(
|
|||
options={columnOptions}
|
||||
isClearable={true}
|
||||
value={columnOptions.filter(
|
||||
(option) => option.value === values.workflowDto.approvalFieldName,
|
||||
(option) => option.value === values.workflowDto.approvalUserFieldName,
|
||||
)}
|
||||
onChange={(option) => form.setFieldValue(field.name, option?.value)}
|
||||
/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue