anph
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '0831上线' (#573) from durian/forgeplus-react:pre_gitlink_server into pre_gitlink_server

This commit is contained in:
durian 2023-08-31 16:13:29 +08:00
parent f091da0bbf cecf29e7c2
commit 83c344a06d
6 changed files with 773 additions and 768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1502
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

10
src/forge/Information/Pages/headerPagebyCCF.jsx
View File

@ -105,8 +105,8 @@ function HeaderPageCCF(props) {
// 新闻动态
data && data.cmsShow === 1 && newsList && newsList.length >= 0 &&
<div className="zone_news">
<p className="in_title mb10">{data.homepageCmsTitle}</p>
<div className="boxmain" style={{ display: "flex" }}>
<p className="in_title mb50">{data.homepageCmsTitle}</p>
<div className="boxmain mb100" style={{ display: "flex" }}>
<div className="zone_new_first">
<Slider {...setting}>
{
@ -114,7 +114,9 @@ function HeaderPageCCF(props) {
newsList.map((i, k) => {
return (
<div className="regform" key={k}>
<img src={i.headImg || img1} alt="" height="595px" style={{ width: "100%", objectFit: "cover" }} onClick={()=>{window.location.href=`/zone/${deptId}/newdetail/${i.id}`}} />
<div className="newsBannerBox">
<img src={i.headImg || img1} alt="" width="785px" style={{objectFit: "cover"}} onClick={()=>{window.location.href=`/zone/${deptId}/newdetail/${i.id}`}} />
</div>
</div>
)
})
@ -123,7 +125,7 @@ function HeaderPageCCF(props) {
}
</Slider>
</div>
<ul className={`zone_new_three ${newsList.length < 4 ? "flexStart" : "spaceeTween"}`}>
<ul className={`zone_new_three_ccf ${newsList.length < 4 ? "flexStart" : "spaceeTween"}`}>
{
newsList.map((i, k) => {
return (

19
src/forge/Information/indexZonebyCCF.scss
View File

@ -11,7 +11,6 @@
width: 0;
.slick-track {
margin-top: 20px;
display: flex;
height: 100%;
@ -26,14 +25,21 @@
img {
position: relative;
z-index: 1;
top: 30px;
}
}
.newsBannerBox{
height: 595px;
display: flex;
align-items: center;
align-content: center;
}
}
}
}
.slick-slider {
max-height: 595px;
overflow: hidden;
&:hover {
.slick-arrow {
display: block !important;
@ -76,7 +82,7 @@
text-align: left;
left: 50%;
margin-left: -115px;
bottom: 5%;
bottom: 20%;
position: absolute;
display: flex !important;
z-index: 2;
@ -123,15 +129,12 @@
}
}
.zone_new_three {
.zone_new_three_ccf {
margin-left: 30px;
display: flex;
flex-direction: column;
margin-bottom: 100px !important;
top: 50px;
position: relative;
.zone_n_value {
margin-top: 20px;
@ -157,7 +160,7 @@
width: 385px;
padding: 20px !important;
border-radius: 4px;
margin-bottom: 21px !important;
margin-bottom: 25px !important;
position: relative;
overflow: hidden;
word-break: break-all;

4
src/forge/Main/tree/Index.jsx
View File

@ -45,7 +45,6 @@ function Index(props) {
const {branches, total_count} = result.data;
setTotal(total_count)
setList(branches);
setNewFormBranchName(branches[0].name);
}
setIsSpin(false);
}).catch(error=>{setIsSpin(false);})
@ -56,6 +55,7 @@ function Index(props) {
const { author, name} = projectDetail;
document.title = `所有分支-${author.name}/${name}`;
}
setNewFormBranchName(projectDetail && projectDetail.default_branch);
}, [projectDetail])
@ -387,7 +387,7 @@ function Index(props) {
<Input placeholder='请输入分支名称' className='createBranchInput' onChange={checkNewBranchName} maxLength={100}/>
<div className='newBranchError mt5'>{newBranchError}</div>
<div className='font-15 createBranchLabel mt20'>分支起点</div>
<Select showSearch style={{width: '340px'}} className='createBranchInput' placeholder="请选择分支起点" onChange={(value)=>{setNewFormBranchName(value)}} getPopupContainer={triggerNode => triggerNode.parentNode}>
<Select showSearch style={{width: '340px'}} className='createBranchInput' placeholder="请选择分支起点" value={newFormBranchName} onChange={(value)=>{setNewFormBranchName(value)}} getPopupContainer={triggerNode => triggerNode.parentNode}>
{branchList && branchList.map((item, index)=>{
return <Select.Option value={item.name} key={index}>{item.name}</Select.Option>
})}

4
src/forge/SecuritySetting/Index.jsx
View File

@ -154,10 +154,10 @@ function Index(props){
<li className={active === 7 ?"active":""}><Link to={`/settings/mybot`}><i className="iconfont icon-kaifabot mr5 font-18"></i><span className="text-shodow-bold">我的Bot</span></Link></li>
<li className={active === 8 ?"active":""}><Link to={`/settings/installbot`}><i className="iconfont icon-BOTpeizhi mr5 font-17"></i><span className="text-shodow-bold">Bot安装</span></Link></li>
</ul>
<ul className="securityUl">
{/* <ul className="securityUl">
<li>个人建站</li>
<li className={active === 9 ?"active":""}><Link to={`/settings/mysite`}><i className="iconfont icon-liebiaoicon mr5 font-15"></i><span className="text-shodow-bold">我的站点</span></Link></li>
</ul>
</ul> */}
</div>
<LongWidth>
<Gap>

2
src/forge/users/Material/Index.jsx
View File

@ -55,7 +55,7 @@ function Index(props){
<Menu.Item key="3" className="font-16" onClick={()=>{props.history.push('/settings/phone')}}>手机号管理</Menu.Item>
<Menu.Item key="0" className="font-16" onClick={()=>{props.history.push('/settings/emails')}}>邮箱管理</Menu.Item>
<Menu.Item key="1" className="font-16" onClick={()=>{props.history.push('/settings/password')}}>密码管理</Menu.Item>
<Menu.Item key="4" className="font-16" onClick={()=>{props.history.push('/settings/verification')}}>身份认证</Menu.Item>
{/* <Menu.Item key="4" className="font-16" onClick={()=>{props.history.push('/settings/verification')}}>身份认证</Menu.Item> */}
<Menu.Item key="2" className="font-16" onClick={()=>{props.history.push('/settings/cancel')}}>账号注销</Menu.Item>
</Menu>}
</div>