Genel Grid düzenlemesi

ui/dev-dist/sw.js

@@ -82,7 +82,7 @@ define(['./workbox-a959eb95'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "/index.html",
-    "revision": "0.sjlnuata16g"
+    "revision": "0.el21c3n5m38"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("/index.html"), {

ui/src/views/form/FormButtons.tsx

@@ -5,7 +5,7 @@ import CustomStore from 'devextreme/data/custom_store'
 import { useState } from 'react'
 import { FaPlus, FaTrash, FaEdit, FaFileAlt, FaSave } from 'react-icons/fa'
 import { useNavigate } from 'react-router-dom'
-import { GridColumnData } from '../list/GridColumnData'
+import { GridColumnData, GridExtraFilterState } from '../list/GridColumnData'
 import { useToolbar } from '../list/useToolbar'
 import { PermissionResults, RowMode } from './types'
 import { GridDto } from '@/proxy/form/models'
@@ -49,6 +49,7 @@ const FormButtons = (props: {
 
   const [loading, setLoading] = useState(false)
   const [deleteRowId, setDeleteRowId] = useState<string>()
+  const [extraFilters, setExtraFilters] = useState<GridExtraFilterState[]>([])
 
   const navigate = useNavigate()
   const { translate } = useLocalization()
@@ -59,6 +60,8 @@ const FormButtons = (props: {
     getSelectedRowsData,
     refreshData,
     getFilter,
+    extraFilters,
+    setExtraFilters,
   })
 
   const handleDelete = async (e: any) => {

ui/src/views/form/FormEdit.tsx

@@ -67,7 +67,7 @@ const FormEdit = (
         ></Helmet>
       )}
       <div className="flex items-center justify-between mb-4">
-        <h3>{translate('::App.Languages.Language')}</h3>
+        <h3>{translate('::' + gridDto?.gridOptions.title)}</h3>
         {permissionResults && (
           <FormButtons
             mode={mode}

ui/src/views/form/FormView.tsx

@@ -62,7 +62,7 @@ const FormView = (
         ></Helmet>
       )}
       <div className="flex items-center justify-between mb-4">
-        <h3>{translate('::App.Languages.Language')}</h3>
+        <h3>{translate('::' + gridDto?.gridOptions.title)}</h3>
         {permissionResults && (
           <FormButtons
             mode={mode}

ui/src/views/list/Grid.tsx

@@ -397,41 +397,53 @@ const Grid = (props: GridProps) => {
   }, [gridDto])
 
   useEffect(() => {
-    if (!gridDto) {
+    if (!gridDto) return
-      return
-    }
 
-    // Set columns
     const cols = getBandedColumns()
     setColumnData(cols)
 
-    // Filters'i AND ile birleştir
+    // 1. extraFilters'tan gelenleri ekle
-    let filterArray: any[] = []
+    const filterArray: any[] = []
     extraFilters.forEach((f) => {
       if (f.value) {
-        if (filterArray.length > 0) {
+        if (filterArray.length > 0) filterArray.push('and')
-          filterArray.push('and')
-        }
         filterArray.push([f.fieldName, f.operator, f.value])
       }
     })
 
-    const params = new URLSearchParams()
+    // 2. searchParams içindeki kolonları filtreye çevir
-    if (filterArray.length > 0) {
+    const params = new URLSearchParams(searchParams)
-      params.set('filter', JSON.stringify(filterArray))
+    if (cols?.length) {
+      cols.forEach((col) => {
+        if (!col.dataField) return
+        const sValue = params.get(col.dataField)
+        if (sValue) {
+          if (filterArray.length > 0) filterArray.push('and')
+          filterArray.push([col.dataField, '=', sValue])
+          // orijinal paramı kaldır
+          params.delete(col.dataField)
+        }
+      })
     }
 
-    // Set data source
+    // 3. oluşan filtreleri `filter` paramına yaz
-    const dataSource: CustomStore<any, any> = createSelectDataSource(
+    if (filterArray.length > 0) {
+      params.set('filter', JSON.stringify(filterArray))
+    } else {
+      params.delete('filter')
+    }
+
+    // 4. datasource oluştur
+    const dataSource = createSelectDataSource(
       gridDto.gridOptions,
       listFormCode,
-      searchParams,
+      params,
       cols,
       setWidgetGroups,
     )
 
     setGridDataSource(dataSource)
-  }, [gridDto, searchParams])
+  }, [gridDto, searchParams, extraFilters])
 
   useEffect(() => {
     refListFormCode.current = listFormCode

ui/src/views/list/GridExtraFilterToolbar.tsx

@@ -56,7 +56,7 @@ export function GridExtraFilterToolbar({
             ) : (
               <input
                 type="text"
-                className="border rounded px-1 py-0.5"
+                className="border rounded px-1 py-1"
                 value={inputValues[fs.fieldName] ?? current?.value ?? ''}
                 placeholder={fs.caption}
                 onChange={(e) =>