From 35ba9d19db1a8428107ffd215545f01e678b84bd Mon Sep 17 00:00:00 2001 From: GAOANG <1140589958@qq.com> Date: Wed, 4 Sep 2024 16:01:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=AD=90=E8=A1=A8=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=93=8D=E4=BD=9C=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/components/SubFormV2.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/Form/src/components/SubFormV2.vue b/src/components/Form/src/components/SubFormV2.vue index 9b826d3..c410374 100644 --- a/src/components/Form/src/components/SubFormV2.vue +++ b/src/components/Form/src/components/SubFormV2.vue @@ -553,7 +553,14 @@ function filterColum(column) { return column.filter((o) => { - return o.key == 'action' || o.key == 'index' || (((isBoolean(o.show) && o.show) || !isBoolean(o.show)) && isBoolean(o.componentProps?.isShow) && o.componentProps?.isShow) || !isBoolean(o.componentProps?.isShow); + let flag = true; + flag = o.key == 'index' || (((isBoolean(o.show) && o.show) || !isBoolean(o.show)) && isBoolean(o.componentProps?.isShow) && o.componentProps?.isShow) || !isBoolean(o.componentProps?.isShow) + if (o.key == 'action' && props.disableAddRow) { + flag = false + } else { + flag = true + } + return flag; }); } From 80f7f5a4230458e55910bb48ab68860213af2139 Mon Sep 17 00:00:00 2001 From: GAOANG <1140589958@qq.com> Date: Wed, 4 Sep 2024 17:11:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=93=8D=E4=BD=9C=E5=88=97?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/components/SubFormV2.vue | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/components/Form/src/components/SubFormV2.vue b/src/components/Form/src/components/SubFormV2.vue index c410374..88b72e1 100644 --- a/src/components/Form/src/components/SubFormV2.vue +++ b/src/components/Form/src/components/SubFormV2.vue @@ -553,13 +553,7 @@ function filterColum(column) { return column.filter((o) => { - let flag = true; - flag = o.key == 'index' || (((isBoolean(o.show) && o.show) || !isBoolean(o.show)) && isBoolean(o.componentProps?.isShow) && o.componentProps?.isShow) || !isBoolean(o.componentProps?.isShow) - if (o.key == 'action' && props.disableAddRow) { - flag = false - } else { - flag = true - } + let flag = (o.key == 'index' || (((isBoolean(o.show) && o.show) || !isBoolean(o.show)) && isBoolean(o.componentProps?.isShow) && o.componentProps?.isShow) || !isBoolean(o.componentProps?.isShow) && (o.key != 'action' || !(o.key == 'action' && props.disableAddRow))) return flag; }); } From 2d0b948b17e5fb4ee4471e0b9890e1768e95dd5f Mon Sep 17 00:00:00 2001 From: GAOANG <1140589958@qq.com> Date: Wed, 4 Sep 2024 17:15:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/components/SubFormV2.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/Form/src/components/SubFormV2.vue b/src/components/Form/src/components/SubFormV2.vue index 88b72e1..0f17280 100644 --- a/src/components/Form/src/components/SubFormV2.vue +++ b/src/components/Form/src/components/SubFormV2.vue @@ -553,7 +553,11 @@ function filterColum(column) { return column.filter((o) => { - let flag = (o.key == 'index' || (((isBoolean(o.show) && o.show) || !isBoolean(o.show)) && isBoolean(o.componentProps?.isShow) && o.componentProps?.isShow) || !isBoolean(o.componentProps?.isShow) && (o.key != 'action' || !(o.key == 'action' && props.disableAddRow))) + let flag = o.key == 'index' || (((isBoolean(o.show) && o.show) || !isBoolean(o.show)) && isBoolean(o.componentProps?.isShow) && o.componentProps?.isShow) || !isBoolean(o.componentProps?.isShow) + if(o.key == 'action' && props.disableAddRow) { + // 是否有操作列与是否有能添加行逻辑算定 + flag = false + } return flag; }); }