From 76e95729e447cfb95fba9074d15f43cacf3fc7f0 Mon Sep 17 00:00:00 2001
From: katherinehhh <shunai.tang@hand-china.com>
Date: Tue, 26 Dec 2023 17:21:25 +0800
Subject: [PATCH] fix: record picker display incorrect data when field has
 default value in collection (#3266)

* fix: default value should not set when field is readpretty or readonly

* fix: record picker display incorrect data when field has default value in collection
---
 .../core/client/src/block-provider/TableSelectorProvider.tsx | 5 +++--
 .../core/client/src/collection-manager/CollectionField.tsx   | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/client/src/block-provider/TableSelectorProvider.tsx b/packages/core/client/src/block-provider/TableSelectorProvider.tsx
index ac11ea6572..4b75dac2be 100644
--- a/packages/core/client/src/block-provider/TableSelectorProvider.tsx
+++ b/packages/core/client/src/block-provider/TableSelectorProvider.tsx
@@ -84,8 +84,8 @@ export const recursiveParent = (schema: Schema, component) => {
   return schema['x-component'] === component
     ? schema
     : schema.parent
-    ? recursiveParent(schema.parent, component)
-    : null;
+      ? recursiveParent(schema.parent, component)
+      : null;
 };
 
 const useAssociationNames = (collection) => {
@@ -256,6 +256,7 @@ export const useTableSelectorProps = () => {
   useEffect(() => {
     if (!ctx?.service?.loading) {
       field.value = 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/collection-manager/CollectionField.tsx b/packages/core/client/src/collection-manager/CollectionField.tsx
index d3ee57d06d..cb91c07ec1 100644
--- a/packages/core/client/src/collection-manager/CollectionField.tsx
+++ b/packages/core/client/src/collection-manager/CollectionField.tsx
@@ -49,7 +49,6 @@ const InternalField: React.FC = (props: Props) => {
       const defaultVal = fieldSchema.default || defaultValue;
       defaultVal !== null && defaultVal !== undefined && setFieldProps('initialValue', defaultVal);
     }
-
     if (!field.validator && (uiSchema['x-validator'] || fieldSchema['x-validator'])) {
       const concatSchema = concat([], uiSchema['x-validator'] || [], fieldSchema['x-validator'] || []);
       field.validator = concatSchema;