diff --git a/src/route/proj/edit/ProjConfigLoginpage.tsx b/src/route/proj/edit/ProjConfigLoginpage.tsx index 240bf75..d32e1c5 100644 --- a/src/route/proj/edit/ProjConfigLoginpage.tsx +++ b/src/route/proj/edit/ProjConfigLoginpage.tsx @@ -14,7 +14,7 @@ import { UploadFile, UploadProps, Image, - // Pagination + Pagination } from "antd"; import { useParams } from "react-router-dom"; import { useEffect, useState } from "react"; @@ -47,6 +47,8 @@ export default function ProjConfigLoginpage(props: any) { const [iframeSrcDoc, setIframeSrcDoc] = useState(); const height = window.innerHeight - 200; const [loginpageArray, setloginpageArray] = useState([]) + // const [page,setPage] = useState(1) + const [total ,setTotal] = useState(0) const [selectedLoginpageId, setSelectedLoginpageId] = useState(''); // 选择页面id和img(初始化用) const [modalId,setModalId] = useState('') @@ -81,54 +83,63 @@ export default function ProjConfigLoginpage(props: any) { } }) } - const getlistLoginpage = () => { + const getlistLoginpage = (page:number) => { get({ messageApi, - url: '/api/loginpage/list', + url: '/api/loginpage/listpage', + config: { + params: { + page: page, + rows: 10 + } + }, onSuccess({ data }) { console.log('登录页图片列表', data); - setloginpageArray(data) + setloginpageArray(data.rows) // setDefaultId(data[0].loginpageId) // upLoginPage(data[0].loginpageId) + setTotal(data.total) + + // 当有返回id时获取图片的previewImgs - const newData = data - get({ - messageApi, - url: `/api/proj/get/config-loginpage/${projId}`, - onSuccess({ data }) { - if (data.loginpageId) { - // lyp - const imgs = newData.filter((item: { loginpageId: any; }) => item.loginpageId === data.loginpageId) - // ?.previewImgs; - setSelectImgs(imgs[0].previewImgs) - // console.log('lyp',imgs); + // const newData = data.rows + // get({ + // messageApi, + // url: `/api/proj/get/config-loginpage/${projId}`, + // onSuccess({ data }) { + // if (data.loginpageId) { + + // const imgs = newData.filter((item: { loginpageId: any; }) => item.loginpageId === data.loginpageId) + + // setSelectImgs(imgs[0].previewImgs) + - } + // } - } - }) + // } + // }) } }) } // 获取默认id - const getDefaultID = () => { - get({ - messageApi, - url: '/api/loginpage/list', - onSuccess({ data }) { - console.log('登录页图片列表', data); - setloginpageArray(data) - // setDefaultId(data[0].loginpageId) - // upLoginPage(data[0].loginpageId) - form.setFieldValue('loginpageId', data[0].loginpageId); - setSelectImgs(data[0].previewImgs) - setSelectedLoginpageId(data[0].loginpageId); - setModalId(data[0].loginpageId) - // 选择页面id - preview() - } - }) - } + // const getDefaultID = () => { + // get({ + // messageApi, + // url: '/api/loginpage/list', + // onSuccess({ data }) { + // console.log('登录页图片列表', data); + // setloginpageArray(data) + // // setDefaultId(data[0].loginpageId) + // // upLoginPage(data[0].loginpageId) + // form.setFieldValue('loginpageId', data[0].loginpageId); + // setSelectImgs(data[0].previewImgs) + // setSelectedLoginpageId(data[0].loginpageId); + // setModalId(data[0].loginpageId) + // // 选择页面id + // preview() + // } + // }) + // } // const upLoginPage = (id: string) => { // post({ // messageApi, @@ -148,7 +159,7 @@ export default function ProjConfigLoginpage(props: any) { // }) // } useEffect(() => { - getlistLoginpage() + // getlistLoginpage(page) get({ messageApi, url: `/api/proj/get/config-loginpage/${projId}`, @@ -157,13 +168,13 @@ export default function ProjConfigLoginpage(props: any) { // if(data.adminPassword adminUsername) form.setFieldValue('adminUsername', data.adminUsername?data.adminUsername:'admin'); form.setFieldValue('adminPassword', data.adminPassword?data.adminPassword:'admin'); - if (data.loginpageId) { + // if (data.loginpageId) { form.setFieldValue('loginpageId', data.loginpageId); setSelectedLoginpageId(data.loginpageId); // lyp // const imgs = loginpageArray.filter(item => item.loginpageId === data.loginpageId) // ?.previewImgs; - // setSelectImgs(imgs[0].previewImgs) + setSelectImgs(data.loginpagePreviewImgs) setModalId(data.loginpageId) form.setFieldValue('subTitle', data.subTitle); @@ -172,9 +183,9 @@ export default function ProjConfigLoginpage(props: any) { // form.setFieldValue('adminUsername', data.adminUsername?data.adminUsername:'admin'); // form.setFieldValue('adminPassword', data.adminPassword?data.adminPassword:'admin'); preview() - } else { - getDefaultID() - } + // } else { + // getDefaultID() + // } if (data.logo) { const url = downloadUrl(data.logo); @@ -554,7 +565,8 @@ export default function ProjConfigLoginpage(props: any) {
{ // console.log(selectImgs); setSelectImgModal(true) - + // setPage(1) + getlistLoginpage(1) }}> {/* src={`${Axios.defaults?.baseURL}/route/file/v2/download/true/${previewImgs}`} */} @@ -627,15 +639,20 @@ export default function ProjConfigLoginpage(props: any) { width={1070} style={{ position: 'relative' }} onOk={() => { - setSelectedLoginpageId(modalId); + form.setFieldValue('loginpageId', modalId) preview() - setSelectImgs(modalImg) + if(modalImg){ + setSelectImgs(modalImg) + setSelectedLoginpageId(modalId); + } setSelectImgModal(false) + }} onCancel={() => { setModalId(selectedLoginpageId) setSelectImgModal(false) + }} @@ -670,12 +687,12 @@ export default function ProjConfigLoginpage(props: any) {
{/* defaultCurrent: 默认当前页数 total:数据总数 defaultPageSize:'页面显示几条' */} - {/* { + { console.log(page); - setpage(page) - setpageImgArray([]) - getPageImgData(page) - }} /> */} + // setPage(page) + setloginpageArray([]) + getlistLoginpage(page) + }} />
diff --git a/src/route/proj/edit/ProjEditStep1.tsx b/src/route/proj/edit/ProjEditStep1.tsx index de32b62..e838d87 100644 --- a/src/route/proj/edit/ProjEditStep1.tsx +++ b/src/route/proj/edit/ProjEditStep1.tsx @@ -155,7 +155,7 @@ export default function ProjEditStep1(props: any) { // name="projName" // rules={[{ required: true, message: '请选择页面样式' }]} > -
+
{/* */}