) {
switch (value) {
case DependencyMode.ALL:
- return ;
+ return ;
case DependencyMode.OUTPUTS:
return ;
case DependencyMode.INPUTS:
diff --git a/rsconcept/frontend/src/features/rsform/components/info-constituenta.tsx b/rsconcept/frontend/src/features/rsform/components/info-constituenta.tsx
index d252ec46..e89d0e68 100644
--- a/rsconcept/frontend/src/features/rsform/components/info-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/info-constituenta.tsx
@@ -1,4 +1,4 @@
-import { IconChild } from '@/components/icons';
+import { IconChild, IconCrucial } from '@/components/icons';
import { cn } from '@/components/utils';
import { labelCstTypification } from '../labels';
@@ -15,6 +15,7 @@ export function InfoConstituenta({ data, className, ...restProps }: InfoConstitu
{data.alias}
{data.is_inherited ? : null}
+ {data.crucial ? : null}
{data.term_resolved ? (
diff --git a/rsconcept/frontend/src/features/rsform/components/pick-multi-constituenta.tsx b/rsconcept/frontend/src/features/rsform/components/pick-multi-constituenta.tsx
index a0cd840c..6056afef 100644
--- a/rsconcept/frontend/src/features/rsform/components/pick-multi-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/pick-multi-constituenta.tsx
@@ -116,7 +116,8 @@ export function PickMultiConstituenta({
const cst = schema.cstByID.get(cstID);
return !!cst && isBasicConcept(cst.cst_type);
}}
- isOwned={cstID => !schema.cstByID.get(cstID)?.is_inherited}
+ isCrucial={cstID => schema.cstByID.get(cstID)?.crucial ?? false}
+ isInherited={cstID => schema.cstByID.get(cstID)?.is_inherited ?? false}
value={value}
onChange={onChange}
className='w-fit'
diff --git a/rsconcept/frontend/src/features/rsform/components/rsform-stats.tsx b/rsconcept/frontend/src/features/rsform/components/rsform-stats.tsx
index f756a623..1b89d0ee 100644
--- a/rsconcept/frontend/src/features/rsform/components/rsform-stats.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/rsform-stats.tsx
@@ -1,6 +1,7 @@
import {
IconChild,
IconConvention,
+ IconCrucial,
IconCstAxiom,
IconCstBaseSet,
IconCstConstSet,
@@ -113,6 +114,12 @@ export function RSFormStats({ className, stats }: RSFormStatsProps) {
value={stats.count_theorem}
/>
+ }
+ value={stats.count_crucial}
+ />
LABEL_THRESHOLD ? 'text-[12px]/[16px]' : 'text-[14px]/[20px]'
)}
@@ -50,6 +51,7 @@ export function TGNode(node: TGNodeInternal) {
{description ? (
DESCRIPTION_THRESHOLD ? 'text-[10px]/[12px]' : 'text-[12px]/[16px]'
@@ -69,9 +71,11 @@ export function TGNode(node: TGNodeInternal) {
// ====== INTERNAL ======
function describeCstNode(cst: IConstituenta) {
- return `${cst.alias}: ${cst.term_resolved}
Типизация: ${labelCstTypification(
- cst
- )}
Содержание: ${
- isBasicConcept(cst.cst_type) ? cst.convention : cst.definition_resolved || cst.definition_formal || cst.convention
+ const contents = isBasicConcept(cst.cst_type)
+ ? cst.convention
+ : cst.definition_resolved || cst.definition_formal || cst.convention;
+ const typification = labelCstTypification(cst);
+ return `${cst.alias}: ${cst.term_resolved}
Типизация: ${typification}
Содержание: ${
+ contents ? contents : 'отсутствует'
}`;
}
diff --git a/rsconcept/frontend/src/features/rsform/components/toolbar-graph-selection.tsx b/rsconcept/frontend/src/features/rsform/components/toolbar-graph-selection.tsx
index 5e454480..ed947efb 100644
--- a/rsconcept/frontend/src/features/rsform/components/toolbar-graph-selection.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/toolbar-graph-selection.tsx
@@ -1,6 +1,9 @@
import { MiniButton } from '@/components/control';
import { Dropdown, DropdownButton, useDropdown } from '@/components/dropdown';
import {
+ IconChild,
+ IconContextSelection,
+ IconCrucial,
IconGraphCollapse,
IconGraphCore,
IconGraphExpand,
@@ -8,7 +11,7 @@ import {
IconGraphInverse,
IconGraphMaximize,
IconGraphOutputs,
- IconGraphSelection,
+ IconGroupSelection,
IconPredecessor,
IconReset
} from '@/components/icons';
@@ -21,7 +24,8 @@ interface ToolbarGraphSelectionProps extends Styling {
onChange: (newSelection: number[]) => void;
graph: Graph;
isCore: (item: number) => boolean;
- isOwned?: (item: number) => boolean;
+ isCrucial: (item: number) => boolean;
+ isInherited: (item: number) => boolean;
}
export function ToolbarGraphSelection({
@@ -29,20 +33,66 @@ export function ToolbarGraphSelection({
graph,
value: selected,
isCore,
- isOwned,
+ isInherited,
+ isCrucial,
onChange,
...restProps
}: ToolbarGraphSelectionProps) {
- const menu = useDropdown();
+ const selectedMenu = useDropdown();
+ const groupMenu = useDropdown();
const emptySelection = selected.length === 0;
+ function handleSelectReset() {
+ onChange([]);
+ }
+
function handleSelectCore() {
+ groupMenu.hide();
const core = [...graph.nodes.keys()].filter(isCore);
onChange([...core, ...graph.expandInputs(core)]);
}
function handleSelectOwned() {
- if (isOwned) onChange([...graph.nodes.keys()].filter(isOwned));
+ groupMenu.hide();
+ onChange([...graph.nodes.keys()].filter((item: number) => !isInherited(item)));
+ }
+
+ function handleSelectInherited() {
+ groupMenu.hide();
+ onChange([...graph.nodes.keys()].filter(isInherited));
+ }
+
+ function handleSelectCrucial() {
+ groupMenu.hide();
+ onChange([...graph.nodes.keys()].filter(isCrucial));
+ }
+
+ function handleExpandOutputs() {
+ onChange([...selected, ...graph.expandOutputs(selected)]);
+ }
+
+ function handleExpandInputs() {
+ onChange([...selected, ...graph.expandInputs(selected)]);
+ }
+
+ function handleSelectMaximize() {
+ selectedMenu.hide();
+ onChange(graph.maximizePart(selected));
+ }
+
+ function handleSelectInvert() {
+ selectedMenu.hide();
+ onChange([...graph.nodes.keys()].filter(item => !selected.includes(item)));
+ }
+
+ function handleSelectAllInputs() {
+ selectedMenu.hide();
+ onChange([...graph.expandInputs(selected)]);
+ }
+
+ function handleSelectAllOutputs() {
+ selectedMenu.hide();
+ onChange([...graph.expandOutputs(selected)]);
}
return (
@@ -50,73 +100,99 @@ export function ToolbarGraphSelection({
}
- onClick={() => onChange([])}
+ onClick={handleSelectReset}
disabled={emptySelection}
/>
-
+
+
}
- onClick={menu.toggle}
+ title='Выделить на основе выбранных...'
+ hideTitle={selectedMenu.isOpen}
+ icon={}
+ onClick={selectedMenu.toggle}
disabled={emptySelection}
/>
-
- }
- onClick={() => onChange([...selected, ...graph.expandAllInputs(selected)])}
- disabled={emptySelection}
- />
- }
- onClick={() => onChange([...selected, ...graph.expandAllOutputs(selected)])}
- disabled={emptySelection}
- />
-
+
}
- onClick={() => onChange([...selected, ...graph.expandInputs(selected)])}
+ onClick={handleExpandInputs}
disabled={emptySelection}
/>
}
- onClick={() => onChange([...selected, ...graph.expandOutputs(selected)])}
+ onClick={handleExpandOutputs}
disabled={emptySelection}
/>
+
+ }
+ onClick={handleSelectAllInputs}
+ disabled={emptySelection}
+ />
+ }
+ onClick={handleSelectAllOutputs}
+ disabled={emptySelection}
+ />
+
}
- onClick={() => onChange(graph.maximizePart(selected))}
+ onClick={handleSelectMaximize}
disabled={emptySelection}
/>
+ }
+ onClick={handleSelectInvert}
+ />
-
}
- onClick={handleSelectCore}
- />
-
}
- onClick={handleSelectOwned}
- />
-
}
- onClick={() => onChange([...graph.nodes.keys()].filter(item => !selected.includes(item)))}
- />
+
+ }
+ onClick={groupMenu.toggle}
+ />
+
+ }
+ onClick={handleSelectCore}
+ />
+ }
+ onClick={handleSelectCrucial}
+ />
+ }
+ onClick={handleSelectOwned}
+ />
+ }
+ onClick={handleSelectInherited}
+ />
+
+
);
}
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx
index 2073c015..b81e6337 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx
@@ -6,9 +6,11 @@ import { Controller, useFormContext, useWatch } from 'react-hook-form';
import { HelpTopic } from '@/features/help';
import { BadgeHelp } from '@/features/help/components/badge-help';
+import { MiniButton } from '@/components/control';
import { TextArea, TextInput } from '@/components/input';
import { CstType, type ICreateConstituentaDTO } from '../../backend/types';
+import { IconCrucialValue } from '../../components/icon-crucial-value';
import { RSInput } from '../../components/rs-input';
import { SelectCstType } from '../../components/select-cst-type';
import { getRSDefinitionPlaceholder } from '../../labels';
@@ -30,6 +32,7 @@ export function FormCreateCst({ schema }: FormCreateCstProps) {
const cst_type = useWatch({ control, name: 'cst_type' });
const convention = useWatch({ control, name: 'convention' });
+ const crucial = useWatch({ control, name: 'crucial' });
const isBasic = isBasicConcept(cst_type);
const isElementary = isBaseSet(cst_type);
const isFunction = isFunctional(cst_type);
@@ -41,9 +44,18 @@ export function FormCreateCst({ schema }: FormCreateCstProps) {
setForceComment(false);
}
+ function handleToggleCrucial() {
+ setValue('crucial', !crucial);
+ }
+
return (
<>
+
}
+ onClick={handleToggleCrucial}
+ />
+
}
+ onClick={handleToggleCrucial}
+ />
-
+
{activeCst ? (
state.setIsModified);
const isProcessing = useMutatingRSForm();
- const { updateConstituenta: cstUpdate } = useUpdateConstituenta();
+ const { updateConstituenta } = useUpdateConstituenta();
+ const { updateCrucial } = useUpdateCrucial();
const showTypification = useDialogsStore(state => state.showShowTypeGraph);
const showEditTerm = useDialogsStore(state => state.showEditWordForms);
const showRenameCst = useDialogsStore(state => state.showRenameCst);
@@ -128,7 +133,7 @@ export function FormConstituenta({ disabled, id, toggleReset, schema, activeCst,
}
function onSubmit(data: IUpdateConstituentaDTO) {
- void cstUpdate({ itemID: schema.id, data }).then(() => {
+ void updateConstituenta({ itemID: schema.id, data }).then(() => {
setIsModified(false);
reset({ ...data });
});
@@ -158,33 +163,48 @@ export function FormConstituenta({ disabled, id, toggleReset, schema, activeCst,
showRenameCst({ schema: schema, target: activeCst });
}
- return (
-