diff --git a/src/route/proj/edit/ProjConfigLoginpage.tsx b/src/route/proj/edit/ProjConfigLoginpage.tsx index 5676ec7..15c8b5e 100644 --- a/src/route/proj/edit/ProjConfigLoginpage.tsx +++ b/src/route/proj/edit/ProjConfigLoginpage.tsx @@ -62,7 +62,7 @@ export default function ProjConfigLoginpage() { url: `/api/proj/preview/${pathParams.projId}`, body: { // projId: pathParams.projId, - loginpageId: selectedLoginpageId, + loginpageId: form.getFieldValue('loginpageId'), logo: logoImgArray.length > 0 ? logoImgArray[0].uid : '', bgImgs: bgImgArray.length > 0 ? bgImgArray[0].uid : '', subTitle: form.getFieldValue('subTitle'), @@ -84,28 +84,44 @@ export default function ProjConfigLoginpage() { console.log('登录页图片列表', data); setloginpageArray(data) // setDefaultId(data[0].loginpageId) - upLoginPage(data[0].loginpageId) + // upLoginPage(data[0].loginpageId) } }) } - const upLoginPage = (id: string) => { - post({ + // 获取默认id + const getDefaultID = () => { + get({ messageApi, - url: `/api/proj/preview/${pathParams.projId}`, - body: { - // projId: pathParams.projId, - loginpageId: id, - logo: logoImgArray.length > 0 ? logoImgArray[0].uid : '', - bgImgs: bgImgArray.length > 0 ? bgImgArray[0].uid : '', - subTitle: form.getFieldValue('subTitle'), - copyrightOwner: form.getFieldValue('copyrightOwner'), - copyrightDate: form.getFieldValue('copyrightDate'), - }, + url: '/api/loginpage/list', onSuccess({ data }) { - setIframeSrcDoc(data.data); + console.log('登录页图片列表', data); + setloginpageArray(data) + // setDefaultId(data[0].loginpageId) + // upLoginPage(data[0].loginpageId) + form.setFieldValue('loginpageId', data[0].loginpageId); + setSelectedLoginpageId(data[0].loginpageId); + preview() } }) } + // const upLoginPage = (id: string) => { + // post({ + // messageApi, + // url: `/api/proj/preview/${pathParams.projId}`, + // body: { + // // projId: pathParams.projId, + // loginpageId:form.getFieldValue('loginpageId'), + // logo: logoImgArray.length > 0 ? logoImgArray[0].uid : '', + // bgImgs: bgImgArray.length > 0 ? bgImgArray[0].uid : '', + // subTitle: form.getFieldValue('subTitle'), + // copyrightOwner: form.getFieldValue('copyrightOwner'), + // copyrightDate: form.getFieldValue('copyrightDate'), + // }, + // onSuccess({ data }) { + // setIframeSrcDoc(data.data); + // } + // }) + // } useEffect(() => { getlistLoginpage() get({ @@ -113,13 +129,19 @@ export default function ProjConfigLoginpage() { url: `/api/proj/get/config-loginpage/${pathParams.projId}`, onSuccess({ data }) { console.log('寻找被选中id', data); - setSelectedLoginpageId(data.loginpageId); - form.setFieldValue('loginpageId', data.loginpageId); - form.setFieldValue('subTitle', data.subTitle); - form.setFieldValue('copyrightOwner', data.copyrightOwner); - form.setFieldValue('copyrightDate', data.copyrightDate); - form.setFieldValue('adminUsername', data.adminUsername); - form.setFieldValue('adminPassword', data.adminPassword); + if (data.loginpageId) { + form.setFieldValue('loginpageId', data.loginpageId); + setSelectedLoginpageId(data.loginpageId); + form.setFieldValue('subTitle', data.subTitle); + form.setFieldValue('copyrightOwner', data.copyrightOwner); + form.setFieldValue('copyrightDate', data.copyrightDate); + form.setFieldValue('adminUsername', data.adminUsername); + form.setFieldValue('adminPassword', data.adminPassword); + preview() + } else { + getDefaultID() + } + if (data.logo) { const url = downloadUrl(data.logo); logoImgArray.splice(0, 1, { @@ -146,13 +168,7 @@ export default function ProjConfigLoginpage() { ...bgImgArray ]) } - // preview() - if (data.loginpageId) { - upLoginPage(data.loginpageId) - } else { - getlistLoginpage(); - } } }) @@ -235,7 +251,22 @@ export default function ProjConfigLoginpage() { }} /> - + + + {/* */}
@@ -478,8 +509,9 @@ export default function ProjConfigLoginpage() { // ...loginpageArray // ]) console.log('选择的id', item.loginpageId); + form.setFieldValue('loginpageId', item.loginpageId); + preview() - upLoginPage(item.loginpageId) }} /> ) @@ -514,7 +546,7 @@ export default function ProjConfigLoginpage() { copyrightDate: form.getFieldValue('copyrightDate'), adminUsername: form.getFieldValue('adminUsername'), adminPassword: form.getFieldValue('adminPassword'), - loginpageId: selectedLoginpageId + loginpageId: form.getFieldValue('loginpageId') }, onBefore() { setLoading(true); diff --git a/src/route/proj/edit/ProjConfigModSave.tsx b/src/route/proj/edit/ProjConfigModSave.tsx index 86b044a..61092f0 100644 --- a/src/route/proj/edit/ProjConfigModSave.tsx +++ b/src/route/proj/edit/ProjConfigModSave.tsx @@ -66,7 +66,7 @@ export default function ProjConfigModSave(props: PropsType) { {title: '添加菜单'}, ]} /> */} -
+