From 9acf3659a3d4458422e87695557d9a7a5d9bd201 Mon Sep 17 00:00:00 2001 From: RedPig97 <1978141412@qq.com> Date: Tue, 23 Jul 2024 19:37:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?style:=20=E6=94=AF=E6=8C=81editshowmode?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grid-field-edit-column/grid-field-edit-column.tsx | 4 ++-- src/control/grid/grid/grid-control.util.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.tsx b/src/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.tsx index f5b709f01..a7f88e1a5 100644 --- a/src/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.tsx +++ b/src/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.tsx @@ -53,7 +53,7 @@ export const GridFieldEditColumn = defineComponent({ gridEditItemProps: IData; editorProps: IData; } => { - switch (ibiz.config.grid.editShowMode) { + switch (c.grid.editShowMode) { case 'cell': return useCellEdit(props, componentRef); case 'row': @@ -63,7 +63,7 @@ export const GridFieldEditColumn = defineComponent({ default: throw new RuntimeError( ibiz.i18n.t('control.common.noSupportItem', { - name: ibiz.config.grid.editShowMode, + name: c.grid.editShowMode, }), ); } diff --git a/src/control/grid/grid/grid-control.util.ts b/src/control/grid/grid/grid-control.util.ts index 959a7e652..2a0ffae9a 100644 --- a/src/control/grid/grid/grid-control.util.ts +++ b/src/control/grid/grid/grid-control.util.ts @@ -132,7 +132,7 @@ export function useITableEvent(c: GridController): { return; } // 单行编辑模式下,行点击会触发 - if (ibiz.config.grid.editShowMode === 'row' && c.model.enableRowEdit) { + if (c.editShowMode === 'row' && c.model.enableRowEdit) { const row = c.findRowState(data); if (row && row.showRowEdit !== true) { // 开启行编辑 -- Gitee From 09190e377013200e27fd9054aa425d453bebe19e Mon Sep 17 00:00:00 2001 From: RedPig97 <1978141412@qq.com> Date: Tue, 23 Jul 2024 19:40:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=A0=91=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=94=AF=E6=8C=81editshowmode=E6=8E=A7=E4=BB=B6=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tree-grid-ex-edit-column/tree-grid-ex-edit-column.tsx | 4 ++-- src/control/tree-grid-ex/tree-grid-ex.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-edit-column/tree-grid-ex-edit-column.tsx b/src/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-edit-column/tree-grid-ex-edit-column.tsx index ce6eb4095..79e5baa1c 100644 --- a/src/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-edit-column/tree-grid-ex-edit-column.tsx +++ b/src/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-edit-column/tree-grid-ex-edit-column.tsx @@ -48,7 +48,7 @@ export const TreeGridExEditColumn = defineComponent({ gridEditItemProps: IData; editorProps: IData; } => { - switch (ibiz.config.grid.editShowMode) { + switch (c.treeGrid.editShowMode) { case 'cell': return useCellEdit(props, componentRef); case 'row': @@ -58,7 +58,7 @@ export const TreeGridExEditColumn = defineComponent({ default: throw new RuntimeError( ibiz.i18n.t('control.common.noSupportItem', { - name: ibiz.config.grid.editShowMode, + name: c.treeGrid.editShowMode, }), ); } diff --git a/src/control/tree-grid-ex/tree-grid-ex.tsx b/src/control/tree-grid-ex/tree-grid-ex.tsx index 026953b4a..e27d74aaf 100644 --- a/src/control/tree-grid-ex/tree-grid-ex.tsx +++ b/src/control/tree-grid-ex/tree-grid-ex.tsx @@ -151,7 +151,7 @@ export const TreeGridExControl = defineComponent({ ): Promise => { const nodeData = c.getNodeData(data.id)!; // 单行编辑模式下,行点击会触发 - if (ibiz.config.grid.editShowMode === 'row' && c.model.enableEdit) { + if (c.editShowMode === 'row' && c.model.enableEdit) { const row = c.state.rows[nodeData._uuid]; if (row && row.showRowEdit !== true) { // 开启行编辑 -- Gitee