From a2c994281eec695a04796291aeae793689e6e04d Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 14 May 2025 10:56:50 +0300
Subject: [PATCH] R: Improve layouting commands
---
.../src/features/help/items/ui/help-formula-tree.tsx | 5 +++++
.../src/features/help/items/ui/help-rsgraph-term.tsx | 3 +++
.../src/features/help/items/ui/help-type-graph.tsx | 5 +++++
.../src/features/oss/dialogs/dlg-edit-block.tsx | 3 +++
.../dialogs/dlg-edit-operation/dlg-edit-operation.tsx | 6 +++---
.../frontend/src/features/oss/models/oss-layout-api.ts | 10 ++++++++++
6 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/rsconcept/frontend/src/features/help/items/ui/help-formula-tree.tsx b/rsconcept/frontend/src/features/help/items/ui/help-formula-tree.tsx
index 77b89ab3..ae6413bf 100644
--- a/rsconcept/frontend/src/features/help/items/ui/help-formula-tree.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-formula-tree.tsx
@@ -27,6 +27,11 @@ export function HelpFormulaTree() {
составные выражения
+
+ Команды
+
+ Space – перемещение экрана
+
);
}
diff --git a/rsconcept/frontend/src/features/help/items/ui/help-rsgraph-term.tsx b/rsconcept/frontend/src/features/help/items/ui/help-rsgraph-term.tsx
index 9e908f2d..04a1bb39 100644
--- a/rsconcept/frontend/src/features/help/items/ui/help-rsgraph-term.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-rsgraph-term.tsx
@@ -69,6 +69,9 @@ export function HelpRSGraphTerm() {
Общие
+
+ Space – перемещение экрана
+
переход к связанной
diff --git a/rsconcept/frontend/src/features/help/items/ui/help-type-graph.tsx b/rsconcept/frontend/src/features/help/items/ui/help-type-graph.tsx
index 2febed90..8427add8 100644
--- a/rsconcept/frontend/src/features/help/items/ui/help-type-graph.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-type-graph.tsx
@@ -27,6 +27,11 @@ export function HelpTypeGraph() {
ступень декартова произведения
+
+ Команды
+
+ Space – перемещение экрана
+
);
}
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-block.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-block.tsx
index 27459f41..3f947f47 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-block.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-block.tsx
@@ -42,6 +42,9 @@ export function DlgEditBlock() {
});
function onSubmit(data: IUpdateBlockDTO) {
+ if (data.item_data.parent !== target.parent) {
+ manager.onBlockChangeParent(data.target, data.item_data.parent);
+ }
return updateBlock({ itemID: manager.oss.id, data });
}
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx
index 492ad928..9c8c5383 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/dlg-edit-operation.tsx
@@ -58,9 +58,9 @@ export function DlgEditOperation() {
const [activeTab, setActiveTab] = useState
(TabID.CARD);
function onSubmit(data: IUpdateOperationDTO) {
- // if (data.item_data.parent !== target.parent) {
- // data.layout = updateLayoutOnOperationChange(data.target, data.item_data.parent, data.layout);
- // }
+ if (data.item_data.parent !== target.parent) {
+ manager.onOperationChangeParent(data.target, data.item_data.parent);
+ }
return updateOperation({ itemID: manager.oss.id, data });
}
diff --git a/rsconcept/frontend/src/features/oss/models/oss-layout-api.ts b/rsconcept/frontend/src/features/oss/models/oss-layout-api.ts
index 45e51d36..cb9a965d 100644
--- a/rsconcept/frontend/src/features/oss/models/oss-layout-api.ts
+++ b/rsconcept/frontend/src/features/oss/models/oss-layout-api.ts
@@ -115,4 +115,14 @@ export class LayoutManager {
height: bottom && top ? bottom - top : data.height
};
}
+
+ /** Update layout when parent changes */
+ onOperationChangeParent(targetID: number, newParent: number | null) {
+ console.error('not implemented', targetID, newParent);
+ }
+
+ /** Update layout when parent changes */
+ onBlockChangeParent(targetID: number, newParent: number | null) {
+ console.error('not implemented', targetID, newParent);
+ }
}