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-07 02:05:32 +00:00
commit 6a21af710b
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,6 +149,7 @@ export const SourceKey = observer(
defaultValue={sourceKey || options?.[0]?.value}
onChange={props?.onChange}
showSearch
filterOption={(input, option) => option?.label.toLowerCase().includes(input.toLowerCase())}
/>
</div>
);
@ -216,6 +217,7 @@ export const TargetKey = observer(
}}
value={initialValue}
disabled={disabled}
filterOption={(input, option) => option?.label.toLowerCase().includes(input.toLowerCase())}
/>
</div>
);
@ -235,6 +237,7 @@ export const ForeignKey = observer(
const compile = useCompile();
const form = useForm();
const [initialValue, setInitialValue] = useState(value || (template === 'view' ? null : field.initialValue));
const [initialOptions, setInitialOptions] = useState([]);
useEffect(() => {
const effectField = ['belongsTo'].includes(type)
? collectionName
@ -254,6 +257,7 @@ export const ForeignKey = observer(
};
});
setOptions(sourceOptions);
setInitialOptions(sourceOptions);
if (value) {
const option = sourceOptions.find((v) => v.value === value);
setInitialValue(option?.label || value);
@ -295,6 +299,15 @@ export const ForeignKey = observer(
props?.onChange?.(value);
setInitialValue(option.label || value);
}}
onSearch={(value) => {
if (value) {
const targetValue = value.toLocaleLowerCase();
const result = options.filter((v) => v.label.toLocaleLowerCase().includes(targetValue));
setOptions(result);
} else {
setOptions(initialOptions);
}
}}
/>
</div>
);

2
packages/core/client/src/schema-component/antd/table-v2/Table.Column.ActionBar.tsx
View File

@ -60,7 +60,7 @@ export const TableColumnActionBar = observer(
<SortableItem
className={designerCss({
margin: isInSubTable ? '-12px -8px' : '-18px -16px',
padding: isInSubTable ? '12px 8px' : '18px 16px',
padding: isInSubTable ? '12px 8px' : '12px 16px',
})}
>
<Designer />

2
packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx
View File

@ -88,7 +88,7 @@ export const TableColumnDecorator = (props) => {
<SortableItem
className={designerCss({
margin: isInSubTable ? '-12px -8px' : '-18px -16px',
padding: isInSubTable ? '12px 8px' : '18px 16px',
padding: isInSubTable ? '12px 8px' : '12px 16px',
})}
>
<CollectionFieldContext.Provider value={collectionField}>