diff --git a/src/pages/ScreenAdvertisement/banner.tsx b/src/pages/ScreenAdvertisement/banner.tsx index a62ab9e..42c4f81 100644 --- a/src/pages/ScreenAdvertisement/banner.tsx +++ b/src/pages/ScreenAdvertisement/banner.tsx @@ -145,7 +145,10 @@ const TableList: React.FC<{}> = () => { { title: '链接', dataIndex: 'pbcLink', - search: false + search: false, + render: (text) => { + return text ? text?.toString().split('||')[1] : '-' + } }, { title: '排序', diff --git a/src/pages/ScreenAdvertisement/components/UpdateBannerForm.tsx b/src/pages/ScreenAdvertisement/components/UpdateBannerForm.tsx index 6422d89..7d82740 100644 --- a/src/pages/ScreenAdvertisement/components/UpdateBannerForm.tsx +++ b/src/pages/ScreenAdvertisement/components/UpdateBannerForm.tsx @@ -1,6 +1,6 @@ -import React, { useRef } from 'react'; +import React, { useRef, useState } from 'react'; import { DrawerForm, ProFormInstance, ProFormSelect, ProFormText, ProFormUploadButton } from '@ant-design/pro-components'; -import { message } from 'antd'; +import { message, Select } from 'antd'; import Upload, { RcFile } from 'antd/es/upload'; import Constants from '@/constants'; export type FormValueType = { @@ -18,8 +18,21 @@ export type UpdateBannerFormProps = { values: Partial; }; +const { Option } = Select; + const UpdateBannerForm: React.FC = (props) => { const formRef = useRef(); + const [linkType, setLinkType] = useState(props.values.pbcLink && props.values.pbcLink.includes('||') ? props.values.pbcLink.split('||')[0] + '||' : 'web||'); + + const selectBefore = ( + + ); + return ( = (props) => { pbcBannerImage = value.pbcBannerImage[0].response.data; } } - return props.onSubmit({ ...value, pbcBannerImage, pbcId: props.values.pbcId }) + return props.onSubmit({ ...value, pbcBannerImage, pbcId: props.values.pbcId, pbcLink: value.pbcLink ? linkType + value.pbcLink : '' }) }} drawerProps={{ destroyOnClose: true, @@ -52,7 +65,7 @@ const UpdateBannerForm: React.FC = (props) => { initialValues={{ pbcTitle: props.values.pbcTitle, pbcBannerType: props.values.pbcBannerType ? props.values.pbcBannerType + '' : null, - pbcLink: props.values.pbcLink, + pbcLink: props.values.pbcLink && props.values.pbcLink.includes('||') ? props.values.pbcLink.split('||')[1] : '', pbcBannerImage: props.values.pbcBannerImage ? [{ uid: '-1', name: props.values.pbcBannerImage.substring(props.values.pbcBannerImage.lastIndexOf('/') + 1), @@ -133,10 +146,11 @@ const UpdateBannerForm: React.FC = (props) => { rules={[{ required: true, message: '请选择类型' }]} /> {/*