ali
/
formula_editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added all field types to universal field modal

This commit is contained in:
Ali 2025-04-07 16:17:41 +04:00
parent 2042e2365a
commit 1680da6f31
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
formula_editor/formula_editor/doctype/formula_editor/formula_editor.js
View File

@ -3100,22 +3100,28 @@ function openUniversalFieldModal(frm, fieldId = null) {
return; return;
} }
// Фильтруем только числовые поля // Получаем все доступные поля, а не только числовые
const numericFields = meta.fields.filter(field => const excluded_types = [
['Int', 'Float', 'Currency'].includes(field.fieldtype) "Tab Break", "Column Break", "Button", "Section Break", "Column Break",
"HTML", "Table", "Attach", "Attach Image", "Code", "Text Editor", "Image",
"Heading", "Fold", "Table MultiSelect"
];
const availableFields = meta.fields.filter(field =>
!excluded_types.includes(field.fieldtype)
); );
if (numericFields.length === 0) { if (availableFields.length === 0) {
frappe.msgprint({ frappe.msgprint({
title: __('Предупреждение'), title: __('Предупреждение'),
message: __(`В DocType ${selectedDoctype} не найдено числовых полей`), message: __(`В DocType ${selectedDoctype} не найдено подходящих полей`),
indicator: 'orange' indicator: 'orange'
}); });
return; return;
} }
// Обновляем опции для поля fieldname // Обновляем опции для поля fieldname
const options = numericFields.map(field => ({ const options = availableFields.map(field => ({
label: field.label || field.fieldname, label: field.label || field.fieldname,
value: field.fieldname value: field.fieldname
})); }));
@ -3130,8 +3136,7 @@ function openUniversalFieldModal(frm, fieldId = null) {
// Обновляем опции для поля фильтра // Обновляем опции для поля фильтра
const filterFieldOptions = meta.fields const filterFieldOptions = meta.fields
.filter(field => .filter(field =>
['Int', 'Float', 'Currency', 'Data', 'Text', 'Date', 'Datetime', !excluded_types.includes(field.fieldtype)
'Check', 'Select', 'Link', 'Small Text', 'Read Only'].includes(field.fieldtype)
) )
.map(field => ({ .map(field => ({
label: field.label || field.fieldname, label: field.label || field.fieldname,