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

ExtraFilterDto Items kısmı çalıştırıldı

Browse source
This commit is contained in:
Sedat ÖZTÜRK 2025-09-18 09:17:20 +03:00
parent 8c11fedfc9
commit fef0623349
7 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/src/Kurs.Platform.Application.Contracts/ListForms/GridOptionsDto/ExtraFilterDto.cs
View file

@ -1,4 +1,6 @@
namespace Kurs.Platform.ListForms;
using System.Collections.Generic;
namespace Kurs.Platform.ListForms;
public class ExtraFilterDto
{
@ -6,7 +8,7 @@ public class ExtraFilterDto
public string Caption { get; set; }
public string Operator { get; set; }
public string DefaultValue { get; set; }
public ExtraFilterItemsDto[] Items { get; set; }
public List<ExtraFilterItemsDto> Items { get; set; }
}
public class ExtraFilterItemsDto

4
api/src/Kurs.Platform.Application/ListForms/ListFormAutoMapperProfile.cs
View file

@ -26,8 +26,8 @@ public class ListFormAutoMapperProfile : Profile
CreateMap<SubFormRelationDto, SubFormRelation>().ReverseMap();
CreateMap<WidgetEditDto, Widget>().ReverseMap();
CreateMap<ExtraFilterDto, ExtraFilter>().ReverseMap();
CreateMap<ExtraFilterItemsDto, ExtraFilterItems>().ReverseMap();
CreateMap<ExtraFilterEditDto, ExtraFilterDto>().ReverseMap();
CreateMap<ExtraFilterEditDto, ExtraFilterDto>()
.ForMember(dest => dest.Items, opt => opt.MapFrom(src => src.Items));
CreateMap<ExtraFilterEditDto, ExtraFilter>().ReverseMap();
CreateMap<ListFormImport, ListFormsImportDto>();

13
api/src/Kurs.Platform.Application/ListForms/ListFormSelectAppService.cs
View file

@ -308,18 +308,19 @@ public class ListFormSelectAppService : PlatformAppService, IListFormSelectAppSe
{
if (!string.IsNullOrWhiteSpace(extraFilter.SqlQuery))
{
var (dynamicDataRepository, connectionString, dataSourceType) = await dynamicDataManager.GetAsync(listForm.IsTenant, listForm.DataSourceCode);
var (dynamicDataRepository, connectionString, dataSourceType) =
await dynamicDataManager.GetAsync(listForm.IsTenant, listForm.DataSourceCode);
var items = await dynamicDataRepository.QueryAsync(extraFilter.SqlQuery, connectionString);
if (items != null)
{
var filter = result.GridOptions.ExtraFilterDto.FirstOrDefault(a => a.FieldName == extraFilter.FieldName);
var filters = result.GridOptions.ExtraFilterDto.ToList();
var filter = filters.FirstOrDefault(a => a.FieldName == extraFilter.FieldName);
if (filter != null)
{
var newItems = new List<ExtraFilterItemsDto>();
// Yeni gelenleri ekle
foreach (var item in items)
{
if (item is IDictionary<string, object> dynamicItem)
@ -332,9 +333,11 @@ public class ListFormSelectAppService : PlatformAppService, IListFormSelectAppSe
}
}
// Listeyi tekrar array olarak ata
filter.Items = newItems.ToArray(); // burada direkt filter kullan
filter.Items = newItems;
}
// 🔑 yeniden atıyoruz ki setter çalışsın
result.GridOptions.ExtraFilterDto = filters.ToArray();
}
}
}

6
api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json
View file

@ -12262,6 +12262,12 @@
"en": "Extra Filters",
"tr": "Ekstra Filtreler"
},
{
"resourceName": "Platform",
"key": "ListForms.ListFormEdit.ExtraFiltersDescription",
"en": "You can create extra filter fields on the Grid.",
"tr": "Grid üzerinde ek filtre alanları oluşturabilirsiniz."
},
{
"resourceName": "Platform",
"key": "ListForms.ListFormEdit.ExtraFieldName",

8
api/src/Kurs.Platform.Domain/Queries/ExtraFilter.cs
View file

@ -10,7 +10,6 @@ public class ExtraFilter : ValueObject
public string Operator { get; set; }
public string DefaultValue { get; set; }
public string SqlQuery { get; set; }
public ExtraFilterItems[] Items { get; set; }
protected override IEnumerable<object> GetAtomicValues()
{
@ -19,12 +18,5 @@ public class ExtraFilter : ValueObject
yield return Operator;
yield return DefaultValue;
yield return SqlQuery;
yield return Items;
}
}
public class ExtraFilterItems
{
public string Value { get; set; }
public string Text { get; set; }
}

3
ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogExtraFilter.tsx
View file

@ -31,7 +31,7 @@ const schema = object().shape({
fieldName: string().required('Field Name Required'),
caption: string().required('Caption Required'),
operator: string().required('Operator Required'),
defaultValue: string().required('Value Required'),
defaultValue: string(),
sqlQuery: string().required('SQL Query Required'),
})
@ -154,6 +154,7 @@ function JsonRowOpDialogExtraFilter({
onSubmit={async (values, { setSubmitting }) => {
setSubmitting(true)
try {
delete values.items
const input: ListFormJsonRowDto = {
index: data.index,
fieldName: data.tabName,

2
ui/src/views/list/GridExtraFilterToolbar.tsx
View file

@ -27,7 +27,7 @@ export function GridExtraFilterToolbar({
)
}
>
<option value="">Seçiniz</option>
{!fs.defaultValue && <option value="">Seçiniz</option>}
{fs.items.map((item: any) => (
<option key={item.key} value={item.key}>
{item.value}