sozsoft/sozsoft-platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LisformWorkflow çalışması

Browse source
This commit is contained in:
Sedat Öztürk 2026-05-23 17:44:40 +03:00
parent cb77dd2109
commit 8f3932bc6e
6 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsDto.cs
View file

@ -365,19 +365,6 @@ public class GridOptionsDto : AuditedEntityDto<Guid>
} }
set { SubFormsJson = JsonSerializer.Serialize(value); } 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] [JsonIgnore]
public string ExtraFilterJson { get; set; } // Cagrilacak Extra Filters public string ExtraFilterJson { get; set; } // Cagrilacak Extra Filters

13
api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsEditDto.cs
View file

@ -123,5 +123,18 @@ public class GridOptionsEditDto : GridOptionsDto
} }
set { ExtraFilterJson = JsonSerializer.Serialize(value); } 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
api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/WorkflowDto.cs
View file

@ -2,7 +2,7 @@
public class WorkflowDto public class WorkflowDto
{ {
public string ApprovalFieldName { get; set; } public string ApprovalUserFieldName { get; set; }
public string ApprovalDateFieldName { get; set; } public string ApprovalDateFieldName { get; set; }
public string ApprovalStatusFieldName { get; set; } public string ApprovalStatusFieldName { get; set; }
} }

6
api/src/Sozsoft.Platform.DbMigrator/Seeds/LanguagesData.json
View file

@ -18730,9 +18730,9 @@
}, },
{ {
"resourceName": "Platform", "resourceName": "Platform",
"key": "ListForms.ListFormEdit.Workflow.ApprovalFieldName", "key": "ListForms.ListFormEdit.Workflow.ApprovalUserFieldName",
"en": "Approval Field Name", "en": "Approval User Field Name",
"tr": "Onay Alanı Adı" "tr": "Onaylayan Kişi Alanı Adı"
}, },
{ {
"resourceName": "Platform", "resourceName": "Platform",

2
ui/src/proxy/form/models.ts
View file

@ -907,7 +907,7 @@ export interface WidgetEditDto {
} }
export interface WorkflowDto { export interface WorkflowDto {
approvalFieldName: string approvalUserFieldName: string
approvalDateFieldName: string approvalDateFieldName: string
approvalStatusFieldName: string approvalStatusFieldName: string
} }

15
ui/src/views/admin/listForm/edit/FormTabWorkflow.tsx
View file

@ -296,8 +296,9 @@ export function FormTabWorkflow(
} }
const schema = object().shape({ const schema = object().shape({
approvalFieldName: string(), approvalUserFieldName: string(),
approvalDateFieldName: string(), approvalDateFieldName: string(),
approvalStatusFieldName: string(),
}) })
const initialValues = useStoreState((s) => s.admin.lists.values) const initialValues = useStoreState((s) => s.admin.lists.values)
@ -320,14 +321,14 @@ export function FormTabWorkflow(
<Card className="my-2"> <Card className="my-2">
<div className="grid grid-cols-1 md:grid-cols-3 gap-3"> <div className="grid grid-cols-1 md:grid-cols-3 gap-3">
<FormItem <FormItem
label={translate('::ListForms.ListFormEdit.Workflow.ApprovalFieldName')} label={translate('::ListForms.ListFormEdit.Workflow.ApprovalUserFieldName')}
invalid={ invalid={
errors.workflowDto?.approvalFieldName && errors.workflowDto?.approvalUserFieldName &&
touched.workflowDto?.approvalFieldName 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>) => ( {({ field, form }: FieldProps<SelectBoxOption>) => (
<Select <Select
field={field} field={field}
@ -335,7 +336,7 @@ export function FormTabWorkflow(
options={columnOptions} options={columnOptions}
isClearable={true} isClearable={true}
value={columnOptions.filter( value={columnOptions.filter(
(option) => option.value === values.workflowDto.approvalFieldName, (option) => option.value === values.workflowDto.approvalUserFieldName,
)} )}
onChange={(option) => form.setFieldValue(field.name, option?.value)} onChange={(option) => form.setFieldValue(field.name, option?.value)}
/> />