diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e0530f70e..a13327b0e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,7 @@
-
+
@@ -15,11 +15,11 @@
-
+
-
-
+
+
@@ -28,11 +28,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -50,11 +141,15 @@
新建翻转课堂
nHeader
点赞
- Educoder
fork
- isedit
.push(
QuillForEditor
+ setContents
+ isedit
+ textcount
+ commentCtx
+ Educoder
+ title
$PROJECT_DIR$/src/forge
@@ -82,6 +177,7 @@
+
@@ -104,20 +200,12 @@
-
+
-
-
-
-
-
-
-
-
@@ -159,18 +247,18 @@
1584692398144
-
+
-
+
-
+
@@ -183,7 +271,7 @@
-
+
@@ -358,17 +446,58 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -376,5 +505,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index 068d34c9d..3a93560c1 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -201,7 +201,7 @@ class NewMerge extends Component{
ischeckmerge=(head,base)=>{
const { projectsId } = this.props.match.params;
- const url = `/projects/${projectsId}/pull_requests/check_can_merge`;
+ const url = `/projects/${projectsId}/pull_requests/check_can_merge.json`;
axios.post(url,{
project_id:projectsId,
head:head,
diff --git a/src/forge/Order/CopyDetail.js b/src/forge/Order/CopyDetail.js
index e36967044..d3e260d6f 100644
--- a/src/forge/Order/CopyDetail.js
+++ b/src/forge/Order/CopyDetail.js
@@ -106,6 +106,16 @@ class CopyDetail extends Component{
isShow:true
});
};
+ stringJson=(value) =>{
+ let _value = null;
+
+ try {
+ _value = JSON.parse(value);
+ } catch (e) {
+ _value = value;
+ }
+ return _value
+ }
//删除工单
deleteorder=(id)=>{
@@ -226,7 +236,7 @@ class CopyDetail extends Component{
{
- console.log("imgOnclick",value);
+ // console.log("imgOnclick",value);
+ }
+
+ stringJson=(value) =>{
+ let _value = null;
+
+ try {
+ _value = JSON.parse(value);
+ } catch (e) {
+ _value = value;
+ }
+ return _value
}
commentCtx = (ctx) => {
@@ -397,7 +408,7 @@ class Detail extends Component{
style={{ height: '150px' }}
placeholder="添加评论..."
options={options}
- setContents={this.state.countvalue}
+ value={this.stringJson(this.state.countvalue)}
onContentChange={this.onContentChange}
showUploadImage={this.handleShowImage}
// onContentChange={handleContentChange}
diff --git a/src/forge/Order/UpdateDetail.js b/src/forge/Order/UpdateDetail.js
index cf92a4c47..e2e17d532 100644
--- a/src/forge/Order/UpdateDetail.js
+++ b/src/forge/Order/UpdateDetail.js
@@ -136,6 +136,16 @@ class UpdateDetail extends Component{
)
}
}
+ stringJson=(value) =>{
+ let _value = null;
+
+ try {
+ _value = JSON.parse(value);
+ } catch (e) {
+ _value = value;
+ }
+ return _value
+ }
// 获取上传后的文件id数组
UploadFunc=(fileList)=>{
this.setState({
@@ -209,7 +219,7 @@ class UpdateDetail extends Component{