From fbbbd7c247fa0939cfe1f3d3bf44f0e3e6acfc66 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Wed, 11 Jun 2025 21:52:32 +0300 Subject: [PATCH] =?UTF-8?q?WEBAPP:=20P8PTable=20=D0=B4=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0=D0=BD=20=D0=B4=D0=BB=D1=8F=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=82=D0=B8=D0=BF=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE?= =?UTF-8?q?=20P8PHintDialog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/p8p_table.js | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/app/components/p8p_table.js b/app/components/p8p_table.js index 84c16ee..f47252c 100644 --- a/app/components/p8p_table.js +++ b/app/components/p8p_table.js @@ -34,7 +34,7 @@ import { Link } from "@mui/material"; //Интерфейсные компоненты import { useTheme } from "@mui/material/styles"; //Взаимодействие со стилями MUI -import { P8PAppInlineError } from "./p8p_app_message"; //Встраиваемое сообщение об ошибке +import { P8PAppInlineError, P8PHintDialog } from "./p8p_app_message"; //Встраиваемое сообщение об ошибке import { P8P_TABLE_AT, HEADER_INITIAL_STATE, hasValue, p8pTableReducer } from "./p8p_table_reducer"; //Редьюсер состояния //--------- @@ -288,28 +288,6 @@ P8PTableColumnMenu.propTypes = { onItemClick: PropTypes.func }; -//Диалог подсказки -const P8PTableColumnHintDialog = ({ columnDef, okBtnCaption, onOk }) => { - return ( - (onOk ? onOk() : null)}> - {columnDef.caption} - -
-
- - - -
- ); -}; - -//Контроль свойств - Диалог подсказки -P8PTableColumnHintDialog.propTypes = { - columnDef: PropTypes.object.isRequired, - okBtnCaption: PropTypes.string.isRequired, - onOk: PropTypes.func -}; - //Диалог фильтра const P8PTableColumnFilterDialog = ({ columnDef, @@ -702,9 +680,7 @@ const P8PTable = ({ //Генерация содержимого return (
- {displayHintColumn ? ( - - ) : null} + {displayHintColumn ? : null} {filterColumn ? (