From 38af01c9ef98be08768a40859c5eb968416cd5d2 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Fri, 22 Aug 2025 14:24:53 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-979=20-=20=D0=98=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D0=BA=D0=B8=20=D1=82=D0=B8=D0=BF=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B2=D1=8B=D0=BD=D0=B5?= =?UTF-8?q?=D1=81=D0=B5=D0=BD=D1=8B=20=D0=B2=20=D0=BE=D0=B1=D1=89=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/panels/query_editor/common.js | 9 ++++++++- .../query_editor/components/attribute/attribute.js | 9 ++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/panels/query_editor/common.js b/app/panels/query_editor/common.js index fc243db..c198bb2 100644 --- a/app/panels/query_editor/common.js +++ b/app/panels/query_editor/common.js @@ -10,6 +10,13 @@ //Типы данных const DATA_TYPE = { STR: 0, NUMB: 1, DATE: 2 }; +//Иконки типов данных +const DATA_TYPE_ICON = { + [DATA_TYPE.STR]: "format_align_left", + [DATA_TYPE.NUMB]: "pin", + [DATA_TYPE.DATE]: "calendar_month" +}; + //Типы элементов диаграммы const NODE_TYPE = { ENTITY: "entity", @@ -20,4 +27,4 @@ const NODE_TYPE = { //Интерфейс модуля //---------------- -export { DATA_TYPE, NODE_TYPE }; +export { DATA_TYPE, DATA_TYPE_ICON, NODE_TYPE }; diff --git a/app/panels/query_editor/components/attribute/attribute.js b/app/panels/query_editor/components/attribute/attribute.js index a3e9508..ff8fc9b 100644 --- a/app/panels/query_editor/components/attribute/attribute.js +++ b/app/panels/query_editor/components/attribute/attribute.js @@ -11,7 +11,7 @@ import React from "react"; //Классы React import PropTypes from "prop-types"; //Контроль свойств компонента import { Handle, Position, useStore } from "reactflow"; //Библиотека редактора диаграмм import { Box, Stack, Icon, Typography } from "@mui/material"; //Компоненты UI -import { DATA_TYPE } from "../../common"; //Общие ресурсы и константы редактора +import { DATA_TYPE, DATA_TYPE_ICON } from "../../common"; //Общие ресурсы и константы редактора запросов //--------- //Константы @@ -48,12 +48,7 @@ const STYLES = { }; //Иконки -const ICONS = { - [DATA_TYPE.STR]: "format_align_left", - [DATA_TYPE.NUMB]: "pin", - [DATA_TYPE.DATE]: "calendar_month", - DEFAULT: "category" -}; +const ICONS = { ...DATA_TYPE_ICON, DEFAULT: "category" }; //Структура данных об атрибуте сущности const ATTRIBUTE_DATA_SHAPE = PropTypes.shape({