From 78af3131c5f0b9cd356b07e1bdbffe888b563ae9 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 27 Sep 2023 16:38:55 +0800 Subject: [PATCH 1/6] issue --- src/forge/Issues/Img/millestones-big.png | Bin 0 -> 2049 bytes src/forge/Order/MilepostDetail.jsx | 9 ++++++-- src/forge/Team/List.jsx | 8 +++++-- src/home/ThirdEdition.jsx | 26 +++++++++++------------ 4 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 src/forge/Issues/Img/millestones-big.png diff --git a/src/forge/Issues/Img/millestones-big.png b/src/forge/Issues/Img/millestones-big.png new file mode 100644 index 0000000000000000000000000000000000000000..b57f83f31b54aad4c495d418796b24a231600e14 GIT binary patch literal 2049 zcmdT_Ycv}O7S00+B~sF5$MN>ghk2Y=56r(NUQA1UYrjpL29*beqbLRh^{j=xnJ?Gx<-tRm2-e33J{J;Q` zfgVy1000>H`gl<^nD^PCI+}>Qp4Nzvc3&@#V0PqkSrOHY1bcIo~C3-$+sJJ&kTcBsp;@d%k87Ba!P)4}N2N0iIF;o7FRn4YzTifUd-dedO zh{=kJJHNI(t(%q>xg><3am`<-`oUC7IOZ3$hr*p0YkY)E+3C@OKxISk@h*e@ zn_}7&MIw<@thBUkHiv_pQ*6!6&2jM+!_gcb&a!Camp-LZX?n^P*0bnzpa^W%{X%D3 zU$w~2*jZmc{B+Zyc`4ohM%RjTH{pk(BGs&|&hkVie~Xu%o*tF@Ml;Gxi}lcC139ng zmNrq`vak?G(fY*72;Ub5EuOaktwm91+16jcbDeX{}G{O8de08+hWe0ZHBtK35NE_8p@4l)eL=W{0cgOzP)lZc_Gwd}Da%#UB zvOo(qvQ;U5HlE}VaAFcMsWj+0Tft?qSP^@?KtL&uFbmkb1O@BV_AkLbJH3v$b(39j%;_@Uxr>(OQNy%qY6Tj?jt_8rgCO2NrS-?^Vs{TJ>xQ@EHwRe*6Si zRE+xjaBHqa?p8TC+gLhjxRs#exW4uFa{eK_c7_p(T=96;)n_?TS(_|uC42RUdB;B; zug|WCRfj$Qqu$L42pYD}poxr8iJ2$yr}$8zpFk@Qup33gqIVcRWI4yX21S7%$V14= z>-{|b%xnI<05|Z-=o(ZSr?>{~Tax9Ykq13K=zm5Hmu(BV^grY1m$H-0{FGEA+W9x$ ziGiq=C%r^#DAO%J#iY|Cn9ijgE#s){~OA^Pti~sbu9t-##Fdh2rNE+ zmz;gUT+xF*@G^FrcMx&(liB;xJw%b}&fftA#v#IZiUW;Ld(ic-GcJs3S{QQme&2 zl>NXDMlSvAl8-|_ zYWo)ktOTwY;n(v9r|d8OWhDvd106v)JB;U4Q^Gw%>OxAIIavGjI_k*D&97QFbE^DW zY&PaV!sxMZ=Ew4;P@XN3t`aP$5_G3qUzZNYF|}Xe6faB~0Z!?XML{LrVxdg>kEyZR zdogHZTRr`0THr(3XmdU?m z%XA|P$sM`a+mF>(h_9Ym9*dZg0(^f>#Sl%I`WGf300%tpT?Hb6e4g4)PxW5BYAA2V5xwbo7?N=MFf;#(SDPJ1r!+d@wETjy|PC~v|XI5 z-H$vsZI^(2YLO#xuhLL+T$ts8po0#q;)pcYZ-6`+f1rp{jy1Gao z7!qm$Zxe&SxN-<#2-ts(G&MD8ZXs;8-lyn}5%2AKrEM;*r%MatKB+Z(XnD5;n}T;& z`y)Uw-wZ$zC9p@ZY7UIpz_16XC{fTj0+ t@~K@yIe0pi1FC6&IG=U+PfasB*ut*g|2boNUGviczQh2pMo&i8zX2FIqJsbc literal 0 HcmV?d00001 diff --git a/src/forge/Order/MilepostDetail.jsx b/src/forge/Order/MilepostDetail.jsx index f7c6603ae..ba1fc49bc 100644 --- a/src/forge/Order/MilepostDetail.jsx +++ b/src/forge/Order/MilepostDetail.jsx @@ -6,7 +6,7 @@ import Datas from '../Issues/Component/datas'; import axios from 'axios'; import { FlexAJ } from '../Component/layout'; import CheckProfile from '../Component/ProfileModal/Profile'; -import emp from '../../forge/Issues/Img/emp.png'; +import millestones from '../../forge/Issues/Img/millestones-big.png'; import './milepost.scss'; import './order.scss'; import '../Issues/index.scss'; @@ -222,7 +222,12 @@ function MilepostDetail(props){ { - total === 0 &&
+ total === 0 && +
+ +

欢迎使用里程碑

+

里程碑用于集中归类管理项目的疑修及进度。在使用之前，您可以先{props.history.push(`/${owner}/${projectsId}/issues/${mileId}/new`)}} className="color-blue">创建一个疑修

+
} { total > 0 && diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx index ed5f3d7ce..c69910749 100644 --- a/src/forge/Team/List.jsx +++ b/src/forge/Team/List.jsx @@ -7,7 +7,7 @@ import Item from './ListItem'; import Right from './RightBox'; import NoData from '../Nodata'; import CheckProfile from '../Component/ProfileModal/Profile'; -import { Menu , Pagination , Dropdown , Spin , Tabs , Radio } from 'antd'; +import { Menu , Pagination , Dropdown , Spin , Tooltip , Radio } from 'antd'; import ConcentrateProject from '../users/GeneralView/ConcentrateProject'; import { getImageUrl } from 'educoder'; import RenderHtml from "../../components/render-html"; @@ -117,7 +117,11 @@ function List(props){ 设置 :""}

-
{organizeDetail && organizeDetail.description}
+
+ + {organizeDetail && organizeDetail.description} + +
diff --git a/src/home/ThirdEdition.jsx b/src/home/ThirdEdition.jsx index ffd8e6f70..7b72060d8 100644 --- a/src/home/ThirdEdition.jsx +++ b/src/home/ThirdEdition.jsx @@ -29,18 +29,18 @@ function ThirdEdition() { return flag; },[flag]) - useEffect(()=>{ - let box = document.getElementById('thirdUl'); - var myTimer = setTimeout(intervalActive, 2500); - box.onmouseover = () => { - clearTimeout(myTimer); - setFlag(false); - } - box.onmouseleave = () => { - myTimer = setTimeout(intervalActive, 2500); - setFlag(true); - } - },[active,flag]) + // useEffect(()=>{ + // let box = document.getElementById('thirdUl'); + // var myTimer = setTimeout(intervalActive, 2500); + // box.onmouseover = () => { + // clearTimeout(myTimer); + // setFlag(false); + // } + // box.onmouseleave = () => { + // myTimer = setTimeout(intervalActive, 2500); + // setFlag(true); + // } + // },[active,flag]) function intervalActive() { if(doubleFlag){ @@ -179,7 +179,7 @@ function ThirdEdition() { return(
  • {i.title} - {i.visits} + {i.from !== "other" && {i.visits} } {i.created_time && i.created_time.split(" ")[0]}
    • ) From e4474420a81d189dcf25f53c39c3c7733769190c Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 7 Oct 2023 14:20:34 +0800 Subject: [PATCH 2/6] issue #3368 --- src/forge/Issues/Component/allMenus.jsx | 6 ++++++ src/forge/Issues/Component/datas.jsx | 4 ++-- src/forge/Issues/Pages/list.jsx | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/forge/Issues/Component/allMenus.jsx b/src/forge/Issues/Component/allMenus.jsx index 90afca543..e4085a0b7 100644 --- a/src/forge/Issues/Component/allMenus.jsx +++ b/src/forge/Issues/Component/allMenus.jsx @@ -53,6 +53,12 @@ function AllMenus({owner,projectsId,chooseFunc,update,defaultNames,defaultIds,op // 父组件按钮：清除筛选条件，将Ids\names里的字段全部改为undefined setIds({author_id:undefined,issue_tag_ids:undefined,issue_priorities_id:undefined,milestone_id:undefined,sort_by:undefined,status_id:undefined,assigner_id:undefined}); setNames({author_name:undefined,issue_tag_name:undefined,issue_priorities_name:undefined,milestone_name:undefined,sortby_name:undefined,status_name:undefined,assigner_name:undefined}); + }, + setChooseTag: (info) => { + let copy = {...ids,issue_tag_ids:[info.id].join(",")}; + let copyname = { ...names,issue_tag_name:info.name}; + setIds(copy);setNames(copyname); + chooseFunc(copy,copyname); } })) // 获取发布人列表 diff --git a/src/forge/Issues/Component/datas.jsx b/src/forge/Issues/Component/datas.jsx index dba2ab56e..ea9ae9c6f 100644 --- a/src/forge/Issues/Component/datas.jsx +++ b/src/forge/Issues/Component/datas.jsx @@ -7,7 +7,7 @@ import { Tooltip } from 'antd'; // issue列表显示 -function Datas({checkbox ,item , projectsId,owner}){ +function Datas({checkbox ,item , projectsId,owner,chooseTagFunc}){ function statusTag(name){ switch (name) { @@ -40,7 +40,7 @@ function Datas({checkbox ,item , projectsId,owner}){ item.tags && item.tags.length>0? item.tags.map((i,k)=>{ return( - {i.name} + chooseTagFunc(i)} style={{backgroundColor: `${i.color}`,cursor:"pointer"}} className="ml8 tagscolor task-hide" title={i.name}>{i.name} ) }) :"" diff --git a/src/forge/Issues/Pages/list.jsx b/src/forge/Issues/Pages/list.jsx index bc177ec84..bb751f803 100644 --- a/src/forge/Issues/Pages/list.jsx +++ b/src/forge/Issues/Pages/list.jsx @@ -340,6 +340,10 @@ function List(props){ setBegin(value[0] || ''); setEnd(value[1] || ''); } + + function chooseTagFunc(taginfo){ + menuRef.current && menuRef.current.setChooseTag(taginfo); + } return(
    setVisible(false)} onSuccess={onSuccess}/> @@ -439,6 +443,7 @@ function List(props){ item={item} owner={owner} projectsId={projectsId} + chooseTagFunc={chooseTagFunc} /> ) }) From ad0515553d3079fceed07f6ded4e8f23bb246bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Sat, 7 Oct 2023 14:33:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E5=BB=BA=E7=AB=99loading=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Server/pages/index.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/forge/Server/pages/index.jsx b/src/forge/Server/pages/index.jsx index 84c0abf1a..521304bc3 100644 --- a/src/forge/Server/pages/index.jsx +++ b/src/forge/Server/pages/index.jsx @@ -32,9 +32,11 @@ function Pages(props) { // 获取站点列表 axios.get(`/site_pages/x.json`, {params:{owner, repo: projectsId}}).then(res=>{ if(res && res.status === 200){ - const {last_build_info} = res.data.data setPageInfo(res.data.data); - last_build_info && last_build_info.length && setResult(last_build_info); + if(res.data.data){ + const {last_build_info} = res.data.data; + last_build_info && last_build_info.length && setResult(last_build_info); + } } setLoading(false); }) From b639779c7152a28c3019047d59733710e5d78dba Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 7 Oct 2023 15:41:35 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E8=80=85=E5=AE=B6=E5=9B=AD=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/home/Index.scss | 7 ++++++- src/home/ThirdEdition.jsx | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/home/Index.scss b/src/home/Index.scss index 2a708cd50..daf4c1993 100644 --- a/src/home/Index.scss +++ b/src/home/Index.scss @@ -812,8 +812,13 @@ body{ text-decoration: underline; } } - span{ + span.listboxcount{ + margin-left: 20px; + } + span.listboxtime{ margin-left: 40px; + width: 97px; + text-align: right; } .listboxcount{ min-width: 60px; diff --git a/src/home/ThirdEdition.jsx b/src/home/ThirdEdition.jsx index 7b72060d8..9f6844eaa 100644 --- a/src/home/ThirdEdition.jsx +++ b/src/home/ThirdEdition.jsx @@ -1,5 +1,6 @@ import React,{ useState , useEffect , useMemo } from 'react'; import { Spin , Skeleton } from 'antd'; +import moment from 'moment'; import T311 from './Img/3-1-1.png'; import T312 from './Img/3-1-2.png'; import T321 from './Img/3-2-1.png'; @@ -141,8 +142,8 @@ function ThirdEdition() { return(
  • {i.title} - {i.visits} - {i.created_time && i.created_time.split(" ")[0]} + {i.from !== "other" && {i.visits} } + {i.from !== "other" && {i.created_time && moment(i.created_time).format("YYYY-MM-DD")} }
    • ) }):"" @@ -180,7 +181,7 @@ function ThirdEdition() {
  • {i.title} {i.from !== "other" && {i.visits} } - {i.created_time && i.created_time.split(" ")[0]} + {i.from !== "other" && {i.created_time && moment(i.created_time).format("YYYY-MM-DD")} }
    • ) }):"" @@ -198,8 +199,8 @@ function ThirdEdition() { return(
  • {i.title} - {i.visits} - {i.created_time && i.created_time.split(" ")[0]} + {i.from !== "other" && {i.visits} } + {i.from !== "other" && {i.created_time && moment(i.created_time).format("YYYY-MM-DD")} }
    • ) }):"" From 10360c3e3731b55a9eae341c90f49b0d7b596d4d Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sun, 8 Oct 2023 10:12:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/merge.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 237a07338..d8d83e155 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -407,7 +407,7 @@ class merge extends Component {
    -
    +
    {data && data.search_count && data.search_count > 0 ? (
    @@ -427,7 +427,7 @@ class merge extends Component {
    ):""} {search_count > select_params.limit ? ( -
    +
    Date: Sun, 8 Oct 2023 11:02:16 +0800 Subject: [PATCH 6/6] issue #3445 --- src/modules/tpm/challengesnew/css/newquestion.css | 2 +- src/modules/tpm/challengesnew/tpm-md-editor.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/tpm/challengesnew/css/newquestion.css b/src/modules/tpm/challengesnew/css/newquestion.css index 400cd5123..51831434f 100644 --- a/src/modules/tpm/challengesnew/css/newquestion.css +++ b/src/modules/tpm/challengesnew/css/newquestion.css @@ -80,6 +80,6 @@ border: none; margin:0px auto; } -.editormd-editing .quoteBox{ +.editormd-editing.quoteBox .editormd{ overflow: unset; } \ No newline at end of file diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js index 6b835f373..0f36bda75 100644 --- a/src/modules/tpm/challengesnew/tpm-md-editor.js +++ b/src/modules/tpm/challengesnew/tpm-md-editor.js @@ -762,8 +762,8 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla return ( -
    -
    +
    +
    {quoteVisible && QuoteDiv } {atWhoVisible && atWhoList}