Skip to content

Commit 1799f11

Browse files
committed
fix: update RedirectURL bug
1 parent 03cc06c commit 1799f11

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/pages/IdentityProvider/Create/CallbackURL.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ export const CallbackURL = (props: FormProps) => {
2020
const { form } = props;
2121
const name = Form.useWatch('name', form);
2222
const redirectURL = getRedirectURL(`${name ? name : `{${intl.formatMessage(INTL.NAME)}}`}`);
23+
const oldRedirectURL = form?.current?.getFieldValue(['config', 'redirectURL']);
2324

2425
useEffect(() => {
25-
// const oldVal = form?.getFieldValue(['config', 'redirectURL']);
26-
// if (oldVal && oldVal.endsWith('}')) {
27-
// form?.setFieldValue(['config', 'redirectURL'], redirectURL);
28-
// }
29-
form?.setFieldValue(['config', 'redirectURL'], redirectURL);
26+
if (!form?.current.getFieldValue(['metadata', 'instanceId'])) {
27+
form.current?.setFieldValue(['config', 'redirectURL'], redirectURL);
28+
}
3029
}, [name]);
3130

3231
return (
@@ -35,7 +34,7 @@ export const CallbackURL = (props: FormProps) => {
3534
label={intl.formatMessage(INTL.AUTH_URL)}
3635
name={['config', 'redirectURL']}
3736
fieldProps={{ autoComplete: 'off' }}
38-
initialValue={redirectURL}
37+
initialValue={oldRedirectURL ? oldRedirectURL : redirectURL}
3938
></ProFormText>
4039
);
4140
};

src/pages/IdentityProvider/Create/_hooks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { IdentityProviderType, ProviderCategory } from '@/enums';
1616
export type FormType = UpdateIdentityProviderRequest & CreateIdentityProviderRequest;
1717

1818
export type FormProps = {
19-
form?: ProFormInstance<FormType>;
19+
form?: any;
2020
};
2121

2222
export default function useIdentityProviderHook() {

src/pages/IdentityProvider/Create/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,16 @@ const CreatePolicy: React.FC = () => {
142142
<ProFormDependency name={['type']}>
143143
{({ type }) => {
144144
if (type === IdentityProviderType.Gitee) {
145-
return <Gitee key={type} form={formRef.current} />;
145+
return <Gitee key={type} form={formRef} />;
146146
}
147147
if (type === IdentityProviderType.GitHub) {
148-
return <GitHub key={type} form={formRef.current} />;
148+
return <GitHub key={type} form={formRef} />;
149149
}
150150
if (type === IdentityProviderType.WeChatMiniProgram) {
151151
return <WeChatMiniProgram key={type} />;
152152
}
153153
if (type === IdentityProviderType.Coding) {
154-
return <Coding key={type} form={formRef.current} />;
154+
return <Coding key={type} form={formRef} />;
155155
}
156156
return null;
157157
}}

0 commit comments

Comments
 (0)