From cdee36542658f4212d1254efef61e77c421f3c6b Mon Sep 17 00:00:00 2001 From: lxmdream Date: Thu, 28 Mar 2024 18:41:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E8=A1=8C=E7=BC=96=E8=BE=91=E6=9C=89=E9=94=99=E8=AF=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=97=B6=E7=82=B9=E5=87=BB=E4=BC=9A=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E8=A1=8C=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../grid/grid-column/grid-field-edit-column/cell-edit.ts | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffca45077..6b4364fe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - 修复表格新建行点击异常 - 修复下载数据导入错误文件异常 +- 修复表格行编辑有错误信息时点击会触发行点击事件 ## [0.6.13] - 2024-03-26 diff --git a/src/control/grid/grid-column/grid-field-edit-column/cell-edit.ts b/src/control/grid/grid-column/grid-field-edit-column/cell-edit.ts index ad271a2fe..693eb0710 100644 --- a/src/control/grid/grid-column/grid-field-edit-column/cell-edit.ts +++ b/src/control/grid/grid-column/grid-field-edit-column/cell-edit.ts @@ -65,8 +65,9 @@ export function useCellEdit( /** 是否阻止内部点击冒泡 */ const stopPropagation = computed(() => { - // 可编辑的时候不管是遮罩还是编辑态的编辑器都不能触发行点击事件。 - return cellEditable.value; + // 可编辑的时候不管是遮罩还是编辑态的编辑器都不能触发行点击事件 + // 补充报错等情况导致显示编辑态的时候也要阻止冒泡 + return cellEditable.value || editorShowEdit.value; }); // 点击遮罩后，开启编辑，然后监听外部点击，外部点击之后关闭编辑 -- Gitee From 2c09ed3e6d305c0c99a842060b04a624a43201c0 Mon Sep 17 00:00:00 2001 From: lxmdream Date: Thu, 28 Mar 2024 18:41:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E5=88=86=E9=A1=B5=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E8=A7=86=E5=9B=BE=E6=94=AF=E6=8C=81=E6=8A=8A=E4=B8=8B?= =?UTF-8?q?=E7=BA=A7=E8=A7=86=E5=9B=BE=E7=9A=84=E9=83=A8=E4=BB=B6=E4=BC=9A?= =?UTF-8?q?=E7=9F=A5=E9=81=93=E5=AE=83=E7=9A=84=E8=A7=86=E5=9B=BE=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E9=9D=A2=E6=9D=BF=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/control/form/form/form.tsx | 2 +- src/panel-component/index.ts | 4 ++++ src/view-engine/tab-search-view.engine.ts | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b4364fe9..8bc9b6c8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Added - 新增日期选择编辑器以支持日期弹框面板的选中事件，并在控制器中维护选中值 +- 分页搜索视图支持把下级视图的部件会知道它的视图布局面板里 ### Fixed diff --git a/src/control/form/form/form.tsx b/src/control/form/form/form.tsx index e5222bec5..71886bdc7 100644 --- a/src/control/form/form/form.tsx +++ b/src/control/form/form/form.tsx @@ -151,7 +151,7 @@ export const FormControl = defineComponent({ }); }; } else { - const key = controlPanel ? model.name! : 'default'; + const key = controlPanel ? 'searchform'! : 'default'; // 树自己绘制，要传递额外的参数 slots[key] = (): VNode => { return ( diff --git a/src/panel-component/index.ts b/src/panel-component/index.ts index 1c0404d5a..ca8cbeef2 100644 --- a/src/panel-component/index.ts +++ b/src/panel-component/index.ts @@ -13,6 +13,8 @@ import { IBizPanelTabPage, IBizPanelContainerGroup, IBizPanelItemRender, + IBizTeleportPlaceholder, + IBizPanelContainerTabs, } from '@ibiz-template/vue3-util'; import IBizAuthUserinfo from './auth-userinfo'; import IBizNavPosIndex from './nav-pos-index'; @@ -77,6 +79,8 @@ export const IBizPanelComponents = { v.use(IBizPanelItemRender); v.use(IBizViewMessage); v.use(IBizPanelStaticCarousel); + v.use(IBizTeleportPlaceholder); + v.use(IBizPanelContainerTabs); }, }; diff --git a/src/view-engine/tab-search-view.engine.ts b/src/view-engine/tab-search-view.engine.ts index f49bda256..fe3a4e8ef 100644 --- a/src/view-engine/tab-search-view.engine.ts +++ b/src/view-engine/tab-search-view.engine.ts @@ -65,6 +65,10 @@ export class TabSearchViewEngine extends TabExpViewEngine { return this.view.getController('tabexppanel') as ITabExpPanelController; } + protected preprocessTabExpModelLayout(): void { + // 不进行模型处理 + } + async onCreated(): Promise { await super.onCreated(); const { childNames } = this.view; -- Gitee From 5d39923c4c9d88a3248b6bcf9d6471d0287ff50e Mon Sep 17 00:00:00 2001 From: lxmdream Date: Thu, 28 Mar 2024 19:17:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=92=8C=E6=90=9C=E7=B4=A2=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=9C=A8=E6=9C=89=E5=B8=83=E5=B1=80=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E7=9A=84=E5=8D=A0=E4=BD=8D=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/form/form/form.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/control/form/form/form.tsx b/src/control/form/form/form.tsx index 71886bdc7..7b9d9b9e3 100644 --- a/src/control/form/form/form.tsx +++ b/src/control/form/form/form.tsx @@ -1,4 +1,5 @@ import { + ControlType, findChildFormDetails, FormController, ScriptFactory, @@ -151,7 +152,10 @@ export const FormControl = defineComponent({ }); }; } else { - const key = controlPanel ? 'searchform'! : 'default'; + // 部件布局的默认占位标识 + const formSlotKey = + model.controlType === ControlType.SEARCHFORM ? 'searchform' : 'form'; + const key = controlPanel ? formSlotKey : 'default'; // 树自己绘制，要传递额外的参数 slots[key] = (): VNode => { return ( -- Gitee