diff --git a/rsconcept/frontend/src/components/Icons.tsx b/rsconcept/frontend/src/components/Icons.tsx index 8352f7d7..1eb7af54 100644 --- a/rsconcept/frontend/src/components/Icons.tsx +++ b/rsconcept/frontend/src/components/Icons.tsx @@ -440,6 +440,14 @@ export function CheckIcon(props: IconProps) { ); } +export function CogIcon(props: IconProps) { + return ( + + + + ); +} + export function CrossIcon(props: IconProps) { return ( diff --git a/rsconcept/frontend/src/components/Navigation/Logo.tsx b/rsconcept/frontend/src/components/Navigation/Logo.tsx index 106714dc..56e6df4a 100644 --- a/rsconcept/frontend/src/components/Navigation/Logo.tsx +++ b/rsconcept/frontend/src/components/Navigation/Logo.tsx @@ -8,7 +8,7 @@ function Logo({ title }: LogoProps) { return ( - {title} + {title} ); } diff --git a/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx b/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx index b02c51cb..9e52c6ac 100644 --- a/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx +++ b/rsconcept/frontend/src/components/Navigation/NavigationButton.tsx @@ -13,7 +13,7 @@ function NavigationButton({ id, icon, description, onClick, text }: NavigationBu type='button' onClick={onClick} tabIndex={-1} - className={`flex items-center h-full gap-1 ${text ? 'px-2' : 'px-4'} mr-1 min-w-fit whitespace-nowrap clr-btn-nav`} + className={`flex items-center h-full gap-1 ${text ? 'px-2' : 'px-4'} mr-1 min-w-fit small-caps whitespace-nowrap clr-btn-nav`} > {icon && {icon}} {text && {text}} diff --git a/rsconcept/frontend/src/pages/RSFormPage/elements/DependencyModePicker.tsx b/rsconcept/frontend/src/pages/RSFormPage/elements/DependencyModePicker.tsx index 78aac3e7..10771c93 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/elements/DependencyModePicker.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/elements/DependencyModePicker.tsx @@ -2,6 +2,7 @@ import { useCallback } from 'react'; import Dropdown from '../../../components/Common/Dropdown'; import DropdownButton from '../../../components/Common/DropdownButton'; +import { CogIcon } from '../../../components/Icons'; import useDropdown from '../../../hooks/useDropdown'; import { DependencyMode } from '../../../models/miscelanious'; import { labelDependencyMode } from '../../../utils/labels'; @@ -21,14 +22,16 @@ function DependencyModePicker({ value, onChange }: DependencyModePickerProps) { }, [pickerMenu, onChange]); return ( -
- + { pickerMenu.isActive && handleChange(DependencyMode.ALL)}> diff --git a/rsconcept/frontend/src/pages/RSFormPage/elements/MatchModePicker.tsx b/rsconcept/frontend/src/pages/RSFormPage/elements/MatchModePicker.tsx index 2e4338f2..cf94bf67 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/elements/MatchModePicker.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/elements/MatchModePicker.tsx @@ -2,6 +2,7 @@ import { useCallback } from 'react'; import Dropdown from '../../../components/Common/Dropdown'; import DropdownButton from '../../../components/Common/DropdownButton'; +import { FilterCogIcon } from '../../../components/Icons'; import useDropdown from '../../../hooks/useDropdown'; import { CstMatchMode } from '../../../models/miscelanious'; import { labelCstMathchMode } from '../../../utils/labels'; @@ -21,16 +22,18 @@ function MatchModePicker({ value, onChange }: MatchModePickerProps) { }, [pickerMenu, onChange]); return ( -
- + { pickerMenu.isActive && - + handleChange(CstMatchMode.ALL)}>

везде: искать во всех атрибутах

diff --git a/rsconcept/frontend/src/pages/RSFormPage/elements/StatusBar.tsx b/rsconcept/frontend/src/pages/RSFormPage/elements/StatusBar.tsx index 4cec8694..2652bfbd 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/elements/StatusBar.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/elements/StatusBar.tsx @@ -28,7 +28,7 @@ function StatusBar({ isModified, constituenta, parseData }: StatusBarProps) { return (
{labelExpressionStatus(status)} diff --git a/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx b/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx index 0f6694e4..dc28af95 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/elements/ViewSideConstituents.tsx @@ -1,6 +1,7 @@ import { useCallback, useLayoutEffect, useMemo, useState } from 'react'; import DataTable, { createColumnHelper, IConditionalStyle, VisibilityState } from '../../../components/DataTable'; +import { MagnifyingGlassIcon } from '../../../components/Icons'; import { useRSForm } from '../../../context/RSFormContext'; import { useConceptTheme } from '../../../context/ThemeContext'; import useLocalStorage from '../../../hooks/useLocalStorage'; @@ -189,17 +190,20 @@ function ViewSideConstituents({ expression, baseHeight, activeID, onOpenEdit }: }, [noNavigation, baseHeight]); return (<> -
+
+
+ +
+ setFilterText(event.target.value)} + /> - setFilterText(event.target.value)} - />