From c3d80fb5882c8f73cc046a6254afb98d34ba11ab Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 15 Jul 2020 17:17:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Component/FileLanguage.jsx | 66 ++++++++ src/forge/DevOps/Dispose.jsx | 46 +++--- src/forge/DevOps/Infos.jsx | 11 +- src/forge/Main/Detail.js | 6 +- src/forge/Order/Milepost.js | 231 ++++++++++++--------------- src/forge/Order/Nav.js | 7 +- src/forge/Order/order.css | 9 +- src/forge/comments/comments.js | 2 +- 8 files changed, 212 insertions(+), 166 deletions(-) create mode 100644 src/forge/Component/FileLanguage.jsx diff --git a/src/forge/Component/FileLanguage.jsx b/src/forge/Component/FileLanguage.jsx new file mode 100644 index 00000000..bd531909 --- /dev/null +++ b/src/forge/Component/FileLanguage.jsx @@ -0,0 +1,66 @@ +import React from 'react'; +import { Select } from 'antd'; + +const Option = Select.Option; +const LANGUAGE = [ + "apex", + "azcli", + "bat", + "clojure", + "coffee", + "cpp", + "csharp", + "csp", + "css", + "dockerfile", + "fsharp", + "go", + "handlebars", + "html", + "ini", + "java", + "javascript", + "json", + "less", + "lua", + "markdown", + "msdax", + "mysql", + "objective", + "perl", + "pgsql", + "php", + "postiats", + "powerquery", + "powershell", + "pug", + "python", + "r", + "razor", + "redis", + "redshift", + "ruby", + "rust", + "sb", + "scheme", + "scss", + "shell", + "solidity", + "sql", + "st", + "swift", + "typescript", + "vb", + "xml", + "yaml", +]; +export default (({ language , select_language })=>{ + return( + + ) +}) \ No newline at end of file diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx index 560f26b6..ec6e0bd4 100644 --- a/src/forge/DevOps/Dispose.jsx +++ b/src/forge/DevOps/Dispose.jsx @@ -3,6 +3,7 @@ import { Form , AutoComplete } from 'antd'; import { Blueback } from '../Component/layout'; import Editor from "react-monaco-editor"; import Modals from './DisposeModal'; +import FileLanguage from '../Component/FileLanguage'; import docker from '../Images/docker.png'; import gradle from '../Images/gradle.png'; @@ -16,7 +17,11 @@ const Option = AutoComplete.Option; export default Form.create()( forwardRef(({ form })=>{ const [ visible , setVisible ] = useState(false); - const { getFieldDecorator } = form; + const [ ymlValue , setYmlValue ] = useState("class Main 1111"); + const [ fileLanguage , setFileLanguage ] = useState(undefined); + + const { getFieldDecorator , validateFields } = form; + const helper = useCallback( (label, name, rules, widget, isRequired = false) => ( @@ -29,10 +34,23 @@ export default Form.create()( [] ) // 修改文件内容 - function changeEditor(){} + function changeEditor(value){ + setYmlValue(value); + } // 切换语言 - function changeAuto(){} + function select_language(value){ + setFileLanguage(value); + } + + // 确定提交 + function submit(){ + validateFields((error,value)=>{ + if(!error){ + console.log(value); + } + }) + } return( setVisible(flag)}> @@ -46,34 +64,26 @@ export default Form.create()(
    • - {helper( - "", - "tag_name", - [{ required: true, message: "请选择语言" }], - - - )} +
    + +

    配置脚本：

    - trustie-pipeline.yml + .trustie-pipeline.yml

    - 确定提交 + 确定提交     ) diff --git a/src/forge/DevOps/Infos.jsx b/src/forge/DevOps/Infos.jsx index 379f10a5..97cdca70 100644 --- a/src/forge/DevOps/Infos.jsx +++ b/src/forge/DevOps/Infos.jsx @@ -1,5 +1,6 @@ import React , { useEffect , useState } from 'react'; import { Banner } from '../Component/layout'; +import { Link } from 'react-router-dom'; import Dispost from './Dispose'; import Structure from './Structure'; @@ -12,19 +13,21 @@ const Div = styled.div`{ export default ((props)=>{ const [ menu , setMenu ] = useState(false); + const path = props.location.pathname; useEffect(()=>{ - const path = props.location.pathname; console.log(props.match.params.projectsId) if(path === `/projects/${props.match.params.projectsId}/ops/list`){ setMenu(true); + }else{ + setMenu(false); } - },[]) + },[path]) return(
    - 工作流配置 - 构建列表 + 工作流配置 + { menu ? 构建列表:""}
    { diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 8ca35f48..041eada6 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -438,12 +438,12 @@ class Detail extends Component { } - {/*
  • -1 ? "active" : ""}> +
  • -1 ? "active" : ""}> 工作流 - {/* {projectDetail && projectDetail.pull_requests_count ? {projectDetail.pull_requests_count} : ""} + {projectDetail && projectDetail.ops_count ? {projectDetail.ops_count} : ""} -
    • */} +
  • -1 || url.indexOf("meilpost") > -1) ? "active" : ""}> 里程碑 diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index 8f8b996b..dd5c1cc3 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -157,139 +157,114 @@ class Milepost extends Component { ) - const Paginations = ( - - { - data && data.versions_count > limit ? -
    - -
    : "" - } -     - ) - - const renderList = () => { - if (data && data.versions && data.versions.length > 0) { - return ( -
    -
    - { - data.versions.length === 0 ? : data.versions.map((item, key) => { - return ( -
    -
    -
    -
    - - {item.name} -
    - -
    -
    -
    -
    - -
    - - - { - item.effective_date ? - {item.effective_date} - : - 暂无截止时间 - } -
    -
    - - - {item.open_issues_count}个开启 - -
    -
    - - - {item.close_issues_count}个关闭 - -
    -
    - { - data && data.user_admin_or_member ? - - : '' - } - -
    -
    -
    - - {item.description} -
    -
    -
    - ) - }) - } -
    -
    - - ) - } else { - return ( - - ) - } - } return (
    -
    -
    -
    - 里程碑{data && data.issue_tags_count}已创建 -
    +
    +
    + 里程碑{data && data.issue_tags_count}已创建
    -
    -
    -
  • this.opneMilelist(1)}>{data && data.open_count}个开启中
    • -
  • this.opneMilelist(2)}>{data && data.closed_count}个已关闭
    • -
    -
    -
      -
    • - - 排序 - -
      • -
    - { - data && data.user_admin_or_member ? - 新的里程碑 - : '' - } -
    -
    - {renderList()} - {Paginations} +
    +
    +
  • this.opneMilelist(1)}>{data && data.open_count}个开启中
    • +
  • this.opneMilelist(2)}>{data && data.closed_count}个已关闭
    • +
    +
    +
      +
    • + + 排序 + +
      • +
    + { + data && data.user_admin_or_member ? + 新的里程碑 + : '' + } +
    +
    + { + data && data.versions && data.versions.length > 0 + ? +
    + { + data.versions.length === 0 ? : data.versions.map((item, key) => { + return ( +
    +
    +
    +
    + + {item.name} +
    +
    +
    +
    +
    +
    + + + { + item.effective_date ? + {item.effective_date} + : + 暂无截止时间 + } +
    +
    + + + {item.open_issues_count}个开启 + +
    +
    + + + {item.close_issues_count}个关闭 + +
    +
    + { + data && data.user_admin_or_member ? +
    +
    + + 编辑 +
    + +
    + + this.closemile(item)}> + 删除 + +
    +
    + : '' + } +
    +
    +
    + {item.description} +
    +
    +
    + ) + }) + } +
    + : + } + { + data && data.versions_count > limit ? +
    + +
    : "" + } ) } diff --git a/src/forge/Order/Nav.js b/src/forge/Order/Nav.js index d0a4b0cd..c7043e3f 100644 --- a/src/forge/Order/Nav.js +++ b/src/forge/Order/Nav.js @@ -2,12 +2,7 @@ import React , { Component } from "react"; import { NavLink } from 'react-router-dom'; import './order.css' class Nav extends Component{ - constructor(props){ - super(props); - this.state={ - projectTag: undefined - } - } + render(){ const { projectsId } = this.props.match.params; return( diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css index 325380ea..229e8348 100644 --- a/src/forge/Order/order.css +++ b/src/forge/Order/order.css @@ -576,9 +576,6 @@ a.issue-type-button.active:hover { cursor: pointer; line-height: 40px; } -.attachmentsList { - margin-left: 4px; -} .paper-clip-color { color: #29bd8b !important; } @@ -663,8 +660,7 @@ a.issue-type-button.active:hover { .comment-background { background: #fff; border-radius: 4px; - padding: 0 15px 15px; - /* border: 1px solid #f4f4f4; */ + padding: 0px 30px; } .border-bottom-comment { border-bottom: 1px solid #eee; @@ -684,7 +680,8 @@ a.issue-type-button.active:hover { border-radius: 9px; } .comment-background .ant-list-item { - padding: 16px; + padding-left: 20px; + box-sizing: border-box; } /* .comment-background .ant-list-split .ant-list-item:last-child{border-bottom: 1px solid #e8e8e8;} */ .border-top-e { diff --git a/src/forge/comments/comments.js b/src/forge/comments/comments.js index 5791d77a..24ef94f3 100644 --- a/src/forge/comments/comments.js +++ b/src/forge/comments/comments.js @@ -502,7 +502,7 @@ class comments extends Component { ) : (
    -
    +