diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss index d46969b8..64d4fb4d 100644 --- a/src/forge/Head/header.scss +++ b/src/forge/Head/header.scss @@ -27,7 +27,7 @@ margin-left: 15px; } -.currentMenu{ +.ant-dropdown-menu.currentMenu{ width: 120px; text-align: center; padding:0px; diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 7838c39d..b20b98be 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -688,6 +688,12 @@ class Detail extends Component { () => () } > + {/* wiki具体某一个地址 */} + () + } + > {/* wiki */} { - if(list){ + if(Array.isArray(list)){ // 没有资源库banner但是通过连接进资源库页面时 let a = list.filter(item=>item.menu_name === "resources"); if((pathname && pathname==="source") && (a && a.length === 0)){ diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index ef026261..23ad1a14 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -1,6 +1,6 @@ import React, { Component } from "react"; import { Link } from "react-router-dom"; -import { Tag } from "antd"; +import { Tag, Tooltip } from "antd"; import { AlignCenter } from '../Component/layout'; import { getImageUrl, turnbar } from "educoder"; import "./merge.css"; @@ -157,7 +157,7 @@ class MergeItem extends Component { "--" )} -
  • {item.version || "--"}
    • +
  • {item.version ? {item.version} : "--"}
  • {item.tracker || "--"}
    • - { !mile ?
  • {item.version || "--"}
    • :""} + {!mile ?
  • + {item.version ? {item.version} : "--"} +
    • : ""}
  • {item.issue_status || "--"}
  • {item.done_ratio || "--"}
  • diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index f698f3be..6ce659ba 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -116,11 +116,11 @@ class order extends Component { }; // 获取列表数据 - getIssueList = (status_type, begin, end) => { + getIssueList = (status_type,) => { this.setState({ isSpin: true }) - const { select_params } = this.state; + const { select_params ,begin,end} = this.state; const { projectsId, owner } = this.props.match.params; const url = `/${owner }/${projectsId}/issues.json`; axios @@ -282,13 +282,17 @@ class order extends Component { // 翻页 ChangePage = (page) => { window.scrollTo(0,0); - const { status_type } = this.state; + const { status_type,select_params } = this.state; this.setState({ isSpin: true, checkedValue: [], all: false, + select_params:{ + ...select_params, + page + } },()=>{ - this.state.select_params.page=page; + // this.state.select_params.page=page; this.getIssueList(status_type); }); }; @@ -432,18 +436,28 @@ class order extends Component { // 修改开始时间 changeBeginTime = (data, value) => { - const { status_type } = this.state; + const { status_type,select_params } = this.state; this.setState({ - begin: value + begin: value, + select_params:{ + ...select_params, + page:1 + } + },()=>{ + this.getIssueList(status_type, value, this.state.end); }) - this.getIssueList(status_type, value, this.state.end); } changeEndTime = (data, value) => { - const { status_type } = this.state; + const { status_type,select_params } = this.state; this.setState({ - end: value - }) - this.getIssueList(status_type, this.state.begin, value); + end: value, + select_params:{ + ...select_params, + page:1 + } + },()=>{ + this.getIssueList(status_type, this.state.begin, value); + }); } // 选择列表里面的checkbox diff --git a/src/forge/Wiki/Index.jsx b/src/forge/Wiki/Index.jsx index f15b1968..1a8b0883 100644 --- a/src/forge/Wiki/Index.jsx +++ b/src/forge/Wiki/Index.jsx @@ -19,7 +19,7 @@ export default (props) => { let projectsId = match.params.projectsId; let owner = match.params.owner; - + let wikiName = match.params.wikiName; const [fileArrInit, setFileArrInit] = useState(null); const [checkItem, setCheckItem] = useState({}); const [itemDetail, setItemDetail] = useState({}); @@ -40,7 +40,12 @@ export default (props) => { setFileArr(res.data); setFileArrInit(res.data); if (res.data.length) { - setCheckItem(res.data[0]); + if (wikiName) { + let activeItem = res.data.filter(item => { return item.name == wikiName })[0] || res.data[0]; + setCheckItem(activeItem) + } else { + setCheckItem(res.data[0]); + } }; } else { setFileArr([]); @@ -191,6 +196,11 @@ export default (props) => { }, }; + function changeitem(item){ + history.push(`/${owner}/${projectsId}/wiki/${item.name}`) + setCheckItem(item); + } + return ( < Spin spinning={!fileArrInit} className="opacitySpin"> {fileArrInit && fileArrInit.length ? @@ -234,7 +244,7 @@ export default (props) => { { fileArr.map(item => { return
    -
    { setCheckItem(item) }}> +
    { changeitem(item) }}>
    {item.name} @@ -266,7 +276,7 @@ export default (props) => { {itemDetail.image_url && 头像} {itemDetail.userName} - 上次修改于{checkItem.commit ? timeAgo(checkItem.commit.author.when):'刚刚'} + 上次修改于{checkItem.commit ? timeAgo(checkItem.commit.author.when) : '刚刚'}
    {permission && }
    diff --git a/src/glcc/check/index.jsx b/src/glcc/check/index.jsx index ea2e5af9..5b66e803 100644 --- a/src/glcc/check/index.jsx +++ b/src/glcc/check/index.jsx @@ -23,6 +23,8 @@ function Check({ current_user, showNotification, history }) { const [taskId, setTaskId] = useState(); const [havePass, setHavePass] = useState(false); + const disabledCheck = new Date().getTime() > new Date('2022-07-01').getTime(); + const columns = [ { title: '学生姓名', @@ -128,8 +130,8 @@ function Check({ current_user, showNotification, history }) { return (
    { - text ? : - + text ? : + }
    ) diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 8701a8aa..4e3288dd 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -27,7 +27,7 @@ body>.-task-title { width: 100%; height:58px; min-width: 1200px; - z-index: 1000; + z-index: 1031; position: fixed; background: #1B2440; color: #fff;