mirror of
https://github.com/IRBorisov/ConceptPortal.git
synced 2025-06-26 13:00:39 +03:00
M: Minor UI improvements
This commit is contained in:
parent
4dc89f4a57
commit
a583d427b5
|
@ -23,7 +23,7 @@ function InfoConstituenta({ data, className, ...restProps }: InfoConstituentaPro
|
||||||
{data.term_resolved || data.term_raw}
|
{data.term_resolved || data.term_raw}
|
||||||
</p>
|
</p>
|
||||||
) : null}
|
) : null}
|
||||||
<p>
|
<p className='break-all'>
|
||||||
<b>Типизация: </b>
|
<b>Типизация: </b>
|
||||||
{labelCstTypification(data)}
|
{labelCstTypification(data)}
|
||||||
</p>
|
</p>
|
||||||
|
|
|
@ -14,7 +14,6 @@ import { useLibrary } from '@/context/LibraryContext';
|
||||||
import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/models/library';
|
import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/models/library';
|
||||||
import { IOperationSchema } from '@/models/oss';
|
import { IOperationSchema } from '@/models/oss';
|
||||||
import { sortItemsForOSS } from '@/models/ossAPI';
|
import { sortItemsForOSS } from '@/models/ossAPI';
|
||||||
import { limits, patterns } from '@/utils/constants';
|
|
||||||
|
|
||||||
interface TabInputOperationProps {
|
interface TabInputOperationProps {
|
||||||
oss: IOperationSchema;
|
oss: IOperationSchema;
|
||||||
|
@ -67,8 +66,6 @@ function TabInputOperation({
|
||||||
id='operation_alias'
|
id='operation_alias'
|
||||||
label='Сокращение'
|
label='Сокращение'
|
||||||
className='w-[14rem]'
|
className='w-[14rem]'
|
||||||
pattern={patterns.library_alias}
|
|
||||||
title={`не более ${limits.library_alias_len} символов`}
|
|
||||||
value={alias}
|
value={alias}
|
||||||
onChange={event => setAlias(event.target.value)}
|
onChange={event => setAlias(event.target.value)}
|
||||||
disabled={attachedID !== undefined}
|
disabled={attachedID !== undefined}
|
||||||
|
|
|
@ -4,7 +4,6 @@ import TextArea from '@/components/ui/TextArea';
|
||||||
import TextInput from '@/components/ui/TextInput';
|
import TextInput from '@/components/ui/TextInput';
|
||||||
import AnimateFade from '@/components/wrap/AnimateFade';
|
import AnimateFade from '@/components/wrap/AnimateFade';
|
||||||
import { IOperationSchema, OperationID } from '@/models/oss';
|
import { IOperationSchema, OperationID } from '@/models/oss';
|
||||||
import { limits, patterns } from '@/utils/constants';
|
|
||||||
|
|
||||||
import PickMultiOperation from '../../components/select/PickMultiOperation';
|
import PickMultiOperation from '../../components/select/PickMultiOperation';
|
||||||
|
|
||||||
|
@ -44,8 +43,6 @@ function TabSynthesisOperation({
|
||||||
id='operation_alias'
|
id='operation_alias'
|
||||||
label='Сокращение'
|
label='Сокращение'
|
||||||
className='w-[14rem]'
|
className='w-[14rem]'
|
||||||
pattern={patterns.library_alias}
|
|
||||||
title={`не более ${limits.library_alias_len} символов`}
|
|
||||||
value={alias}
|
value={alias}
|
||||||
onChange={event => setAlias(event.target.value)}
|
onChange={event => setAlias(event.target.value)}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
import TextArea from '@/components/ui/TextArea';
|
import TextArea from '@/components/ui/TextArea';
|
||||||
import TextInput from '@/components/ui/TextInput';
|
import TextInput from '@/components/ui/TextInput';
|
||||||
import AnimateFade from '@/components/wrap/AnimateFade';
|
import AnimateFade from '@/components/wrap/AnimateFade';
|
||||||
import { limits, patterns } from '@/utils/constants';
|
|
||||||
|
|
||||||
interface TabOperationProps {
|
interface TabOperationProps {
|
||||||
alias: string;
|
alias: string;
|
||||||
|
@ -26,8 +25,6 @@ function TabOperation({ alias, setAlias, title, setTitle, comment, setComment }:
|
||||||
id='operation_alias'
|
id='operation_alias'
|
||||||
label='Сокращение'
|
label='Сокращение'
|
||||||
className='w-[14rem]'
|
className='w-[14rem]'
|
||||||
pattern={patterns.library_alias}
|
|
||||||
title={`не более ${limits.library_alias_len} символов`}
|
|
||||||
value={alias}
|
value={alias}
|
||||||
onChange={event => setAlias(event.target.value)}
|
onChange={event => setAlias(event.target.value)}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -26,7 +26,7 @@ import useLocalStorage from '@/hooks/useLocalStorage';
|
||||||
import { AccessPolicy, LibraryItemType, LocationHead } from '@/models/library';
|
import { AccessPolicy, LibraryItemType, LocationHead } from '@/models/library';
|
||||||
import { ILibraryCreateData } from '@/models/library';
|
import { ILibraryCreateData } from '@/models/library';
|
||||||
import { combineLocation, validateLocation } from '@/models/libraryAPI';
|
import { combineLocation, validateLocation } from '@/models/libraryAPI';
|
||||||
import { EXTEOR_TRS_FILE, limits, patterns, storage } from '@/utils/constants';
|
import { EXTEOR_TRS_FILE, storage } from '@/utils/constants';
|
||||||
import { information } from '@/utils/labels';
|
import { information } from '@/utils/labels';
|
||||||
|
|
||||||
function FormCreateItem() {
|
function FormCreateItem() {
|
||||||
|
@ -153,8 +153,6 @@ function FormCreateItem() {
|
||||||
label='Сокращение'
|
label='Сокращение'
|
||||||
placeholder={file && 'Загрузить из файла'}
|
placeholder={file && 'Загрузить из файла'}
|
||||||
className='w-[14rem]'
|
className='w-[14rem]'
|
||||||
pattern={patterns.library_alias}
|
|
||||||
title={`не более ${limits.library_alias_len} символов`}
|
|
||||||
value={alias}
|
value={alias}
|
||||||
onChange={event => setAlias(event.target.value)}
|
onChange={event => setAlias(event.target.value)}
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -11,7 +11,6 @@ import TextInput from '@/components/ui/TextInput';
|
||||||
import { useOSS } from '@/context/OssContext';
|
import { useOSS } from '@/context/OssContext';
|
||||||
import { ILibraryUpdateData, LibraryItemType } from '@/models/library';
|
import { ILibraryUpdateData, LibraryItemType } from '@/models/library';
|
||||||
import ToolbarItemAccess from '@/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess';
|
import ToolbarItemAccess from '@/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess';
|
||||||
import { limits, patterns } from '@/utils/constants';
|
|
||||||
import { information } from '@/utils/labels';
|
import { information } from '@/utils/labels';
|
||||||
|
|
||||||
import { useOssEdit } from '../OssEditContext';
|
import { useOssEdit } from '../OssEditContext';
|
||||||
|
@ -102,8 +101,6 @@ function FormOSS({ id, isModified, setIsModified }: FormOSSProps) {
|
||||||
required
|
required
|
||||||
label='Сокращение'
|
label='Сокращение'
|
||||||
className='w-[14rem]'
|
className='w-[14rem]'
|
||||||
pattern={patterns.library_alias}
|
|
||||||
title={`не более ${limits.library_alias_len} символов`}
|
|
||||||
disabled={!controller.isMutable}
|
disabled={!controller.isMutable}
|
||||||
value={alias}
|
value={alias}
|
||||||
onChange={event => setAlias(event.target.value)}
|
onChange={event => setAlias(event.target.value)}
|
||||||
|
|
|
@ -335,7 +335,6 @@ function OssFlow({ isModified, setIsModified }: OssFlowProps) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const canvasWidth = useMemo(() => 'calc(100vw - 1rem)', []);
|
|
||||||
const canvasHeight = useMemo(() => calculateHeight('1.75rem + 4px'), [calculateHeight]);
|
const canvasHeight = useMemo(() => calculateHeight('1.75rem + 4px'), [calculateHeight]);
|
||||||
|
|
||||||
const OssNodeTypes: NodeTypes = useMemo(
|
const OssNodeTypes: NodeTypes = useMemo(
|
||||||
|
@ -413,7 +412,7 @@ function OssFlow({ isModified, setIsModified }: OssFlowProps) {
|
||||||
{...menuProps}
|
{...menuProps}
|
||||||
/>
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
<div className='relative' style={{ height: canvasHeight, width: canvasWidth }}>
|
<div className='relative w-[100vw]' style={{ height: canvasHeight }}>
|
||||||
{graph}
|
{graph}
|
||||||
</div>
|
</div>
|
||||||
</AnimateFade>
|
</AnimateFade>
|
||||||
|
|
|
@ -10,7 +10,6 @@ import SubmitButton from '@/components/ui/SubmitButton';
|
||||||
import TextArea from '@/components/ui/TextArea';
|
import TextArea from '@/components/ui/TextArea';
|
||||||
import TextInput from '@/components/ui/TextInput';
|
import TextInput from '@/components/ui/TextInput';
|
||||||
import { ILibraryUpdateData, LibraryItemType } from '@/models/library';
|
import { ILibraryUpdateData, LibraryItemType } from '@/models/library';
|
||||||
import { limits, patterns } from '@/utils/constants';
|
|
||||||
|
|
||||||
import { useRSEdit } from '../RSEditContext';
|
import { useRSEdit } from '../RSEditContext';
|
||||||
import ToolbarItemAccess from './ToolbarItemAccess';
|
import ToolbarItemAccess from './ToolbarItemAccess';
|
||||||
|
@ -102,8 +101,6 @@ function FormRSForm({ id, isModified, setIsModified }: FormRSFormProps) {
|
||||||
required
|
required
|
||||||
label='Сокращение'
|
label='Сокращение'
|
||||||
className='w-[14rem]'
|
className='w-[14rem]'
|
||||||
pattern={patterns.library_alias}
|
|
||||||
title={`не более ${limits.library_alias_len} символов`}
|
|
||||||
disabled={!controller.isContentEditable}
|
disabled={!controller.isContentEditable}
|
||||||
value={alias}
|
value={alias}
|
||||||
onChange={event => setAlias(event.target.value)}
|
onChange={event => setAlias(event.target.value)}
|
||||||
|
|
|
@ -35,7 +35,6 @@ export const PARAMETER = {
|
||||||
* Numeric limitations.
|
* Numeric limitations.
|
||||||
*/
|
*/
|
||||||
export const limits = {
|
export const limits = {
|
||||||
library_alias_len: 12,
|
|
||||||
location_len: 500
|
location_len: 500
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -48,8 +47,7 @@ export const EXTEOR_TRS_FILE = '.trs';
|
||||||
* Regex patterns for data validation.
|
* Regex patterns for data validation.
|
||||||
*/
|
*/
|
||||||
export const patterns = {
|
export const patterns = {
|
||||||
login: '^[a-zA-Z][a-zA-Z0-9_\\-]{1,}[a-zA-Z0-9]$',
|
login: '^[a-zA-Z][a-zA-Z0-9_\\-]{1,}[a-zA-Z0-9]$'
|
||||||
library_alias: `.{1,${limits.library_alias_len}}`
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue
Block a user