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

fix: collectionFieldInterfaceSelect (#3945)

Browse Source 
* fix: formula field caluation error

* fix: collection manager primarykey

* fix: nanoid & uuid suport index

* fix: collectionFieldInterfaceSelect
This commit is contained in:
katherinehhh 2024-04-06 17:20:51 +08:00 committed by GitHub
parent aae936aa01
commit de5bd5aae7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/CollectionFields.tsx
View File

@ -84,14 +84,14 @@ export const CollectionFields = () => {
};
const dm = useDataSourceManager();
const handleFieldChange = async (value, filterByTk) => {
const handleFieldChange = async (value, filterByTk, flag = true) => {
await api.request({
url: `dataSourcesCollections/${dataSourceKey}.${name}/fields:update?filterByTk=${filterByTk}`,
method: 'post',
data: value,
});
dm.getDataSource(dataSourceKey).reload();
message.success(t('Saved successfully'));
flag && message.success(t('Saved successfully'));
};
const useTitleFieldProps = () => {
return {

43
packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionFieldInterfaceSelect.tsx
View File

@ -1,6 +1,6 @@
import { observer, useForm, useField } from '@formily/react';
import { Select, Tag } from 'antd';
import React, { useState } from 'react';
import React, { useEffect, useState } from 'react';
import { useCompile, useCollectionManager_deprecated, useRecord, useFieldInterfaceOptions } from '@nocobase/client';
const getInterfaceOptions = (data, type) => {
@ -31,7 +31,37 @@ export const CollectionFieldInterfaceSelect = observer(
const data = getInterfaceOptions(initOptions, record.type);
const form = useForm();
const field = useField();
const [selectValue, setSelectValue] = useState(value);
const [options, setOptions] = useState(data);
const targetRecord = Object.values(form.values)?.[0]?.[field.index];
const targetType = targetRecord?.type || record.type;
useEffect(() => {
//只有一个选项的时候选中该选项
if (options.length === 1 && options[0]?.children?.length === 1) {
const targetValue = options[0]?.children?.[0]?.name;
if (targetValue !== selectValue) {
const interfaceConfig = getInterface(targetValue);
handleFieldChange(
{
interface: targetValue,
uiSchema: { title: record?.uiSchema?.title, ...interfaceConfig?.default?.uiSchema },
},
record.name,
false,
);
setSelectValue(targetValue);
}
}
}, [options]);
useEffect(() => {
if (record?.possibleTypes) {
const targetRecord = Object.values(form.values)?.[0]?.[field.index];
const targetType = targetRecord?.type || record.type;
const newOptions = getInterfaceOptions(initOptions, targetType);
setOptions(newOptions);
}
}, [targetType]);
return ['oho', 'obo', 'o2m', 'm2o', 'm2m'].includes(record.interface) ? (
<Tag key={value}>
{compile(initOptions.find((h) => h.key === 'relation')['children'].find((v) => v.name === value)?.['label'])}
@ -41,7 +71,7 @@ export const CollectionFieldInterfaceSelect = observer(
aria-label={`field-interface-${record?.type}`}
//@ts-ignore
role="button"
defaultValue={value}
value={selectValue}
style={{ width: '100%' }}
popupMatchSelectWidth={false}
onChange={(value) => {
@ -53,14 +83,7 @@ export const CollectionFieldInterfaceSelect = observer(
},
record.name,
);
}}
onDropdownVisibleChange={(open) => {
if (open && record?.possibleTypes) {
const targetRecord = Object.values(form.values)?.[0]?.[field.index];
const targetType = targetRecord?.type || record.type;
const newOptions = getInterfaceOptions(initOptions, targetType);
setOptions(newOptions);
}
setSelectValue(value);
}}
>
{options.map((group) => (