fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-07 14:39:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: scopeKeyOptions should be obtained in real-time (#4029)

Browse Source 
* fix: formula field caluation error

* fix: scopeKeyOptions

* fix: bug

* fix: bug
This commit is contained in:
katherinehhh 2024-04-13 09:28:24 +08:00 committed by GitHub
parent f36bc41a11
commit 3fd5b05940
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx
View File

@ -175,12 +175,13 @@ export const EditFieldAction = (props) => {
const compile = useCompile();
const [data, setData] = useState<any>({});
const { isDialect } = useDialect();
const scopeKeyOptions = useMemo(() => {
return (
record?.fields ||
getCollection(record.collectionName)
.options.fields.filter((v) => {
return v.interface === 'select';
return ['string', 'bigInt', 'integer'].includes(v.type);
})
.map((k) => {
return {

2
packages/core/client/src/collection-manager/interfaces/sort.ts
View File

@ -22,7 +22,7 @@ export class SortFieldInterface extends CollectionFieldInterface {
'x-validator': 'integer',
},
};
availableTypes = ['bigInt', 'integer', 'sort'];
availableTypes = ['sort'];
hasDefaultValue = false;
properties = {
...defaultProps,

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

@ -191,6 +191,7 @@ const EditFieldAction = (props) => {
const compile = useCompile();
const { name } = useParams();
const isDialect = (dialect: string) => currentDatabase?.dialect === dialect;
const fields = record?.fields || getCollection(record.collectionName, name)?.options?.fields;
const currentCollections = useMemo(() => {
return collections.map((v) => {
return {
@ -204,7 +205,7 @@ const EditFieldAction = (props) => {
record?.fields ||
getCollection(record.collectionName, name)
?.options?.fields.filter((v) => {
return v.interface === 'select';
return ['string', 'bigInt', 'integer'].includes(v.type);
})
.map((k) => {
return {
@ -213,7 +214,7 @@ const EditFieldAction = (props) => {
};
})
);
}, [record.name]);
}, [record.name, fields]);
return (
<RecordProvider record={record} parent={parentRecord}>
<ActionContextProvider value={{ visible, setVisible }}>

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

@ -20,7 +20,9 @@ const getInterfaceOptions = (data, type) => {
return v.children.length > 0;
});
};
const isValueInOptions = (value, options) => {
return options?.some((option) => option.children?.some?.((child) => child.name === value));
};
export const CollectionFieldInterfaceSelect = observer(
(props: any) => {
const { value, handleFieldChange } = props;
@ -51,6 +53,19 @@ export const CollectionFieldInterfaceSelect = observer(
);
setSelectValue(targetValue);
}
//选中的值不在选项中切换为第一个
} else if (selectValue && !isValueInOptions(selectValue, options)) {
const targetValue = options[0]?.children?.[0]?.name;
const interfaceConfig = getInterface(targetValue);
handleFieldChange(
{
interface: targetValue,
uiSchema: { title: record?.uiSchema?.title, ...interfaceConfig?.default?.uiSchema },
},
record.name,
false,
);
setSelectValue(targetValue);
}
}, [options]);