diff --git a/src/components/richText/wang/index.tsx b/src/components/richText/wang/index.tsx index 683782b..4b4b928 100644 --- a/src/components/richText/wang/index.tsx +++ b/src/components/richText/wang/index.tsx @@ -3,7 +3,7 @@ import AlertMenu from './fullScreen' import E from 'wangeditor'; import { Button, message, Spin } from 'antd'; import { pictureDisplayPath, uploadAttachmentPath } from '@/utils/DownloadUtils'; -import { isEmpty } from '@/utils/CommonUtils'; +import { isEmpty, isNotEmpty } from '@/utils/CommonUtils'; import { createNewFileBid } from '@/services/download_'; interface WangType { @@ -194,21 +194,18 @@ const BraftText: React.FC = (props) => { willCreate = false; } - // 重新设置编辑器内容 - echo && editor.txt.html(echo); - return () => { // 组件销毁时销毁编辑器 注:class写法需要在componentWillUnmount中调用 editor.destroy() setLoading(false); setContent(''); } - }, [echo]); + }, []); useEffect(() => { // 重新设置编辑器内容 - value && editor.txt.html(value); - }, [value]) + echo && editor.txt.html(echo); + }, [echo]) /** *提供给父级的内容 **/ diff --git a/src/pages/PartyMemberTopic/Management/EventMaintenance/components/EventMaintenanceModal.tsx b/src/pages/PartyMemberTopic/Management/EventMaintenance/components/EventMaintenanceModal.tsx index a17723b..a631077 100644 --- a/src/pages/PartyMemberTopic/Management/EventMaintenance/components/EventMaintenanceModal.tsx +++ b/src/pages/PartyMemberTopic/Management/EventMaintenance/components/EventMaintenanceModal.tsx @@ -38,6 +38,8 @@ const EventMaintenanceModal: React.FC = (props) => { const [imageId, setImageId] = useState(''); //富文本正文图片objectId const [contentImageId, setContentImageId] = useState(''); + //富文本正文 + const [content, setContent] = useState(''); //活动类型选择 const [typeSelect, setTypeSelect] = useState(''); //loading @@ -49,6 +51,10 @@ const EventMaintenanceModal: React.FC = (props) => { message.error("请上传主图"); return; } + if (isEmpty(braftRef.current.getHtml())) { + message.error("请编辑正文内容"); + return; + } form.validateFields().then(values => { const data = { banner: null, @@ -92,12 +98,14 @@ const EventMaintenanceModal: React.FC = (props) => { form.setFieldsValue(record); setImageId(record?.image); setContentImageId(record?.contentImageId); + setContent(record?.content); onTypeChage(record?.type); } return () => { setImageId(''); setContentImageId(''); setTypeSelect(''); + setContent(''); setLoading(false); }; }, [record?.id]) @@ -174,13 +182,13 @@ const EventMaintenanceModal: React.FC = (props) => { - + {readOnly ? (
) : ( - + )}