File tree Expand file tree Collapse file tree 3 files changed +9
-10
lines changed
src/pages/IdentityProvider/Create Expand file tree Collapse file tree 3 files changed +9
-10
lines changed Original file line number Diff line number Diff 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} ;
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ import { IdentityProviderType, ProviderCategory } from '@/enums';
1616export type FormType = UpdateIdentityProviderRequest & CreateIdentityProviderRequest ;
1717
1818export type FormProps = {
19- form ?: ProFormInstance < FormType > ;
19+ form ?: any ;
2020} ;
2121
2222export default function useIdentityProviderHook ( ) {
Original file line number Diff line number Diff 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 } }
You can’t perform that action at this time.
0 commit comments