mirror of
https://github.com/IRBorisov/ConceptPortal.git
synced 2025-06-26 13:00:39 +03:00
Small UI fixes
This commit is contained in:
parent
3e5dda2db2
commit
dc0e527a0b
|
@ -90,7 +90,7 @@ function ConstituentaPicker({
|
|||
className='overflow-y-auto text-sm border select-none'
|
||||
style={{ maxHeight: size, minHeight: size }}
|
||||
>
|
||||
<DataTable dense noHeader
|
||||
<DataTable dense noHeader noFooter
|
||||
data={filteredData}
|
||||
columns={columns}
|
||||
conditionalRowStyles={conditionalRowStyles}
|
||||
|
|
|
@ -128,13 +128,13 @@ function ArgumentsTab({ state, schema, partialUpdate }: ArgumentsTabProps) {
|
|||
return (
|
||||
<div className='flex flex-col gap-3'>
|
||||
|
||||
<div className='overflow-y-auto text-sm border select-none max-h-[7.5rem] min-h-[7.5rem]'>
|
||||
<DataTable dense
|
||||
<div className='overflow-y-auto text-sm border select-none max-h-[5.8rem] min-h-[5.8rem]'>
|
||||
<DataTable dense noFooter
|
||||
data={state.arguments}
|
||||
columns={columns}
|
||||
conditionalRowStyles={conditionalRowStyles}
|
||||
noDataComponent={
|
||||
<span className='flex flex-col justify-center p-2 text-center min-h-[5rem]'>
|
||||
<span className='flex flex-col justify-center p-2 text-center min-h-[3.6rem]'>
|
||||
<p>Аргументы отсутствуют</p>
|
||||
</span>
|
||||
}
|
||||
|
@ -142,7 +142,7 @@ function ArgumentsTab({ state, schema, partialUpdate }: ArgumentsTabProps) {
|
|||
/>
|
||||
</div>
|
||||
|
||||
<div className='flex items-center justify-center w-full gap-2 select-none'>
|
||||
<div className='flex items-center justify-center w-full gap-2 py-1 select-none'>
|
||||
<span title='Выберите аргумент из списка сверху и значение из списка снизу'
|
||||
className='font-semibold text-center'
|
||||
>
|
||||
|
@ -171,10 +171,11 @@ function ArgumentsTab({ state, schema, partialUpdate }: ArgumentsTabProps) {
|
|||
data={schema?.items}
|
||||
onSelectValue={handleSelectConstituenta}
|
||||
prefixID={prefixes.cst_modal_list}
|
||||
rows={5}
|
||||
rows={7}
|
||||
/>
|
||||
|
||||
<RSInput id='result'
|
||||
dimensions='w-full mt-[0.3rem]'
|
||||
placeholder='Итоговое определение'
|
||||
height='4.8rem'
|
||||
value={state.definition}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { useEffect, useLayoutEffect, useState } from 'react';
|
||||
import { useLayoutEffect, useState } from 'react';
|
||||
import { TabList, TabPanel, Tabs } from 'react-tabs';
|
||||
|
||||
import ConceptTab from '../../components/Common/ConceptTab';
|
||||
|
@ -27,7 +27,7 @@ export enum TabID {
|
|||
}
|
||||
|
||||
function DlgConstituentaTemplate({ hideWindow, schema, onCreate }: DlgConstituentaTemplateProps) {
|
||||
const [validated, setValidated] = useState(false);
|
||||
const [ validated, setValidated ] = useState(false);
|
||||
const [ template, updateTemplate ] = usePartialUpdate<ITemplateState>({});
|
||||
const [ substitutes, updateSubstitutes ] = usePartialUpdate<IArgumentsState>({
|
||||
definition: '',
|
||||
|
@ -53,7 +53,7 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate }: DlgConstituen
|
|||
updateConstituenta({ alias: createAliasFor(constituenta.cst_type, schema) });
|
||||
}, [constituenta.cst_type, updateConstituenta, schema]);
|
||||
|
||||
useEffect(
|
||||
useLayoutEffect(
|
||||
() => {
|
||||
setValidated(validateCstAlias(constituenta.alias, constituenta.cst_type, schema));
|
||||
}, [constituenta.alias, constituenta.cst_type, schema]);
|
||||
|
@ -119,6 +119,8 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate }: DlgConstituen
|
|||
selectedIndex={activeTab}
|
||||
onSelect={setActiveTab}
|
||||
defaultFocus
|
||||
forceRenderTabPanel
|
||||
|
||||
selectedTabClassName='clr-selected'
|
||||
className='flex flex-col items-center'
|
||||
>
|
||||
|
@ -148,14 +150,14 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate }: DlgConstituen
|
|||
</div>
|
||||
|
||||
<div className='w-full'>
|
||||
<TabPanel>
|
||||
<TabPanel style={{ display: activeTab === TabID.TEMPLATE ? '': 'none' }}>
|
||||
<TemplateTab
|
||||
state={template}
|
||||
partialUpdate={updateTemplate}
|
||||
/>
|
||||
</TabPanel>
|
||||
|
||||
<TabPanel>
|
||||
<TabPanel style={{ display: activeTab === TabID.ARGUMENTS ? '': 'none' }}>
|
||||
<ArgumentsTab
|
||||
schema={schema}
|
||||
state={substitutes}
|
||||
|
@ -163,7 +165,7 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate }: DlgConstituen
|
|||
/>
|
||||
</TabPanel>
|
||||
|
||||
<TabPanel>
|
||||
<TabPanel style={{ display: activeTab === TabID.CONSTITUENTA ? '': 'none' }}>
|
||||
<ConstituentaTab
|
||||
state={constituenta}
|
||||
partialUpdate={updateConstituenta}
|
||||
|
|
Loading…
Reference in New Issue
Block a user