From 0113cc52e23e6f22ec832e676a335fffd7beceb7 Mon Sep 17 00:00:00 2001 From: davay-popozhe Date: Tue, 9 Jul 2024 10:56:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-823=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=BE=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D1=8E=20=D0=BE=D1=82=2010.?= =?UTF-8?q?06.24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/panels/rrp_conf_editor/iud_form_dialog.js | 9 +++------ .../rrp_conf_editor/iud_form_text_field.js | 1 + app/panels/rrp_conf_editor/rrp_conf_editor.js | 16 ++++++++-------- app/panels/rrp_conf_editor/section_tab_panel.js | 1 + 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/panels/rrp_conf_editor/iud_form_dialog.js b/app/panels/rrp_conf_editor/iud_form_dialog.js index 3bae06d..5c734f3 100644 --- a/app/panels/rrp_conf_editor/iud_form_dialog.js +++ b/app/panels/rrp_conf_editor/iud_form_dialog.js @@ -10,10 +10,9 @@ import React, { useState, useContext, useCallback, useEffect } from "react"; //Классы React import PropTypes from "prop-types"; //Контроль свойств компонента import { Dialog, DialogTitle, IconButton, Icon, DialogContent, Typography, DialogActions, Button } from "@mui/material"; //Интерфейсные компоненты -//import { MessagingСtx } from "../../context/messaging"; //Контекст сообщений import { ApplicationСtx } from "../../context/application"; //Контекст приложения import { BackEndСtx } from "../../context/backend"; //Контекст взаимодействия с сервером -import { IUDFormTextField } from "./iud_form_text_field"; //Кастомные строки ввода +import { IUDFormTextField } from "./iud_form_text_field"; //Компонент поля ввода import { STATUSES } from "./layouts"; //Статусы и стили диалогового окна //--------- @@ -39,9 +38,6 @@ const IUDFormDialog = ({ initial, onClose, onReload }) => { //Собственное состояние const [formData, setFormData] = useState({ ...initial }); - //Подключение к контексту сообщений - //const { showMsgWarn } = useContext(MessagingСtx); - //Подключение к контексту приложения const { pOnlineShowDictionary } = useContext(ApplicationСtx); @@ -62,7 +58,7 @@ const IUDFormDialog = ({ initial, onClose, onReload }) => { //Отработка добавления/изсправления/удаления элемента const handleReload = () => { if (onReload) { - onReload(formData); + onReload(); } else null; }; @@ -264,6 +260,7 @@ const IUDFormDialog = ({ initial, onClose, onReload }) => { : null; }, [formData.colCode, formData.rowCode, formData.sctnCode, formData.sctnName, formData.status, getSctnMrkCodeName]); + //Генерация содержимого return ( {formTitle()} diff --git a/app/panels/rrp_conf_editor/iud_form_text_field.js b/app/panels/rrp_conf_editor/iud_form_text_field.js index ae04ec9..4ef0877 100644 --- a/app/panels/rrp_conf_editor/iud_form_text_field.js +++ b/app/panels/rrp_conf_editor/iud_form_text_field.js @@ -43,6 +43,7 @@ const IUDFormTextField = ({ elementCode, elementValue, labelText, onChange, dict if (onChange) onChange(e.target.name, e.target.value); }; + //Генерация содержимого return ( diff --git a/app/panels/rrp_conf_editor/rrp_conf_editor.js b/app/panels/rrp_conf_editor/rrp_conf_editor.js index b14dc38..80ebec0 100644 --- a/app/panels/rrp_conf_editor/rrp_conf_editor.js +++ b/app/panels/rrp_conf_editor/rrp_conf_editor.js @@ -11,15 +11,15 @@ import React, { useCallback, useContext, useState, useEffect } from "react"; // import { Box, Tab, Tabs, IconButton, Icon, Stack, Button } from "@mui/material"; //Интерфейсные компоненты import { P8PDataGrid, P8P_DATA_GRID_SIZE } from "../../components/p8p_data_grid"; //Таблица данных import { P8P_DATA_GRID_CONFIG_PROPS } from "../../config_wrapper"; //Подключение компонентов к настройкам приложения +import { ApplicationСtx } from "../../context/application"; //Контекст приложения import { BackEndСtx } from "../../context/backend"; //Контекст взаимодействия с сервером import { NavigationCtx } from "../../context/navigation"; //Контекст навигации import { MessagingСtx } from "../../context/messaging"; //Контекст сообщений -import { TEXTS } from "../../../app.text"; //Текстовые константы -import { SectionTabPanel } from "./section_tab_panel"; //Кастомный Tab -import { ApplicationСtx } from "../../context/application"; //Контекст приложения +import { SectionTabPanel } from "./section_tab_panel"; //Компонент вкладки раздела +import { IUDFormDialog } from "./iud_form_dialog"; //Диалог добавления/исправления/удаления компонентов настройки регламентированного отчёта import { STATUSES, dataCellRender } from "./layouts"; //Дополнительная разметка и вёрстка клиентских элементов -import { IUDFormDialog } from "./iud_form_dialog"; //Кастомное диалоговое окно -import { STYLES as COMMON_STYLES } from "./layouts"; +import { TEXTS } from "../../../app.text"; //Текстовые константы +import { STYLES as COMMON_STYLES } from "./layouts"; //Общие стили //--------- //Константы @@ -248,7 +248,7 @@ const RrpConfEditor = () => { })); setTabValue(tabFocus); } - //eslint-disable-next-line react-hooks/exhaustive-deps + // eslint-disable-next-line react-hooks/exhaustive-deps }, [rrpDoc.reload, rrpDoc.docLoaded, dataGrid.reload, dataGrid.docLoaded, executeStored]); //Отбор показателя раздела по ид. @@ -269,8 +269,8 @@ const RrpConfEditor = () => { loadData(); }, [rrpDoc.reload, dataGrid.reload, loadData]); - const handleDialogReload = data => { - console.log(JSON.stringify(data)); + //При изменениях элемента + const handleDialogReload = () => { setRrpDoc(pv => ({ ...pv, reload: true })); }; diff --git a/app/panels/rrp_conf_editor/section_tab_panel.js b/app/panels/rrp_conf_editor/section_tab_panel.js index 4afb35d..ff67ee9 100644 --- a/app/panels/rrp_conf_editor/section_tab_panel.js +++ b/app/panels/rrp_conf_editor/section_tab_panel.js @@ -18,6 +18,7 @@ import { Box, Typography } from "@mui/material"; //Интерфейсные ко const SectionTabPanel = props => { const { children, value, index, ...other } = props; + //Генерация содержимого return (