From 6cc5bc576782b018b9f33ed003c68f7354648d51 Mon Sep 17 00:00:00 2001
From: Dollerino <dollerok101@gmail.com>
Date: Tue, 11 Nov 2025 15:52:42 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-1006=20-=20=D0=94?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B3=D0=B0=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F/=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/p8p_dialog.js              | 18 +++++++++---------
 app/panels/clnt_task_board/task_dialog.js |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/components/p8p_dialog.js b/app/components/p8p_dialog.js
index 11e6e9d..1bc2a4a 100644
--- a/app/components/p8p_dialog.js
+++ b/app/components/p8p_dialog.js
@@ -29,8 +29,8 @@ const P8P_DIALOG_WIDTH = {
 
 //Стили
 const STYLES = {
-    SCROLL: { overflow: "auto", ...APP_STYLES.SCROLL },
-    SCROLL_HIDE: { overflow: "hidden", display: "flex", flexDirection: "column" }
+    SCROLL: display =>
+        display === true ? { overflow: "auto", ...APP_STYLES.SCROLL } : { overflow: "hidden", display: "flex", flexDirection: "column" }
 };
 
 //-----------------------
@@ -52,12 +52,12 @@ const P8PDialog = ({
     fullWidth,
     inputs,
     children,
+    okDisabled = false,
+    scrollContent = true,
     onOk,
     onCancel,
     onClose,
-    onInputChange,
-    okDisabled = false,
-    scrollContent = true
+    onInputChange
 }) => {
     //Состояние элементов ввода диалога
     const [inputsState, setInputsState] = useState([]);
@@ -94,7 +94,7 @@ const P8PDialog = ({
     return (
         <Dialog onClose={handleClose} open {...{ ...(width ? { maxWidth: width } : {}), ...(fullWidth === true ? { fullWidth: true } : {}) }}>
             <DialogTitle>{title}</DialogTitle>
-            <DialogContent sx={scrollContent ? STYLES.SCROLL : STYLES.SCROLL_HIDE}>
+            <DialogContent sx={STYLES.SCROLL(scrollContent)}>
                 {inputsState.map((input, i) => (
                     <P8PInput key={i} {...input} formValues={formValues} onChange={handleInputChange} />
                 ))}
@@ -121,12 +121,12 @@ P8PDialog.propTypes = {
     fullWidth: PropTypes.bool,
     inputs: PropTypes.arrayOf(PropTypes.shape(P8P_INPUT)),
     children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
+    okDisabled: PropTypes.bool,
+    scrollContent: PropTypes.bool,
     onOk: PropTypes.func,
     onCancel: PropTypes.func,
     onClose: PropTypes.func,
-    onInputChange: PropTypes.func,
-    okDisabled: PropTypes.bool,
-    scrollContent: PropTypes.bool
+    onInputChange: PropTypes.func
 };
 
 //----------------
diff --git a/app/panels/clnt_task_board/task_dialog.js b/app/panels/clnt_task_board/task_dialog.js
index fb3e159..940fcef 100644
--- a/app/panels/clnt_task_board/task_dialog.js
+++ b/app/panels/clnt_task_board/task_dialog.js
@@ -139,7 +139,7 @@ const TaskDialog = ({ taskRn, taskType, editable, onTasksReload, onClose }) => {
         <>
             {!task.init && docProps.loaded && (
                 <P8PDialog
-                    title={task.nRn ? `Исправление события${task.nClosed ? " (событые аннулировано)" : ""}` : "Добавление события"}
+                    title={task.nRn ? `Исправление события${task.nClosed ? " [аннулировано]" : ""}` : "Добавление события"}
                     fullWidth={true}
                     onOk={() => (taskRn ? handleUpdateEvent(onClose).then(onTasksReload) : handleInsertTask(onClose).then(onTasksReload))}
                     onClose={onClose ? onClose : null}