mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 08:47:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fix default value of optional field (#2053)

Browse Source 
* fix: fix default value of optional field

* fix: fix can not save default value
This commit is contained in:
被雨水过滤的空气-Rairn 2023-06-15 14:38:52 +08:00 committed by GitHub
parent c89d7f980f
commit 74b8687071
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
View File

@ -112,6 +112,10 @@ FormItem.Designer = function Designer() {
const IsShowMultipleSwitch = useIsShowMultipleSwitch(); const IsShowMultipleSwitch = useIsShowMultipleSwitch();
const collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']); const collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
const targetField = getCollectionJoinField(
`${collectionField?.target}.${fieldSchema['x-component-props'].fieldNames?.label}`,
);
const targetCollection = getCollection(collectionField?.target); const targetCollection = getCollection(collectionField?.target);
const interfaceConfig = getInterface(collectionField?.interface); const interfaceConfig = getInterface(collectionField?.interface);
const validateSchema = interfaceConfig?.['validateSchema']?.(fieldSchema); const validateSchema = interfaceConfig?.['validateSchema']?.(fieldSchema);
@ -353,6 +357,7 @@ FormItem.Designer = function Designer() {
'x-decorator': 'FormItem', 'x-decorator': 'FormItem',
'x-component-props': { 'x-component-props': {
...fieldSchema['x-component-props'], ...fieldSchema['x-component-props'],
targetField,
component: component:
collectionField?.target && collectionField?.interface !== 'chinaRegion' collectionField?.target && collectionField?.interface !== 'chinaRegion'
? 'AssociationSelect' ? 'AssociationSelect'
@ -377,6 +382,7 @@ FormItem.Designer = function Designer() {
'x-component': 'VariableInput', 'x-component': 'VariableInput',
'x-component-props': { 'x-component-props': {
...(fieldSchema?.['x-component-props'] || {}), ...(fieldSchema?.['x-component-props'] || {}),
targetField,
collectionName: collectionField?.collectionName, collectionName: collectionField?.collectionName,
schema: collectionField?.uiSchema, schema: collectionField?.uiSchema,
className: defaultInputStyle, className: defaultInputStyle,