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] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=B3=A8=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;
         });
     }