diff --git a/src/components/render-html.jsx b/src/components/render-html.jsx index 99c5500d3..e85dd061a 100644 --- a/src/components/render-html.jsx +++ b/src/components/render-html.jsx @@ -9,6 +9,7 @@ import { renderToString } from 'katex' const preRegex = /
]*>/g;
const strRegexSub = /:([a-zA-Z_]+):/g;
+// const quoteRegex = /[#]()/g;
function _unescape(str) {
let div = document.createElement('div')
div.innerHTML = str
diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js
index 087d4d248..3918a68c9 100644
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@@ -319,7 +319,7 @@ class CoderRootFileDetail extends Component {
) : detail.direct_download ? (
diff --git a/src/forge/Newfile/Index.js b/src/forge/Newfile/Index.js
index 460d90f34..50568f855 100644
--- a/src/forge/Newfile/Index.js
+++ b/src/forge/Newfile/Index.js
@@ -64,7 +64,7 @@ function Index(props){
{...props}
filepath={`${file_path}`}
language = {language}
- content={undefined}
+ content={""}
readOnly={false}
editor_type="new"
descName={filename ? `Add ${filename}`:""}
diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js
index dc7b945a4..b030da0f0 100644
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@@ -92,7 +92,7 @@ class UserSubmitComponent extends Component {
base64_filepath:Base64.encode(path.substr(1)),
branch: returnbar(branch),
new_branch: submitType === "1" ? values.branchname : undefined,
- content:editor_type === "upload" ? content : Base64.encode(content),
+ content:content ? (editor_type === "upload" ? content : Base64.encode(content)):"",
message: values.desc,
})
.then((result) => {
diff --git a/src/modules/tpm/challengesnew/css/newquestion.css b/src/modules/tpm/challengesnew/css/newquestion.css
index 81c4dcdc8..7b7f251d0 100644
--- a/src/modules/tpm/challengesnew/css/newquestion.css
+++ b/src/modules/tpm/challengesnew/css/newquestion.css
@@ -6,8 +6,8 @@
border-color: #5091FF !important;
}
.quoteDiv{
- width: 240px!important;
- max-height: 257px!important;
+ width: 360px!important;
+ max-height: 280px!important;
}
.quoteDiv > li{
display: flex;
diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js
index 26402bcf1..c5d3b56b3 100644
--- a/src/modules/tpm/challengesnew/tpm-md-editor.js
+++ b/src/modules/tpm/challengesnew/tpm-md-editor.js
@@ -96,7 +96,6 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
const [quoteVisible, setQuoteVisible] = useState(false);
const [screenIssues, setScreenIssues ] = useState([]);
const quoteVisibleRef = useRef(false);
- const [ quotelist , setQuotelist ] = useState([]);
const chooseIssuesList = useRef([]);
useEffect(()=>{
@@ -121,7 +120,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
// 请求issues接口获取全部可quote的issue列表
function getIssueList(keyword){
axios.get(`/v1/${owner}/${projectsId}/issues`,{params:{
- only_name:true,keyword
+ only_name:true,keyword,sort_direction:"desc",sort_by:"issues.created_on"
}}).then(result=>{
if(result){
!keyword && setIssues(result.data.issues);
@@ -130,6 +129,13 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
}
})
}
+
+ useEffect(()=>{
+ if(initValue){
+ console.log(initValue);
+ }
+ },[initValue])
+
// # 引用的弹框div
const QuoteDiv = (
@@ -163,7 +169,6 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
const list = new Set(chooseIssuesList.current);
list.add(i.project_issues_index);
chooseIssuesList.current = Array.from(list);
- setQuotelist(Array.from(list));
}
function onMouseOverQuote(key){
document.getElementsByClassName("quote active")[0] && (document.getElementsByClassName("quote active")[0].className="quote");
@@ -664,7 +669,6 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
if(value.indexOf(str) === -1){
if(str==="#"){
chooseIssuesList.current = [];
- setQuotelist([])
}
}
//截取第一个字符到光标的内容
@@ -685,7 +689,6 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
const list = new Set(chooseIssuesList.current);
list.delete(atWhoMap.get(index));
chooseIssuesList.current = Array.from(list);
- setQuotelist(Array.from(list))
}
}
})
@@ -698,7 +701,6 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
const list = new Set(chooseIssuesList.current);
list.delete(atWhoMap.get(index));
chooseIssuesList.current = Array.from(list);
- setQuotelist(Array.from(list));
}
}
})