From b3dfc939f346fc251d80e580a5788f5a45323c08 Mon Sep 17 00:00:00 2001
From: katherinehhh <shunai.tang@hand-china.com>
Date: Wed, 22 Nov 2023 21:12:08 +0800
Subject: [PATCH] fix: m2o association field should support pattern configure
 (#3074)

* fix: m2o association field should support pattern configure

* fix: setInitialValueundefined
---
 packages/core/client/src/block-provider/TableBlockProvider.tsx  | 2 +-
 .../client/src/schema-component/antd/form-item/FormItem.tsx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/client/src/block-provider/TableBlockProvider.tsx b/packages/core/client/src/block-provider/TableBlockProvider.tsx
index 4ef57799b..7829612ac 100644
--- a/packages/core/client/src/block-provider/TableBlockProvider.tsx
+++ b/packages/core/client/src/block-provider/TableBlockProvider.tsx
@@ -139,7 +139,7 @@ export const useTableBlockProps = () => {
     if (!ctx?.service?.loading) {
       field.value = [];
       field.value = ctx?.service?.data?.data;
-      field.setInitialValue(ctx?.service?.data?.data);
+      field?.setInitialValue(ctx?.service?.data?.data);
       field.data = field.data || {};
       field.data.selectedRowKeys = ctx?.field?.data?.selectedRowKeys;
       field.componentProps.pagination = field.componentProps.pagination || {};
diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
index 14500788e..ff27a8ee1 100644
--- a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
+++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
@@ -584,7 +584,7 @@ FormItem.Designer = function Designer() {
           }}
         />
       )}
-      {form && !form?.readPretty && collectionField?.interface !== 'o2m' && !isPatternDisabled(fieldSchema) && (
+      {form && !form?.readPretty && !isPatternDisabled(fieldSchema) && (
         <SchemaSettings.SelectItem
           key="pattern"
           title={t('Pattern')}