This commit is contained in:
caishi 2021-01-20 20:14:39 +08:00
parent a22b5b3701
commit 2278d03c47
15 changed files with 2358 additions and 2351 deletions

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 724 KiB

After

Width:  |  Height:  |  Size: 724 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -42,14 +42,14 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
<span> <span>
{ operate ? { operate ?
<Link to={`/projects/${owner}/${projectsId}/devops/dispose/${item.id}`} className="mr10 color-grey-6"> <Link to={`/projects/${owner}/${projectsId}/devops/dispose/${item.id}`} className="mr10 color-grey-6">
<i className="iconfont iconzaibianji font-13 mr3"></i>编辑</Link> :"" <i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</Link> :""
} }
{ operate ? { operate ?
<Popconfirm title={"确定要删除此流水线?"} onConfirm={()=>deleteFunc(item.id)} okText="确定" cancelText={"取消"}> <Popconfirm title={"确定要删除此流水线?"} onConfirm={()=>deleteFunc(item.id)} okText="确定" cancelText={"取消"}>
<a className="mr10 color-grey-6"><i className="iconfont iconlajitong font-13 mr3"></i>删除</a> <a className="mr10 color-grey-6"><i className="iconfont icon-lajitong font-13 mr3"></i>删除</a>
</Popconfirm>:"" </Popconfirm>:""
} }
<Link to={`/projects/${owner}/${projectsId}/devops/list`} className="color-grey-6"><i className="iconfont iconyunhang font-13 mr3"></i>查看运行记录</Link> <Link to={`/projects/${owner}/${projectsId}/devops/list`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
</span> </span>
) )
} }

View File

@ -26,9 +26,9 @@ function StageItem({item, templates,saveItems,k, slideItems , deleteStep}){
cancelText="否" cancelText="否"
onConfirm={() => deleteStep(item.id,k)} onConfirm={() => deleteStep(item.id,k)}
><a> ><a>
<i className="iconfont iconlajitong1 font-14"></i></a> <i className="iconfont icon-lajitong1 font-14"></i></a>
</Popconfirm> </Popconfirm>
<a onClick={()=>slideItems(k,item.hide)}><i className={ (!item.hide || item.hide === false) ? "iconfont iconsanjiaoxing-down font-14" :"iconfont icontriangle font-14"}></i></a> <a onClick={()=>slideItems(k,item.hide)}><i className={ (!item.hide || item.hide === false) ? "iconfont icon-sanjiaoxing-down font-14" :"iconfont icon-triangle font-14"}></i></a>
</span> </span>
</FlexAJ> </FlexAJ>
<div className={(!item.hide || item.hide === false) ? "stepsBody active" : "stepsBody"}> <div className={(!item.hide || item.hide === false) ? "stepsBody active" : "stepsBody"}>

View File

@ -6,7 +6,7 @@ function head(){
return( return(
<AlignCenterBetween> <AlignCenterBetween>
<span className="font-20">工作流配置</span> <span className="font-20">工作流配置</span>
<a href={`https://forum.trustie.net/forums/3111/detail`} target="_blank" className="color-grey-6"><i className="iconfont icontishi1 font-14 mr3"></i>模板使用说明</a> <a href={`https://forum.trustie.net/forums/3111/detail`} target="_blank" className="color-grey-6"><i className="iconfont icon-tishi1 font-14 mr3"></i>模板使用说明</a>
</AlignCenterBetween> </AlignCenterBetween>
) )
} }

View File

@ -3,7 +3,7 @@ import MenusRename from './menusRename';
import MenusAdd from './menusAdd'; import MenusAdd from './menusAdd';
const typeIcon = { const typeIcon = {
init:"iconinitialize",build:"iconstructure",deploy:"iconarrange",customize:"iconnewStage",confirm:'iconsure' init:"icon-initialize",build:"icon-structure",deploy:"icon-arrange",customize:"icon-newStage",confirm:'icon-sure'
} }
function Menus({step,changeStep, menuList , renameFunc , checkDatas , addFunc }){ function Menus({step,changeStep, menuList , renameFunc , checkDatas , addFunc }){

View File

@ -39,7 +39,7 @@ function menusAdd ({ getName , checkDatas , k }){
return( return(
<li className="menuAdd"> <li className="menuAdd">
{ !show && <i className="iconfont icontianjia" onClick={showInput}></i> } { !show && <i className="iconfont icon-tianjia" onClick={showInput}></i> }
<Input <Input
ref={(el) => setRef(el)} ref={(el) => setRef(el)}
size={"small"} size={"small"}

View File

@ -45,7 +45,7 @@ function menusRename({ name , edit , id , renameFunc }){
style={{width:"75px",display : `${show?"block":'none'}`}} style={{width:"75px",display : `${show?"block":'none'}`}}
onChange={(e)=>setN(e.target.value)} onChange={(e)=>setN(e.target.value)}
/> />
{ !show && edit && <i className="iconfont iconeditUnder font-16 color-grey-9" onClick={changeShow}></i> } { !show && edit && <i className="iconfont icon-editUnder font-16 color-grey-9" onClick={changeShow}></i> }
</span> </span>
</div> </div>
) )

View File

@ -3,7 +3,6 @@ import './Index.scss';
import { Form , Input , Cascader , Radio , Checkbox , Upload , Button } from "antd"; import { Form , Input , Cascader , Radio , Checkbox , Upload , Button } from "antd";
import { locData } from "../Utils/locData"; import { locData } from "../Utils/locData";
export default Form.create()( export default Form.create()(
forwardRef(({form})=>{ forwardRef(({form})=>{
const { getFieldDecorator, validateFields, setFieldsValue } = form; const { getFieldDecorator, validateFields, setFieldsValue } = form;
@ -39,7 +38,7 @@ export default Form.create()(
)} )}
{helper( {helper(
'组织描述', '组织描述',
"desc", "description",
[{ required: true, message: "请输入组织描述" }], [{ required: true, message: "请输入组织描述" }],
<Input.TextArea <Input.TextArea
autoSize={{ minRows: 3, maxRows: 5 }} autoSize={{ minRows: 3, maxRows: 5 }}
@ -48,13 +47,13 @@ export default Form.create()(
)} )}
{helper( {helper(
'所在地区', '所在地区',
"area", "location",
[], [],
<Cascader placeholder="请选择城市" options={locData}/>,false <Cascader placeholder="请选择城市" options={locData}/>,false
)} )}
{helper( {helper(
'可见性', '可见性',
"exposure", "visibility",
[{ required: true, message: "请选择可见性" }], [{ required: true, message: "请选择可见性" }],
<Radio.Group name="exposure"> <Radio.Group name="exposure">
<Radio style={radioStyle} value="1" key={1}>公开</Radio> <Radio style={radioStyle} value="1" key={1}>公开</Radio>
@ -64,16 +63,24 @@ export default Form.create()(
)} )}
{helper( {helper(
'选择头像', '选择头像',
"photo", "image",
[], [],
<Upload></Upload>,false <Upload></Upload>,false
)} )}
{helper( {helper(
'权限', '权限',
"operation", "repo_admin_change_team_access",
[], [],
<Checkbox value="1" key={1}>项目管理员可以添加或移除团队的访问权限</Checkbox>,false <Checkbox value="1" key={1}>项目管理员可以添加或移除团队的访问权限</Checkbox>,false
)} )}
{helper(
<span>最大仓库数<span className="color-grey-8">设置为-1表示使用全局默认值</span></span>,
"max_repo_creation",
[],
<Input
placeholder="最大仓库数" style={{width:"100px"}}
/>,false
)}
</Form> </Form>
</div> </div>
<p className="mt20"> <p className="mt20">