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

fix: source field type filtering association fields in sql collection & view collection (#5014)
Some checks are pending
auto-merge / push-commit (push) Waiting to run
Details
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Waiting to run
Details
deploy client docs / Build (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details

Browse Source 
* fix: source field type filtering relationship fields in sql collection and view collection

* fix: bug

* fix: bug
This commit is contained in:
Katherine 2024-08-08 15:52:06 +08:00 committed by GitHub
parent bd573b6ee2
commit cd5d48eb80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/src/collection-manager/templates/components/PreviewFields.tsx
View File

@ -69,7 +69,7 @@ const PreviewCom = (props) => {
}; };
}); });
const children = collection.fields const children = collection.fields
.filter((v) => !['hasOne', 'hasMany', 'belongsToMany'].includes(v?.type)) .filter((v) => !['obo', 'oho', 'm2m', 'o2m'].includes(v?.interface))
?.map((v) => { ?.map((v) => {
return { value: v.name, key: v.name, label: t(v.uiSchema?.title || v.name) }; return { value: v.name, key: v.name, label: t(v.uiSchema?.title || v.name) };
}) })

6
packages/core/client/src/collection-manager/templates/components/sql-collection/FieldsConfigure.tsx
View File

@ -68,11 +68,12 @@ const useSourceFieldsOptions = () => {
return; return;
} }
const children = (collection.fields as FieldOptions[]) const children = (collection.fields as FieldOptions[])
.filter((v) => !['hasOne', 'hasMany', 'belongsToMany'].includes(v?.type)) .filter((v) => {
return !['hasOne', 'hasMany', 'belongsToMany', 'belongsTo'].includes(v?.type);
})
?.map((v) => { ?.map((v) => {
return { value: v.name, label: t(v.uiSchema?.title) }; return { value: v.name, label: t(v.uiSchema?.title) };
}); });
data.push({ data.push({
value: item, value: item,
label: t(collection.title), label: t(collection.title),
@ -110,7 +111,6 @@ export const FieldsConfigure = observer(
[compile], [compile],
); );
const sourceFieldsOptions = useSourceFieldsOptions(); const sourceFieldsOptions = useSourceFieldsOptions();
const refGetInterface = useRef(getInterface); const refGetInterface = useRef(getInterface);
useEffect(() => { useEffect(() => {
const fieldsMp = new Map(); const fieldsMp = new Map();