Commit 33063f28 by chenshu

fix:优化样式

parent 15e9930c
......@@ -153,7 +153,9 @@ class GraphicsEditor extends React.Component {
return str
}
this.editorInt.config.onchange = (html) => {
const textLength = this.editorInt.txt.text().replace(/\&nbsp\;/ig, ' ').length;
const videoCount = ((html || '').match(/<iframe/g) || []).length;
const imageCount = ((html || '').match(/<img/g) || []).length;
const textLength = this.editorInt.txt.text().replace(/\&nbsp\;/ig, ' ').length + videoCount + imageCount;
this.setState({ textLength }, () => {
onChange(html, this.state.textLength);
})
......@@ -167,7 +169,7 @@ class GraphicsEditor extends React.Component {
const { limitLength = 1000, isIntro } = this.props;
return <div className={`graphics-editor-container${isIntro ? ' introduce' : ''}`}>
<div className="editor-box" id={`editor${editorId}`}></div>
{textLength > limitLength && <div className="editor-tips">超了{textLength - limitLength}个字</div>}
<div className="editor-tips">({textLength}/100000)</div>
</div>
}
}
......
......@@ -33,9 +33,10 @@
.editor-tips {
position: absolute;
top: 5px;
bottom: 5px;
right: 8px;
color: #f5222d;
color: #666;
z-index: 1;
}
.w-e-full-screen-editor {
.w-e-text-container {
......
......@@ -285,7 +285,6 @@ class AddGraphicsCourse extends React.Component {
courseMedia,
introduce,
}
console.log()
const previewGraphicsModal = (
<PreviewGraphicsModal
courseBasicInfo={courseBasinInfo}
......@@ -319,6 +318,7 @@ class AddGraphicsCourse extends React.Component {
})
const { ossUrl } = file;
const { courseMedia, introduce, isContent } = this.state;
console.log(isContent, 55555555)
this.setState({
[isContent ? 'courseMedia' : 'introduce']: `${isContent ? courseMedia : introduce}<p><img style="max-width: 100%;" src="${ossUrl}" /><br/><p>`
});
......
......@@ -26,8 +26,9 @@ class AddGraphicsIntro extends React.Component {
this.state = {
showSelectFileModal: false,
diskList: [],
selectType:null
selectType: null,
}
this.isContent = true;
}
componentDidMount() {
......@@ -49,8 +50,10 @@ class AddGraphicsIntro extends React.Component {
clickEditor = (e) => {
if (e && e.target.closest('.content-editor')) {
this.isContent = true
console.log(11111111)
} else if (e && e.target.closest('.introduce-editor')) {
this.isContent = false
console.log(222222222)
}
}
......
......@@ -119,7 +119,7 @@ class WatchDataModal extends React.Component {
key: 'progress',
dataIndex: 'progress',
render: (val) => {
return <span>{val || 0}%</span>
return <span>{val === 100 ? '已完成' : `${val || 0}%`}</span>
}
}
];
......
......@@ -76,7 +76,7 @@ class PreviewCourseModal extends React.Component {
const { courseBasicInfo, courseClassInfo = {}, courseIntroInfo, type,courseState,origin} = this.props;
const { coverUrl, courseName, scheduleVideoUrl,videoDuration} = courseBasicInfo;
const { liveDate, calendarTime,startTime,endTime,timeHorizonStart, timeHorizonEnd, teacherName } = courseClassInfo;
const { liveCourseMediaRequests } = courseIntroInfo;
const { introduce } = courseIntroInfo;
let liveDateStr, startTimeStr, endTimeStr;
......@@ -177,28 +177,12 @@ class PreviewCourseModal extends React.Component {
<div className="container__introduction__title">直播课简介</div>
}
<div className="container__introduction__list editor-box">
{
liveCourseMediaRequests.map((item, index) => {
if (item.mediaType === 'TEXT') {
return (
<div
className="intro-item text"
dangerouslySetInnerHTML={{
__html: item.mediaContent
}}
/>
)
}
if (item.mediaType === 'PICTURE') {
return (
<div className="intro-item picture">
<img src={item.mediaUrl} />
</div>
)
}
})
}
<div
className="intro-item text"
dangerouslySetInnerHTML={{
__html: introduce
}}
/>
</div>
</div>
</div>
......
......@@ -122,19 +122,14 @@
margin-top: 13px;
}
.text {
color: #666;
line-height: 17px;
color: #666;
p {
font-size: 12px;
}
p {
font-size: 12px;
}
.picture {
img {
width: 100%;
}
img {
width: 100%;
}
}
}
......
......@@ -293,8 +293,8 @@ class AddVideoCourse extends React.Component {
scheduleVideoUrl,
courseName,
scheduleMedia,
videoDuration
videoDuration,
introduce,
} = this.state;
const courseBasinInfo = {
......@@ -304,7 +304,8 @@ class AddVideoCourse extends React.Component {
videoDuration
}
const courseIntroInfo = {
liveCourseMediaRequests: scheduleMedia
liveCourseMediaRequests: scheduleMedia,
introduce,
}
const previewCourseModal = (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment