Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2024-11-28 04:26:38 +00:00
commit 2f1e19c00a

View File

@ -83,13 +83,13 @@ export const useRemoveGridFormItem = () => {
};
};
export const findTableColumn = (schema: Schema, key: string, action: string, deepth = 0) => {
export const findTableColumn = (schema: Schema, key: string, action: string, name: string) => {
return schema.reduceProperties((buf, s) => {
if (s[key] === action) {
if (s[key] === action && (!name || s.name === name)) {
return s;
}
const c = s.reduceProperties((buf, s) => {
if (s[key] === action) {
if (s[key] === action && (!name || s.name === name)) {
return s;
}
return buf;