m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整

Browse Source
dev_tj
杨树明 5 years ago
parent 3c57080a3c
commit 12ad095236
8 changed files with 224 additions and 214 deletions
Show Stats Download Patch File Download Diff File

132
public/react/src/modules/courses/boards/TopicDetail.js
Unescape View File

@ -65,7 +65,7 @@ class TopicDetail extends Component {
const topicId = this.props.match.params.topicId
const bid = this.props.match.params.boardId
const memoUrl = `/messages/${topicId}.json`;
this.setState({
memoLoading: true
@ -73,7 +73,7 @@ class TopicDetail extends Component {
axios.get(memoUrl,{
})
.then((response) => {
if (response.data.status === -1) {
setTimeout(() => {
this.props.showNotification('帖子不存在！')
@ -81,7 +81,7 @@ class TopicDetail extends Component {
// this.props.toListPage(response.data.data.course_id, bid)
return;
} else {
this.setState({
memo: Object.assign({}, {
...response.data.data,
@ -93,7 +93,7 @@ class TopicDetail extends Component {
// const { memo_replies, memo } = response.data;
// let hasMoreComments = false;
// if (memo_replies && memo_replies.length === 10 && memo.total_replies_count > 10) {
// if (memo_replies && memo_replies.length === 10 && memo.total_replies_count > 10) {
// // 遍历一遍，计算下是否还有评论未加载
// let totalCount = 10;
// memo_replies.forEach(item=>{
@ -123,14 +123,14 @@ class TopicDetail extends Component {
})
this.fetchReplies()
$('body>#root').on('onMemoDelete', (event) => {
$('body>#root').on('onMemoDelete', (event) => {
// const val = $('body>#root').data('onMemoDelete')
const val = window.onMemoDelete ;
this.onMemoDelete( JSON.parse(decodeURIComponent(val)) )
})
}
onPaginationChange = (pageCount) => {
@ -157,7 +157,7 @@ class TopicDetail extends Component {
this.props.showNotification('删除成功');
const props = Object.assign({}, this.props, {})
this.props.toListPage( Object.assign({}, this.props.match.params, {'coursesId': this.state.memo.course_id} ) )
} else if (status === -1) {
this.props.showNotification('帖子已被删除');
this.props.history.push(`/forums`)
@ -168,11 +168,11 @@ class TopicDetail extends Component {
}
componentDidUpdate(prevProps, prevState, snapshot) {
// if (this.state.memo && this.state.memo.content
// if (this.state.memo && this.state.memo.content
// && (!prevProps.memo || prevProps.memo.content != this.state.memo.content) ) {
if (this.state.memo && this.state.memo.content && prevState.memoLoading === true && this.state.memoLoading === false) {
// md渲染content，等xhr执行完（即memoLoading变化），memo.content更新后初始化md
setTimeout(()=>{
// var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
// htmlDecode: "style,script,iframe", // you can filter tags decode
@ -183,7 +183,7 @@ class TopicDetail extends Component {
// });
}, 200)
}
}
clickPraise(){
@ -192,7 +192,7 @@ class TopicDetail extends Component {
const url = memo.user_praise ? '/praise_tread/unlike.json' : `/praise_tread/like.json`;
const _method = memo.user_praise ? axios.delete : axios.post
let _data = {
object_id: memo.id,
object_id: memo.id,
object_type: 'message', //Discuss
}
if (memo.user_praise) {
@ -204,10 +204,10 @@ class TopicDetail extends Component {
..._data
},
{
}
).then((response) => {
const newMemo = Object.assign({}, this.state.memo)
newMemo.praises_count = newMemo.user_praise ? newMemo.praises_count - 1 : newMemo.praises_count + 1
newMemo.total_praises_count = newMemo.user_praise ? newMemo.total_praises_count - 1 : newMemo.total_praises_count + 1
@ -248,10 +248,10 @@ class TopicDetail extends Component {
className="mr12 color9B9B overflowHidden1" length="58" style={{maxWidth: '480px'}}>
{fileName}
</a>
<span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
</div>
)
})
@ -268,7 +268,7 @@ class TopicDetail extends Component {
permission: true, //
children: children,
child_message_count: reply.total_count,
hidden: reply.is_hidden,
hidden: reply.is_hidden,
id: reply.id,
image_url: reply.author.image_url,
reward: null, //
@ -289,7 +289,7 @@ class TopicDetail extends Component {
})
.then((response) => {
const { replies, liked, total_replies_count, total_count } = response.data.data
const memo = Object.assign({}, this.state.memo)
memo.user_praise = liked
memo.total_replies_count = total_replies_count;
@ -322,15 +322,15 @@ class TopicDetail extends Component {
return;
}
const url = `/messages/${id}/reply.json`;
const { comments } = this.state;
const user = this._getUser();
/*
移除末尾的空行
.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
*/
commentContent = handleContentBeforeCreateSecondLevelComment(commentContent)
if (!commentContent) {
this.props.showNotification('不能为空')
@ -340,9 +340,9 @@ class TopicDetail extends Component {
content: commentContent
},
{
}
}
).then((response) => {
if (response.data.data.id) {
if (response.data.data.id) {
let newId = response.data.data.id;
const commentIndex = this._findById(id, comments);
const parentComment = comments[commentIndex]
@ -361,7 +361,7 @@ class TopicDetail extends Component {
memo: newMemo2
})
}
}).catch((error) => {
console.log(error)
})
@ -369,14 +369,14 @@ class TopicDetail extends Component {
// 公共接口 --- 删除回复
deleteComment = (parrentComment, childCommentId) => {
handleDeleteComment(this, parrentComment, childCommentId, 'message')
}
// 公共接口 --- 回复点赞
commentPraise = (discussId) => {
handleCommentPraise(this, discussId, 'message', (old_user_praise) => {
const newMemo2 = Object.assign({}, this.state.memo);
newMemo2.total_praises_count = old_user_praise
newMemo2.total_praises_count = old_user_praise
? newMemo2.total_praises_count - 1 : newMemo2.total_praises_count + 1;
this.setState({
memo: newMemo2
@ -390,7 +390,7 @@ class TopicDetail extends Component {
createNewComment = (commentContent, id, editor) => {
let content = handleContentBeforeCreateNew(commentContent);
const { memo } = this.props;
const url = `/messages/${id}/reply.json`;
// const url = `/api/v1/memos/${memo.id}/reply`;
@ -399,7 +399,7 @@ class TopicDetail extends Component {
content: content
},
{
}
}
).then((response) => {
if (response.data.status === -1) {
console.error('服务端异常')
@ -407,15 +407,15 @@ class TopicDetail extends Component {
}
// this.props.showNotification('帖子发表成功')
if (response.data) {
if (response.data) {
const _id = response.data.data.id;
// ke
editor.html && editor.html('');
editor.afterBlur && editor.afterBlur()
// md
editor.setValue && editor.setValue('')
const user = this._getUser();
this.setState({
comments: addNewComment(comments, _id, content, user, this.props.isSuperAdmin(), this)
@ -427,8 +427,8 @@ class TopicDetail extends Component {
})
this.refs.editor.showEditor();
this.refs.editor.close();
}
}).catch((error) => {
console.log(error)
@ -444,7 +444,7 @@ class TopicDetail extends Component {
})
.then((response) => {
const { replies, liked, total_replies_count } = response.data.data
// const memo = Object.assign({}, this.state.memo)
// memo.total_replies_count = total_replies_count;
this.setState({
@ -460,19 +460,19 @@ class TopicDetail extends Component {
// 置顶
setTop(memo) {
// const params = {
// sticky: memo.sticky ? 0 : 1,
// sticky: memo.sticky ? 0 : 1,
// }
// if (this.state.p_s_order) {
// if (this.state.p_s_order) {
// params.order = this.state.p_s_order;
// }
// if (this.state.p_forum_id) {
// if (this.state.p_forum_id) {
// params.forum_id = this.state.p_forum_id;
// }
// let paramsUrl = urlStringify(params)
const set_top_or_down_Url = `/messages/${memo.id}/sticky_top.json`;
// 获取memo list
axios.put(set_top_or_down_Url, {
})
.then((response) => {
const status = response.data.status
@ -487,7 +487,7 @@ class TopicDetail extends Component {
console.log(error)
})
}
setRewardDialogVisible = (visible) => {
this.setState({
goldRewardDialogOpen: visible
@ -512,7 +512,7 @@ class TopicDetail extends Component {
}
}
render() {
const { match, history } = this.props
const { recommend_shixun, current_user,author_info } = this.props;
@ -567,7 +567,7 @@ class TopicDetail extends Component {
<div className="padding30 bor-bottom-greyE" style={{paddingBottom: '20px'}}>
<div className="font-16 cdefault clearfix pr pr35">
<span className="noteDetailTitle">{memo.subject}</span>
{ !!memo.sticky && <span className="btn-cir btn-cir-red ml10"
{ !!memo.sticky && <span className="btn-cir btn-cir-red ml10"
style={{position: 'relative', bottom: '4px'}}>置顶</span>}
{ !!memo.reward && <span className="color-orange font-14 ml15"
data-tip-down={`获得平台奖励金币：${memo.reward}`} >
@ -578,9 +578,9 @@ class TopicDetail extends Component {
<div className="edu-position-hidebox" style={{position: 'absolute', right: '2px',top:'4px'}}>
<a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
<ul className="edu-position-hide undis">
{ ( isCurrentUserTheAuthor || isAdmin ) &&
<li><a
{ ( isCurrentUserTheAuthor || isAdmin ) &&
<li><a
onClick={() => this.props.toEditPage( Object.assign({}, this.props.match.params, {'coursesId': this.state.memo.course_id}) ) }
>编&nbsp;&nbsp;辑</a></li>}
{ isAdmin &&
@ -590,7 +590,7 @@ class TopicDetail extends Component {
<li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>置&nbsp;&nbsp;顶</a></li> )
}
{ isAdmin &&
<li><a href="javascript:void(0);" onClick={() => this.refs.sendToCourseModal.setVisible(true)}>发&nbsp;&nbsp;送</a></li>
<li><a href="javascript:void(0);" onClick={() => this.refs.sendToCourseModal.setVisible(true)}>发&nbsp;&nbsp;送</a></li>
}
{ ( isCurrentUserTheAuthor || isAdmin ) && <li>
<a href="javascript:void(0)" onClick={() =>
@ -602,9 +602,9 @@ class TopicDetail extends Component {
</ul>
</div>
}
</div>
<div className="df mt20">
<div className="df mt20">
<img src={setImagesUrl(`/images/${author && author.image_url}`)} className="radius mr10 mt2" width="40px" height="40px"/>
<div className="flex1">
<div className="color-grey-9 lineh-20">
@ -625,7 +625,7 @@ class TopicDetail extends Component {
<span style={{ top: "1px", position: "relative" }}>{memo.visits || '1'}</span>
</span>
</Tooltip>
{ !!memo.total_replies_count &&
{ !!memo.total_replies_count &&
<Tooltip title={"回复数"}>
<a href="javascript:void(0)" className="noteDetailNum">
<i className="iconfont icon-huifu1 mr5" onClick={this.showCommentInput}></i>
@ -633,8 +633,8 @@ class TopicDetail extends Component {
</a>
</Tooltip>
}
{!!memo.total_praises_count &&
<Tooltip title={"点赞数"}>
{!!memo.total_praises_count &&
<Tooltip title={"点赞数"}>
<span className={`noteDetailNum `} style={{}}>
<i className="iconfont icon-dianzan-xian mr5"></i>
<span style={{ top: "2px", position: "relative" }}>{ memo.total_praises_count }</span>
@ -654,12 +654,12 @@ class TopicDetail extends Component {
</div>
</div>
<div className="padding30 memoContent new_li" style={{ paddingBottom: '10px'}}>
{/* <MarkdownToHtml content={memo.content}></MarkdownToHtml> */}
{memo.is_md == true ?
<MarkdownToHtml content={memo.content}></MarkdownToHtml>
:
{memo.is_md == true ?
<MarkdownToHtml content={memo.content}></MarkdownToHtml>
:
<div dangerouslySetInnerHTML={{ __html: memo.content }}></div>
}
</div>
@ -674,17 +674,17 @@ class TopicDetail extends Component {
</Tooltip>
</div>
{ memo.attachments && !!memo.attachments.length &&
{ memo.attachments && !!memo.attachments.length &&
<div>
{this.renderAttachment()}
</div>
}
</div>
{!isCourseEnd && <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
{!isCourseEnd && <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
height={160} showError={true} buttonText={'发表'} className={comments && comments.length && 'borderBottom'}></MemoDetailMDEditor>}
{/* onClick={ this.createNewComment }
{/* onClick={ this.createNewComment }
enableReplyTo={true}
*/}
<div className="padding20 memoReplies commentsDelegateParent comments_hideSecondReplyUserHeader"
@ -711,22 +711,22 @@ class TopicDetail extends Component {
onlySuperAdminCouldHide={true}
></Comments>
{/* { true ? :
{/* { true ? :
<div className="memoMore">
<div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
</div>} */}
</div>
<div className="memoMore" style={{'margin-top': '20px'}}>
{ total_count > REPLY_PAGE_COUNT &&
{ total_count > REPLY_PAGE_COUNT &&
<Pagination showQuickJumper onChange={this.onPaginationChange} current={pageCount} total={total_count} pageSize={10}/>
}
{!isCourseEnd && <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>}
</div>
</div>
</div>
</div>
</div>

46
public/react/src/modules/courses/common/comments/CommonReply.js
Unescape View File

@ -18,7 +18,7 @@ import { generateComments, generateChildComments, _findById, handleContentBefore
const REPLY_PAGE_COUNT = 10
const $ = window.$;
/*
/*
相比较GraduateTopicReply 改动的地方
列表接口名 /graduation_tasks/${graduation_topic_id}/show_comment.json?parent_id=${parent.id}&limit=500
回复类型名 jour_type: this.props.jour_type,
@ -34,7 +34,7 @@ class CommonReply extends Component{
componentDidMount(){
this.fetchReplies()
}
_getUser() {
const { current_user } = this.props;
@ -58,7 +58,7 @@ class CommonReply extends Component{
// m_parent_id
reply_id: memo.user_id || this.state.homework_user_id
}
}
}
).then((response) => {
if (response.data.status === -1) {
console.error('服务端异常')
@ -66,15 +66,15 @@ class CommonReply extends Component{
}
// this.props.showNotification('帖子发表成功')
if (response.data && response.data.id) {
if (response.data && response.data.id) {
const _id = response.data.id;
// md
editor.setValue && editor.setValue('')
this.refs.editor.close && this.refs.editor.close()
const user = this._getUser();
const isSuperAdmin = this.props.isSuperAdmin()
this.setState({
comments: addNewComment(this.state.comments, _id, content, user, isSuperAdmin, this),
total_count: this.state.total_count + 1
@ -98,13 +98,13 @@ class CommonReply extends Component{
return;
}
const url = `/users/reply_message.json`;
const { comments } = this.state;
const user = this._getUser();
const graduation_topic_id = this.props.memo.id
const commentIndex = this._findById(id, comments);
let comment = comments[commentIndex];
commentContent = handleContentBeforeCreateSecondLevelComment(commentContent)
axios.post(url, {
journals_for_message: {
@ -117,9 +117,9 @@ class CommonReply extends Component{
}
},
{
}
}
).then((response) => {
if (response.data.id) {
if (response.data.id) {
let newId = response.data.id;
const newMemo2 = Object.assign({}, this.props.memo);
@ -132,7 +132,7 @@ class CommonReply extends Component{
})
}
}).catch((error) => {
console.log(error)
})
@ -146,7 +146,7 @@ class CommonReply extends Component{
})
.then((response) => {
const { comments } = response.data
// const memo = Object.assign({}, this.state.memo)
// memo.sum_replies_count = sum_replies_count;
@ -164,7 +164,7 @@ class CommonReply extends Component{
this.fetchReplies()
})
}
fetchReplies = () => {
const graduation_topic_id = this.props.memo.id
const course_id = this.props.course_id
@ -174,7 +174,7 @@ class CommonReply extends Component{
})
.then((response) => {
const { comments, messages_count, homework_user_id, parent_messages_count } = response.data
this.setState({
comments: generateComments(comments, this.transformReply),
// : this.state.comments.concat(comments),
@ -185,7 +185,7 @@ class CommonReply extends Component{
console.log(error)
})
}
transformReply = (reply, children = []) => {
const isAdmin = this.props.isAdmin()
const isSuperAdmin = this.props.isSuperAdmin()
@ -194,7 +194,7 @@ class CommonReply extends Component{
isSuperAdmin: isSuperAdmin,
permission: true, //
children: children,
hidden: reply.hidden,
hidden: reply.hidden,
id: reply.id,
image_url: reply.author.image_url,
reward: null, //
@ -249,7 +249,7 @@ class CommonReply extends Component{
padding-bottom: 30px;
}
`}</style>
<MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
<MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
height={160} showError={true} imageExpand={true}
replyComment={this.replyComment}
commentsLength={comments ? comments.length : 0}
@ -268,7 +268,7 @@ class CommonReply extends Component{
commentPraise={this.commentPraise}
rewardCode={this.rewardCode}
hiddenComment={this.hiddenComment}
usingAntdModal={true}
isChildCommentPagination={true}
loadMoreChildComments={this.loadMoreChildComments}
@ -276,15 +276,15 @@ class CommonReply extends Component{
showRewardButton={false}
onlySuperAdminCouldHide={true}
></Comments>
{/* { true ? :
{/* { true ? :
<div className="memoMore">
<div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
</div>} */}
</div>
{ total_count > REPLY_PAGE_COUNT &&
{ total_count > REPLY_PAGE_COUNT &&
<div className="memoMore">
<Pagination showQuickJumper onChange={this.onPaginationChange} current={pageCount} total={total_count} pageSize={10}/>
<div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>

44
public/react/src/modules/courses/graduation/topics/GraduateTopicReply.js
Unescape View File

@ -28,7 +28,7 @@ class GraduateTopicReply extends Component{
componentDidMount(){
this.fetchReplies()
}
_getUser() {
const { current_user } = this.props;
@ -52,7 +52,7 @@ class GraduateTopicReply extends Component{
// m_parent_id
reply_id: memo.user_id
}
}
}
).then((response) => {
if (response.data.status === -1) {
console.error('服务端异常')
@ -60,18 +60,18 @@ class GraduateTopicReply extends Component{
}
// this.props.showNotification('帖子发表成功')
if (response.data && response.data.id) {
if (response.data && response.data.id) {
const _id = response.data.id;
// md
editor.setValue && editor.setValue('')
const user = this._getUser();
this.setState({
comments: addNewComment(this.state.comments, _id, content, user, this.props.isSuperAdmin(), this),
total_count: this.state.total_count + 1
})
this.refs.editor.showEditor();
}
}).catch((error) => {
console.log(error)
@ -89,13 +89,13 @@ class GraduateTopicReply extends Component{
return;
}
const url = `/users/reply_message.json`;
const { comments } = this.state;
const user = this._getUser();
const graduation_topic_id = this.props.memo.id
const commentIndex = this._findById(id, comments);
let comment = comments[commentIndex];
commentContent = handleContentBeforeCreateSecondLevelComment(commentContent)
axios.post(url, {
journals_for_message: {
@ -107,9 +107,9 @@ class GraduateTopicReply extends Component{
}
},
{
}
}
).then((response) => {
if (response.data.id) {
if (response.data.id) {
let newId = response.data.id;
this.setState({
@ -122,7 +122,7 @@ class GraduateTopicReply extends Component{
memo: newMemo2
})
}
}).catch((error) => {
console.log(error)
})
@ -136,7 +136,7 @@ class GraduateTopicReply extends Component{
})
.then((response) => {
const { comments } = response.data
// const memo = Object.assign({}, this.state.memo)
// memo.sum_replies_count = sum_replies_count;
@ -154,7 +154,7 @@ class GraduateTopicReply extends Component{
this.fetchReplies()
})
}
fetchReplies = () => {
const graduation_topic_id = this.props.memo.id
const course_id = this.props.course_id
@ -164,7 +164,7 @@ class GraduateTopicReply extends Component{
})
.then((response) => {
const { comments, messages_count } = response.data
this.setState({
comments: generateComments(comments, this.transformReply),
// : this.state.comments.concat(comments),
@ -174,7 +174,7 @@ class GraduateTopicReply extends Component{
console.log(error)
})
}
transformReply = (reply, children = []) => {
const isAdmin = this.props.isAdmin()
const isSuperAdmin = this.props.isSuperAdmin()
@ -184,7 +184,7 @@ class GraduateTopicReply extends Component{
permission: true, //
children: children,
child_message_count: reply.child_message_count,
hidden: reply.hidden,
hidden: reply.hidden,
id: reply.id,
image_url: reply.author.image_url,
reward: null, //
@ -226,7 +226,7 @@ class GraduateTopicReply extends Component{
return(
<React.Fragment>
<MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
<MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
height={160} showError={true}></MemoDetailMDEditor>
<div className="padding40 bor-bottom-greyE memoReplies commentsDelegateParent"
@ -242,7 +242,7 @@ class GraduateTopicReply extends Component{
commentPraise={this.commentPraise}
rewardCode={this.rewardCode}
hiddenComment={this.hiddenComment}
usingAntdModal={true}
isChildCommentPagination={true}
loadMoreChildComments={this.loadMoreChildComments}
@ -251,15 +251,15 @@ class GraduateTopicReply extends Component{
onlySuperAdminCouldHide={true}
></Comments>
{/* { true ? :
{/* { true ? :
<div className="memoMore">
<div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
</div>} */}
</div>
{ total_count > REPLY_PAGE_COUNT &&
{ total_count > REPLY_PAGE_COUNT &&
<div className="memoMore">
<Pagination showQuickJumper onChange={this.onPaginationChange} current={pageCount} total={total_count} pageSize={10}/>
<div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>

124
public/react/src/modules/forums/MemoDetail.js
Unescape View File

@ -58,7 +58,7 @@ class MemoDetail extends Component {
// window.$("html,body").animate({"scrollTop":0})
const { match } = this.props
const memoUrl = `/memos/${match.params.memoId}.json`;
this.setState({
memoLoading: true
@ -79,7 +79,7 @@ class MemoDetail extends Component {
const { memo_replies, memo } = response.data;
let hasMoreComments = false;
if (memo_replies && memo_replies.length === 10 && memo.replies_count > 10) {
if (memo_replies && memo_replies.length === 10 && memo.replies_count > 10) {
// 遍历一遍，计算下是否还有评论未加载
let totalCount = 10;
memo_replies.forEach(item=>{
@ -96,7 +96,7 @@ class MemoDetail extends Component {
})
delete response.data.memo_replies;
// reset
response.data.memo.praise_count = response.data.memo.memo_praise_count
response.data.memo.praise_count = response.data.memo.memo_praise_count
this.props.initForumState(response.data)
// const user = response.data.current_user;
// user.tidding_count = response.data.tidding_count;
@ -110,14 +110,14 @@ class MemoDetail extends Component {
console.log(error)
})
$('body>#root').on('onMemoDelete', (event) => {
$('body>#root').on('onMemoDelete', (event) => {
// const val = $('body>#root').data('onMemoDelete')
const val = window.onMemoDelete ;
this.onMemoDelete( JSON.parse(decodeURIComponent(val)) )
})
}
componentWillUnmount() {
$('body>#root').off('onMemoDelete')
@ -134,7 +134,7 @@ class MemoDetail extends Component {
this.props.showNotification('删除成功');
this.props.history.push(`/forums`)
} else if (status === -1) {
this.props.showNotification('帖子已被删除');
this.props.history.push(`/forums`)
@ -145,7 +145,7 @@ class MemoDetail extends Component {
}
componentDidUpdate(prevProps, prevState, snapshot) {
// if (this.props.memo && this.props.memo.content
// if (this.props.memo && this.props.memo.content
// && (!prevProps.memo || prevProps.memo.content != this.props.memo.content) ) {
if (this.props.memo && this.props.memo.content && prevState.memoLoading === true && this.state.memoLoading === false) {
// md渲染content，等xhr执行完（即memoLoading变化），memo.content更新后初始化md
@ -191,7 +191,7 @@ class MemoDetail extends Component {
const ar = item.url.split('/')
const fileName = item.title
let filesize = item.filesize
attachments.push(
<div className="color-grey df" key={index} style={{ lineHeight: '17px'}}>
<a className="color-grey ">
@ -202,7 +202,7 @@ class MemoDetail extends Component {
{fileName}
</a>
<span className="color656565 mt2 color-grey-6 font-12 mr8">{filesize}</span>
</div>
)
})
@ -241,7 +241,7 @@ class MemoDetail extends Component {
/*
移除末尾的空行
.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
*/
if (commentContent) {
commentContent = commentContent.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
@ -254,10 +254,10 @@ class MemoDetail extends Component {
},
{
// withCredentials: true
}
}
).then((response) => {
response.data.memo = response.data
if (response.data.memo) {
if (response.data.memo) {
let newDiscuss = response.data.memo;
var commentIndex = this._findById(id, comments);
@ -278,8 +278,8 @@ class MemoDetail extends Component {
// "position": newDiscuss.position,
"time": "1分钟前",
"praise_count": 0,
"user_id": newDiscuss.author_id,
"user_id": newDiscuss.author_id,
})
@ -292,9 +292,9 @@ class MemoDetail extends Component {
const $ = window.$
var view_selector = `.commentItemMDEditorView_${id}`
$(view_selector).hide();
}
}
this.setState({
// runTesting: false,
comments: comments
@ -320,15 +320,15 @@ class MemoDetail extends Component {
deleteCommentId = childCommentId;
}
const url = `/memos/${deleteCommentId}.json`
let comments = this.state.comments;
let comments = this.state.comments;
axios.delete(url,
{
// withCredentials: true
}
}
).then((response) => {
// TODO 删除成功或失败
if (response.data && response.data.status === 0) {
if (response.data && response.data.status === 0) {
const commentIndex = this._findById(parrentComment.id, comments);
// https://stackoverflow.com/questions/29527385/removing-element-from-array-in-component-state
@ -371,13 +371,13 @@ class MemoDetail extends Component {
},
{
// withCredentials: true
}
}
).then((response) => {
if (response.data.praise_count === 0 || response.data.praise_count) {
if (response.data.praise_count === 0 || response.data.praise_count) {
comments[commentIndex].user_praise = !comments[commentIndex].user_praise;
comments[commentIndex].praise_count = response.data.praise_count;
this.setState({
comments
})
@ -406,9 +406,9 @@ class MemoDetail extends Component {
},
{
// withCredentials: true
}
}
).then((response) => {
if (response.data && response.data.code) {
if (response.data && response.data.code) {
const commentIndex = this._findById(parrentComment.id, comments);
if (childComment) {
@ -418,13 +418,13 @@ class MemoDetail extends Component {
parrentComment.children[childCommentIndex] = newChildComment
comments[commentIndex] = parrentComment;
this.setState({
comments
})
} else {
comments[commentIndex].reward = response.data.code;
this.setState({
comments
})
@ -449,14 +449,14 @@ class MemoDetail extends Component {
},
{
// withCredentials: true
}
}
).then((response) => {
if (response.data.status === -1) {
if (response.data.status === -1) {
showNotification(response.data.message)
return;
}
if (response.data.status === 0) {
if (response.data.status === 0) {
if (!childCommentId) {
comment.hidden = !comment.hidden;
this.setState({
@ -468,7 +468,7 @@ class MemoDetail extends Component {
childComment.hidden = !childComment.hidden;
this.setState({ comments })
}
}
// {"message":"Couldn't find Discuss with id=911","status":-1}
@ -481,7 +481,7 @@ class MemoDetail extends Component {
const { memo } = this.props;
if(content != undefined){
content = content.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
var beforeImage = content.split("<img");
var afterImage = content.split("/>");
if(beforeImage[0] == "" && afterImage[1] == ""){
@ -500,13 +500,13 @@ class MemoDetail extends Component {
},
{
// withCredentials: true
}
}
).then((response) => {
if (response.data.status === -1) {
console.error('服务端异常')
return;
}
if (response.data) {
if (response.data) {
response.data.memo = response.data
const newMemo = response.data.memo;
// ke
@ -533,11 +533,11 @@ class MemoDetail extends Component {
"user_praise": false,
"time": "1分钟前",
"praise_count": 0,
"user_id": user.user_id,
"user_id": user.user_id,
})
this.setState({
comments
})
@ -558,11 +558,11 @@ class MemoDetail extends Component {
const user = this._getUser();
const url = `/memos/${memo.id}/more_reply.json?page=${pageCount}`;
axios.get(url, {
},
{
// withCredentials: true
}
}
).then((response) => {
if (response.data.status === -1) {
console.error('服务端异常')
@ -575,7 +575,7 @@ class MemoDetail extends Component {
})
return;
}
if (response.data.memos_count) {
if (response.data.memos_count) {
const newComments = comments.concat(memo_replies);
const hasMoreComments = memo_replies.length === 10
this.setState({
@ -595,12 +595,12 @@ class MemoDetail extends Component {
// 置顶
setTop(memo) {
const params = {
sticky: memo.sticky ? 0 : 1,
sticky: memo.sticky ? 0 : 1,
}
if (this.state.p_s_order) {
if (this.state.p_s_order) {
params.order = this.state.p_s_order;
}
if (this.state.p_forum_id) {
if (this.state.p_forum_id) {
params.forum_id = this.state.p_forum_id;
}
let paramsUrl = urlStringify(params)
@ -628,7 +628,7 @@ class MemoDetail extends Component {
const { memo, author_info } = this.props;
const newMemo = Object.assign({}, memo);
const _reward = parseInt(inputVal)
const url = `/discusses/${memo.id}/reward_code.json`
axios.post(url, {
@ -667,6 +667,8 @@ class MemoDetail extends Component {
}
// --------------------------------------------------------------------------------------------帖子獎勵 END
showCommentInput = () => {
debugger
if (window.__useKindEditor === true) {
this.refs.editor.showEditor();
} else {
@ -702,8 +704,8 @@ class MemoDetail extends Component {
margin-top: 6px;
}
`}</style>
<RewardDialog goldRewardDialogOpen={goldRewardDialogOpen}
<RewardDialog goldRewardDialogOpen={goldRewardDialogOpen}
setRewardDialogVisible={this.setRewardDialogVisible}
rewardCode={this.rewardCodeMemo}
{...this.props}
@ -714,12 +716,12 @@ class MemoDetail extends Component {
<div className="font-16 mb5 cdefault clearfix pr pr35" style={{display: 'flex', alignItems: 'center'}}>
{/* overflowHidden1 */}
<span className="noteDetailTitle " style={{maxWidth: '634px'}}>{memo.subject}</span>
{ memo.sticky && <span className="btn-cir btn-cir-red ml10 "
{ memo.sticky && <span className="btn-cir btn-cir-red ml10 "
style={{ height: '20px', alignSelf: 'flex-start', marginTop: '10px' }}
>置顶</span>}
{ !!memo.reward &&
{ !!memo.reward &&
<Tooltip title={`获得平台奖励金币：${memo.reward}`}>
<span className="color-orange font-14 ml15"
<span className="color-orange font-14 ml15"
style={{ height: '20px', alignSelf: 'flex-start', marginTop: '1px' }}
>
<i className="iconfont icon-gift mr5"></i>
@ -749,8 +751,8 @@ class MemoDetail extends Component {
</ul>
</div>
}
{/* <Link className={`task-hide fr return_btn color-grey-6 mt2 ${ _current_user && (_current_user.admin === true
|| _current_user.user_id === author_info.user_id) ? '': 'no_mr'} `} to="/forums"
{/* <Link className={`task-hide fr return_btn color-grey-6 mt2 ${ _current_user && (_current_user.admin === true
|| _current_user.user_id === author_info.user_id) ? '': 'no_mr'} `} to="/forums"
style={{ marginRight: '10px'}}
>
返回
@ -773,7 +775,7 @@ class MemoDetail extends Component {
<span className={`noteDetailNum ${!!memo.replies_count ? 'rightline' : ''} cdefault`}>
<i className="iconfont icon-liulanyan mr5"></i>{memo.viewed_count}
</span>
{ !!memo.replies_count &&
{ !!memo.replies_count &&
<Tooltip title={ "写评论" }>
<a href="javascript:void(0)" className="noteDetailNum">
<i className="iconfont icon-huifu1 mr5" onClick={this.showCommentInput}></i>{memo.replies_count}
@ -784,11 +786,11 @@ class MemoDetail extends Component {
</div>
</div>
<div className="padding40 memoContent new_li">
{ !memo.is_md ?
<div dangerouslySetInnerHTML={{__html: memo.content}}></div> :
<div id="memo_content_editorMd" className="new_li">
<textarea style={{'display': 'none'}}>
{memo.content}
@ -807,7 +809,7 @@ class MemoDetail extends Component {
</p>
</div>
{ this.props.attachments_list &&
{ this.props.attachments_list &&
<div>
{this.renderAttachment()}
</div>
@ -836,17 +838,17 @@ class MemoDetail extends Component {
></Comments>
{ hasMoreComments ?
{ hasMoreComments ?
<div className="memoMore" style={{ cursor: 'default' }}>
<a onClick={this.moreMemos}>查看更多评论</a>
<div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
</div>
:
</div>
:
<div className="memoMore">
<div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
<div className="writeCommentBtn" onClick={this.showCommentInput}>写评论1</div>
</div>}
</div>
</div>
</div>
</div>

32
public/react/src/modules/forums/MemoDetailKEEditor.js
Unescape View File

@ -14,27 +14,27 @@ class MemoDetailKEEditor extends Component {
componentDidUpdate(prevProps, prevState, snapshot) {
if (this.props.memo && (!prevProps.memo || this.props.memo.id != prevProps.memo.id)) {
this.keEditor = window.sd_create_editor_from_data(this.props.memo.id, null, "100%", "Memo");
window._kk = this.keEditor
window._kk = this.keEditor
}
}
componentDidMount() {
this.keEditor = window.sd_create_editor_from_data(this.props.memo.id, null, "100%", "Memo");
window._kk = this.keEditor
window._kk = this.keEditor
}
showEditor() {
// $("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => {
// if (this.keEditor) {
// const FF = !(window.mozInnerScreenX == null);
// if (FF) {
// this.keEditor.focus()
// } else {
// this.keEditor.edit.win.document.body.focus()
// }
// }
// });
$("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => {
if (this.keEditor) {
const FF = !(window.mozInnerScreenX == null);
if (FF) {
this.keEditor.focus()
} else {
this.keEditor.edit.win.document.body.focus()
}
}
});
}
render() {
@ -44,17 +44,17 @@ class MemoDetailKEEditor extends Component {
}
return (
<div nhname={`new_message_${memo.id}`} className="" style={{ paddingTop: '20px', paddingBottom: '20px' }}
<div nhname={`new_message_${memo.id}`} className="" style={{ paddingTop: '20px', paddingBottom: '20px' }}
id="commentInput">
<form acceptCharset="UTF-8" action="/discusses?challenge_id=118&dis_id=61&dis_type=Shixun"
<form acceptCharset="UTF-8" action="/discusses?challenge_id=118&dis_id=61&dis_type=Shixun"
style={{ flexDirection: 'column', width: '94%', marginLeft: '3%'}}
className="df" data-remote="true" id="new_comment_form" method="post">
<div nhname={`toolbar_container_${memo.id}`}></div>
<textarea id={`comment_news_${memo.id}`}
nhname={`new_message_textarea_${memo.id}`} name="content" className="none">
nhname={`new_message_textarea_${memo.id}`} name="content" className="none">
</textarea>
</form>
<a id={`new_message_submit_btn_${memo.id}`} href="javascript:void(0)"
<a id={`new_message_submit_btn_${memo.id}`} href="javascript:void(0)"
style={{display: 'none'}} className="commentsbtn task-btn task-btn-blue fr">
发送
</a>

41
public/react/src/modules/forums/MemoDetailMDEditor.js
Unescape View File

@ -27,7 +27,7 @@ class MemoDetailMDEditor extends Component {
componentDidUpdate(prevProps, prevState, snapshot) {
if (this.props.memo && (!prevProps.memo || this.props.memo.id != prevProps.memo.id)) {
// this.keEditor = window.sd_create_editor_from_data(this.props.memo.id, null, "100%", "Memo");
// window._kk = this.keEditor
// window._kk = this.keEditor
}
}
@ -48,7 +48,7 @@ class MemoDetailMDEditor extends Component {
console.log('create_editorMD_4comment')
var commentMDEditor = window.create_editorMD_4comment("memo_comment_editorMd", '', this.props.height || 240, placeholder, imageUrl, () => {
// commentMDEditor.focus()
this.initDrag()
commentMDEditor.cm.on("change", (_cm, changeObj) => {
@ -64,8 +64,8 @@ class MemoDetailMDEditor extends Component {
});
this.commentMDEditor = commentMDEditor;
window.commentMDEditor = commentMDEditor;
}, window.__tt)
}, window.__tt)
}
componentDidMount() {
!this.props.usingMockInput && this.initMDEditor()
@ -75,8 +75,13 @@ class MemoDetailMDEditor extends Component {
}
onCommit = () => {
if(this.props.checkIfProfileCompleted()===false){
this.props.showhideAccountPhoneemailDialog()
return
}
const content = this.commentMDEditor.getValue();
// this.props.showError ==
// this.props.showError ==
if (this.props.showError == true) {
if (!content || content.trim() == "") {
this.setState({
@ -103,18 +108,18 @@ class MemoDetailMDEditor extends Component {
window.$(document).trigger("onReply", { commentContent: content
, id: this.props.memo.id, editor: this.commentMDEditor } );
}
}
showEditor() {
// $("html, body").animate({ scrollTop: $('.commentInput:visible').offset().top - 100 }, 1000, () => {
// if (this.commentMDEditor) {
// this.commentMDEditor.cm.focus()
// } else {
// this.onMockInputClick()
// }
// });
$("html, body").animate({ scrollTop: $('.commentInput:visible').offset().top - 100 }, 1000, () => {
if (this.commentMDEditor) {
this.commentMDEditor.cm.focus()
} else {
this.onMockInputClick()
}
});
}
close = () => {
this.setState({isInited: false})
@ -166,16 +171,16 @@ class MemoDetailMDEditor extends Component {
width:100%!important;
}
`}</style>
<div style={{ display: isInited ? 'none' : '', borderBottom: `${this.props.commentsLength == 0 ? 'none' : '1px solid #EEEEEE'}`}}
<div style={{ display: isInited ? 'none' : '', borderBottom: `${this.props.commentsLength == 0 ? 'none' : '1px solid #EEEEEE'}`}}
className={`mockInputWrapper commentInput ${className}`} >
<input onClick={this.onMockInputClick} placeholder={placeholder || '我要回复'}></input>
<a href="javascript:void(0)"
<a href="javascript:void(0)"
onClick={this.onMockInputClick} className="commentsbtn task-btn task-btn-blue">
{this.props.buttonText || '发送'}
</a>
</div>
<style>
{/*
{/*
先注释了，影响到了md的拖拽
{
`
@ -185,7 +190,7 @@ class MemoDetailMDEditor extends Component {
`
} */}
</style>
<div nhname={`new_message_${memo.id}`}
<div nhname={`new_message_${memo.id}`}
className={`commentInput commentInputs ${className} ${imageExpand && 'editormd-image-click-expand' }`}
style={{ padding: '30px',boxSizing:"border-box", display: isInited ? '' : 'none', paddingBottom: '40px' }} >
<div id="memo_comment_editorMd" className="editorMD" style={{ marginBottom: '0px'
@ -197,7 +202,7 @@ class MemoDetailMDEditor extends Component {
{ errorMsg && <span className="fl" style={{color: 'red', marginTop: '6px',
marginLeft: '4px'}}>{errorMsg}</span> }
<div style={{height: "16px"}}>
<a id={`new_message_submit_btn_${memo.id}`} href="javascript:void(0)"
<a id={`new_message_submit_btn_${memo.id}`} href="javascript:void(0)"
onClick={this.onCommit} className="commentsbtn task-btn task-btn-blue fr">
{this.props.buttonText || '发送'}
</a>

14
public/react/src/modules/forums/MemoDetailMDEditortwo.js
Unescape View File

@ -96,13 +96,13 @@ class MemoDetailMDEditortwo extends Component {
}
showEditor() {
// $("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => {
// if (this.commentMDEditor) {
// this.commentMDEditor.cm.focus()
// } else {
// $('#commentInput input')[0].click()
// }
// });
$("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => {
if (this.commentMDEditor) {
this.commentMDEditor.cm.focus()
} else {
$('#commentInput input')[0].click()
}
});
}
onMockInputClick = () => {
this.setState({isInited: true})

5
public/react/src/search/searchc.css
Unescape View File

@ -20,11 +20,14 @@
justify-content: center;
}
.packinput .ant-input-group-addon{
border: 1px solid #4cacff!important;
}
.packinput .ant-input-group-addon .ant-btn{
width:137px !important;
font-size: 18px;
height: 53px;
background:rgba(76,172,255,1);
border-color: #4cacff !important;
}
.tabtitle{

Write Preview
Loading…
Cancel
Save