{
jsCopy()
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js
new file mode 100644
index 000000000..79133f34c
--- /dev/null
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js
@@ -0,0 +1,52 @@
+import React, { Component } from 'react';
+import { ActionBtn } from 'educoder'
+
+import { Form , Modal } from 'antd'
+
+class RepositoryAddFile extends Component {
+ constructor(props) {
+ super(props);
+ this.state={
+ visible:false
+ }
+ }
+
+ addFile = () =>{
+ this.setState({
+ visible:true
+ })
+ }
+ cancelAdd = () =>{
+ this.setState({
+ visible:false
+ })
+ }
+ render(){
+ let { visible } = this.state
+ return(
+
+ +添加文件
+
+
+
+
+
+
+
+ )
+ }
+}
+const WrappedRepositoryAddFile = Form.create({name: 'taskRepositoryAddFile'})(RepositoryAddFile);
+// RouteHOC()
+export default (WrappedRepositoryAddFile);
\ No newline at end of file
From f701a456c7eb37892b47a3e895df537556be9c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 30 Aug 2019 17:47:10 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../courses/exercise/Testpapersettinghomepage.js | 16 ++++++++--------
.../courses/shixunHomework/shixunHomework.js | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index b958faa5c..2c56b8b58 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -332,17 +332,17 @@ class Testpapersettinghomepage extends Component{
{this.props.isAdmin()===true?
:
}
@@ -370,7 +370,7 @@ class Testpapersettinghomepage extends Component{
padding-top: 10px;
padding-bottom: 8px;
}
- a:hover {
+ .exercisesafonts:hover {
color:#1A0B00 !important;
}
`}
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index dd5a93534..dd694828a 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -1100,7 +1100,7 @@ class ShixunHomework extends Component{
{course_modules&&course_modules.main_category.map((item,key)=>{
return(
- datas&&datas.category_id===null?"": this.moveTos(item.main_category_id)} title={item.main_category_name}>{item.main_category_name}
+ datas&&datas.category_id===null?"": this.moveTos(item.main_category_id)} title={item.main_category_name.length>18?item.main_category_name:""}>{item.main_category_name}
)
})}
@@ -1109,10 +1109,10 @@ class ShixunHomework extends Component{
return (!this.state.dirSearchValue || item.category_name.indexOf(this.state.dirSearchValue) != -1)
}).map( (item,key) => {
if(datas&&datas.category_id!=null&&datas&&datas.category_id===item.category_id===false){
- return this.moveTos(item.category_id )} title={item.category_name}>{item.category_name}
+ return this.moveTos(item.category_id )} title={item.category_name.length>18?item.category_name:""}>{item.category_name}
}
if(datas&&datas.category_id===null){
- return this.moveTos(item.category_id )} title={item.category_name}>{item.category_name}
+ return this.moveTos(item.category_id )} title={item.category_name.length>18?item.category_name:""}>{item.category_name}
}
})}
From 5991971f128d6975b120b0245504c8b9f97fe147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 30 Aug 2019 17:48:51 +0800
Subject: [PATCH 3/5] Merge branches 'dev_Ysl' and 'dev_aliyun' of
https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl
# Conflicts:
# public/react/src/modules/courses/poll/PollNew.js
---
.../react/src/modules/courses/poll/PollNew.js | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index eab42d253..bccef3075 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -280,9 +280,13 @@ class PollNew extends Component {
questionnair: true,
left_banner_id:result.data.left_banner_id
})
- // console.log(this.state.polls_nametest)
- // console.log(this.state.polls_descriptiontest)
- // }
+ if( result.data.poll.polls_name){
+ if( result.data.poll.polls_name.length>0){
+ this.setState({
+ addonAfter: result.data.poll.polls_name.length,
+ })
+ }
+ }
}).catch((error) => {
console.log(error)
})
@@ -326,8 +330,13 @@ class PollNew extends Component {
polls_descriptiontest: result.data.poll.polls_description,
questionnair: true,
})
-
- // }
+ if( result.data.poll.polls_name){
+ if( result.data.poll.polls_name.length>0){
+ this.setState({
+ addonAfter: result.data.poll.polls_name.length,
+ })
+ }
+ }
}).catch((error) => {
console.log(error)
})
From 5457f81c611815d660eb54fcc96c67d11e7d6461 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 30 Aug 2019 18:02:59 +0800
Subject: [PATCH 4/5] spin
---
public/react/src/modules/tpm/TPMIndexHOC.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index a0178c895..1782cff56 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -481,12 +481,13 @@ export function TPMIndexHOC(WrappedComponent) {
}
`
}
+
+
+
-
-
this.initCommonState(user)}
{...this.props} {...this.state}
@@ -497,11 +498,12 @@ export function TPMIndexHOC(WrappedComponent) {
+
-
+