diff --git a/public/react/src/common/UrlTool.js b/public/react/src/common/UrlTool.js index e56e3f1b8..27be52c43 100644 --- a/public/react/src/common/UrlTool.js +++ b/public/react/src/common/UrlTool.js @@ -100,6 +100,10 @@ export function Railsgettimes() { railsgettimess(`${getUrl()}/api/main/first_stamp.json`); // railsgettimess(`https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp`); } +export function getmyUrl(geturl) { + + return `${getUrl()}${geturl}`; +} export function getUploadActionUrl(path, goTest) { Railsgettimes() @@ -180,4 +184,4 @@ export function publicSearchs(Placeholder,onSearch,onInputs,onChanges,loadings) loading={loadings||false} allowClear={true} >) -} \ No newline at end of file +} diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js index ded33c43a..2cb074a6a 100644 --- a/public/react/src/common/educoder.js +++ b/public/react/src/common/educoder.js @@ -2,7 +2,7 @@ // export { default as OrderStateUtil } from '../routes/Order/components/OrderStateUtil'; -export { getImageUrl as getImageUrl, getRandomNumber as getRandomNumber,getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl +export { getImageUrl as getImageUrl,getmyUrl as getmyUrl, getRandomNumber as getRandomNumber,getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl , getUploadActionUrl as getUploadActionUrl,getUploadActionUrltwo as getUploadActionUrltwo ,getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth , getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode ,getupload_git_file as getupload_git_file} from './UrlTool'; diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index d6f4ec7a1..348303116 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/public/react/src/modules/courses/Resource/Fileslistitem.js @@ -1,9 +1,8 @@ import React,{ Component } from "react"; -import { WordsBtn,ActionBtn,getUrl } from 'educoder'; +import { WordsBtn,ActionBtn,getmyUrl } from 'educoder'; import {Tooltip,message,Input, Button} from 'antd'; import {Link} from 'react-router-dom'; import axios from 'axios' -import {} from 'educoder'; import moment from 'moment' import CoursesListType from '../coursesPublic/CoursesListType'; import Showoldfiles from "../coursesPublic/Showoldfiles"; @@ -12,13 +11,12 @@ import HeadlessModal from '../../user/usersInfo/common/HeadlessModal' import ClipboardJS from 'clipboard' import '../../user/usersInfo/video/InfosVideo.css' let _clipboard = null; -let getUrls=getUrl(); class Fileslistitem extends Component{ constructor(props){ super(props); this.state = { videoModalObj:false, - file_url:"", + file_url:null, } } setVisible=(bool)=>{ @@ -62,7 +60,7 @@ class Fileslistitem extends Component{ if(list.content_type==="video/mp4"){ this.setState({ videoModalObj:true, - file_url:getUrls+list.url+'?file_name='+list.title, + file_url:getmyUrl(list.url+'?file_name='+list.title), }) return }else{ @@ -94,7 +92,7 @@ class Fileslistitem extends Component{ if(list.content_type==="video/mp4"){ this.setState({ videoModalObj:true, - file_url:getUrls+list.url+'?file_name='+list.title, + file_url:getmyUrl(list.url+'?file_name='+list.title), }) return }else{ @@ -130,7 +128,7 @@ class Fileslistitem extends Component{ Clicktobroadcastthevideo=(bool,url)=>{ this.setState({ videoModalObj:bool, - file_url:getUrls+url, + file_url:getmyUrl(url), }) } @@ -217,7 +215,8 @@ class Fileslistitem extends Component{ const { checkBox, discussMessage,index } = this.props; - + console.log("Fileslistitem"); + console.log(file_url); return(
{ @@ -233,12 +232,12 @@ class Fileslistitem extends Component{ src={file_url} controls="true" controlslist="nodownload"> 您的浏览器不支持 video 标签。 -
- - this.copyurls()}>复制视频地址 -
+ {/*
*/} + {/* */} + {/* this.copyurls()}>复制视频地址*/} + {/*
*/} :"" diff --git a/public/react/src/modules/developer/components/myMonacoEditor/index.scss b/public/react/src/modules/developer/components/myMonacoEditor/index.scss index b3f305e68..45d0975c0 100644 --- a/public/react/src/modules/developer/components/myMonacoEditor/index.scss +++ b/public/react/src/modules/developer/components/myMonacoEditor/index.scss @@ -87,4 +87,10 @@ 50% { color: #fff; } +} + +.monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input, +.monaco-editor .margin, +.minimap .minimap-decorations-layer{ + background-color: transparent !important; } \ No newline at end of file