12 ? item.student_id : ''}
>{item.student_id}
{item.commit_status===true?已提交 :""}
@@ -761,26 +761,30 @@ render(){
}
.members .leaderIcon {
}
+ .workPost.members {
+ width: 452px;
+ }
`}
-
+
{selectmemberslist&&selectmemberslist.map((item,key)=>{
+ const _is_leader = (item.is_leader || !this.isEdit && key==0)
return(
-
-
- {item.user_name}{ (item.is_leader || !this.isEdit && key==0) && 5}>
+
-
分班情况：
+
+ this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{width: '1000px', paddingTop: '4px'}}>
-
- this.groupgroup([])}>不限
-
-
- {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{
- return(
-
- {item.group_group_name}
- ({item.count})
-
-
- )
- })}
-
:""}
diff --git a/public/react/src/modules/forums/MemoNew.js b/public/react/src/modules/forums/MemoNew.js
index 11a3d0ca2..00a39b184 100644
--- a/public/react/src/modules/forums/MemoNew.js
+++ b/public/react/src/modules/forums/MemoNew.js
@@ -1,835 +1,838 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
-import { Select,Icon, Upload, Button } from 'antd';
-
-// demo http://react-component.github.io/upload/examples/simple.html
-// import Upload from 'rc-upload';
-
-import axios from 'axios'
-
-import 'antd/lib/select/style/index.css'
-import TPMMDEditor from '../tpm/challengesnew/TPMMDEditor'
-
-import { getUrl, getUploadActionUrl, appendFileSizeToUploadFileAll, appendFileSizeToUploadFile } from 'educoder'
-const Option = Select.Option;
-const $ = window.$;
-
-let origin = getUrl();
-let path = getUrl("/editormd/lib/")
-
-// load
-if (!window.postUpMsg) {
- $.getScript(
- `${origin}/javascripts/attachments.js`,
- (data, textStatus, jqxhr) => {
-
- });
-}
-
-// editorMD to create
-/**
- *
- * @param id 渲染DOM的id
- * @param width 宽度
- * @param high 高度
- * @param placeholder
- * @param imageUrl 上传图片的url
- * @returns {*} 返回一个editorMD实例
- */
-function create_editorMD(id, width, high, placeholder, imageUrl, callback){
- var editorName = window.editormd(id, {
- width : width,
- height : high,
- syncScrolling : "single",
- //你的lib目录的路径，我这边用JSP做测试的
- path : path , // "/editormd/lib/"
- tex : true,
- tocm : true,
- emoji : true,
- taskList : true,
- codeFold : true,
- searchReplace : true,
- htmlDecode : "style,script,iframe",
- sequenceDiagram : true,
- autoFocus: false,
- toolbarIcons : function() {
- // Or return editormd.toolbarModes[name]; // full, simple, mini
- // Using "||" set icons align right.
- return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table"
- // , '|', "underlineIcon"
- , "|", "watch", "clear" ]
- },
- toolbarCustomIcons : {
- testIcon : "",
- testIcon1 : "",
-
- // underlineIcon例子
- // underlineIcon : ""
- },
- //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
- saveHTMLToTextarea : true,
- // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
- dialogMaskOpacity : 0.6,
- placeholder: placeholder,
- imageUpload : true,
- imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
- imageUploadURL : imageUrl,//url
- onload: function(){
-
- // underlineIcon例子
- // $('#'+ id + " .underline").bind('click', function() {
- // var __Cursor = editorName.cm.getDoc().getCursor();
- // editorName.appendMarkdown('__')
- // editorName.cm.setCursor(__Cursor.line, __Cursor.ch + 2);
- // });
-
- // this.previewing();
- $("#"+ id +" [type=\"latex\"]").bind("click", function(){
- editorName.cm.replaceSelection("```latex");
- editorName.cm.replaceSelection("\n");
- editorName.cm.replaceSelection("\n");
- editorName.cm.replaceSelection("```");
- var __Cursor = editorName.cm.getDoc().getCursor();
- editorName.cm.setCursor(__Cursor.line-1, 0);
- });
-
- $("#"+ id +" [type=\"inline\"]").bind("click", function(){
- editorName.cm.replaceSelection("$$$$");
- var __Cursor = editorName.cm.getDoc().getCursor();
- editorName.cm.setCursor(__Cursor.line, __Cursor.ch-2);
- editorName.cm.focus();
- });
- $("[type=\"inline\"]").attr("title", "行内公式");
- $("[type=\"latex\"]").attr("title", "多行公式");
-
- window.md_elocalStorage(editorName, `memoNew_${id}`, "memoNew");
-
- callback && callback()
- }
- });
- return editorName;
-}
-
-const typeNameMap = {
- '技术分享': 5,
- '操作指南': 3,
-}
-export const typeNameMap2 = {
- 5: '技术分享',
- 3: '操作指南',
-}
-const defaultType = '技术分享'
-
-const languageSeparator = '/'
-class MemoNew extends Component {
- constructor(props) {
- super(props)
- this.mdRef = React.createRef();
-
- // https://testbdweb.trustie.net/uploads.js?attachment_id=1&filename=jqui.js
- // https://ant.design/components/upload-cn/
- this.uploaderProps = {
- action: '/uploads.js',
- data: { attachment_id: 1 }, // , filename: 2
- headers: {
- Authorization: 'authorization-text',
- },
- multiple: true,
- beforeUpload(file) {
- // console.log('beforeUpload', file.name);
- },
- onStart: (file) => {
- console.log('onStart', file.name);
- // this.refs.inner.abort(file);
- },
- onSuccess(file) {
- console.log('onSuccess', file);
- },
- onProgress(step, file) {
- console.log('onProgress', Math.round(step.percent), file.name);
- },
- onError(err) {
- console.log('onError', err);
- },
- };
-
- this.state = {
- memoSubject: '',
- memoContent: '',
- memoType: typeNameMap[defaultType],
- memoRepertoire: '',
- memoLanguage: [],
-
- repertoires: [],
- currentSelectRepertoiresIndex: -1,
- repertoiresTagMap: {},
-
- fileList: []
- }
- }
- onCommit() {
- const { memoSubject, memoRepertoire, memoLanguage, currentMemoId, memoType } = this.state;
- const { showNotification } = this.props;
- if (!memoSubject) {
- showNotification('请先输入话题名称')
- return
- }
- let mdVal;
- try {
- mdVal = this.mdRef.current.getValue()
-
- } catch (e) {
- showNotification('编辑器还未加载完毕，请稍后')
- return
- }
-
- if (!mdVal) {
- showNotification('请先输入话题内容')
- return
- }
- // !memoRepertoire ||
- if (memoType === 5 && ( !memoLanguage || memoLanguage.length === 0 )) {
- showNotification('请先选择技术标签')
- return
- }
- /*
-
-
-
- http://localhost:3000/attachments/download/185790/Git-2.17.1.2-32-bit.exe
- https://www.educoder.net/attachments/205112.js?attachment_id=1
- */
- // collect attachments
- const $ = window.$;
- const attachmentsMap = {};
- const attachmentIds = this.state.fileList.map(item => {
- return item.response ? item.response.id : item.id
- })
- // $('#attachments_fields .attachment').each(( index, item ) => {
- // const filename = $(item).find('.upload_filename').val();
- // // $($('#attachments_fields .attachment')[0]).find('input:nth-child(6)').val()
- // const token = $(item).find('input:nth-child(7)').val()
- // const attachment_id = parseInt($(item).children().last().val())
- // attachmentsMap[index] = {
- // filename,
- // token,
- // attachment_id
- // }
- // attachmentIds.push(attachment_id)
- // })
-
-
- if (currentMemoId) {
- this.updateMemo(attachmentIds)
- } else {
- this.newMemo(attachmentIds)
- }
- }
- onCancel() {
- const { currentMemoId, memoType } = this.state;
- if (currentMemoId) { // 编辑
- this.props.history.push(`/forums/${currentMemoId}`)
- } else { // 新建
- this.props.history.push(`/forums`)
- }
- // debugger;this.props.history.goBack()
- }
- updateMemo(attachmentsMap) {
- const { memoSubject, memoRepertoire, memoLanguage, memoType, currentMemoId, content } = this.state;
- const mdVal = this.mdRef.current.getValue()
- console.log('isContentEdit: ', mdVal === content);
- const newMemoUrl = `/memos/${currentMemoId}.json`
- axios.put(newMemoUrl, {
- content_changed: this.contentChanged,
- tags: memoLanguage,
- // memo:{
- subject: memoSubject ,
- content: mdVal,
- forum_id: memoType,
- repertoire_name: memoRepertoire,
- // language: memoLanguage.join(languageSeparator),
- //
- // },
- attachment_ids: attachmentsMap
- }, {
- // withCredentials: true,
- })
- .then((response) => {
- const { status, message, memo_id } = response.data;
- if (status === 0) {
- window.$("html,body").animate({"scrollTop":0})
- this.props.history.push(`/forums/${currentMemoId}`)
- } else {
- this.props.showNotification(message)
- }
- }).catch((error) => {
- console.log(error)
- })
- }
- newMemo(attachmentsMap) {
- const { memoSubject, memoRepertoire, memoLanguage, memoType } = this.state;
- const mdVal = this.mdRef.current.getValue()
-
- const newMemoUrl = `/memos.json`
- axios.post(newMemoUrl, {
- tags: memoLanguage,
- // memo:{
- subject: memoSubject ,
- content: mdVal,
- forum_id: memoType,
- // repertoire_name: memoRepertoire,
-
- // },
- attachment_ids: attachmentsMap
- }, {
- // withCredentials: true,
- })
- .then((response) => {
- const { status, message, memo_id } = response.data;
- if (status === 0) {
- window.$("html,body").animate({"scrollTop":0})
- this.props.history.push(`/forums/${memo_id}`)
- } else {
- this.props.showNotification(message)
- }
- }).catch((error) => {
- console.log(error)
- })
- }
- componentDidMount() {
- const newMemoUrl = `/memos/new.json`
- axios.get(newMemoUrl,{
- // withCredentials: true,
- })
- .then((response) => {
- const data = response.data;
- const repertoires = [];
- const repertoiresTagMap = {}
- if ( data.tag_list ) {
- // data.tag_list.forEach((item, index)=>{
- // const tagArray = [];
- // item.tag.forEach( (tag, index) => {
- // tagArray.push(tag.name)
- // })
- // repertoires.push(item.rep.repertoire.name)
- // repertoiresTagMap[item.rep.repertoire.name] = tagArray
- // })
- this.setState({
- tag_list: data.tag_list
- // repertoires,
- // repertoiresTagMap
- })
-
- // const user = response.data.current_user;
- // user.tidding_count = response.data.tidding_count;
- // this.props.initCommonState(user)
-
- // 初始化 csrf meta
- const $ = window.$
- $('head').append( $('') )
- $('head').append( $(``) )
- }
- }).catch((error) => {
- console.log(error)
- })
-
- // 如果是编辑
- const { match } = this.props
- const memoId = match.params.memoId;
- if (memoId) {
- const memoUrl = `/memos/${match.params.memoId}/edit.json`;
- axios.get(memoUrl,{
- // withCredentials: true,
- })
- .then((response) => {
- const tag_list = response.data.tag_list
- if (tag_list) {
- // this.setState({...response.data})
- const { content, forum_id, id, repertoire_name, subject,
- current_user, tag_list, attachments_url, memo_tags, attachments } = response.data;
- this.initMD(content);
- // this.onRepertoiresChange(repertoire_name)
- // tag -> memo_tags
- const tag = memo_tags;
- let memoLanguage = []
- if (tag) {
- memoLanguage = tag.map((item, index) => {
- return item.id + ""
- })
- }
- const fileList = attachments.map(item => {
- return {
- id: item.id,
- uid: item.id,
- name: appendFileSizeToUploadFile(item),
- url: item.url,
- filesize: item.filesize,
- status: 'done'
- }
- })
- this.setState({
- fileList,
- currentMemoId: memoId,
- memoSubject: subject,
- memoType: forum_id,
- memoRepertoire: repertoire_name,
- memoLanguage,
- attachments_url,
- content
-
- // repertoires: [],
- // currentSelectRepertoiresIndex: -1,
- }, ()=> {
- // 解决有时候编辑时内容不显示的问题
- setTimeout(() => {
- this.mdRef.current && this.mdRef.current.setValue(content || '')
- }, 2000)
-
- $('.upload_filename').each((index, item) => {
- var width = window._textWidth($(item), '14px');
- console.log(width)
- $(item).css('width', width + 20)
- })
-
- })
- // 加载完后滚动条滚动
- window.$("html,body").animate({"scrollTop":0})
-
- this.props.initForumState({
- // current_user,
- tag_list
- })
- }
-
- }).catch((error) => {
- console.log(error)
- })
- } else {
- this.initMD();
- }
-
-
-
-
- }
- initMD(initValue) {
- return;
-
- this.contentChanged = false;
- const placeholder = "";
- // amp;
- // 编辑时要传memoId
- // const imageUrl = `/upload_with_markdown?container_id=&container_type=Memo`;
- const imageUrl = `/api/attachments.json`;
-
- // 创建editorMd
-
- const taskpass_editormd = create_editorMD("memoMD", '100%', 400, placeholder, imageUrl, () => {
- setTimeout(()=>{
- taskpass_editormd.resize()
- taskpass_editormd.cm && taskpass_editormd.cm.refresh()
- }, 500)
-
- if (initValue) {
- taskpass_editormd.setValue(initValue)
- }
- taskpass_editormd.cm.on("change", (_cm, changeObj) =>{
- console.log('....contentChanged')
- this.contentChanged = true;
- })
- });
- this.taskpass_editormd = taskpass_editormd;
- window.taskpass_editormd = taskpass_editormd;
-
- }
-
- renderOptions(array) {
- const elementArray = [];
- array.forEach(( item, index ) => {
- elementArray.push(
-
- )
- })
- return elementArray
- }
- onRepertoiresChange(value) {
-
- const index = this.state.repertoires.indexOf(value)
-
- this.setState({
- currentSelectRepertoiresIndex: index,
- memoRepertoire: value,
- memoLanguage: ''
- });
- };
-
- renderTag() {
- const { tag_list } = this.state;
- if (!tag_list || tag_list.length === 0) {
- return ''
- }
- const result = []
-
- tag_list.forEach((item, index) => {
- result.push()
- })
-
- return result;
- }
-
- onTagChange(value) {
- if (value && value.length > 3) {
- this.props.showNotification(`最多选择3个技术标签`)
-
- return;
- }
- this.setState({
- memoLanguage: value
- })
- }
-
- onTypeChange(value) {
-
- this.setState({
- memoType: typeNameMap[value]
- })
- }
- onMemoNameChange(e) {
- this.setState({
- memoSubject: e.target.value
- })
- }
- renderAttachment() {
- const { attachments_url } = this.state;
- const attachments = []
- attachments_url.forEach((item, index) => {
- const ar = item.url.split('/')
- const fileName = ar[ar.length - 1]
- /*
-
-
-
-
-
- {window.conver_size(item.id)}
-
-
-
-
- {/**/}
-
-
-
-
-
- )
- })
- return attachments;
- }
- handleChange = (info) => {
- if (info.file.status === 'uploading' || info.file.status === 'done') {
- let fileList = info.fileList;
- this.setState({
- fileList: appendFileSizeToUploadFileAll(fileList)
- });
- }
- }
- onAttachmentRemove = (file) => {
- this.props.confirm({
- // title: '确定要删除这个附件吗?',
- content: '是否确认删除?',
-
- okText: '确定',
- cancelText: '取消',
- // content: 'Some descriptions',
- onOk: () => {
- this.deleteAttachment(file)
- },
- onCancel() {
- console.log('Cancel');
- },
- });
- return false;
- }
- deleteAttachment = (file) => {
- // 初次上传不能直接取uid
- const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
- axios.delete(url, {
- })
- .then((response) => {
- if (response.data) {
- const { status } = response.data;
- if (status == 0) {
- console.log('--- success')
-
- this.setState((state) => {
- const index = state.fileList.indexOf(file);
- const newFileList = state.fileList.slice();
- newFileList.splice(index, 1);
- return {
- fileList: newFileList,
- };
- });
- }
- }
- })
- .catch(function (error) {
- console.log(error);
- });
- }
- render() {
- const { match, history } = this.props
- const {
- // repertoires, repertoiresTagMap, currentSelectRepertoiresIndex, memoRepertoire,
- tag_list,
- memoSubject, memoType,
- memoLanguage, attachments_url, fileList } = this.state;
- const memoId = match.params.memoId;
-
- const uploadProps = {
- width: 600,
- fileList,
- multiple: true,
- // https://github.com/ant-design/ant-design/issues/15505
- // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
- // showUploadList: false,
- action: `${getUploadActionUrl()}`,
- onChange: this.handleChange,
- onRemove: this.onAttachmentRemove,
- beforeUpload: (file) => {
- console.log('beforeUpload', file.name);
- const isLt150M = file.size / 1024 / 1024 < 150;
- if (!isLt150M) {
- this.props.showNotification('文件大小必须小于150MB!');
- }
- return isLt150M;
- },
- };
- return (
-
+
+
+
+
+ {window.conver_size(item.id)}
+
+
+
+
+ {/**/}
+
+
+
+
+
+ )
+ })
+ return attachments;
+ }
+ handleChange = (info) => {
+ if (info.file.status === 'uploading' || info.file.status === 'done') {
+ let fileList = info.fileList;
+ this.setState({
+ fileList: appendFileSizeToUploadFileAll(fileList)
+ });
+ }
+ }
+ onAttachmentRemove = (file) => {
+ this.props.confirm({
+ // title: '确定要删除这个附件吗?',
+ content: '是否确认删除?',
+
+ okText: '确定',
+ cancelText: '取消',
+ // content: 'Some descriptions',
+ onOk: () => {
+ this.deleteAttachment(file)
+ },
+ onCancel() {
+ console.log('Cancel');
+ },
+ });
+ return false;
+ }
+ deleteAttachment = (file) => {
+ // 初次上传不能直接取uid
+ const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+ axios.delete(url, {
+ })
+ .then((response) => {
+ if (response.data) {
+ const { status } = response.data;
+ if (status == 0) {
+ console.log('--- success')
+
+ this.setState((state) => {
+ const index = state.fileList.indexOf(file);
+ const newFileList = state.fileList.slice();
+ newFileList.splice(index, 1);
+ return {
+ fileList: newFileList,
+ };
+ });
+ }
+ }
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
+ render() {
+ const { match, history } = this.props
+ const {
+ // repertoires, repertoiresTagMap, currentSelectRepertoiresIndex, memoRepertoire,
+ tag_list,
+ memoSubject, memoType,
+ memoLanguage, attachments_url, fileList } = this.state;
+ const memoId = match.params.memoId;
+
+ const uploadProps = {
+ width: 600,
+ fileList,
+ multiple: true,
+ // https://github.com/ant-design/ant-design/issues/15505
+ // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
+ // showUploadList: false,
+ action: `${getUploadActionUrl()}`,
+ onChange: this.handleChange,
+ onRemove: this.onAttachmentRemove,
+ beforeUpload: (file) => {
+ console.log('beforeUpload', file.name);
+ const isLt150M = file.size / 1024 / 1024 < 150;
+ if (!isLt150M) {
+ this.props.showNotification('文件大小必须小于150MB!');
+ }
+ return isLt150M;
+ },
+ };
+ return (
+
diff --git a/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js b/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
index 855f6ce53..861c4f879 100644
--- a/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
+++ b/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
@@ -35,7 +35,7 @@ export default class TpmQuestionNew extends Component {
*
5 && _is_leader ? '#4CACFF' : 'inherit'}`}}>
+ {item.user_name}{ item.user_name.length <= 5 && _is_leader &&
-
+ 9 ? item.group_name : ''}
>{item.group_name}
- 12 ? item.student_id : ''}
>{item.student_id}
{item.user_id != this.props.current_user.user_id ?
diff --git a/public/react/src/modules/courses/busyWork/common/LeaderIcon.js b/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
index 8599b8bd0..7d56d1b24 100644
--- a/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
+++ b/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
@@ -8,8 +8,9 @@ export default function LeaderIcon(props = {}) {
icon = 组长
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 4e2c58bb8..1b25a5717 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -711,8 +711,12 @@ class GraduationTaskssettinglist extends Component{
title: '姓名',
dataIndex: 'name',
key: 'name',
-
- className:'edu-txt-center'
+ className:'edu-txt-center',
+ render: (text, record) => (
+
+ {record.name}
+
+ ),
}, {
title: '学号',
dataIndex: 'stduynumber',
@@ -720,7 +724,7 @@ class GraduationTaskssettinglist extends Component{
className:'edu-txt-center',
render: (text, record) => (
- {record.stduynumber}
+ {record.stduynumber}
),
}, {
@@ -935,6 +939,7 @@ class GraduationTaskssettinglist extends Component{
if(taskslistdata&&taskslistdata.have_grouping===false){
+
columns.some((item,key)=> {
if (item.title === "分组") {
columns.splice(key, 1)
@@ -964,10 +969,35 @@ class GraduationTaskssettinglist extends Component{
.ant-table-tbody>tr>td, .ant-table-thead>tr>th{
padding: 16px 10px
}
+
`
}
+ {taskslistdata&&taskslistdata.have_grouping===true||
+ taskslistdata&&taskslistdata.have_project===true||
+ taskslistdata&&taskslistdata.cross_comment===true?:""}
{/*提示*/}
+ this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{width: '1000px', paddingTop: '4px'}}>
+
+
+ {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{
+ return(
+
+ {item.group_group_name}
+ ({item.count})
+
+
+ )
+ })}
+
+
- - - {fileName} - -
- */ - // ?attachment_id=2 - /* - - - - */ - attachments.push( -
-
- );
- }
-}
-
-export default MemoNew;
+import React, { Component } from 'react';
+import { Redirect } from 'react-router';
+
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import PropTypes from 'prop-types';
+
+import classNames from 'classnames'
+
+import { Select,Icon, Upload, Button } from 'antd';
+
+// demo http://react-component.github.io/upload/examples/simple.html
+// import Upload from 'rc-upload';
+
+import axios from 'axios'
+
+import 'antd/lib/select/style/index.css'
+import TPMMDEditor from '../tpm/challengesnew/TPMMDEditor'
+
+import { getUrl, getUploadActionUrl, appendFileSizeToUploadFileAll, appendFileSizeToUploadFile } from 'educoder'
+const Option = Select.Option;
+const $ = window.$;
+
+let origin = getUrl();
+let path = getUrl("/editormd/lib/")
+
+// load
+if (!window.postUpMsg) {
+ $.getScript(
+ `${origin}/javascripts/attachments.js`,
+ (data, textStatus, jqxhr) => {
+
+ });
+}
+
+// editorMD to create
+/**
+ *
+ * @param id 渲染DOM的id
+ * @param width 宽度
+ * @param high 高度
+ * @param placeholder
+ * @param imageUrl 上传图片的url
+ * @returns {*} 返回一个editorMD实例
+ */
+function create_editorMD(id, width, high, placeholder, imageUrl, callback){
+ var editorName = window.editormd(id, {
+ width : width,
+ height : high,
+ syncScrolling : "single",
+ //你的lib目录的路径，我这边用JSP做测试的
+ path : path , // "/editormd/lib/"
+ tex : true,
+ tocm : true,
+ emoji : true,
+ taskList : true,
+ codeFold : true,
+ searchReplace : true,
+ htmlDecode : "style,script,iframe",
+ sequenceDiagram : true,
+ autoFocus: false,
+ toolbarIcons : function() {
+ // Or return editormd.toolbarModes[name]; // full, simple, mini
+ // Using "||" set icons align right.
+ return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table"
+ // , '|', "underlineIcon"
+ , "|", "watch", "clear" ]
+ },
+ toolbarCustomIcons : {
+ testIcon : "",
+ testIcon1 : "",
+
+ // underlineIcon例子
+ // underlineIcon : ""
+ },
+ //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
+ saveHTMLToTextarea : true,
+ // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
+ dialogMaskOpacity : 0.6,
+ placeholder: placeholder,
+ imageUpload : true,
+ imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+ imageUploadURL : imageUrl,//url
+ onload: function(){
+
+ // underlineIcon例子
+ // $('#'+ id + " .underline").bind('click', function() {
+ // var __Cursor = editorName.cm.getDoc().getCursor();
+ // editorName.appendMarkdown('__')
+ // editorName.cm.setCursor(__Cursor.line, __Cursor.ch + 2);
+ // });
+
+ // this.previewing();
+ $("#"+ id +" [type=\"latex\"]").bind("click", function(){
+ editorName.cm.replaceSelection("```latex");
+ editorName.cm.replaceSelection("\n");
+ editorName.cm.replaceSelection("\n");
+ editorName.cm.replaceSelection("```");
+ var __Cursor = editorName.cm.getDoc().getCursor();
+ editorName.cm.setCursor(__Cursor.line-1, 0);
+ });
+
+ $("#"+ id +" [type=\"inline\"]").bind("click", function(){
+ editorName.cm.replaceSelection("$$$$");
+ var __Cursor = editorName.cm.getDoc().getCursor();
+ editorName.cm.setCursor(__Cursor.line, __Cursor.ch-2);
+ editorName.cm.focus();
+ });
+ $("[type=\"inline\"]").attr("title", "行内公式");
+ $("[type=\"latex\"]").attr("title", "多行公式");
+
+ window.md_elocalStorage(editorName, `memoNew_${id}`, "memoNew");
+
+ callback && callback()
+ }
+ });
+ return editorName;
+}
+
+const typeNameMap = {
+ '技术分享': 5,
+ '操作指南': 3,
+}
+export const typeNameMap2 = {
+ 5: '技术分享',
+ 3: '操作指南',
+}
+const defaultType = '技术分享'
+
+const languageSeparator = '/'
+class MemoNew extends Component {
+ constructor(props) {
+ super(props)
+ this.mdRef = React.createRef();
+
+ // https://testbdweb.trustie.net/uploads.js?attachment_id=1&filename=jqui.js
+ // https://ant.design/components/upload-cn/
+ this.uploaderProps = {
+ action: '/uploads.js',
+ data: { attachment_id: 1 }, // , filename: 2
+ headers: {
+ Authorization: 'authorization-text',
+ },
+ multiple: true,
+ beforeUpload(file) {
+ // console.log('beforeUpload', file.name);
+ },
+ onStart: (file) => {
+ console.log('onStart', file.name);
+ // this.refs.inner.abort(file);
+ },
+ onSuccess(file) {
+ console.log('onSuccess', file);
+ },
+ onProgress(step, file) {
+ console.log('onProgress', Math.round(step.percent), file.name);
+ },
+ onError(err) {
+ console.log('onError', err);
+ },
+ };
+
+ this.state = {
+ memoSubject: '',
+ memoContent: '',
+ memoType: typeNameMap[defaultType],
+ memoRepertoire: '',
+ memoLanguage: [],
+
+ repertoires: [],
+ currentSelectRepertoiresIndex: -1,
+ repertoiresTagMap: {},
+
+ fileList: []
+ }
+ }
+ onCommit() {
+ const { memoSubject, memoRepertoire, memoLanguage, currentMemoId, memoType } = this.state;
+ const { showNotification } = this.props;
+ if (!memoSubject) {
+ showNotification('请先输入话题名称')
+ return
+ }
+ let mdVal;
+ try {
+ mdVal = this.mdRef.current.getValue()
+
+ } catch (e) {
+ showNotification('编辑器还未加载完毕，请稍后')
+ return
+ }
+
+ if (!mdVal) {
+ showNotification('请先输入话题内容')
+ return
+ }
+ // !memoRepertoire ||
+ if (memoType === 5 && ( !memoLanguage || memoLanguage.length === 0 )) {
+ showNotification('请先选择技术标签')
+ return
+ }
+ /*
+
+
+
+ http://localhost:3000/attachments/download/185790/Git-2.17.1.2-32-bit.exe
+ https://www.educoder.net/attachments/205112.js?attachment_id=1
+ */
+ // collect attachments
+ const $ = window.$;
+ const attachmentsMap = {};
+ const attachmentIds = this.state.fileList.map(item => {
+ return item.response ? item.response.id : item.id
+ })
+ // $('#attachments_fields .attachment').each(( index, item ) => {
+ // const filename = $(item).find('.upload_filename').val();
+ // // $($('#attachments_fields .attachment')[0]).find('input:nth-child(6)').val()
+ // const token = $(item).find('input:nth-child(7)').val()
+ // const attachment_id = parseInt($(item).children().last().val())
+ // attachmentsMap[index] = {
+ // filename,
+ // token,
+ // attachment_id
+ // }
+ // attachmentIds.push(attachment_id)
+ // })
+
+
+ if (currentMemoId) {
+ this.updateMemo(attachmentIds)
+ } else {
+ this.newMemo(attachmentIds)
+ }
+ }
+ onCancel() {
+ const { currentMemoId, memoType } = this.state;
+ if (currentMemoId) { // 编辑
+ this.props.history.push(`/forums/${currentMemoId}`)
+ } else { // 新建
+ this.props.history.push(`/forums`)
+ }
+ // debugger;this.props.history.goBack()
+ }
+ updateMemo(attachmentsMap) {
+ const { memoSubject, memoRepertoire, memoLanguage, memoType, currentMemoId, content } = this.state;
+ const mdVal = this.mdRef.current.getValue()
+ console.log('isContentEdit: ', mdVal === content);
+ const newMemoUrl = `/memos/${currentMemoId}.json`
+ axios.put(newMemoUrl, {
+ content_changed: this.contentChanged,
+ tags: memoLanguage,
+ // memo:{
+ subject: memoSubject ,
+ content: mdVal,
+ forum_id: memoType,
+ repertoire_name: memoRepertoire,
+ // language: memoLanguage.join(languageSeparator),
+ //
+ // },
+ attachment_ids: attachmentsMap
+ }, {
+ // withCredentials: true,
+ })
+ .then((response) => {
+ const { status, message, memo_id } = response.data;
+ if (status === 0) {
+ window.$("html,body").animate({"scrollTop":0})
+ this.props.history.push(`/forums/${currentMemoId}`)
+ } else {
+ this.props.showNotification(message)
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+ newMemo(attachmentsMap) {
+ const { memoSubject, memoRepertoire, memoLanguage, memoType } = this.state;
+ const mdVal = this.mdRef.current.getValue()
+
+ const newMemoUrl = `/memos.json`
+ axios.post(newMemoUrl, {
+ tags: memoLanguage,
+ // memo:{
+ subject: memoSubject ,
+ content: mdVal,
+ forum_id: memoType,
+ // repertoire_name: memoRepertoire,
+
+ // },
+ attachment_ids: attachmentsMap
+ }, {
+ // withCredentials: true,
+ })
+ .then((response) => {
+ const { status, message, memo_id } = response.data;
+ if (status === 0) {
+ window.$("html,body").animate({"scrollTop":0})
+ this.props.history.push(`/forums/${memo_id}`)
+ } else {
+ this.props.showNotification(message)
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+ componentDidMount() {
+ const newMemoUrl = `/memos/new.json`
+ axios.get(newMemoUrl,{
+ // withCredentials: true,
+ })
+ .then((response) => {
+ const data = response.data;
+ const repertoires = [];
+ const repertoiresTagMap = {}
+ if ( data.tag_list ) {
+ // data.tag_list.forEach((item, index)=>{
+ // const tagArray = [];
+ // item.tag.forEach( (tag, index) => {
+ // tagArray.push(tag.name)
+ // })
+ // repertoires.push(item.rep.repertoire.name)
+ // repertoiresTagMap[item.rep.repertoire.name] = tagArray
+ // })
+ this.setState({
+ tag_list: data.tag_list
+ // repertoires,
+ // repertoiresTagMap
+ })
+
+ // const user = response.data.current_user;
+ // user.tidding_count = response.data.tidding_count;
+ // this.props.initCommonState(user)
+
+ // 初始化 csrf meta
+ const $ = window.$
+ $('head').append( $('') )
+ $('head').append( $(``) )
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
+
+ // 如果是编辑
+ const { match } = this.props
+ const memoId = match.params.memoId;
+ if (memoId) {
+ const memoUrl = `/memos/${match.params.memoId}/edit.json`;
+ axios.get(memoUrl,{
+ // withCredentials: true,
+ })
+ .then((response) => {
+ const tag_list = response.data.tag_list
+ if (tag_list) {
+ // this.setState({...response.data})
+ const { content, forum_id, id, repertoire_name, subject,
+ current_user, tag_list, attachments_url, memo_tags, attachments } = response.data;
+ this.initMD(content);
+ // this.onRepertoiresChange(repertoire_name)
+ // tag -> memo_tags
+ const tag = memo_tags;
+ let memoLanguage = []
+ if (tag) {
+ memoLanguage = tag.map((item, index) => {
+ return item.id + ""
+ })
+ }
+ const fileList = attachments.map(item => {
+ return {
+ id: item.id,
+ uid: item.id,
+ name: appendFileSizeToUploadFile(item),
+ url: item.url,
+ filesize: item.filesize,
+ status: 'done'
+ }
+ })
+ this.setState({
+ fileList,
+ currentMemoId: memoId,
+ memoSubject: subject,
+ memoType: forum_id,
+ memoRepertoire: repertoire_name,
+ memoLanguage,
+ attachments_url,
+ content
+
+ // repertoires: [],
+ // currentSelectRepertoiresIndex: -1,
+ }, ()=> {
+ // 解决有时候编辑时内容不显示的问题
+ setTimeout(() => {
+ this.mdRef.current && this.mdRef.current.setValue(content || '')
+ }, 2000)
+
+ $('.upload_filename').each((index, item) => {
+ var width = window._textWidth($(item), '14px');
+ console.log(width)
+ $(item).css('width', width + 20)
+ })
+
+ })
+ // 加载完后滚动条滚动
+ window.$("html,body").animate({"scrollTop":0})
+
+ this.props.initForumState({
+ // current_user,
+ tag_list
+ })
+ }
+
+ }).catch((error) => {
+ console.log(error)
+ })
+ } else {
+ this.initMD();
+ }
+
+
+
+
+ }
+ initMD(initValue) {
+ return;
+
+ this.contentChanged = false;
+ const placeholder = "";
+ // amp;
+ // 编辑时要传memoId
+ // const imageUrl = `/upload_with_markdown?container_id=&container_type=Memo`;
+ const imageUrl = `/api/attachments.json`;
+
+ // 创建editorMd
+
+ const taskpass_editormd = create_editorMD("memoMD", '100%', 400, placeholder, imageUrl, () => {
+ setTimeout(()=>{
+ taskpass_editormd.resize()
+ taskpass_editormd.cm && taskpass_editormd.cm.refresh()
+ }, 500)
+
+ if (initValue) {
+ taskpass_editormd.setValue(initValue)
+ }
+ taskpass_editormd.cm.on("change", (_cm, changeObj) =>{
+ console.log('....contentChanged')
+ this.contentChanged = true;
+ })
+ });
+ this.taskpass_editormd = taskpass_editormd;
+ window.taskpass_editormd = taskpass_editormd;
+
+ }
+
+ renderOptions(array) {
+ const elementArray = [];
+ array.forEach(( item, index ) => {
+ elementArray.push(
+
+ )
+ })
+ return elementArray
+ }
+ onRepertoiresChange(value) {
+
+ const index = this.state.repertoires.indexOf(value)
+
+ this.setState({
+ currentSelectRepertoiresIndex: index,
+ memoRepertoire: value,
+ memoLanguage: ''
+ });
+ };
+
+ renderTag() {
+ const { tag_list } = this.state;
+ if (!tag_list || tag_list.length === 0) {
+ return ''
+ }
+ const result = []
+
+ tag_list.forEach((item, index) => {
+ result.push()
+ })
+
+ return result;
+ }
+
+ onTagChange(value) {
+ if (value && value.length > 3) {
+ this.props.showNotification(`最多选择3个技术标签`)
+
+ return;
+ }
+ this.setState({
+ memoLanguage: value
+ })
+ }
+
+ onTypeChange(value) {
+
+ this.setState({
+ memoType: typeNameMap[value]
+ })
+ }
+ onMemoNameChange(e) {
+ this.setState({
+ memoSubject: e.target.value
+ })
+ }
+ renderAttachment() {
+ const { attachments_url } = this.state;
+ const attachments = []
+ attachments_url.forEach((item, index) => {
+ const ar = item.url.split('/')
+ const fileName = ar[ar.length - 1]
+ /*
+
- { memoId ? '编辑话题' : '发布话题'}
- {/*
- */}
-
-
-
- */}
-
-
-
-
-
- 话题名称
-
- *
-
-
- this.onMemoNameChange(val)} placeholder="">
-
-
-
-
- 必填项
-
-
-
-
- {/* TODOTODO 这里重复的html代码太多，如果有其他页面有类似需求，需要封装*/}
-
-
- 开始上传 */}
-
-
- (单个文件150M以内)
-
-
- {/* 请求status 422 */}
-
- {/*
- 内容
-
- *
-
-
-
-
- {/* */}
-
-
- {/*
-
-
- {/*
-
-
-
*/}
-
-
-
-
- 必填项
-
-
-
-
-
- {/* memoType === typeNameMap['技术分享'] &&
-
-
- 话题类型
-
- *
-
-
-
-
-
-
- 必填项
-
-
-
-
*/}
-
- { memoType === typeNameMap['技术分享'] &&
-
-
- 技术标签
-
- *
-
-
-
-
-
-
-
-
-
-
- 必填项
-
-
-
-
}
-
-
-
-
-
- 技术标签
-
- *
-
-
-
-
-
-
-
-
- 必填项
-
-
- + + {fileName} + +
+ */ + // ?attachment_id=2 + /* + + + + */ + attachments.push( +
+
+ );
+ }
+}
+
+export default MemoNew;
diff --git a/public/react/src/modules/tpm/challengesnew/TPMquestion.js b/public/react/src/modules/tpm/challengesnew/TPMquestion.js
index 82d94f787..8fc2b1133 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMquestion.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMquestion.js
@@ -411,9 +411,7 @@ export default class TPMquestion extends Component {
window.location.href = '/shixuns/'+this.props.match.params.shixunId+'/challenges/'+this.props.match.params.checkpointId+'/editquestion';
}
questionadd=()=>{
- $('html').animate({
- scrollTop: 10
- }, 200);
+
let{questionaddarray}=this.state;
let questionaddsums=questionaddarray.length;
@@ -431,15 +429,13 @@ export default class TPMquestion extends Component {
}
})
-
-
questionaddarrays.push({type:0,choose_id:0});
this.setState({
activetype:0,
questionaddarray:questionaddarrays,
questionaddtype:true,
+ editquestionaddtype:false,
newquestionaddtype:true,
- editquestionaddtype:false,
questionlists:[{str:"A",val:"",type:false},{str:"B",val:"",type:false},{str:"C",val:"",type:false},{str:"D",val:"",type:false}],
answeshixunsGroup: 1,
answeoptions:[10,20],
@@ -447,17 +443,17 @@ export default class TPMquestion extends Component {
shixunssanswerkillvalue:"",
shixunsskillanswerlist:[],
contentMdRefval:"",
- newquestioMDMdContval:""
+ newquestioMDMdContval:"",
})
- // setTimeout(() => {
- // this.newquestioMDMdCont.current.setValue('')
- // this.newquestioMDMdRef.current.setValue('')
- //
- // }, 2000)
-
- this.shixunsautoHeight()
+ setTimeout(() => {
+ this.newquestioMDMdRef.current.setValue('')
+ }, 1000)
+ setTimeout(() => {
+ this.newquestioMDMdCont.current.setValue('')
+ }, 1500)
+ // this.shixunsautoHeight()
}
editquestionlists=(newquestionlists)=>{
@@ -592,6 +588,10 @@ export default class TPMquestion extends Component {
}
answer_subit=(sumtype,challenge_choose_id)=>{
+ $('html').animate({
+ scrollTop:10
+ }, 500);
+
let {challenge_id,questionlists,shixunsskillanswerlist,answeonshixunsmark,answeshixunsGroup,questionaddarray} =this.state;
if(challenge_id===undefined){
message.error("关卡id为空");
@@ -679,6 +679,7 @@ export default class TPMquestion extends Component {
let id = this.props.match.params.shixunId;
+ let checkpointId=this.props.match.params.checkpointId
let url;
if(sumtype==="edit"){
let newquestioMDvalue = this.neweditanswerRef.current.getValue().trim();
@@ -781,7 +782,9 @@ export default class TPMquestion extends Component {
description:
'新建成功，请点击右侧加号继续添加',
});
- // this.getanswer_subitlist()
+ window.location.href=`/shixuns/${id}/challenges/${checkpointId}/editquestion/${response.data.challenge_choose_id}`;
+
+ // this.getanswer_subitlist()
// this.gochooseid("/shixuns/"+this.props.match.params.shixunId+"/challenges/"+this.props.match.params.checkpointId+"/editquestion"+"/"+response.data.challenge_choose_id)
}).catch((error) => {
console.log(error)
@@ -817,7 +820,8 @@ export default class TPMquestion extends Component {
neweditanswerRefval:'',
editanswersRefval:''
})
-
+ this.newquestioMDMdRef.current.setValue('')
+ this.newquestioMDMdCont.current.setValue('')
}else{
let id = this.props.match.params.shixunId;
let url ='/shixuns/'+id+'/challenges/'+challenge_id+'/edit_choose_question.json?choose_id='+challenge_choose_id;
@@ -920,6 +924,7 @@ export default class TPMquestion extends Component {
)
})
+
return (
交流问答 / 详情
+
+ { memoId ? '编辑话题' : '发布话题'}
+ {/*
+ */}
+
+
+
+ */}
+
+
+
+
+
+ 话题名称
+
+ *
+
+
+ this.onMemoNameChange(val)} placeholder="">
+
+
+
+
+ 必填项
+
+
+
+
+ {/* TODOTODO 这里重复的html代码太多，如果有其他页面有类似需求，需要封装*/}
+
+
+ 开始上传 */}
+
+
+ (单个文件150M以内)
+
+
+ {/* 请求status 422 */}
+
+ {/*
+ 内容
+
+ *
+
+
+
+
+ {/* */}
+
+
+ {/*
+
+
+ {/*
+
+
+
*/}
+
+
+
+
+ 必填项
+
+
+
+
+
+ {/* memoType === typeNameMap['技术分享'] &&
+
+
+ 话题类型
+
+ *
+
+
+
+
+
+
+ 必填项
+
+
+
+
*/}
+
+ { memoType === typeNameMap['技术分享'] &&
+
+
+ 技术标签
+
+ *
+
+
+
+
+
+
+
+
+
+
+ 必填项
+
+
+
+
}
+
+
+
+
+
+ 技术标签
+
+ *
+
+
+
+
+
+
+
+
+ 必填项
+
+
+
diff --git a/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js b/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
index 32b56aae1..d0e6f98bd 100644
--- a/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
+++ b/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
@@ -4,6 +4,8 @@ import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Tooltip} from
import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
+import axios from 'axios';
+
import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
const Option = Select.Option;
@@ -21,7 +23,17 @@ export default class TpmQuestionEdit extends Component {
componentDidMount() {
}
-
+ delecbtns=()=>{
+ let url=`/shixuns/${this.props.match.params.shixunId}/challenges/${this.props.match.params.checkpointId}/destroy_challenge_choose.json`;
+ axios.delete((url), { data: {
+ choose_id:this.props.match.params.choose_id
+ }})
+ .then((result)=>{
+ if(result.data.status===1){
+ window.location.href=`/shixuns/${this.props.match.params.shixunId}/challenges/${this.props.match.params.checkpointId}/editquestion`;
+ }
+ })
+ }
render() {
@@ -202,6 +214,9 @@ export default class TpmQuestionEdit extends Component {
onClick={()=>this.props.answer_subit()}>提交
取消
+
+ this.delecbtns()}
+ className="delectshixuncdbtn fr">删除
必填项
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index f163f5ed5..3aa329ec9 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -1,132 +1,124 @@
-import React, { Component } from 'react';
-
-import {Link} from 'react-router-dom';
-import {Tooltip,Menu} from 'antd';
-import {getImageUrl} from 'educoder';
-
-import "./usersInfo.css"
-import "../../courses/css/members.css"
-import "../../courses/css/Courses.css"
-
-import { LinkAfterLogin } from 'educoder'
-
-class InfosBanner extends Component{
- constructor(props){
- super(props);
- }
- render(){
- let {
- data ,
- id,
- login,
- moduleName,
- current_user,
- }=this.props;
- let is_current=this.props.is_current;
- let {username}= this.props.match.params;
- let {pathname}=this.props.location;
- moduleName=pathname.split("/")[3];
-
- console.log(is_current)
- return(
-
-
- )
- }
-}
+import React, { Component } from 'react';
+
+import {Link} from 'react-router-dom';
+import {Tooltip,Menu} from 'antd';
+import {getImageUrl} from 'educoder';
+
+import "./usersInfo.css"
+import "../../courses/css/members.css"
+import "../../courses/css/Courses.css"
+
+import { LinkAfterLogin } from 'educoder'
+
+class InfosBanner extends Component{
+ constructor(props){
+ super(props);
+ }
+ render(){
+ let {
+ data ,
+ id,
+ login,
+ moduleName,
+ current_user,
+ }=this.props;
+ let is_current=this.props.is_current;
+ let {username}= this.props.match.params;
+ let {pathname}=this.props.location;
+ moduleName=pathname.split("/")[3];
+
+ return(
+
-
-
-
-
-
- - {data && data.name} - { - data && is_current == false && data.identity =="学生" ? "" : - - } -
-
-
-
- 私信
-
-
- }
-
-
- {is_current ? "我":"TA"}的经验值
- {data && data.experience}
-
-
- {is_current ? "我":"TA"}的金币
- {data && data.grade}
-
- {
- is_current ?
-
- {
- data && data.attendance_signed ?
- 已签到
- :
- 签到
- }
-
- :
-
-
-
- this.setState({moduleName: 'courses'})}
- to={`/users/${username}/courses`}>翻转课堂
-
-
- this.setState({moduleName: 'shixuns'})}
- to={`/users/${username}/shixuns`}>开发社区
-
-
- this.setState({moduleName: 'paths'})}
- to={`/users/${username}/paths`}>实践课程
-
-
- this.setState({moduleName: 'projects'})}
- to={`/users/${username}/projects`}>项目
-
-
- this.setState({moduleName: 'package'})}
- to={`/users/${username}/package`}>众包
-
- {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
- &&
- this.setState({moduleName: 'videos'})}
- to={`/users/${username}/videos`}>视频
- }
-
- {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
- &&
- this.setState({moduleName: 'videos'})}
- to={`/users/${username}/videos`}>题库
- }
-
-
-
+
+ )
+ }
+}
export default InfosBanner;
\ No newline at end of file
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index f59827f45..c66453b4c 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -538,6 +538,27 @@ a.edu-greyline-btn:hover,a.edu-greyshallowline-btn:hover{border:1px solid #B2B2B
font-weight: 400;
color: rgba(255,255,255,1);
}
+
+/*删除按钮*/
+.delectshixuncdbtn{
+ display: block;
+ border: 1px solid #CDCDCD;
+ background-color: #fafafa;
+ color: #999!important;
+ width: 120px;
+ text-align: center;
+ height: 30px;
+ line-height: 30px;
+ border-radius: 2px;
+ width: 130px;
+ height: 40px;
+ background: rgba(77,124,254,0);
+ border-radius: 4px;
+ line-height: 40px;
+ font-size: 16px;
+ font-family: MicrosoftYaHei;
+ font-weight: 400;
+}
.defalutSubmitbtn:hover{background-color: #459BE6;border: 1px solid #459BE6;}
/*-------------------------------------------公用按钮：以white-btn(或者edu-default-btn无padding)为基础，宽度和高度可以用padding填充，颜色用edu-color-btn，end-----------------------------------------*/
+
+
+
+
+
+ + {data && data.name} + { + data && is_current == false && data.identity =="学生" ? "" : + + } +
+
+
+
+ 私信
+
+
+ }
+
+
+ {is_current ? "我":"TA"}的经验值
+ {data && data.experience}
+
+
+ {is_current ? "我":"TA"}的金币
+ {data && data.grade}
+
+ {
+ is_current ?
+
+ {
+ data && data.attendance_signed ?
+ 已签到
+ :
+ 签到
+ }
+
+ :
+
+
+
+ this.setState({moduleName: 'courses'})}
+ to={`/users/${username}/courses`}>翻转课堂
+
+
+ this.setState({moduleName: 'shixuns'})}
+ to={`/users/${username}/shixuns`}>实训项目
+
+
+ this.setState({moduleName: 'paths'})}
+ to={`/users/${username}/paths`}>实践课程
+
+
+ this.setState({moduleName: 'projects'})}
+ to={`/users/${username}/projects`}>开发项目
+
+
+ this.setState({moduleName: 'package'})}
+ to={`/users/${username}/package`}>众包
+
+ {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+ &&
+ this.setState({moduleName: 'videos'})}
+ to={`/users/${username}/videos`}>视频
+ }
+
+
+