diff --git a/public/react/package-lock.json b/public/react/package-lock.json index ce3ac05c7..7bd937b8b 100644 --- a/public/react/package-lock.json +++ b/public/react/package-lock.json @@ -15012,6 +15012,18 @@ } } }, + "react-zmage": { + "version": "0.8.5-beta.31", + "resolved": "https://registry.npm.taobao.org/react-zmage/download/react-zmage-0.8.5-beta.31.tgz", + "integrity": "sha1-kc+7Hs+Y0fYFEdDFfZEt4K+53ZY=", + "requires": { + "classnames": "^2.2.6", + "lodash.memoize": "^4.1.2", + "prop-types": "^15.6.2", + "react": "^16.6.3", + "react-dom": "^16.6.3" + } + }, "read-pkg": { "version": "1.1.0", "resolved": "http://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz", diff --git a/public/react/src/modules/courses/Video/video-play/index.jsx b/public/react/src/modules/courses/Video/video-play/index.jsx index 3556d4a05..93d04b245 100644 --- a/public/react/src/modules/courses/Video/video-play/index.jsx +++ b/public/react/src/modules/courses/Video/video-play/index.jsx @@ -28,7 +28,6 @@ export default ({ src, videoId, logWatchHistory, courseId = null }) => { const suf = src.split('.').pop() const isFlv = suf === 'flv' const el = useRef() - const deviceMatch = navigator.userAgent.toLowerCase().match(regex) const device = deviceMatch ? deviceMatch[0] : 'pc' diff --git a/public/react/src/modules/courses/exercise/ExerciseNew.js b/public/react/src/modules/courses/exercise/ExerciseNew.js index 07bd1467c..e605b2f07 100644 --- a/public/react/src/modules/courses/exercise/ExerciseNew.js +++ b/public/react/src/modules/courses/exercise/ExerciseNew.js @@ -1,94 +1,57 @@ -import React,{ Component } from "react"; +import React, { Component } from "react"; -import { - Form, Input, InputNumber, Switch, Radio, - Slider, Button, Upload, Icon, Rate, Checkbox, message, - Row, Col, Select, Modal, Tooltip -} from 'antd'; -import axios from 'axios' -// import './board.css' -// import "../common/formCommon.css" +import { CBreadcrumb } from 'educoder'; -// import { RouteHOC } from './common.js' - -// import { Q_TYPE_SINGLE, Q_TYPE_MULTI, Q_TYPE_JUDGE, Q_TYPE_NULL, Q_TYPE_MAIN, Q_TYPE_SHIXUN } from './new/common' -// import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor'; -// import CBreadcrumb from '../common/CBreadcrumb' -import {getUrl, ActionBtn, CBreadcrumb} from 'educoder'; - -// import SingleEditor from './new/SingleEditor' -// import SingleDisplay from './new/SingleDisplay' -// import JudgeEditor from './new/JudgeEditor' -// import JudgeDisplay from './new/JudgeDisplay' -// import NullEditor from './new/NullEditor' -// import NullDisplay from './new/NullDisplay' -// import MainEditor from './new/MainEditor' -// import MainDisplay from './new/MainDisplay' -// import ShixunEditor from './new/ShixunEditor' -// import ShixunDisplay from './new/ShixunDisplay' - -import update from 'immutability-helper' import './new/common.css' import '../css/Courses.css' import ExerciseNewCommon from './ExerciseNewCommon' -const { TextArea } = Input; -class ExerciceNew extends Component{ - constructor(props){ +class ExerciceNew extends Component { + constructor(props) { super(props); - - this.state = { - + left_banner_id: null } - } - componentDidMount = () => { - } initData = (data) => { - this.setState({left_banner_id: data.left_banner_id}) + this.setState({ left_banner_id: data.left_banner_id }) + } + componentDidMount() { + document.title = this.props.coursedata && this.props.coursedata.name; } render() { - let { left_banner_id } = this.state; - - + let { left_banner_id } = this.state; const { current_user } = this.props - - const courseId=this.props.match.params.coursesId; - - const isEdit = this.isEdit; - - document.title=this.props.coursedata&&this.props.coursedata.name; - return( -
- {this.isEdit ? "编辑" : "新建"}试卷
- this.props.history.length == 1 ? : this.props.history.goBack()
- onClick={() => this.props.history.push(`/classrooms/${courseId}/exercises/${left_banner_id}`)}>
- 返回
+ const courseId = this.props.match.params.coursesId;
+ return (
+
+ {this.isEdit ? "编辑" : "新建"}试卷
+ this.props.history.push(`/classrooms/${courseId}/exercises/${left_banner_id}`)}>
+ 返回
-