diff --git a/app.styles.js b/app.styles.js
index 9627d6b..ce9318e 100644
--- a/app.styles.js
+++ b/app.styles.js
@@ -3,10 +3,49 @@
Типовые стили
*/
+//---------------------
+//Подключение библиотек
+//---------------------
+
+import { STATE } from "./app.text"; //Текстовые ресурсы и константы
+import { red, green, orange, grey } from "@mui/material/colors";
+
//----------------
//Интерфейс модуля
//----------------
+//Цвета
+export const APP_COLORS = {
+ [STATE.UNDEFINED]: {
+ color: "#dcdcdca0",
+ contrColor: "black"
+ },
+ [STATE.INFO]: {
+ color: "white",
+ contrColor: "black"
+ },
+ [STATE.OK]: {
+ color: green[200],
+ contrColor: green[900]
+ },
+ [STATE.ERR]: {
+ color: red[200],
+ contrColor: red[900]
+ },
+ [STATE.WARN]: {
+ color: orange[200],
+ contrColor: orange[900]
+ },
+ HOVER: {
+ color: grey[200],
+ contrColor: grey[900]
+ },
+ ACTIVE: {
+ color: grey[400],
+ contrColor: grey[900]
+ }
+};
+
//Стили
export const APP_STYLES = {
SCROLL: {
diff --git a/app.text.js b/app.text.js
index ce5a66c..57dd8c0 100644
--- a/app.text.js
+++ b/app.text.js
@@ -18,7 +18,8 @@ export const TITLES = {
//Текст
export const TEXTS = {
LOADING: "Ожидайте...", //Ожидание завершения процесса
- NO_DATA_FOUND: "Данных не найдено" //Отсутствие данных
+ NO_DATA_FOUND: "Данных не найдено", //Отсутствие данных
+ NO_DATA_FOUND_SHORT: "Н.Д." //Отсутствие данных (кратко)
};
//Текст кнопок
@@ -65,3 +66,12 @@ export const ERRORS = {
export const ERRORS_HTTP = {
404: "Адрес не найден"
};
+
+//Типовые статусы
+export const STATE = {
+ UNDEFINED: "UNDEFINED",
+ INFO: "INFORMATION",
+ OK: "OK",
+ ERR: "ERR",
+ WARN: "WARN"
+};
diff --git a/app/components/p8p_app_message.js b/app/components/p8p_app_message.js
index c58acb1..08a6520 100644
--- a/app/components/p8p_app_message.js
+++ b/app/components/p8p_app_message.js
@@ -18,6 +18,8 @@ import Typography from "@mui/material/Typography"; //Текст
import Button from "@mui/material/Button"; //Кнопки
import Container from "@mui/material/Container"; //Контейнер
import Box from "@mui/material/Box"; //Обёртка
+import { BUTTONS, STATE } from "../../app.text"; //Типовые текстовые ресурсы и константы
+import { APP_COLORS } from "../../app.styles"; //Типовые стили
//---------
//Константы
@@ -25,9 +27,9 @@ import Box from "@mui/material/Box"; //Обёртка
//Варианты исполнения
const P8P_APP_MESSAGE_VARIANT = {
- INFO: "information",
- WARN: "warning",
- ERR: "error"
+ INFO: STATE.INFO,
+ WARN: STATE.WARN,
+ ERR: STATE.ERR
};
//Стили
@@ -36,28 +38,35 @@ const STYLES = {
wordBreak: "break-word"
},
INFO: {
- titleText: {},
- bodyText: {}
+ titleText: {
+ color: APP_COLORS[STATE.INFO].contrColor
+ },
+ bodyText: {
+ color: APP_COLORS[STATE.INFO].contrColor
+ }
},
WARN: {
titleText: {
- color: "orange"
+ color: APP_COLORS[STATE.WARN].contrColor
},
bodyText: {
- color: "orange"
+ color: APP_COLORS[STATE.WARN].contrColor
}
},
ERR: {
titleText: {
- color: "red"
+ color: APP_COLORS[STATE.ERR].contrColor
},
bodyText: {
- color: "red"
+ color: APP_COLORS[STATE.ERR].contrColor
}
},
INLINE_MESSAGE: {
with: "100%",
textAlign: "center"
+ },
+ FULL_ERROR_TEXT_BUTTON: {
+ color: APP_COLORS[STATE.WARN].contrColor
}
};
@@ -104,12 +113,7 @@ const P8PAppMessage = ({
//Заголовок
let titlePart;
- if (title && titleText)
- titlePart = (
-
- {titleText}
-
- );
+ if (title && titleText) titlePart = {titleText};
//Кнопка Отмена
let cancelBtnPart;
@@ -120,7 +124,7 @@ const P8PAppMessage = ({
let okBtnPart;
if (okBtn && okBtnCaption)
okBtnPart = (
-