From 56d2b7d57e447f46f630990b07c75f631f3ff619 Mon Sep 17 00:00:00 2001
From: aibayanyu20 <aibayanyu@qq.com>
Date: Tue, 1 Nov 2022 08:50:16 +0800
Subject: [PATCH 1/2] fix: fix table column data is passed into chlidren is
 undefined or null errorr

---
 components/table/hooks/useColumns.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/table/hooks/useColumns.tsx b/components/table/hooks/useColumns.tsx
index 8aed4d259b..aab022e250 100644
--- a/components/table/hooks/useColumns.tsx
+++ b/components/table/hooks/useColumns.tsx
@@ -37,7 +37,7 @@ function fillSlots<RecordType>(columns: ColumnsType<RecordType>, contextSlots: R
         () => [column.title as any],
       );
     }
-    if ('children' in cloneColumn) {
+    if ('children' in cloneColumn && Array.isArray(cloneColumn.children)) {
       cloneColumn.children = fillSlots(cloneColumn.children, contextSlots);
     }
 

From 93ecf475bd6614b67469d23561ec3dd2cf7641c6 Mon Sep 17 00:00:00 2001
From: undefined <undefined>
Date: Sun, 10 Dec 2023 22:09:54 +0800
Subject: [PATCH 2/2] fix: fix useConfigInject wave error

---
 components/config-provider/hooks/useConfigInject.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/config-provider/hooks/useConfigInject.ts b/components/config-provider/hooks/useConfigInject.ts
index 0c781d0f5a..801eaad03f 100644
--- a/components/config-provider/hooks/useConfigInject.ts
+++ b/components/config-provider/hooks/useConfigInject.ts
@@ -44,7 +44,7 @@ export default (name: string, props: Record<any, any>) => {
   const csp = computed(() => props.csp ?? configProvider.csp);
   const wave = computed<{
     disabled?: boolean;
-  }>(() => props.wave ?? configProvider.wave.value);
+  }>(() => props.wave ?? configProvider?.wave?.value);
 
   return {
     configProvider,