mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-05 21:49:25 +08:00
fix(RemoteSelect component): fix selected option label not loaded on first render (#5736)
* feat: add defaultParams option to service in RemoteSelect and UsersSelect components * fix: conditionally set defaultParams in RemoteSelect component
This commit is contained in:
parent
d62f9507a6
commit
f56f49d3ca
@ -39,7 +39,9 @@ export type RemoteSelectProps<P = any> = SelectProps<P, any> & {
|
|||||||
/**
|
/**
|
||||||
* useRequest() `service` parameter
|
* useRequest() `service` parameter
|
||||||
*/
|
*/
|
||||||
service: ResourceActionOptions<P>;
|
service: ResourceActionOptions<P> & {
|
||||||
|
defaultParams?: any;
|
||||||
|
};
|
||||||
target: string;
|
target: string;
|
||||||
mapOptions?: (data: any) => SelectProps['fieldNames'];
|
mapOptions?: (data: any) => SelectProps['fieldNames'];
|
||||||
dataSource?: string;
|
dataSource?: string;
|
||||||
@ -177,6 +179,7 @@ const InternalRemoteSelect = withDynamicSchemaProps(
|
|||||||
{
|
{
|
||||||
manual,
|
manual,
|
||||||
debounceWait: wait,
|
debounceWait: wait,
|
||||||
|
...(service.defaultParams ? { defaultParams: [service.defaultParams] } : {}),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
const runDep = useMemo(
|
const runDep = useMemo(
|
||||||
|
@ -36,7 +36,6 @@ export function UsersSelect(props) {
|
|||||||
|
|
||||||
function InternalUsersSelect({ value, onChange }) {
|
function InternalUsersSelect({ value, onChange }) {
|
||||||
const scope = useWorkflowVariableOptions({ types: [isUserKeyField] });
|
const scope = useWorkflowVariableOptions({ types: [isUserKeyField] });
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Variable.Input scope={scope} value={value} onChange={onChange}>
|
<Variable.Input scope={scope} value={value} onChange={onChange}>
|
||||||
<RemoteSelect
|
<RemoteSelect
|
||||||
@ -46,6 +45,7 @@ function InternalUsersSelect({ value, onChange }) {
|
|||||||
}}
|
}}
|
||||||
service={{
|
service={{
|
||||||
resource: 'users',
|
resource: 'users',
|
||||||
|
defaultParams: value ? { filter: { id: value } } : undefined,
|
||||||
}}
|
}}
|
||||||
manual={false}
|
manual={false}
|
||||||
value={value}
|
value={value}
|
||||||
|
@ -30,6 +30,7 @@ function InternalUsersSelect({ value, onChange, variableOptions }) {
|
|||||||
}}
|
}}
|
||||||
service={{
|
service={{
|
||||||
resource: 'users',
|
resource: 'users',
|
||||||
|
defaultParams: value ? { filter: { id: value } } : undefined,
|
||||||
}}
|
}}
|
||||||
manual={false}
|
manual={false}
|
||||||
value={value}
|
value={value}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user