From 1260f159c9ef75dc0c583b6101445c0bfd0bc397 Mon Sep 17 00:00:00 2001 From: Ivan <8611739+IRBorisov@users.noreply.github.com> Date: Thu, 3 Jul 2025 14:35:26 +0300 Subject: [PATCH] M: Multiple minor UI fixes --- .../frontend/src/features/help/items/ui/help-library.tsx | 2 +- .../src/features/library/components/pick-schema.tsx | 2 +- .../library/pages/library-page/toolbar-search.tsx | 2 +- .../library/pages/library-page/use-library-columns.tsx | 2 +- .../frontend/src/features/oss/components/oss-stats.tsx | 2 +- .../src/features/oss/components/pick-multi-operation.tsx | 4 ++-- .../frontend/src/features/oss/components/select-block.tsx | 2 +- .../src/features/oss/components/select-operation.tsx | 2 +- .../oss/dialogs/dlg-create-block/dlg-create-block.tsx | 2 +- .../dialogs/dlg-create-operation/tab-input-operation.tsx | 2 +- .../dlg-create-operation/tab-synthesis-operation.tsx | 2 +- .../oss/dialogs/dlg-edit-operation/tab-operation.tsx | 2 +- .../features/oss/dialogs/dlg-relocate-constituents.tsx | 8 ++++---- .../oss-page/editor-oss-graph/side-panel/side-panel.tsx | 4 ++-- .../src/features/rsform/components/pick-substitutions.tsx | 4 ++-- .../src/features/rsform/components/rsform-stats.tsx | 4 ++-- .../features/rsform/components/select-constituenta.tsx | 2 +- .../rsform/dialogs/dlg-cst-template/tab-template.tsx | 2 +- .../rsform-page/editor-rsform-card/editor-rsform-card.tsx | 7 ++++--- .../src/features/users/components/select-user.tsx | 7 +------ rsconcept/frontend/src/styling/utilities.css | 2 +- 21 files changed, 31 insertions(+), 35 deletions(-) diff --git a/rsconcept/frontend/src/features/help/items/ui/help-library.tsx b/rsconcept/frontend/src/features/help/items/ui/help-library.tsx index f7168071..59dd40f2 100644 --- a/rsconcept/frontend/src/features/help/items/ui/help-library.tsx +++ b/rsconcept/frontend/src/features/help/items/ui/help-library.tsx @@ -48,7 +48,7 @@ export function HelpLibrary() { фильтр по пользователю
  • - фильтр по названию и шифру + фильтр по названию и сокращению
  • сбросить фильтры diff --git a/rsconcept/frontend/src/features/library/components/pick-schema.tsx b/rsconcept/frontend/src/features/library/components/pick-schema.tsx index 2213c6b1..28ae53f0 100644 --- a/rsconcept/frontend/src/features/library/components/pick-schema.tsx +++ b/rsconcept/frontend/src/features/library/components/pick-schema.tsx @@ -59,7 +59,7 @@ export function PickSchema({ const columns = [ columnHelper.accessor('alias', { id: 'alias', - header: 'Шифр', + header: 'Сокращение', size: 150, minSize: 80, maxSize: 150 diff --git a/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx b/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx index 77f17878..30f16566 100644 --- a/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx +++ b/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx @@ -88,7 +88,7 @@ export function ToolbarSearch({ className, total, filtered }: ToolbarSearchProps /> + ); } diff --git a/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx b/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx index 8b5f02fd..f6e85214 100644 --- a/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx +++ b/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx @@ -231,7 +231,7 @@ export function PickSubstitutions({ item.id !== rightArgument?.id)} value={leftArgument} onChange={setLeftArgument} @@ -263,7 +263,7 @@ export function PickSubstitutions({ item.id !== leftArgument?.id)} value={rightArgument} onChange={setRightArgument} diff --git a/rsconcept/frontend/src/features/rsform/components/rsform-stats.tsx b/rsconcept/frontend/src/features/rsform/components/rsform-stats.tsx index 756d02a4..f756a623 100644 --- a/rsconcept/frontend/src/features/rsform/components/rsform-stats.tsx +++ b/rsconcept/frontend/src/features/rsform/components/rsform-stats.tsx @@ -29,7 +29,7 @@ interface RSFormStatsProps { export function RSFormStats({ className, stats }: RSFormStatsProps) { return ( - + ); } diff --git a/rsconcept/frontend/src/features/rsform/components/select-constituenta.tsx b/rsconcept/frontend/src/features/rsform/components/select-constituenta.tsx index 69f0404a..da1d124c 100644 --- a/rsconcept/frontend/src/features/rsform/components/select-constituenta.tsx +++ b/rsconcept/frontend/src/features/rsform/components/select-constituenta.tsx @@ -16,7 +16,7 @@ interface SelectConstituentaProps { export function SelectConstituenta({ items, - placeholder = 'Выберите конституенту', + placeholder = 'Выбор конституенты', ...restProps }: SelectConstituentaProps) { return ( diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-template.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-template.tsx index 1e8efa95..ac82cbd1 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-template.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-template.tsx @@ -67,7 +67,7 @@ export function TabTemplate() { noBorder noSearch clearable - placeholder='Выберите категорию' + placeholder='Категория' className='grow' idFunc={cst => String(cst.id)} labelValueFunc={cst => cst.term_raw} diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/editor-rsform-card.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/editor-rsform-card.tsx index 15b74308..2da98c89 100644 --- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/editor-rsform-card.tsx +++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/editor-rsform-card.tsx @@ -63,14 +63,15 @@ export function EditorRSFormCard() { - + > + + ); } diff --git a/rsconcept/frontend/src/features/users/components/select-user.tsx b/rsconcept/frontend/src/features/users/components/select-user.tsx index 913430aa..f9a9520a 100644 --- a/rsconcept/frontend/src/features/users/components/select-user.tsx +++ b/rsconcept/frontend/src/features/users/components/select-user.tsx @@ -31,12 +31,7 @@ function compareUsers(a: IUserInfo, b: IUserInfo) { return a.id - b.id; } -export function SelectUser({ - filter, - noAnonymous, - placeholder = 'Выберите пользователя', - ...restProps -}: SelectUserProps) { +export function SelectUser({ filter, noAnonymous, placeholder = 'Выбор пользователя', ...restProps }: SelectUserProps) { const { users } = useUsers(); const getUserLabel = useLabelUser(); diff --git a/rsconcept/frontend/src/styling/utilities.css b/rsconcept/frontend/src/styling/utilities.css index 80936370..06e887fc 100644 --- a/rsconcept/frontend/src/styling/utilities.css +++ b/rsconcept/frontend/src/styling/utilities.css @@ -151,7 +151,7 @@ @utility cc-animate-panel { transition-property: translate, opacity; transition-timing-function: var(--ease-bezier); - transition-duration: var(--duration-transform); + transition-duration: var(--duration-move); } @utility cc-animate-position {