From 3f539065ba4ce412555889d214885cca6f71d458 Mon Sep 17 00:00:00 2001
From: Mikhail Chechnev <mim_@mail.ru>
Date: Mon, 21 Jul 2025 10:09:27 +0300
Subject: [PATCH 1/3] =?UTF-8?q?WEBAPP:=20=D0=9D=D0=BE=D0=B2=D1=8B=D0=B5=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D1=8B=20?=
 =?UTF-8?q?P8PDialog=20=D0=B8=20P8PInput?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/p8p_dialog.js |  76 +++++++++++++++++++
 app/components/p8p_input.js  | 137 +++++++++++++++++++++++++++++++++++
 2 files changed, 213 insertions(+)
 create mode 100644 app/components/p8p_dialog.js
 create mode 100644 app/components/p8p_input.js

diff --git a/app/components/p8p_dialog.js b/app/components/p8p_dialog.js
new file mode 100644
index 0000000..30ab288
--- /dev/null
+++ b/app/components/p8p_dialog.js
@@ -0,0 +1,76 @@
+/*
+    Парус 8 - Панели мониторинга
+    Компонент: Диалог
+*/
+
+//---------------------
+//Подключение библиотек
+//---------------------
+
+import React, { useEffect, useState } from "react"; //Классы React
+import PropTypes from "prop-types"; //Контроль свойств компонента
+import { Dialog, DialogTitle, DialogContent, DialogActions, Button } from "@mui/material"; //Интерфейсные компоненты
+import { BUTTONS } from "../../app.text"; //Общие текстовые ресурсы
+import { P8P_INPUT, P8PInput } from "./p8p_input"; //Поле ввода
+
+//-----------
+//Тело модуля
+//-----------
+
+//Диалог
+const P8PDialog = ({ title, inputs = [], children, onOk, onCancel, onClose }) => {
+    //Состояние диалога
+    const [state, setState] = useState({});
+
+    //При изменении элемента ввода
+    const handleInputChange = (name, value) => setState(pv => ({ ...pv, [name]: value }));
+
+    //При нажатии на "ОК" диалога
+    const handleOk = () => onOk && onOk(state);
+
+    //При нажатии на "Отмена" диалога
+    const handleCancel = () => onCancel && onCancel();
+
+    //При нажатии на "Закрыть" диалога
+    const handleClose = () => (onClose ? onClose() : onCancel ? onCancel() : null);
+
+    //При подключении к старнице
+    useEffect(() => {
+        setState(inputs.reduce((res, input) => ({ ...res, [input.name]: input.value == undefined ? null : input.value }), {}));
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    //Формирование представления
+    return (
+        <Dialog onClose={handleClose} open>
+            <DialogTitle>{title}</DialogTitle>
+            <DialogContent>
+                {inputs.map((input, i) => (
+                    <P8PInput key={i} {...input} value={state[input.name]} formValues={state} onChange={handleInputChange} />
+                ))}
+                {children}
+            </DialogContent>
+            <DialogActions>
+                {onOk && <Button onClick={handleOk}>{BUTTONS.OK}</Button>}
+                {onCancel && <Button onClick={handleCancel}>{BUTTONS.CANCEL}</Button>}
+                {onClose && <Button onClick={handleClose}>{BUTTONS.CLOSE}</Button>}
+            </DialogActions>
+        </Dialog>
+    );
+};
+
+//Контроль свойств - Диалог
+P8PDialog.propTypes = {
+    title: PropTypes.string.isRequired,
+    inputs: PropTypes.arrayOf(PropTypes.shape(P8P_INPUT)),
+    children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
+    onOk: PropTypes.func,
+    onCancel: PropTypes.func,
+    onClose: PropTypes.func
+};
+
+//----------------
+//Интерфейс модуля
+//----------------
+
+export { P8PDialog };
diff --git a/app/components/p8p_input.js b/app/components/p8p_input.js
new file mode 100644
index 0000000..2adc568
--- /dev/null
+++ b/app/components/p8p_input.js
@@ -0,0 +1,137 @@
+/*
+    Парус 8 - Панели мониторинга
+    Компонент: Поле ввода
+*/
+
+//---------------------
+//Подключение библиотек
+//---------------------
+
+import React, { useState, useEffect } from "react"; //Классы React
+import PropTypes from "prop-types"; //Контроль свойств компонента
+import { Box, Icon, Input, InputAdornment, FormControl, Select, InputLabel, MenuItem, IconButton, Autocomplete, TextField } from "@mui/material"; //Интерфейсные компоненты
+
+//---------
+//Константы
+//---------
+
+//Формат свойств поля ввода
+const P8P_INPUT = {
+    name: PropTypes.string.isRequired,
+    value: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.instanceOf(Date)]),
+    label: PropTypes.string.isRequired,
+    onChange: PropTypes.func,
+    dictionary: PropTypes.func,
+    list: PropTypes.array,
+    type: PropTypes.string,
+    freeSolo: PropTypes.bool,
+    disabled: PropTypes.bool,
+    formValues: PropTypes.object
+};
+
+//-----------
+//Тело модуля
+//-----------
+
+//Поле ввода
+const P8PInput = ({ name, value, label, onChange, dictionary, list, type, freeSolo = false, disabled = false, formValues, ...other }) => {
+    //Значение элемента
+    const [currentValue, setCurrentValue] = useState(value);
+
+    //При получении нового значения из вне
+    useEffect(() => {
+        setCurrentValue(value);
+    }, [value]);
+
+    //Выбор значения из словаря
+    const handleDictionaryClick = () => dictionary && dictionary(formValues, res => (res ? res.map(i => handleChangeByName(i.name, i.value)) : null));
+
+    //Изменение значения элемента (по событию)
+    const handleChange = e => {
+        setCurrentValue(e.target.value);
+        if (onChange) onChange(e.target.name, e.target.value);
+    };
+
+    //Изменение значения элемента (по имени и значению)
+    const handleChangeByName = (targetName, value) => {
+        if (targetName === name) setCurrentValue(value);
+        if (onChange) onChange(targetName, value);
+    };
+
+    //Генерация содержимого
+    return (
+        <Box p={1}>
+            <FormControl variant={"standard"} fullWidth {...other}>
+                {list ? (
+                    freeSolo ? (
+                        <Autocomplete
+                            id={name}
+                            name={name}
+                            freeSolo
+                            disabled={disabled}
+                            inputValue={currentValue ? currentValue : ""}
+                            onChange={(event, newValue) => handleChangeByName(name, newValue)}
+                            onInputChange={(event, newInputValue) => handleChangeByName(name, newInputValue)}
+                            options={list}
+                            renderInput={params => <TextField {...params} label={label} name={name} variant={"standard"} />}
+                        />
+                    ) : (
+                        <>
+                            <InputLabel id={`${name}Lable`} shrink>
+                                {label}
+                            </InputLabel>
+                            <Select
+                                labelId={`${name}Lable`}
+                                id={name}
+                                name={name}
+                                label={label}
+                                value={[undefined, null].includes(currentValue) ? "" : currentValue}
+                                onChange={handleChange}
+                                disabled={disabled}
+                                displayEmpty
+                            >
+                                {list.map((item, i) => (
+                                    <MenuItem key={i} value={[undefined, null].includes(item.value) ? "" : item.value}>
+                                        {item.name}
+                                    </MenuItem>
+                                ))}
+                            </Select>
+                        </>
+                    )
+                ) : (
+                    <>
+                        <InputLabel {...(type == "date" ? { shrink: true } : {})} htmlFor={name}>
+                            {label}
+                        </InputLabel>
+                        <Input
+                            id={name}
+                            name={name}
+                            value={currentValue ? currentValue : ""}
+                            endAdornment={
+                                dictionary ? (
+                                    <InputAdornment position="end">
+                                        <IconButton aria-label={`${name} select`} onClick={handleDictionaryClick} edge="end">
+                                            <Icon>list</Icon>
+                                        </IconButton>
+                                    </InputAdornment>
+                                ) : null
+                            }
+                            {...(type ? { type } : {})}
+                            onChange={handleChange}
+                            disabled={disabled}
+                        />
+                    </>
+                )}
+            </FormControl>
+        </Box>
+    );
+};
+
+//Контроль свойств - Поле ввода
+P8PInput.propTypes = P8P_INPUT;
+
+//----------------
+//Интерфейс модуля
+//----------------
+
+export { P8P_INPUT, P8PInput };

From a3fd089452134c673337b9bd2ddb33ea83953fcc Mon Sep 17 00:00:00 2001
From: Mikhail Chechnev <mim_@mail.ru>
Date: Mon, 21 Jul 2025 10:13:32 +0300
Subject: [PATCH 2/3] =?UTF-8?q?WEBAPP:=20"=D0=A0=D0=B5=D0=B4=D0=B0=D0=BA?=
 =?UTF-8?q?=D1=82=D0=BE=D1=80=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5?=
 =?UTF-8?q?=D0=BA=20=D0=A0=D0=9E"=20-=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=82=D0=B8=D0=BF=D0=BE=D0=B2=D1=8B=D0=B5=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D1=8B=20?=
 =?UTF-8?q?P8PDialog=20=D0=B8=20P8PInput?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rrp_conf_editor/components/dialog_help.js |   6 +-
 .../components/dialog_mark_iu.js              |  18 +--
 .../components/dialog_order.js                |  10 +-
 .../components/dialog_section_iu.js           |  10 +-
 app/panels/rrp_conf_editor/components/form.js |  76 ---------
 .../rrp_conf_editor/components/form_field.js  | 149 ------------------
 .../rrp_conf_editor/components/marks.js       |  15 +-
 .../rrp_conf_editor/components/sections.js    |  12 +-
 8 files changed, 38 insertions(+), 258 deletions(-)
 delete mode 100644 app/panels/rrp_conf_editor/components/form.js
 delete mode 100644 app/panels/rrp_conf_editor/components/form_field.js

diff --git a/app/panels/rrp_conf_editor/components/dialog_help.js b/app/panels/rrp_conf_editor/components/dialog_help.js
index b6a8b43..f54c810 100644
--- a/app/panels/rrp_conf_editor/components/dialog_help.js
+++ b/app/panels/rrp_conf_editor/components/dialog_help.js
@@ -10,7 +10,7 @@
 import React from "react"; //Классы React
 import PropTypes from "prop-types"; //Контроль свойств компонента
 import { Typography, List, ListItem } from "@mui/material"; //Интерфейсные элементы
-import { Form } from "./form"; //Типовая форма
+import { P8PDialog } from "../../../components/p8p_dialog"; //Типовой диалог
 
 //---------
 //Константы
@@ -53,7 +53,7 @@ const DialogHelp = ({ onClose }) => {
 
     //Генерация содержимого
     return (
-        <Form title={"Информация"} onClose={handleClose}>
+        <P8PDialog title={"Информация"} onClose={handleClose}>
             <Typography>Карточки показателей содержат сокращенную информацию о типе состава показателя. Список сокращений:</Typography>
             <List disablePadding={true}>
                 <HelpListItem name={"fx"} desc={"формула"} />
@@ -71,7 +71,7 @@ const DialogHelp = ({ onClose }) => {
                 <HelpListItem name={"ДПНП"} desc={"декларация по налогу на прибыль"} />
                 <HelpListItem name={"РО"} desc={"регламентированный отчет"} />
             </List>
-        </Form>
+        </P8PDialog>
     );
 };
 
diff --git a/app/panels/rrp_conf_editor/components/dialog_mark_iu.js b/app/panels/rrp_conf_editor/components/dialog_mark_iu.js
index 5c726f1..d59bf4f 100644
--- a/app/panels/rrp_conf_editor/components/dialog_mark_iu.js
+++ b/app/panels/rrp_conf_editor/components/dialog_mark_iu.js
@@ -10,7 +10,7 @@
 import React from "react"; //Классы React
 import PropTypes from "prop-types"; //Контроль свойств компонента
 import { useDictionary } from "../hooks"; //Кастомные хуки
-import { Form } from "./form"; //Типовая форма
+import { P8PDialog } from "../../../components/p8p_dialog"; //Типовой диалог
 
 //-----------
 //Тело модуля
@@ -67,15 +67,15 @@ const DialogMarkIU = ({
 
     //Генерация содержимого
     return (
-        <Form
+        <P8PDialog
             title={`${insert === true ? "Добавление" : "Исправление"} показателя`}
-            fields={[
-                { elementCode: "code", elementValue: code, labelText: "Мнемокод" },
-                { elementCode: "name", elementValue: name, labelText: "Наименование" },
-                { elementCode: "rowCode", elementValue: rowCode, labelText: "Строка", dictionary: selectRow },
-                { elementCode: "rowVersion", elementValue: rowVersion, labelText: "Редакция строки", disabled: true },
-                { elementCode: "columnCode", elementValue: columnCode, labelText: "Графа", dictionary: selectColumn },
-                { elementCode: "columnVersion", elementValue: columnVersion, labelText: "Редакция графы", disabled: true }
+            inputs={[
+                { name: "code", value: code, label: "Мнемокод" },
+                { name: "name", value: name, label: "Наименование" },
+                { name: "rowCode", value: rowCode, label: "Строка", dictionary: selectRow },
+                { name: "rowVersion", value: rowVersion, label: "Редакция строки", disabled: true },
+                { name: "columnCode", value: columnCode, label: "Графа", dictionary: selectColumn },
+                { name: "columnVersion", value: columnVersion, label: "Редакция графы", disabled: true }
             ]}
             onOk={handleOk}
             onCancel={handleCancel}
diff --git a/app/panels/rrp_conf_editor/components/dialog_order.js b/app/panels/rrp_conf_editor/components/dialog_order.js
index dddf9ea..df93e1e 100644
--- a/app/panels/rrp_conf_editor/components/dialog_order.js
+++ b/app/panels/rrp_conf_editor/components/dialog_order.js
@@ -9,7 +9,7 @@
 
 import React from "react"; //Классы React
 import PropTypes from "prop-types"; //Контроль свойств компонента
-import { Form } from "./form"; //Типовая форма
+import { P8PDialog } from "../../../components/p8p_dialog"; //Типовой диалог
 import { COL_ROW_ORDER } from "../common"; //Обще стили и константы
 
 //-----------
@@ -26,11 +26,11 @@ const DialogOrder = ({ rowOrder = 0, columnOrder = 0, onOk, onCancel }) => {
 
     //Генерация содержимого
     return (
-        <Form
+        <P8PDialog
             title={"Сортировка"}
-            fields={[
-                { elementCode: "rowOrder", elementValue: rowOrder, labelText: "Строки", list: COL_ROW_ORDER },
-                { elementCode: "columnOrder", elementValue: columnOrder, labelText: "Графы", list: COL_ROW_ORDER }
+            inputs={[
+                { name: "rowOrder", value: rowOrder, label: "Строки", list: COL_ROW_ORDER },
+                { name: "columnOrder", value: columnOrder, label: "Графы", list: COL_ROW_ORDER }
             ]}
             onOk={handleOk}
             onCancel={handleCancel}
diff --git a/app/panels/rrp_conf_editor/components/dialog_section_iu.js b/app/panels/rrp_conf_editor/components/dialog_section_iu.js
index 9694f41..cf8ddf5 100644
--- a/app/panels/rrp_conf_editor/components/dialog_section_iu.js
+++ b/app/panels/rrp_conf_editor/components/dialog_section_iu.js
@@ -9,7 +9,7 @@
 
 import React from "react"; //Классы React
 import PropTypes from "prop-types"; //Контроль свойств компонента
-import { Form } from "./form"; //Типовая форма
+import { P8PDialog } from "../../../components/p8p_dialog"; //Типовой диалог
 
 //-----------
 //Тело модуля
@@ -25,11 +25,11 @@ const DialogSectionIU = ({ code = "", name = "", insert = true, onOk, onCancel }
 
     //Генерация содержимого
     return (
-        <Form
+        <P8PDialog
             title={`${insert === true ? "Добавление" : "Исправление"} раздела`}
-            fields={[
-                { elementCode: "code", elementValue: code, labelText: "Мнемокод" },
-                { elementCode: "name", elementValue: name, labelText: "Наименование" }
+            inputs={[
+                { name: "code", value: code, label: "Мнемокод" },
+                { name: "name", value: name, label: "Наименование" }
             ]}
             onOk={handleOk}
             onCancel={handleCancel}
diff --git a/app/panels/rrp_conf_editor/components/form.js b/app/panels/rrp_conf_editor/components/form.js
deleted file mode 100644
index 98030ce..0000000
--- a/app/panels/rrp_conf_editor/components/form.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-    Парус 8 - Панели мониторинга - РО - Редактор настройки регламентированного отчёта
-    Компонент панели: Форма
-*/
-
-//---------------------
-//Подключение библиотек
-//---------------------
-
-import React, { useEffect, useState } from "react"; //Классы React
-import PropTypes from "prop-types"; //Контроль свойств компонента
-import { Dialog, DialogTitle, DialogContent, DialogActions, Button } from "@mui/material"; //Интерфейсные компоненты
-import { BUTTONS } from "../../../../app.text"; //Общие текстовые ресурсы
-import { FORM_FILED, FormField } from "./form_field"; //Элемент формы
-
-//-----------
-//Тело модуля
-//-----------
-
-//Форма
-const Form = ({ title, fields = [], children, onOk, onCancel, onClose }) => {
-    //Состояние формы
-    const [state, setState] = useState({});
-
-    //При изменении элемента формы
-    const handleFieldChange = (name, value) => setState(pv => ({ ...pv, [name]: value }));
-
-    //При нажатии на "ОК" формы
-    const handleOk = () => onOk && onOk(state);
-
-    //При нажатии на "Отмена" формы
-    const handleCancel = () => onCancel && onCancel();
-
-    //При нажатии на "Закрыть" формы
-    const handleClose = () => (onClose ? onClose() : onCancel ? onCancel() : null);
-
-    //При подключении к старнице
-    useEffect(() => {
-        setState(fields.reduce((res, f) => ({ ...res, [f.elementCode]: f.elementValue == undefined ? null : f.elementValue }), {}));
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
-
-    //Формирование представления
-    return (
-        <Dialog onClose={handleClose} open>
-            <DialogTitle>{title}</DialogTitle>
-            <DialogContent>
-                {fields.map((f, i) => (
-                    <FormField key={i} {...f} elementValue={state[f.elementCode]} formValues={state} onChange={handleFieldChange} />
-                ))}
-                {children}
-            </DialogContent>
-            <DialogActions>
-                {onOk && <Button onClick={handleOk}>{BUTTONS.OK}</Button>}
-                {onCancel && <Button onClick={handleCancel}>{BUTTONS.CANCEL}</Button>}
-                {onClose && <Button onClick={handleClose}>{BUTTONS.CLOSE}</Button>}
-            </DialogActions>
-        </Dialog>
-    );
-};
-
-//Контроль свойств - Форма
-Form.propTypes = {
-    title: PropTypes.string.isRequired,
-    fields: PropTypes.arrayOf(PropTypes.shape(FORM_FILED)),
-    children: PropTypes.oneOfType([PropTypes.node, PropTypes.arrayOf(PropTypes.node)]),
-    onOk: PropTypes.func,
-    onCancel: PropTypes.func,
-    onClose: PropTypes.func
-};
-
-//----------------
-//Интерфейс модуля
-//----------------
-
-export { Form };
diff --git a/app/panels/rrp_conf_editor/components/form_field.js b/app/panels/rrp_conf_editor/components/form_field.js
deleted file mode 100644
index 587a1ad..0000000
--- a/app/panels/rrp_conf_editor/components/form_field.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-    Парус 8 - Панели мониторинга - РО - Редактор настройки регламентированного отчёта
-    Компонент панели: Поле ввода формы
-*/
-
-//---------------------
-//Подключение библиотек
-//---------------------
-
-import React, { useState, useEffect } from "react"; //Классы React
-import PropTypes from "prop-types"; //Контроль свойств компонента
-import { Box, Icon, Input, InputAdornment, FormControl, Select, InputLabel, MenuItem, IconButton, Autocomplete, TextField } from "@mui/material"; //Интерфейсные компоненты
-
-//---------
-//Константы
-//---------
-
-//Формат свойств поля формы
-const FORM_FILED = {
-    elementCode: PropTypes.string.isRequired,
-    elementValue: PropTypes.oneOfType([PropTypes.number, PropTypes.string, PropTypes.instanceOf(Date)]),
-    labelText: PropTypes.string.isRequired,
-    onChange: PropTypes.func,
-    dictionary: PropTypes.func,
-    list: PropTypes.array,
-    type: PropTypes.string,
-    freeSolo: PropTypes.bool,
-    disabled: PropTypes.bool,
-    formValues: PropTypes.object
-};
-
-//-----------
-//Тело модуля
-//-----------
-
-//Поле ввода формы
-const FormField = ({
-    elementCode,
-    elementValue,
-    labelText,
-    onChange,
-    dictionary,
-    list,
-    type,
-    freeSolo = false,
-    disabled = false,
-    formValues,
-    ...other
-}) => {
-    //Значение элемента
-    const [value, setValue] = useState(elementValue);
-
-    //При получении нового значения из вне
-    useEffect(() => {
-        setValue(elementValue);
-    }, [elementValue]);
-
-    //Выбор значения из словаря
-    const handleDictionaryClick = () => dictionary && dictionary(formValues, res => (res ? res.map(i => handleChangeByName(i.name, i.value)) : null));
-
-    //Изменение значения элемента (по событию)
-    const handleChange = e => {
-        setValue(e.target.value);
-        if (onChange) onChange(e.target.name, e.target.value);
-    };
-
-    //Изменение значения элемента (по имени и значению)
-    const handleChangeByName = (name, value) => {
-        if (name === elementCode) setValue(value);
-        if (onChange) onChange(name, value);
-    };
-
-    //Генерация содержимого
-    return (
-        <Box p={1}>
-            <FormControl variant="standard" fullWidth {...other}>
-                {list ? (
-                    freeSolo ? (
-                        <Autocomplete
-                            id={elementCode}
-                            name={elementCode}
-                            freeSolo
-                            disabled={disabled}
-                            inputValue={value ? value : ""}
-                            onChange={(event, newValue) => handleChangeByName(elementCode, newValue)}
-                            onInputChange={(event, newInputValue) => handleChangeByName(elementCode, newInputValue)}
-                            options={list}
-                            renderInput={params => <TextField {...params} label={labelText} name={elementCode} variant={"standard"} />}
-                        />
-                    ) : (
-                        <>
-                            <InputLabel id={`${elementCode}Lable`} shrink>
-                                {labelText}
-                            </InputLabel>
-                            <Select
-                                labelId={`${elementCode}Lable`}
-                                id={elementCode}
-                                name={elementCode}
-                                label={labelText}
-                                value={[undefined, null].includes(value) ? "" : value}
-                                onChange={handleChange}
-                                disabled={disabled}
-                                displayEmpty
-                            >
-                                {list.map((item, i) => (
-                                    <MenuItem key={i} value={[undefined, null].includes(item.value) ? "" : item.value}>
-                                        {item.name}
-                                    </MenuItem>
-                                ))}
-                            </Select>
-                        </>
-                    )
-                ) : (
-                    <>
-                        <InputLabel {...(type == "date" ? { shrink: true } : {})} htmlFor={elementCode}>
-                            {labelText}
-                        </InputLabel>
-                        <Input
-                            id={elementCode}
-                            name={elementCode}
-                            value={value ? value : ""}
-                            endAdornment={
-                                dictionary ? (
-                                    <InputAdornment position="end">
-                                        <IconButton aria-label={`${elementCode} select`} onClick={handleDictionaryClick} edge="end">
-                                            <Icon>list</Icon>
-                                        </IconButton>
-                                    </InputAdornment>
-                                ) : null
-                            }
-                            {...(type ? { type } : {})}
-                            onChange={handleChange}
-                            disabled={disabled}
-                        />
-                    </>
-                )}
-            </FormControl>
-        </Box>
-    );
-};
-
-//Контроль свойств - Поле ввода формы
-FormField.propTypes = FORM_FILED;
-
-//----------------
-//Интерфейс модуля
-//----------------
-
-export { FORM_FILED, FormField };
diff --git a/app/panels/rrp_conf_editor/components/marks.js b/app/panels/rrp_conf_editor/components/marks.js
index b62520f..a8ea9f1 100644
--- a/app/panels/rrp_conf_editor/components/marks.js
+++ b/app/panels/rrp_conf_editor/components/marks.js
@@ -103,14 +103,14 @@ const Marks = ({ marks, order, marksLoading, marksInit, onRefresh, onMarkInsert,
     //При переходе к составу показателя
     const handleMarkCnOpen = (mark, constitution) => showMarkCn(mark, constitution, res => res.success && handleRefresh());
 
-    //При закрытии формы добавления/исправления по "ОК"
-    const handleIUFormOk = values => {
+    //При закрытии диалога добавления/исправления по "ОК"
+    const handleIUDialogOk = values => {
         if (modMark === true) onMarkInsert && onMarkInsert(values, res => res && setModMark(null));
         else onMarkUpdate && onMarkUpdate({ ...modMark, ...values }, res => res && setModMark(null));
     };
 
-    //При закрытии формы добавления/исправления по "Отмена"
-    const handleIUFormCancel = () => setModMark(null);
+    //При закрытии диалога добавления/исправления по "Отмена"
+    const handleIUDialogCancel = () => setModMark(null);
 
     //Формирование представления
     return (
@@ -118,7 +118,12 @@ const Marks = ({ marks, order, marksLoading, marksInit, onRefresh, onMarkInsert,
             {dialogOrder && <DialogOrder {...order} onOk={handleOrderChange} onCancel={toggleOrderDialog} />}
             {dialogHelp && <DialogHelp onClose={toggleHelpDialog} />}
             {modMark && (
-                <DialogMarkIU {...(modMark === true ? {} : modMark)} insert={modMark === true} onOk={handleIUFormOk} onCancel={handleIUFormCancel} />
+                <DialogMarkIU
+                    {...(modMark === true ? {} : modMark)}
+                    insert={modMark === true}
+                    onOk={handleIUDialogOk}
+                    onCancel={handleIUDialogCancel}
+                />
             )}
             {marksInit &&
                 (marks ? (
diff --git a/app/panels/rrp_conf_editor/components/sections.js b/app/panels/rrp_conf_editor/components/sections.js
index 4c63745..3d25186 100644
--- a/app/panels/rrp_conf_editor/components/sections.js
+++ b/app/panels/rrp_conf_editor/components/sections.js
@@ -118,15 +118,15 @@ const Sections = ({ conf, onSectionChange, onSectionCountChange }) => {
     //При удалении раздела настройки
     const handleSectionDelete = section => showMsgWarn("Удалить раздел?", () => deleteSection(section));
 
-    //При закрытии формы добавления/исправления по "ОК"
-    const handleIUFormOk = async values => {
+    //При закрытии диалога добавления/исправления по "ОК"
+    const handleIUDialogOk = async values => {
         if (modSection === true) await insertSection({ conf, ...values });
         else await updateSection({ rn: modSection.NRN, ...values });
         setModSection(null);
     };
 
-    //При закрытии формы добавления/исправления по "Отмена"
-    const handleIUFormCancel = () => setModSection(null);
+    //При закрытии диалога добавления/исправления по "Отмена"
+    const handleIUDialogCancel = () => setModSection(null);
 
     //При изменении состава разделов
     useEffect(() => {
@@ -155,8 +155,8 @@ const Sections = ({ conf, onSectionChange, onSectionCountChange }) => {
                     code={modSection?.SCODE}
                     name={modSection?.SNAME}
                     insert={modSection === true}
-                    onOk={handleIUFormOk}
-                    onCancel={handleIUFormCancel}
+                    onOk={handleIUDialogOk}
+                    onCancel={handleIUDialogCancel}
                 />
             )}
             {sections.length > 0 ? (

From d792187ff92715a53a6d4b8a48718fedeb3e03ef Mon Sep 17 00:00:00 2001
From: Mikhail Chechnev <mim_@mail.ru>
Date: Mon, 21 Jul 2025 11:52:08 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=A0=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D0=B5=D0=B9:=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20P8PDia?=
 =?UTF-8?q?log,=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panels_editor/components/components_hooks.js |  2 +-
 .../panels_editor/components/editors_common.js   | 16 ++++------------
 ...G_P8PANELS_EDITOR.pck => PKG_P8PANELS_PE.pck} |  8 ++++----
 3 files changed, 9 insertions(+), 17 deletions(-)
 rename db/{PKG_P8PANELS_EDITOR.pck => PKG_P8PANELS_PE.pck} (97%)

diff --git a/app/panels/panels_editor/components/components_hooks.js b/app/panels/panels_editor/components/components_hooks.js
index a23fce5..518cd82 100644
--- a/app/panels/panels_editor/components/components_hooks.js
+++ b/app/panels/panels_editor/components/components_hooks.js
@@ -59,7 +59,7 @@ const useUserProcDesc = ({ code, refresh }) => {
             try {
                 setLoading(true);
                 const data = await executeStored({
-                    stored: "PKG_P8PANELS_EDITOR.USERPROCS_DESC",
+                    stored: "PKG_P8PANELS_PE.USERPROCS_DESC",
                     args: { SCODE: code },
                     respArg: "COUT",
                     isArray: name => name === "arguments",
diff --git a/app/panels/panels_editor/components/editors_common.js b/app/panels/panels_editor/components/editors_common.js
index 2c2f172..20bf1d0 100644
--- a/app/panels/panels_editor/components/editors_common.js
+++ b/app/panels/panels_editor/components/editors_common.js
@@ -17,10 +17,6 @@ import {
     Typography,
     Divider,
     Chip,
-    Dialog,
-    DialogTitle,
-    DialogContent,
-    DialogActions,
     Button,
     TextField,
     InputAdornment,
@@ -34,6 +30,7 @@ import {
 import client from "../../../core/client"; //Клиент БД
 import { ApplicationСtx } from "../../../context/application"; //Контекст приложения
 import { BUTTONS } from "../../../../app.text"; //Общие текстовые ресурсы
+import { P8PDialog } from "../../../components/p8p_dialog"; //Типовой диалог
 import { useUserProcDesc } from "./components_hooks"; //Общие хуки компонентов
 import "../panels_editor.css"; //Стили редактора
 
@@ -168,14 +165,9 @@ EditorSubHeader.propTypes = {
 const ConfigDialog = ({ title, children, onOk, onCancel }) => {
     //Формирование представления
     return (
-        <Dialog onClose={onCancel} open>
-            <DialogTitle>{title}</DialogTitle>
-            <DialogContent>{children}</DialogContent>
-            <DialogActions>
-                <Button onClick={() => onOk && onOk()}>{BUTTONS.OK}</Button>
-                <Button onClick={() => onCancel && onCancel()}>{BUTTONS.CANCEL}</Button>
-            </DialogActions>
-        </Dialog>
+        <P8PDialog title={title} onOk={onOk} onCancel={onCancel}>
+            {children}
+        </P8PDialog>
     );
 };
 
diff --git a/db/PKG_P8PANELS_EDITOR.pck b/db/PKG_P8PANELS_PE.pck
similarity index 97%
rename from db/PKG_P8PANELS_EDITOR.pck
rename to db/PKG_P8PANELS_PE.pck
index 0a7a734..4f70e50 100644
--- a/db/PKG_P8PANELS_EDITOR.pck
+++ b/db/PKG_P8PANELS_PE.pck
@@ -1,4 +1,4 @@
-create or replace package PKG_P8PANELS_EDITOR as
+create or replace package PKG_P8PANELS_PE as
 
   /* Список аргументов пользовательской процедуры */
   procedure USERPROCS_DESC
@@ -7,9 +7,9 @@ create or replace package PKG_P8PANELS_EDITOR as
     COUT                    out clob     -- Сериализованный список аргументов
   );
 
-end PKG_P8PANELS_EDITOR;
+end PKG_P8PANELS_PE;
 /
-create or replace package body PKG_P8PANELS_EDITOR as
+create or replace package body PKG_P8PANELS_PE as
 
   /* Описание пользовательской процедуры */
   procedure USERPROCS_DESC
@@ -123,5 +123,5 @@ create or replace package body PKG_P8PANELS_EDITOR as
     end if;
   end USERPROCS_DESC;
 
-end PKG_P8PANELS_EDITOR;
+end PKG_P8PANELS_PE;
 /