diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 3b0ac86a7..c5d3082ba 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -23,7 +23,6 @@ class CommentsController < ApplicationController @discuss.hidden = false @discuss.user_id = current_user.id @discuss.root_id = params[:comments][:parent_id] - @discusses.parent_container_id = @discuss.save! rescue Exception => e uid_logger_error("reply discuss failed : #{e.message}") diff --git a/public/react/src/common/components/comment/CommentIcon.js b/public/react/src/common/components/comment/CommentIcon.js index 97a57da5e..9e9650b47 100644 --- a/public/react/src/common/components/comment/CommentIcon.js +++ b/public/react/src/common/components/comment/CommentIcon.js @@ -4,11 +4,11 @@ * @Github: * @Date: 2019-12-18 10:49:46 * @LastEditors : tangjiang - * @LastEditTime : 2019-12-24 18:04:52 + * @LastEditTime : 2019-12-25 10:03:21 */ import './index.scss'; import React from 'react'; -import { Icon } from 'antd'; +// import { Icon } from 'antd'; // import MyIcon from '../MyIcon'; function CommentIcon ({ type, // 图标类型 @@ -25,13 +25,15 @@ function CommentIcon ({ } const _className = [undefined, null, ''].includes(count) ? 'comment_count_none' : 'comment_count'; + const _classIcon = `iconfont icon-${type} icon_font_size_14 comment_icon `; return ( - + {/* */} + { count } ) diff --git a/public/react/src/common/components/comment/CommentItem.js b/public/react/src/common/components/comment/CommentItem.js index e3a229c50..7360ddfd6 100644 --- a/public/react/src/common/components/comment/CommentItem.js +++ b/public/react/src/common/components/comment/CommentItem.js @@ -4,7 +4,7 @@ * @Github: * @Date: 2019-12-17 17:35:17 * @LastEditors : tangjiang - * @LastEditTime : 2019-12-24 18:05:18 + * @LastEditTime : 2019-12-25 14:53:41 */ import './index.scss'; import React, { useState } from 'react'; @@ -28,7 +28,7 @@ function CommentItem ({ // 加载更多评论内容 // const [showMore, setShowMore] = useState(false); // 显示子列数 - const [showItemCount, setShowItemCount] = useState(1); + const [showItemCount, setShowItemCount] = useState(5); // 箭头方向 const [arrow, setArrow] = useState(false); @@ -74,7 +74,7 @@ function CommentItem ({ {author.name || ''} {time || ''} - deleteComment(id)}/> + deleteComment(id)}> ); @@ -95,7 +95,7 @@ function CommentItem ({ const commentAppend = (children = []) => { const len = children.length; - const _moreClass = len > 1 ? 'comment_item_loadmore show' : 'comment_item_loadmore' + const _moreClass = len > showItemCount ? 'comment_item_loadmore show' : 'comment_item_loadmore' const lastTxt = len - showItemCount; const renderChild = (children) => { return children.map((child, i) => { @@ -112,7 +112,7 @@ function CommentItem ({ key={`child_${i}`} className={showOrHide} > -
+
{commentAvatar(author)}
{commentInfo(id, author, time, can_delete)} @@ -179,13 +179,14 @@ function CommentItem ({ handleShowOrHide(id, !hidden ? 1 : 0)} /> {/* 回复 */} {/* 点赞 */} @@ -193,7 +194,7 @@ function CommentItem ({ iconColor={ user_praise ? '#5091FF' : '' } className='comment-icon-margin' theme={user_praise ? 'filled' : ''} - type="like" + type="dianzan" count={praise_count} iconClick={() => handleClickLick(id)} /> diff --git a/public/react/src/common/components/comment/index.scss b/public/react/src/common/components/comment/index.scss index 2e1dc4880..067fc7e9a 100644 --- a/public/react/src/common/components/comment/index.scss +++ b/public/react/src/common/components/comment/index.scss @@ -27,6 +27,13 @@ $ml: 20px; padding: 20px 0; box-sizing: border-box; border-bottom: 1px solid $bdColor; + + .comment_child_item_area:hover{ + .item-close{ + display: inline-block; + } + } + .flex-image{ width: 48px; height: 48px; @@ -46,7 +53,7 @@ $ml: 20px; margin-left: $ml; } .item-close{ - display: inline-block; + display: none; cursor: pointer; float: right; } @@ -54,6 +61,7 @@ $ml: 20px; .item-close.hide{ display: none; } + } .item-ctx{ line-height: $lh22; @@ -140,6 +148,10 @@ $ml: 20px; } } } + + .icon_font_size_14{ + font-size: 14px !important; + } } .comment_form_area, diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js index 1f7518a9d..f9318eb9d 100644 --- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js +++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js @@ -25,23 +25,22 @@ class NewShixunModel extends Component{ } componentDidMount() { let{page,type,keyword,order,diff,limit,status,sort}=this.state; - let newsort=sort - if(this.props&&this.props.user.course_name===undefined){ - newsort="created_at"; - }else{ - newsort="publish_time"; - } - if(this.props.type==='shixuns'){ - this.getdatalist(page,type,status,keyword,order,diff,limit,undefined,newsort); + this.getdatalist(page,type,status,keyword,order,diff,limit,undefined,sort); }else{ this.getdatalist(page,type,undefined,keyword,order,undefined,limit,undefined,sort); } - } - getdatalist=(page,type,newstatus,keyword,order,diff,limit,pagetype,sort)=>{ - + getdatalist=(page,type,newstatus,keyword,order,diff,limit,pagetype,sorts)=>{ + let newsort=sorts; + if(this.props.type==="shixuns"&&type==="mine"){ + if(this.props&&this.props.user.course_name===undefined){ + newsort="created_at"; + }else{ + newsort="publish_time"; + } + } this.setState({ isspinning:true }) @@ -53,14 +52,14 @@ class NewShixunModel extends Component{ url="/subject_lists.json"; } axios.get(url,{params:{ - page, - type, - status, - keyword, - order, - diff, - limit, - sort + page:page, + type:type, + status:status, + keyword:keyword, + order:order, + diff:diff, + limit:limit, + sort:newsort }}).then((response) => { if(response.data){ if(pagetype===undefined){ diff --git a/public/react/src/modules/developer/components/errorResult/index.js b/public/react/src/modules/developer/components/errorResult/index.js index fa568edca..f92ea1773 100644 --- a/public/react/src/modules/developer/components/errorResult/index.js +++ b/public/react/src/modules/developer/components/errorResult/index.js @@ -3,8 +3,8 @@ * @Author: tangjiang * @Github: * @Date: 2019-12-03 15:20:55 - * @LastEditors: tangjiang - * @LastEditTime: 2019-12-03 20:36:24 + * @LastEditors : tangjiang + * @LastEditTime : 2019-12-25 11:41:42 */ import './index.scss'; import React from 'react'; @@ -46,6 +46,7 @@ function ErrorResult (props) { case 3: // 创建pod失败 result = (
+

系统繁忙，请稍后重试

); break; diff --git a/public/react/src/modules/developer/components/execResult/index.js b/public/react/src/modules/developer/components/execResult/index.js index 6f9341b9a..fe90e904b 100644 --- a/public/react/src/modules/developer/components/execResult/index.js +++ b/public/react/src/modules/developer/components/execResult/index.js @@ -3,8 +3,8 @@ * @Author: tangjiang * @Github: * @Date: 2019-11-28 08:44:54 - * @LastEditors: tangjiang - * @LastEditTime: 2019-12-19 10:44:16 + * @LastEditors : tangjiang + * @LastEditTime : 2019-12-25 11:42:10 */ import './index.scss'; import React, { useState, useEffect } from 'react'; @@ -82,7 +82,7 @@ function ExecResult (props) { } else if (state === 4){ return (

- {error_msg} + 系统繁忙，请稍后重试

) } else if (state === -1) { diff --git a/public/react/src/modules/developer/components/textNumber/index.js b/public/react/src/modules/developer/components/textNumber/index.js index 77a58c3e8..a8f743d16 100644 --- a/public/react/src/modules/developer/components/textNumber/index.js +++ b/public/react/src/modules/developer/components/textNumber/index.js @@ -4,11 +4,11 @@ * @Github: * @Date: 2019-11-27 10:58:37 * @LastEditors : tangjiang - * @LastEditTime : 2019-12-24 16:48:56 + * @LastEditTime : 2019-12-25 10:02:03 */ import './index.scss'; import React from 'react'; -import { Icon } from 'antd'; +// import { Icon } from 'antd'; const numberal = require('numeral'); const TextNumber = (props) => { @@ -47,14 +47,18 @@ const TextNumber = (props) => { const renderCtx = (className, theme) => { if (type === 'icon') { // 图标加文字时 const _className = `text_number_area text_icon_numb flex_${position} ${className}`; + const _classIcon = `iconfont icon-${text} numb_icon`; return (
- + > */} + + {renderNumb()}
) diff --git a/public/react/src/modules/developer/index.scss b/public/react/src/modules/developer/index.scss index ad6cc09a3..680bbe228 100644 --- a/public/react/src/modules/developer/index.scss +++ b/public/react/src/modules/developer/index.scss @@ -77,7 +77,12 @@ } } .oj_item_name{ + flex-wrap: wrap; color: #459be5; cursor: pointer; + max-width: 510px; + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; } } diff --git a/public/react/src/modules/developer/split_pane_resizer.scss b/public/react/src/modules/developer/split_pane_resizer.scss index 1e240545c..cd8ce22ca 100644 --- a/public/react/src/modules/developer/split_pane_resizer.scss +++ b/public/react/src/modules/developer/split_pane_resizer.scss @@ -117,7 +117,7 @@ } .comp_ctx{ - height: calc(100vh - 178px); + // height: calc(100vh - 178px); overflow-y: hidden; } diff --git a/public/react/src/modules/developer/studentStudy/leftpane/comment/index.js b/public/react/src/modules/developer/studentStudy/leftpane/comment/index.js index 2ec70227d..9b4287e76 100644 --- a/public/react/src/modules/developer/studentStudy/leftpane/comment/index.js +++ b/public/react/src/modules/developer/studentStudy/leftpane/comment/index.js @@ -4,17 +4,21 @@ * @Github: * @Date: 2019-11-27 09:49:35 * @LastEditors : tangjiang - * @LastEditTime : 2019-12-24 17:58:26 + * @LastEditTime : 2019-12-25 10:55:44 */ import './index.scss'; -import React, { useEffect } from 'react'; +import React, { useEffect, useState } from 'react'; import Comment from '../../../../../common/components/comment'; import { connect } from 'react-redux'; import actions from '../../../../../redux/actions'; - +import { Pagination } from 'antd'; const CommentTask = (props) => { + // 当前页 + const [current, setCurrent] = useState(1); + const { + pages, isAdmin, identifier, commentLists, @@ -23,7 +27,8 @@ const CommentTask = (props) => { deleteComment, getCommentLists, showOrHideComment, - replayChildComment + replayChildComment, + changePagination } = props; useEffect(() => { @@ -35,7 +40,6 @@ const CommentTask = (props) => { // 添加评论 const handleAddComment = (ctx) => { - console.log('添加的评论内容: ', ctx); addComment(identifier, { comments: { content: ctx @@ -53,7 +57,7 @@ const CommentTask = (props) => { } // 删除评论 const handleSubmitDeleteComment = (id) => { - console.log('删除评论:', identifier, id); + // console.log('删除评论:', identifier, id); deleteComment(identifier, id); } @@ -72,6 +76,20 @@ const CommentTask = (props) => { }); } + // 点击分页 + const handlePageChange = (page, pageSize) => { + setCurrent(page); + changePagination(page); + // setTimeout(() => { + // 调用查询接口 + getCommentLists(identifier); + // }, 300); + } + + const _style = { + display: pages.total > pages.limit ? 'block' : 'none' + } + return (
{ showOrHideComment={handleShowOrHideComment} submitDeleteComment={handleSubmitDeleteComment} /> + +
+ +
) } const mapStateToProps = (state) => { const { - commentLists // 评论列表 + commentLists, // 评论列表 + pages } = state.commentReducer; const { comment_identifier @@ -98,7 +127,8 @@ const mapStateToProps = (state) => { return { commentLists, isAdmin: userInfo.admin, - identifier: comment_identifier + identifier: comment_identifier, + pages } } @@ -110,6 +140,7 @@ const mapDispatchToProps = (dispatch) => ({ deleteComment: (identifier, id) => dispatch(actions.deleteComment(identifier, id)), likeComment: (identifier, id, params) => dispatch(actions.likeComment(identifier, id, params)), showOrHideComment: (identifier, id, params) => dispatch(actions.showOrHideComment(identifier, id, params)), + changePagination: (page) => dispatch(actions.changePagination(page)) }) export default connect( diff --git a/public/react/src/modules/developer/studentStudy/leftpane/comment/index.scss b/public/react/src/modules/developer/studentStudy/leftpane/comment/index.scss index ba9c132d9..b09eb849b 100644 --- a/public/react/src/modules/developer/studentStudy/leftpane/comment/index.scss +++ b/public/react/src/modules/developer/studentStudy/leftpane/comment/index.scss @@ -1,8 +1,16 @@ .task_comment_task{ + display: flex; + flex-direction: column; + justify-content: space-between; background: #fff; padding: 20px 30px 0; height: calc(100vh - 177px); box-sizing: border-box; overflow-y: auto; border-bottom: 1px solid rgba(244,244,244,1); + + .task_comment_page{ + padding: 10px 0; + text-align: center; + } } \ No newline at end of file diff --git a/public/react/src/modules/developer/studentStudy/leftpane/commitRecord/index.js b/public/react/src/modules/developer/studentStudy/leftpane/commitRecord/index.js index da51d524d..34bc6e1c3 100644 --- a/public/react/src/modules/developer/studentStudy/leftpane/commitRecord/index.js +++ b/public/react/src/modules/developer/studentStudy/leftpane/commitRecord/index.js @@ -3,12 +3,12 @@ * @Author: tangjiang * @Github: * @Date: 2019-11-27 09:49:33 - * @LastEditors: tangjiang - * @LastEditTime: 2019-12-20 19:35:01 + * @LastEditors : tangjiang + * @LastEditTime : 2019-12-25 14:45:20 */ import './index.scss'; import React, { useState, useEffect } from 'react'; -import { Table, Icon, message } from 'antd'; +import { Table, Icon, message, Pagination } from 'antd'; import { connect } from 'react-redux'; import { Link } from 'react-router-dom'; import actions from '../../../../../redux/actions'; @@ -20,6 +20,7 @@ import ErrorResult from '../../../components/errorResult'; const numberal = require('numeral'); const {reviewResult} = CONST; +// 表格列 const columns = [ { title: '提交时间', @@ -60,29 +61,30 @@ const columns = [ } ] -const paginationConfig = { - total: 1, // 总条数 - pageSize: 10, // 每页显示条数 - current: 1, // 当前页数 - showQuickJumper: true -} +// const paginationConfig = { +// total: 1, // 总条数 +// pageSize: 5, // 每页显示条数 +// current: 1, // 当前页数 +// showQuickJumper: true +// } const CommitRecord = (props) => { - const { identifier, + pages, commitRecord, // excuteState, language, operateType, commitRecordDetail, - getUserCommitRecord + getUserCommitRecord, + changeRecordPagination } = props; - const [pagination, setPagination] = useState(paginationConfig); - const [tableData, setTableData] = useState([]); - + const [current, setCurrent] = useState(1); + // const [pagination, setPagination] = useState(paginationConfig); + // const [tableData, setTableData] = useState([]); + // 复制面板 let clipboard; - // const [recordDetail, setRecordDetail] = useState({}); const [renderCtx, setRenderCtx] = useState(() => { return function () { @@ -140,12 +142,12 @@ const CommitRecord = (props) => { getUserCommitRecord(identifier); }, []); // 提交记录变化时，同步到表单数据 - useEffect(() => { - const len = commitRecord.length; - const pageConfig = Object.assign({}, paginationConfig, {total: len}); - setTableData(commitRecord); - setPagination(pageConfig); - }, [commitRecord]); + // useEffect(() => { + // // const len = commitRecord.length; + // // const pageConfig = Object.assign({}, paginationConfig, {total: len}); + // setTableData(commitRecord); + // // setPagination(pageConfig); + // }, [commitRecord]); // 提交详情变化时，显示当前提交信息 useEffect(() => { // setRecordDetail(commitRecordDetail); @@ -179,20 +181,46 @@ const CommitRecord = (props) => { // }); // } // - const handleTableChange = (pagination) => { - setPagination(Object.assign({}, pagination)); + // const handleTableChange = (pagination) => { + // setPagination(Object.assign({}, pagination)); + // } + + const handlePaginationChange = (page) => { + setCurrent(page); + changeRecordPagination(page); + // 调用查询接口 + getUserCommitRecord(identifier); + // setPagination(Object.assign({}, pagination, { current: page})); + // console.log('======>>>>>>', pagination) } // console.log(commitRecord); + + const _style = { + display: pages.total > pages.limit ? 'block' : 'none' + }; + return (
{renderCtx()} - +
+
+
+ +
+ ) } @@ -207,7 +235,8 @@ const mapStateToProps = (state) => { commitRecordDetail, commitRecord, hack, - operateType + operateType, + pages } = ojForUserReducer; const { excuteState } = commonReducer; return { @@ -216,11 +245,13 @@ const mapStateToProps = (state) => { commitRecord, // 提交记录 excuteState, // 代码执行状态 language: hack.language, - operateType + operateType, + pages } } const mapDispatchToProps = (dispatch) => ({ - getUserCommitRecord: (identifier) => dispatch(actions.getUserCommitRecord(identifier)) + getUserCommitRecord: (identifier) => dispatch(actions.getUserCommitRecord(identifier)), + changeRecordPagination: (page) => dispatch(actions.changeRecordPagination(page)) }); export default connect( diff --git a/public/react/src/modules/developer/studentStudy/leftpane/commitRecord/index.scss b/public/react/src/modules/developer/studentStudy/leftpane/commitRecord/index.scss index fb099445e..80305f2b8 100644 --- a/public/react/src/modules/developer/studentStudy/leftpane/commitRecord/index.scss +++ b/public/react/src/modules/developer/studentStudy/leftpane/commitRecord/index.scss @@ -2,7 +2,20 @@ // padding: 20px 30px; padding: 0 20px; overflow-y: auto; - height: calc(100vh - 177px); + // height: calc(100vh - 177px); + height: calc(100vh - 122px); + + .commit_record_table_pagination{ + height: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; + + .commit_record_pagination{ + padding: 10px 0; + text-align: center; + } + } .record_header{ display: flex; // justify-content: space-between; diff --git a/public/react/src/modules/developer/studentStudy/leftpane/index.js b/public/react/src/modules/developer/studentStudy/leftpane/index.js index 53e932db1..d9527a13e 100644 --- a/public/react/src/modules/developer/studentStudy/leftpane/index.js +++ b/public/react/src/modules/developer/studentStudy/leftpane/index.js @@ -4,7 +4,7 @@ * @Github: * @Date: 2019-11-23 11:33:41 * @LastEditors : tangjiang - * @LastEditTime : 2019-12-24 17:16:54 + * @LastEditTime : 2019-12-25 11:07:42 // */ import './index.scss'; import React, { useState, useEffect, useMemo } from 'react'; @@ -96,7 +96,7 @@ const LeftPane = (props) => { // 添加评论 const handleAddComment = (ctx) => { - console.log('添加的评论内容: ', ctx, props.identifier); + // console.log('添加的评论内容: ', ctx, props.identifier); props.identifier && props.addComment(props.identifier, { comments: { content: ctx @@ -104,6 +104,10 @@ const LeftPane = (props) => { }); }; + const _style = { + display: defaultActiveKey === 'record' ? 'none' : 'flex' + }; + return (