Merge branch 'gaoang-2024-8' into 'dev'

feat: 子表隐藏添加按钮同时隐藏操作列

See merge request itc-framework/ma/2024/front!19

src/components/Form/src/components/SubFormV2.vue

@@ -553,7 +553,12 @@
 
     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 = 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;
         });
     }
 </script>