From 2044abdca2eaf9ec460f644e2cf55fb50ec561f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sedat=20=C3=96ZT=C3=9CRK?= <76204082+iamsedatozturk@users.noreply.github.com> Date: Wed, 29 Jul 2026 11:28:53 +0300 Subject: [PATCH] =?UTF-8?q?Grid=20ve=20Tree=20i=C3=A7in=20Heigth=20EditorO?= =?UTF-8?q?ptions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/views/list/Grid.tsx | 12 ++++++++++++ ui/src/views/list/Tree.tsx | 12 ++++++++++++ ui/src/views/list/useListFormColumns.ts | 14 ++++++-------- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/ui/src/views/list/Grid.tsx b/ui/src/views/list/Grid.tsx index f77498cf..49be4d2a 100644 --- a/ui/src/views/list/Grid.tsx +++ b/ui/src/views/list/Grid.tsx @@ -726,6 +726,18 @@ const Grid = (props: GridProps) => { const formItem = columnFormat?.editOrderNo != null ? columnFormat : undefined const isNewRow = Boolean((editor as any).row?.isNewRow) || mode === 'new' + if (columnFormat?.editorOptions) { + try { + const configuredEditorOptions = JSON.parse(columnFormat.editorOptions) + editor.editorOptions = { + ...editor.editorOptions, + ...configuredEditorOptions, + } + } catch (err) { + console.error('EditorOptions parse error:', columnFormat.fieldName, err) + } + } + const hasReadOnlyEditorOption = editor.editorOptions?.readOnly === true const hasDisabledEditorOption = editor.editorOptions?.disabled === true diff --git a/ui/src/views/list/Tree.tsx b/ui/src/views/list/Tree.tsx index f58a4745..e830e3d5 100644 --- a/ui/src/views/list/Tree.tsx +++ b/ui/src/views/list/Tree.tsx @@ -665,6 +665,18 @@ const Tree = (props: TreeProps) => { const formItem = columnFormat?.editOrderNo != null ? columnFormat : undefined const isNewRow = Boolean((editor as any).row?.isNewRow) || mode === 'new' + if (columnFormat?.editorOptions) { + try { + const configuredEditorOptions = JSON.parse(columnFormat.editorOptions) + editor.editorOptions = { + ...editor.editorOptions, + ...configuredEditorOptions, + } + } catch (err) { + console.error('EditorOptions parse error:', columnFormat.fieldName, err) + } + } + const hasReadOnlyEditorOption = editor.editorOptions?.readOnly === true const hasDisabledEditorOption = editor.editorOptions?.disabled === true diff --git a/ui/src/views/list/useListFormColumns.ts b/ui/src/views/list/useListFormColumns.ts index 68cebe17..a910482a 100644 --- a/ui/src/views/list/useListFormColumns.ts +++ b/ui/src/views/list/useListFormColumns.ts @@ -862,17 +862,15 @@ const useListFormColumns = ({ } } - column.editorOptions = { ...editorOptions } - // Format bilgisini öncelik sırasına göre ata - if (column.editorOptions.displayFormat) { - column.format = column.editorOptions.displayFormat - } else if (column.editorOptions.format) { - column.format = column.editorOptions.format + if (editorOptions.displayFormat) { + column.format = editorOptions.displayFormat + } else if (editorOptions.format) { + column.format = editorOptions.format } - if (typeof column.editorOptions.encodeHtml === 'boolean') { - column.encodeHtml = column.editorOptions.encodeHtml + if (typeof editorOptions.encodeHtml === 'boolean') { + column.encodeHtml = editorOptions.encodeHtml } // columnCustomizationDto