fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-01 18:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-01-06 13:11:37 +00:00
commit 1513568caa
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/core/client/src/collection-manager/Configuration/components/index.tsx
View File

@ -171,10 +171,10 @@ export const TargetKey = observer(
setOptions(
getCollection(target)
.fields?.filter((v) => {
if (type !== 'hasMany') {
return v.primaryKey || v.unique;
if (v.primaryKey || v.unique) {
return true;
}
return supportTypes.includes(v.type);
return type === 'hasMany' && supportTypes.includes(v.type);
})
.map((k) => {
return {
@ -196,10 +196,10 @@ export const TargetKey = observer(
setOptions(
getCollection(target)
.fields?.filter((v) => {
if (type !== 'hasMany') {
return v.primaryKey || v.unique;
if (v.primaryKey || v.unique) {
return true;
}
return supportTypes.includes(v.type);
return type === 'hasMany' && supportTypes.includes(v.type);
})
.map((k) => {
return {

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

@ -161,10 +161,10 @@ export const TargetKey = observer(
setOptions(
getCollection(target, dataSourceKey)
.fields?.filter((v) => {
if (type !== 'hasMany') {
return v.primaryKey || v.unique;
if (v.primaryKey || v.unique) {
return true;
}
return supportTypes.includes(v.type);
return type === 'hasMany' && supportTypes.includes(v.type);
})
.map((k) => {
return {
@ -196,10 +196,10 @@ export const TargetKey = observer(
setOptions(
data.data
?.filter((v) => {
if (type !== 'hasMany') {
return v.primaryKey || v.unique;
if (v.primaryKey || v.unique) {
return true;
}
return supportTypes.includes(v.type);
return type === 'hasMany' && supportTypes.includes(v.type);
})
.map((k) => {
return {