feat(FilterManager): enhance filter row display with priority indicators and update alert message for clarity
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 1m42s
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 1m42s
This commit is contained in:
@@ -535,6 +535,7 @@ function GatewayAutocomplete({ label, value, onChange, gateways = [], required =
|
|||||||
function SortableFilterRow({
|
function SortableFilterRow({
|
||||||
filter,
|
filter,
|
||||||
index,
|
index,
|
||||||
|
totalCount,
|
||||||
filterKey,
|
filterKey,
|
||||||
isSelected,
|
isSelected,
|
||||||
onToggleSelect,
|
onToggleSelect,
|
||||||
@@ -582,7 +583,13 @@ function SortableFilterRow({
|
|||||||
/>
|
/>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<span className="badge bg-secondary-lt text-muted me-2">#{index + 1}</span>
|
{index === totalCount - 1 ? (
|
||||||
|
<span className="badge bg-green-lt text-green" title="Высший приоритет">#{index + 1} ★</span>
|
||||||
|
) : index === 0 ? (
|
||||||
|
<span className="badge bg-secondary-lt text-muted" title="Низший приоритет">#{index + 1}</span>
|
||||||
|
) : (
|
||||||
|
<span className="badge bg-secondary-lt text-muted">#{index + 1}</span>
|
||||||
|
)}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<div className="d-flex align-items-start">
|
<div className="d-flex align-items-start">
|
||||||
@@ -1997,9 +2004,14 @@ function FilterManager() {
|
|||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<div className="alert alert-info mb-3 d-flex align-items-center">
|
<div className="alert alert-info mb-3">
|
||||||
<IconGripVertical size={18} className="me-2" />
|
<div className="d-flex align-items-center">
|
||||||
<span>Перетащите строки за иконку <IconGripVertical size={14} className="mx-1" /> чтобы изменить приоритет правил</span>
|
<IconGripVertical size={18} className="me-2" />
|
||||||
|
<span>Перетащите строки за иконку <IconGripVertical size={14} className="mx-1" /> чтобы изменить приоритет</span>
|
||||||
|
</div>
|
||||||
|
<div className="text-muted small mt-1">
|
||||||
|
<strong>Важно:</strong> В RouterOS правила внизу списка имеют <strong>высший приоритет</strong> (переопределяют верхние)
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<DndContext
|
<DndContext
|
||||||
sensors={sensors}
|
sensors={sensors}
|
||||||
@@ -2059,6 +2071,7 @@ function FilterManager() {
|
|||||||
key={key}
|
key={key}
|
||||||
filter={filter}
|
filter={filter}
|
||||||
index={index}
|
index={index}
|
||||||
|
totalCount={serverFilters.filter(f => f != null).length}
|
||||||
filterKey={key}
|
filterKey={key}
|
||||||
isSelected={isSelected}
|
isSelected={isSelected}
|
||||||
onToggleSelect={() => toggleSelectFilter(key)}
|
onToggleSelect={() => toggleSelectFilter(key)}
|
||||||
|
|||||||
Reference in New Issue
Block a user