+ {contentTitle &&
+ {contentTitle}
} +{content}
+
@@ -28,7 +27,7 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
})
:
)
}
+
renderMenu=(personal)=>{
const { current_user } = this.props;
return(
@@ -275,8 +275,12 @@ class NewHeader extends Component {
)
}
+ handleVisibleChange = visible => {
+ this.setState({ visible });
+ };
+
render() {
- const { match} = this.props;
+ const { match ,resetUserInfo ,showNotification} = this.props;
let current_user = this.props.user;
let {
AccountProfiletype,
@@ -285,6 +289,7 @@ class NewHeader extends Component {
headtypesonClickbool,
headtypess,
settings,
+ visible,
} = this.state;
/*用户名称 用户头像url*/
let activeIndex = false;
@@ -395,7 +400,7 @@ class NewHeader extends Component {
{
settings.navbar && settings.navbar.map((item, key) => {
var new_link = item.link;
- var user_login = this.props.user && this.props.user.login;
+ var user_login = current_user && current_user.login;
var is_hidden = item.hidden
if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
if (user_login) {
@@ -426,25 +431,30 @@ class NewHeader extends Component {
}
- 您暂未发布任何版本{baseOperate && projectType !==2 && 创建新版本}
+ 您暂未发布任何版本{baseOperate && projectType !==2 && 创建新版本}
}
diff --git a/src/forge/Head/AppPullRefresh.jsx b/src/forge/Head/AppPullRefresh.jsx
new file mode 100644
index 000000000..2b9c76606
--- /dev/null
+++ b/src/forge/Head/AppPullRefresh.jsx
@@ -0,0 +1,108 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { Icon } from 'antd';
+import _ from 'lodash';
+import Nodata from '../Nodata';
+
+
+class PullRefresh extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ }
+ this.pullRef = {};
+ // 节流
+ this.onScrollList = _.throttle(this.handleScroll, 200, {
+ leading: false,
+ trailing: true,
+ });
+ }
+
+ componentDidMount() {
+ let dom = document.querySelector('.pull-refresh-wrap');
+ dom && dom.addEventListener('scroll', this.onScrollList);
+ }
+
+ componentWillUnmount() {
+ let dom = document.querySelector('.pull-refresh-wrap');
+ dom && dom.removeEventListener('scroll', this.onScrollList)
+ }
+
+
+ handleScroll = () => {
+ if (this.props.count < this.props.pageSize) return;
+ if (this.props.type === 1 || this.props.type === 2) return;
+ const wrap = this.pullRef;
+ const currentScroll = wrap.scrollTop + wrap.clientHeight
+
+ // 触底
+ if (currentScroll >= (wrap.scrollHeight - 200)) {
+ this.loadData()
+ }
+ }
+
+
+ handleLoadClick = () => {
+ this.loadData();
+ }
+
+ loadData = () => {
+ this.props.onPullRefresh()
+ }
+
+
+ renderLoading() {
+ switch (this.props.type) {
+ case 0: // 加载更多
+ return 显示更多
+ case 1: // 加载中
+ return (
+
+
+ )
+ case 2: // 无样式
+ return 没有更多了
+ default:
+ return 没有更多了
+ }
+ }
+
+
+ render() {
+ const { className, count, children } = this.props;
+ return (
+ { this.pullRef = dom }}
+ >
+
+ {children}
+
+ {
+ count < 1 &&
+
+ )
+ }
+
+}
+
+
+PullRefresh.propTypes = {
+ className: PropTypes.string,
+ children: PropTypes.any,
+ onPullRefresh: PropTypes.func.isRequired,
+ type: PropTypes.oneOf([0, 1, 2]),
+ count: PropTypes.number.isRequired,
+ pageSize: PropTypes.number.isRequired,
+}
+
+
+export default PullRefresh
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index be36d6dbd..41d7fcfd3 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
import AccountProfile from "../../modules/user/AccountProfile";
import { getImageUrl } from 'educoder'
import axios from 'axios';
-import { Input , notification , Dropdown , Menu } from 'antd';
+import { Input , notification , Dropdown ,Popover, Menu,Badge, Button } from 'antd';
import { Link } from 'react-router-dom';
import LoginDialog from '../../modules/login/LoginDialog';
@@ -13,6 +13,7 @@ import '../../modules/tpm/TPMIndex.css';
import CheckProfile from '../Component/ProfileModal/Profile';
import './header.scss';
+import NoticeContent from './NoticeContent';
const $ = window.$
// TODO 这部分脚本从公共脚本中直接调用
const { Search } = Input;
@@ -47,6 +48,7 @@ class NewHeader extends Component {
settings: null,
visiblemyss: false,
openSearch:false,
+ visible:false, //浮动消息框展示控制
}
}
componentDidMount() {
@@ -92,9 +94,6 @@ class NewHeader extends Component {
this.setState({
user: newProps.user
})
- if (newProps.Headertop !== undefined) {
- old_url = newProps.Headertop.old_url
- }
}
educoderlogin = () => {
@@ -255,6 +254,7 @@ class NewHeader extends Component {
- {/* {search_url ? this.SearchInput(openSearch,search_url):""} */}
{ search_url &&
-
+
:""
}
- {this.props.user && this.props.user.login && notice_url ?
- }
+ visible={visible}
+ onVisibleChange={this.handleVisibleChange}
+ destroyTooltipOnHide
+ >
+
+
+
+
+
+
+ : ""
}
{!user || (user && !user.login) ?
diff --git a/src/forge/Head/NoticeContent.jsx b/src/forge/Head/NoticeContent.jsx
new file mode 100644
index 000000000..634a7adc8
--- /dev/null
+++ b/src/forge/Head/NoticeContent.jsx
@@ -0,0 +1,262 @@
+import React, { useEffect, useState } from 'react';
+import { Badge, Menu } from 'antd';
+import { Link } from 'react-router-dom';
+import axios from 'axios';
+import AppPullRefresh from './AppPullRefresh';
+import { noticeSourceType } from '../common/static';
+import './header.scss';
+import '../SecuritySetting/notice/manager/Index.scss';
+import '../SecuritySetting/Index.scss';
+import '../SecuritySetting/notice/myNotice/Index.scss';
+
+
+function NoticeContent({ visible, showNotification, resetUserInfo, current_user: { login } }) {
+ const [initialize, setInitialize] = useState(true);
+ const [noticeType, setNoticeType] = useState("notification");
+ const [letterUnreadCount, setLetterUnreadCount] = useState(0);//未读私信数量
+
+ const [noticeUnreadCount, setNoticeUnreadCount] = useState(0);//未读系统通知数量
+ const [noticePage, setNoticePage] = useState(0);
+ const [noticeUnreadList, setNoticeUnreadList] = useState([]);//未读系统通知列表
+
+ const [atUnreadCount, setAtUnreadCount] = useState();//未读@我数量
+ const [atPage, setAtPage] = useState(0);
+ const [atUnreadList, setAtUnreadList] = useState([]);//未读@我列表
+
+ useEffect(() => {
+ resetUserInfo();
+ }, [noticeUnreadCount,atUnreadCount]);
+
+ useEffect(()=>{
+ setNoticePage(0);
+ setAtPage(0);
+ },[visible])
+
+ useEffect(() => {
+ const params = {
+ type: noticeType,
+ limit: 10,
+ page: noticeType === "notification" ? noticePage : noticeType === "atme" ? atPage : "",
+ status: 1,
+ }
+ getMessageList(params);
+ }, [noticePage, atPage]);
+
+ useEffect(() => {
+ const params = {
+ type: noticeType,
+ limit: 10,
+ page: 0,
+ status: 1,
+ };
+ if (initialize) {
+ params.type = "atme"
+ }
+ visible && getMessageList(params);
+ }, [visible]);
+
+
+ function getMessageList(params) {
+ axios.get(`/users/${login}/messages.json`, {
+ params: params,
+ }).then((response) => {
+ if (response && response.data) {
+ setNoticeUnreadCount(response.data.unread_notification);
+ setAtUnreadCount(response.data.unread_atme);
+ if (params.type === "notification") {
+ let list = response.data.messages;
+ if (params.page !== 0) {
+ list = [...noticeUnreadList, ...list];
+ }
+ setNoticeUnreadList(list);
+ if (initialize) {
+ // 如果是第一次加载，根据数据量判断是否切换tab栏
+ setInitialize(false);
+ if (response.data.unread_notification === 0 && response.data.unread_atme !== 0) {
+ setNoticeType("atme");
+ }
+ }
+ } else if (params.type === "atme") {
+ let list = response.data.messages;
+ if (params.page !== 0) {
+ list = [...atUnreadList, ...list];
+ }
+ setAtUnreadList(list);
+ }
+ }
+ })
+ }
+
+ function readAll() {
+ axios.post(`/users/${login}/messages/read.json`, {
+ type: noticeType,
+ ids: [-1]
+ }).then((response) => {
+ let data = response.data;
+ if (!data) return;
+ if (data.status === 0) {
+ changeReadMarkAll(noticeType);
+ } else {
+ showNotification(data.message);
+ }
+ });
+ }
+
+
+ function changeReadMarkAll(noticeType) {
+ if (noticeType === "notification") {
+ let list = noticeUnreadList.slice();
+ list.forEach(item => {
+ item.status = 2;
+ })
+ setNoticeUnreadList(list);
+ setNoticeUnreadCount(0);
+ } else if (noticeType === "atme") {
+ let list = atUnreadList.slice();
+ list.forEach(item => {
+ item.status = 2;
+ })
+ setAtUnreadList(list);
+ setAtUnreadCount(0);
+ }
+ }
+
+ // const [letter_unread_list, setLetter_unread_list] = useState([
+ // {
+ // id: 122,
+ // read: 0, //是否已读，0未读，1已读
+ // send_name: "蒋宇航", //消息发送人
+ // send_login: "jiangYuHang", //消息发送人的login，前端根据这个跳转到消息内页
+ // content: "私信内容", //最近一条未读消息的内容
+ // create_time: "2019-03-04 18:08", //发送时间
+ // },
+ // ]);
+
+ function readItem(item) {
+ axios.post(`/users/${login}/messages/read.json`, {
+ type: noticeType,
+ ids: [item.id]
+ }).then((response) => {
+ let data = response.data;
+ if (!data) return;
+ if (data.status === 0) {
+ changeReadMark(item);
+ item.notification_url && window.open(item.notification_url);
+ } else {
+ showNotification(data.message);
+ }
+ });
+ }
+
+
+ function changeReadMark(item) {
+ if (item.type === "notification") {
+ let list = noticeUnreadList.slice();
+ let index = noticeUnreadList.indexOf(item);
+ list[index].status = 2;
+ setNoticeUnreadList(list);
+ if (noticeUnreadCount > 0) {
+ setNoticeUnreadCount(noticeUnreadCount - 1);
+ }
+ } else if (item.type === "atme") {
+ let list = atUnreadList.slice();
+ let index = atUnreadList.indexOf(item);
+ list[index].status = 2;
+ setAtUnreadList(list);
+ if (atUnreadCount > 0) {
+ setAtUnreadCount(atUnreadCount - 1);
+ }
+ }
+ }
+
+ return (
+
- {user && user.login &&
-
-
-
-
-
- }
-
:""
+ {current_user && current_user.login ?
+
+ { setNoticePage(noticePage + 1); }} //触发加载ajax的function
+ // type={2} // 传送加载组件的状态
+ count={noticeUnreadList.length} // 数据当前的总数量
+ pageSize={10} //
+ >
+ {
+ noticeUnreadList.map(item => {
+ return (
+
+ }
+
+ {/* @我 */}
+ {noticeType === "atme" && { setAtPage(atPage + 1); }} //触发加载ajax的function
+ // type={1} // 传送加载组件的状态
+ count={atUnreadList.length} // 数据当前的总数量
+ pageSize={10} //
+ >
+ {atUnreadList.map(item => {
+ return (
+
+ }
+
+ {/* 私信 */}
+ {/* {noticeType === "1" ? letter_unread_list.length > 0 ? letter_unread_list.map(item => {
+ return (
+
+
+ )
+}
+export default NoticeContent;
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss
index fc8ca9d62..263cd1ee5 100644
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@@ -24,8 +24,9 @@
width: 34px;
height: 34px;
border-radius: 50%;
- margin-left: 30px;
+ margin-left: 15px;
}
+
.currentMenu{
width: 120px;
text-align: center;
@@ -126,4 +127,139 @@
width: 110px;
text-align: right;
}
+}
+
+// 右上角小铃铛单独样式
+.notice-popover{
+ //popover小尖尖
+ .ant-popover-arrow{
+ display: none;
+ }
+
+ //popover框
+ .ant-popover-inner-content {
+ width: 386px;
+ height: 446px;
+ box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
+ border-radius: 4px;
+ margin-top: -10px;
+ padding: 12px 1px 12px 0;
+ }
+}
+
+.messageHoverDiv .ant-menu-item{
+ margin-right: 24px !important;
+}
+
+.hoverNotice-head{
+ margin-left: 18px;
+
+ & .ant-badge{
+ font-size: 14px !important;
+ }
+
+ &>.ant-menu-horizontal {
+ border-bottom: 1px solid #e8e8e8 !important;
+ }
+}
+
+.hoverNotice-body{
+ height: 342px;
+ overflow-y: scroll;
+
+ & b{
+ font-weight: 400;
+ text-shadow: 0.5px 0 0 #333;
+ }
+
+ .none_panels{
+ height: 100%;
+ }
+}
+
+.message-icon{
+ position: relative;
+ .ant-scroll-number{
+ right:12px;
+ padding: 0 0px;
+ }
+}
+
+
+
+.hoverNotice-buttom{
+ display: flex;
+ justify-content: space-between;
+ padding: 12px 18px;
+ a{
+ color: #466AFF;
+ &:hover{
+ opacity:0.85;
+ }
+ }
+}
+
+.noticeCont-back{
+ .pointer{
+ cursor: pointer;
+ }
+ &:hover{
+ background: #F3F4F6;
+ }
+}
+
+.noticeCont{
+ display: flex;
+ margin: 0 16px 0 18px;
+ padding: 12px 0 10px 0;
+ line-height: 24px;
+ border-bottom: 1px solid #EEEEEE;
+ cursor: default;
+ i{
+ font-size: 14px !important;
+ margin-right: 6px;
+ color: #333333;
+ }
+
+ .boldSpan{
+ font-weight: 400;
+ text-shadow: 0.5px 0 0 #333;
+ }
+
+ .noticeCont-text{
+ display: flex;
+ color:#333333;
+ flex:auto;
+ justify-content: space-between;
+
+ & .content-span{
+ word-break: break-all;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
+ }
+
+ & .atme-cont-span{
+ width: 272px;
+ }
+
+ & .notice-cont-span{
+ width: 255px;
+ }
+
+ .timeSpan{
+ font-size: 12px;
+ color: #666666;
+ }
+
+ .at-name{
+ margin-right: 12px;
+ }
+ }
+}
+
+.text-center{
+ text-align: center;
}
\ No newline at end of file
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 02a829a7b..545b92fe1 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -67,14 +67,14 @@ function CoderDepot(props){
const [ editReadme , setEditReadme ] = useState(false);
const [ pullsFlag , setPullsFlag ] = useState(true);
const [ issuesFlag , setIssuesFlag ] = useState(true);
+ const [ releaseVersions , setReleaseVersions] = useState(undefined);
+ const details = props.projectDetail;
const owner = props.match.params.owner;
const projectsId = props.match.params.projectsId;
let branchName = props.match.params.branchName;
branchName = returnbar(branchName);
- const details = props.projectDetail;
let pathname = props.history.location.pathname;
-
const { bannerList } = props;
useEffect(()=>{
@@ -90,7 +90,6 @@ function CoderDepot(props){
}
},[bannerList])
-
useEffect(()=>{
if(details){
setProjectDetail(details);
@@ -100,7 +99,7 @@ function CoderDepot(props){
setDefaultBranch(details.default_branch);
setInviteCode(details.invite_code);
}
- },[details])
+ })
useEffect(()=>{
if(treeValue){
@@ -127,11 +126,22 @@ function CoderDepot(props){
}
},[projectsId,owner,pathname,defaultBranch])
+ useEffect(()=>{
+ axios.get(`/${owner}/${projectsId}/releases.json`).then((result)=>{
+ if(result && result.data && result.data.releases){
+ const release = {
+ "list":result.data.releases,
+ "total_count":result.data.releases.length
+ }
+ setReleaseVersions(release);
+ }
+ })
+ },[releaseVersions])
+
// 获取主目录列表
function getDirInfo(branch){
setIsSpin(true);
const url = `/${owner}/${projectsId}/entries.json`;
-
axios.get(url, {
params: { ref: branch }
}).then((result) => {
@@ -521,13 +531,13 @@ function CoderDepot(props){
}
{/* 发布 */}
{
- projectDetail && projectDetail.release_versions &&
+ releaseVersions &&
+
+
+
+ {/* 系统通知 */}
+ {noticeType === "notification" && { readItem(item) }}>
+
+ )
+ })
+ }
+
+
+
+
+
+ {item.time_ago}
+
+ { readItem(item) }}>
+
+ )
+ })
+ }
+
+
+
+
+ " + (item.sender ? item.sender.name : '') + " " + item.content + " 中@我" }}>
+ {item.time_ago}
+
+
+
+ )
+ }) : "暂无数据" : ""} */}
+ = 30 && item.content.length <= 34 ? '65px' : "" }}>
+
+
+ {item.send_name}：
+ = 50 ? item.content.substr(0, 50) + "..." : item.content }}>
+ {item.create_time ? timeAgo(item.create_time) : "刚刚"}
+
+
+ 全部消息
+ {noticeUnreadCount > 0 && noticeType === "notification" && 所有系统消息一键已读}
+ {atUnreadCount > 0 && noticeType === "atme" && 所有@我一键已读}
+
+ {item.message}
+ {item.message}
{truncateCommitId(`${item.sha}`)}
-
+
+
+
+
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 560420a66..3d82db26f 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -255,7 +255,11 @@ class Detail extends Component {
open_devops: flag
})
}
- canvasChannel = () => {
+ /**
+ *
+ * @param {*} deleteFlag ：同步镜像需要提示成功，且未成功的情况下不需要删除项目
+ */
+ canvasChannel = (deleteFlag) => {
const name = window.location.hostname === "localhost" ? "testforgeplus.trustie.net" : window.location.hostname;
const actioncable = require("actioncable");
var project = this.state.project;
@@ -272,10 +276,15 @@ class Detail extends Component {
console.log(`###### ---received data--- ######`);
console.log(data);
if (data) {
- if ( data.project && data.project.mirror_status === 2) {
- this.deleteProjectBack();
+ if(deleteFlag){
+ this.props.showNotification("镜像同步成功!");
+ window.location.reload();
+ }else{
+ if (data.project && data.project.mirror_status === 2) {
+ this.deleteProjectBack();
+ }
+ this.getDetail();
}
- this.getDetail();
this.setState({
firstSync: false,
secondSync: false
@@ -428,8 +437,10 @@ class Detail extends Component {
const url = `/${owner}/${projectsId}/sync_mirror.json`;
axios.post(url).then(result => {
if (result && result.data && result.data.status === 0) {
- this.props.showNotification("镜像同步成功!");
- this.getProject(2);
+ this.setState({
+ secondSync:true
+ })
+ this.canvasChannel(true);
} else {
this.props.showNotification("镜像同步失败!");
}
@@ -670,17 +681,22 @@ class Detail extends Component {
(props) => (
diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss
index a6666ce17..0d77ff431 100644
--- a/src/forge/Main/list.scss
+++ b/src/forge/Main/list.scss
@@ -426,14 +426,15 @@
border-right: none;
}
.gitAddressClone > input{
- border:none;
outline: none;
- padding:0px 8px;
- height: 40px;
- line-height: 40px;
- border-radius: 0px;
- border: 1px solid #eee;
- flex:1;
+ padding: 0px 8px;
+ height: 38px;
+ line-height: 38px;
+ border: none!important;
+ border-right: 1px solid #eee!important;
+ border-radius: 4px 0px 0px 4px;
+ flex: 1;
+ max-width: 249px;
}
.wrap-commit-table .ant-table-small > .ant-table-content > .ant-table-body{
margin:0px;
diff --git a/src/forge/Main/version/New.jsx b/src/forge/Main/version/New.jsx
index d9028b848..3f432e94d 100644
--- a/src/forge/Main/version/New.jsx
+++ b/src/forge/Main/version/New.jsx
@@ -32,9 +32,9 @@ export default Form.create()(
const [fileList, setFileList] = useState(undefined);
const [attachment, setAttachment] = useState(undefined);
const [options , setOptions] = useState(undefined);
-
+ const stable = history && history.location && history.location.state.stable;
const { projectsId, versionId , owner } = match.params;
-
+
useEffect(()=>{
if(projectDetail && projectDetail.default_branch){
setBranch(projectDetail.default_branch);
@@ -129,6 +129,7 @@ export default Form.create()(
function changeBranch(params) {
setBranch(params);
}
+
return (
{
- data && data.user_permission && type !== 2 &&
+ data && data.user_admin_permission &&
@@ -128,7 +125,7 @@ function version(props) {
} else if (releases && releases.length === 0) {
return (
diff --git a/src/forge/Nodata.js b/src/forge/Nodata.js
index 3147e5601..ccc74ac54 100644
--- a/src/forge/Nodata.js
+++ b/src/forge/Nodata.js
@@ -1,7 +1,7 @@
import React , { Component } from 'react';
import nodata from './Images/nodata.png';
-
+import './css/index.scss';
class Nodata extends Component{
render(){
const { _html , small } = this.props;
diff --git a/src/forge/Notice/Index.jsx b/src/forge/Notice/Index.jsx
index 3f61688fb..73a2561bd 100644
--- a/src/forge/Notice/Index.jsx
+++ b/src/forge/Notice/Index.jsx
@@ -10,10 +10,6 @@ const Apply = Loadable({
loader: () => import("./Apply"),
loading: Loading,
});
-const Notify = Loadable({
- loader: () => import("./Notify"),
- loading: Loading,
-});
const UndoEvent = Loadable({
loader: () => import("./UndoEvent"),
loading: Loading,
@@ -23,7 +19,7 @@ function Index(props){
const pathname = props.history.location.pathname;
const user = props.user;
- const [ menu , setMenu ] = useState("notify");
+ const [ menu , setMenu ] = useState("undo");
const [ messagesCount , setMessagesCount ] = useState(0);
const [ transferCount , setTransferCount ] = useState(0);
const [ applyCount , setApplyCount ] = useState(0);
@@ -48,10 +44,6 @@ function Index(props){
useEffect(()=>{
if(pathname && username){
if(pathname === `/${username}/notice`){
- setMenu("notify");
- changeNum(user.undo_messages);
- }
- if(pathname === `/${username}/notice/undo`){
setMenu("undo");
}
if(pathname === `/${username}/notice/apply`){
@@ -83,14 +75,8 @@ function Index(props){
return (
diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js
index 5b48affaf..fced2f7fd 100644
--- a/src/forge/Main/version/version.js
+++ b/src/forge/Main/version/version.js
@@ -8,9 +8,9 @@ import './version.scss';
import axios from 'axios';
import Tree from '../img/tree-black.png';
import RenderHtml from '../../../components/render-html';
+import User from "../../Component/User";
function version(props) {
- console.log(props);
const [ data , setData ] = useState(undefined);
const [ releases , setReleases ] = useState(undefined);
const [ isSpin , setIsSpin ] = useState(true);
@@ -19,7 +19,6 @@ function version(props) {
const type = props.projectDetail && props.projectDetail.type;
const turnFromNew = location && location.query && location.query.turnFromNew;
const current_user_login = user && user.login;
- owner && console.log(owner);
useEffect(()=>{
getIssueList();
},[])
@@ -48,7 +47,6 @@ function version(props) {
}
//删除
function deleteRelease(releaseId) {
- console.log(releaseId);
if(releaseId){
axios.delete(`/${owner}/${projectsId}/releases/${releaseId}.json`).then((result)=>{
if(result){
@@ -64,28 +62,29 @@ function version(props) {
{item.draft}
- {item.tag_name}{item.draft === "预发行" ?"(standalone)":""}
+ {item.tag_name}
- {truncateCommitId(item.sha)}
+ {truncateCommitId(item.sha)}
})
- {item.user_name}
+
)
@@ -115,7 +112,7 @@ function version(props) {
return (
- 发布{item.name}{item.draft === "预发行" ?"(standalone)版本":""}
+ 发布{item.name}
- {
- (isManager || isDeveloper) && type !==2 &&
-
- }
- {current_user_login == owner && {deleteRelease(item.version_id)}}>}
+ {data && data.user_admin_permission && }
+ {data && data.user_admin_permission && {deleteRelease(item.version_id)}}>}
-
+
showBody(key,item.bodyshow)}>
- - {item.tag_name}.TAR.gz - {item.tag_name}.ZIP -
- {/* 发行版附件下载 */} - {/* {item.attachments.length !=0 &&- 附件： */} + {/* 发行版附件下载 */} {item.attachments && item.attachments.map((item)=>{ - return({item.title}) + return(下载 {item.title}) })} - {/*
} */} + {/* 发行版下载包 */} + 下载 {item.tag_name}.TAR.gz + 下载 {item.tag_name}.ZIP +-
-
- - - 通知 - {messagesCount ? {messagesCount}:""} - -
-
-
+
接收仓库
{transferCount ? {transferCount}:""}
@@ -109,16 +95,10 @@ function Index(props){
return
; }} > - { - return ; - }} - > { - return diff --git a/src/forge/Order/CopyDetail.js b/src/forge/Order/CopyDetail.js index 1f61e7369..906de4be7 100644 --- a/src/forge/Order/CopyDetail.js +++ b/src/forge/Order/CopyDetail.js @@ -1,11 +1,13 @@ -import React, { Component } from "react"; +import React from "react"; import OrderItem from './order_form' -class CopyDetail extends Component { - render() { - return ( -; + return ; }} > - ) - } + + +function CopyDetail(props){ + const operate = props.match.params.operate; + console.log(operate); + return( + + ) } -export default CopyDetail; +export default CopyDetail; \ No newline at end of file diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 8805004b9..b377b6a1d 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -315,7 +315,7 @@ class Detail extends Component { - 标签: + 标记: {data && data.issue_tags ? ( diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index c1c8bdd06..0f5d191e0 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/src/forge/Order/MilepostDetail.js @@ -40,7 +40,7 @@ class MilepostDetail extends Component { issue_type: undefined, status_type: '1', //设置选择高亮 - issue_tag_ids: '标签', + issue_tag_ids: '标记', tracker_ids: '类型', author_ids: '发布人', assigned_to_ids: '负责人', @@ -194,7 +194,7 @@ class MilepostDetail extends Component { done_ratio : undefined, status_id: undefined, assigned_to_id: undefined, - issue_tag_ids: '标签', + issue_tag_ids: '标记', tracker_ids: '类型', author_ids: '发布人', assigned_to_ids: '负责人', @@ -254,7 +254,7 @@ class MilepostDetail extends Component {
-
-
+ {this.state.issue_tag_ids}
diff --git a/src/forge/Order/Nav.js b/src/forge/Order/Nav.js
index b5d196d61..3f5a20c59 100644
--- a/src/forge/Order/Nav.js
+++ b/src/forge/Order/Nav.js
@@ -7,7 +7,7 @@ class Nav extends Component{
const { projectsId , owner } = this.props.match.params;
return(
-
- 标签 + 标记 - 个人信息 -
- -1 ?"active":""}>基本资料 +
- -1 ?"active":""}>基本资料 +
- 消息通知 +
- -1 && pathname.indexOf("/settings/notice/config") == -1) || pathname.indexOf("/settings/notice/privateLetter")>-1 ?"active":""}>我的通知 + {/*
- -1 ?"active":""}>通知管理 */}
- 安全设置 -
- -1 ?"active":""}>SSH密钥 +
- -1 ?"active":""}>SSH密钥
-
- 共{data && data.issue_tags_count}个标签
+ 共{data && data.issue_tags_count}个标记
+
{getFieldDecorator("issue_tag_ids", {rules: []})(
diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index d9d4e49c2..8419fd31c 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -14,6 +14,16 @@ import { Link } from 'react-router-dom';
import './Index.scss';
+const MyNoticeIndex = Loadable({
+ loader: () => import("./notice/myNotice/Index"),
+ loading: Loading,
+});
+
+const NoticeManager = Loadable({
+ loader: () => import("./notice/manager/Index"),
+ loading: Loading,
+});
+
const SSHNew = Loadable({
loader: () => import("./sub/New"),
loading: Loading,
@@ -26,6 +36,12 @@ const SSHIndex = Loadable({
loader: () => import("./sub/SSH"),
loading: Loading,
});
+
+const PrivateLetter = Loadable({
+ loader: () => import("./notice/privateLetter/Index"),
+ loading: Loading,
+});
+
function Index(props){
const { current_user } = props;
const { pathname } = props.location;
@@ -39,18 +55,35 @@ function Index(props){
{current_user && current_user.username}
- -
+
-
+
+
+ )
+}
+export default NoticeManager;
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/notice/manager/Index.scss b/src/forge/SecuritySetting/notice/manager/Index.scss
new file mode 100644
index 000000000..87a77a758
--- /dev/null
+++ b/src/forge/SecuritySetting/notice/manager/Index.scss
@@ -0,0 +1,87 @@
+.notice-manager-tip{
+ font-size:16px;
+ font-weight:400;
+}
+.manager-cont-top{
+ font-size: 14px;
+ font-weight: 600;
+ height: 44px;
+ padding-left: 20px;
+ background: #FAFCFF;
+ border: 1px solid #89a4f7;
+ line-height: 44px;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
+ margin-top: 25px;
+}
+
+.manager-cont{
+ padding: 8px 20px 6px;
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+
+ .manager-cont-title{
+ width: 320px;
+ }
+}
+
+.notice01{
+ .ant-checkbox-disabled.ant-checkbox-checked .ant-checkbox-inner::after {
+ border-color: white;
+ }
+ .ant-checkbox-disabled .ant-checkbox-inner {
+ background-color: #999999 !important;
+ border-color: #999999 !important;
+ }
+
+ .ant-checkbox-checked .ant-checkbox-inner {
+ background-color: #466AFF;
+ border: #466AFF;
+ }
+
+ .ant-checkbox-checked::after{
+ border: 1px solid #466AFF;
+ }
+ .ant-checkbox-wrapper:hover .ant-checkbox-inner, .ant-checkbox:hover .ant-checkbox-inner, .ant-checkbox-input:focus + .ant-checkbox-inner,.ant-radio-checked .ant-radio-inner,.ant-radio-wrapper:hover .ant-radio, .ant-radio:hover .ant-radio-inner, .ant-radio-input:focus + .ant-radio-inner {
+ border-color: #466AFF;
+ }
+
+ .ant-checkbox + span,.manager-cont-title {
+ color: #000000;
+ }
+
+ .ant-radio-inner::after{
+ background-color:#466AFF;
+ }
+
+ .but25{
+ background-color: #466AFF;
+ color: #fff;
+ border-color: #466AFF;
+ &:hover{
+ opacity: 0.8;
+ background-color: #466AFF;
+ border-color: #466AFF;
+ }
+ &:active{
+ opacity: 1;
+ background-color: #466AFF;
+ border-color: #466AFF;
+ }
+ }
+
+ ::-webkit-scrollbar {
+ width: 5px; /*对垂直流动条有效*/
+ }
+ /*定义滑块颜色、内阴影及圆角*/
+ ::-webkit-scrollbar-thumb {
+ border-radius: 6px;
+ box-shadow: inset 0 0 6px #FFF;
+ background-color: #D4D4D4;
+ }
+ ::-webkit-scrollbar-track {
+ box-shadow: inset 0 0 6px #fff;
+ background-color: #FFF;
+ }
+}
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.jsx b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
new file mode 100644
index 000000000..2de2b8c3f
--- /dev/null
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
@@ -0,0 +1,263 @@
+import React, { useState, useEffect } from 'react';
+import { Link } from 'react-router-dom';
+import axios from 'axios';
+import { Badge, Button, Checkbox, Menu, Pagination } from 'antd';
+import DelModal from '../../../Component/ModalFun';
+import NoneData from '../../../Nodata.js';
+import { noticeSourceType } from '../../../common/static';
+import './Index.scss';
+import '../manager/Index.scss'
+
+function MyNotice(props) {
+ let current_user = props.current_user;
+ let resetUserInfo = props.resetUserInfo;
+ //消息悬停框选择tab
+ let popover = props.location.query && props.location.query.noticeType;
+ let pageSize = 15;
+ const [noticeType, setNoticeType] = useState(popover==="atme"?"2":"0");//消息类别tab栏选择
+ const [selectedNum, setSelectedNum] = useState(0);//@我批量删除选择消息条数
+ const [isBatchDelete, setIsBatchDelete] = useState(false);//@我是否批量删除
+ const [batchDeleteCheckedAll, setBatchDeleteCheckAll] = useState(false);//@我批量删除--全选
+
+ const [noticeUnreadCount, setNoticeUnreadCount] = useState();//未读系统通知数量
+ // const [letterUnreadCount, setLetterUnreadCount] = useState(0);//未读私信数量
+ const [atUnreadCount, setAtUnreadCount] = useState();//未读@我数量
+ const [messageList, setMessageList] = useState([]);
+ const [messTotalCount, setMessTotalCount] = useState();//消息总数
+ const [currentPage, setCurrentPage] = useState(1);//当前页数
+ const [onlyUnread, setOnlyUnread] = useState();
+
+ useEffect(()=>{
+ popover==="atme" ? setNoticeType("2"):setNoticeType("0");
+ },[popover])
+
+ useEffect(()=>{
+ resetUserInfo();
+ },[noticeUnreadCount,atUnreadCount])
+
+ useEffect(() => {
+ getMessageList();
+ }, [noticeType, onlyUnread, currentPage, current_user])
+
+ function getMessageList() {
+ const params = {
+ type: noticeType === "0" ? "notification" : noticeType === "2" ? "atme" : "",
+ status: onlyUnread ? onlyUnread : "",
+ limit: pageSize,
+ page: currentPage,
+ };
+ axios.get(`/users/${current_user.login}/messages.json`, {
+ params: params,
+ }).then((response) => {
+ if(response && response.data){
+ setNoticeUnreadCount(response.data.unread_notification);
+ setAtUnreadCount(response.data.unread_atme);
+ setMessageList(response.data.messages);
+ setMessTotalCount(response.data.total_count);
+ }
+ });
+ }
+
+ function readNotice(id){
+ if(id){
+ const params = {
+ type: noticeType === "0" ? "notification" : noticeType === "2" ? "atme" : "",
+ ids:id,
+ };
+ axios.post(`/users/${current_user.login}/messages/read.json`,params).then((response)=>{
+ if(response.status === 200){
+ getMessageList();
+ //已读当前页码最后一条数据时跳转到前一页
+ let totlaPage = Math.ceil((messTotalCount-1)/pageSize);
+ setCurrentPage(currentPage>=totlaPage? totlaPage : currentPage);
+ }
+ });
+ }
+ }
+
+ function handleClick(e) {
+ setNoticeType(e.key);
+ setCurrentPage(1);
+ setOnlyUnread();
+ if (e.key != "2") {
+ setIsBatchDelete(false);
+ }
+ }
+
+ function onChange(e) {
+ var checkboxNum = 0;
+ let messageListNew=messageList.slice();
+ messageListNew.map((item)=>{
+ if(item.id===e.target.value){
+ item.checkedBatch = e.target.checked;
+ }
+ item.checkedBatch?checkboxNum++:"";
+ });
+ setMessageList(messageListNew);
+ setSelectedNum(checkboxNum);
+ setBatchDeleteCheckAll(checkboxNum === messageList.length);
+ }
+
+
+ function onChangeAll(e) {
+ setBatchDeleteCheckAll(e.target.checked);
+ setSelectedNum(e.target.checked?messageList.length:0);
+ let messageListNew=messageList.slice();
+ messageListNew.map((item)=>{
+ item.checkedBatch = e.target.checked;
+ });
+ setMessageList(messageListNew);
+ }
+
+ function deleteNotice(id) {
+ const ids = [];
+ if(!id){
+ messageList.map(item=>{
+ item.checkedBatch && ids.push(item.id);
+ });
+ }
+ DelModal({
+ title: noticeType === "1" ? '删除私信用户' : id ? '删除消息' : '批量删除',
+ contentTitle: noticeType === "1" ? '您确定要删除与 xxx 的聊天吗？' : id ? '您确定要删除这条@我消息吗？' : '您确定要删除选中的' + selectedNum + '条消息吗？',
+ content: noticeType === "1" ? '此操作将删除与xxx的聊天框和xxx的所有聊天记录，请进行确认以防数据的丢失' : id ? '此操作将删除这条消息，请进行确认以防数据的丢失' : '此操作将删除选中的' + selectedNum + '条消息，请进行确认以防数据的丢失',
+ onOk: () => {
+ const params = {
+ type: noticeType === "0" ? "notification" : noticeType === "2" ? "atme" : "",
+ ids:id?id:ids,
+ };
+ axios.delete(`/users/${current_user.login}/messages.json`,{
+ data:params,
+ }).then((response)=>{
+ if(response.status === 200){
+ getMessageList();
+ //删除当前页码最后一条数据时跳转到前一页
+ let totlaPage = Math.ceil((messTotalCount-1)/pageSize);
+ setCurrentPage(currentPage>=totlaPage? totlaPage : currentPage);
+ setSelectedNum(0);
+ setBatchDeleteCheckAll(false);
+ }
+ });
+ }
+ });
+ }
+
+ function cancelBatchDelete(){
+ setIsBatchDelete(false);
+ setSelectedNum(0);
+ //取消选中效果
+ let messageListNew=messageList.slice();
+ messageListNew.map((item)=>{
+ item.checkedBatch = false;
+ });
+ setMessageList(messageListNew);
+ setBatchDeleteCheckAll(false);
+ }
+
+ //跳转到消息详情页面
+ function turnToMess(item){
+ if(item.notification_url){
+ window.open(`${item.notification_url}`);
+ readNotice([item.id]);
+ }
+ }
+
+ return (
+
+ 通知管理
+
+
+ 您可以通过通知管理来选择接受通知的方式
+
+
+ 我创建或负责的
+
+
+ 站内信
+ 邮件
+
+ 易修状态变更
+
+ 站内信
+ 邮件
+
+ 易修截止日期到达最后一天
+
+ 站内信
+ 邮件
+
+ 合并请求状态变更
+
+ 站内信
+ 邮件
+
+ 易修有新的评论
+
+ 站内信
+ 邮件
+
+
+ 合并请求有新的评论
+
+ 我管理的仓库
+
+
+ 站内信
+ 邮件
+
+ 被关注
+
+ 站内信
+ 邮件
+
+ 被点赞
+
+ 站内信
+ 邮件
+
+ 被复刻
+
+ 站内信
+ 邮件
+
+
+ 有新的里程碑
+
+ 我关注的仓库
+
+
+ 站内信
+ 邮件
+
+ 被删除
+
+ 站内信
+ 邮件
+
+ 被转移
+
+ 站内信
+ 邮件
+
+ 有新的易修
+
+ 站内信
+ 邮件
+
+ 有新的合并请求
+
+ 站内信
+ 邮件
+
+ 有新的版本发布
+
+
+ )
+}
+export default MyNotice;
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.scss b/src/forge/SecuritySetting/notice/myNotice/Index.scss
new file mode 100644
index 000000000..8eab84c0c
--- /dev/null
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.scss
@@ -0,0 +1,259 @@
+.whiteBack .boies .sshHead{
+ padding:0 10px 0px 0px;
+}
+.sshHead{
+ .ant-badge{
+ font-size: 16px;
+ color: #333333;
+ }
+ .ant-menu-item{
+ padding:0px;
+ margin-right:34px!important;
+ height: 34px;
+ width: 64px;
+ text-align: center;
+ line-height: 0px;
+ position: relative;
+ }
+
+ li.ant-menu-item, .ant-menu-horizontal > .ant-menu-item {
+ border-bottom: 0px;
+ }
+
+ & .ant-menu-item-selected{
+ color: #333333;
+ font-weight: 400;
+ text-shadow: 0.5px 0 #333;
+ border-bottom: 2px solid #2A61FF !important;
+ }
+
+ .ant-badge-count, .ant-badge-dot, .ant-badge .ant-scroll-number-custom-component {
+ right: -6px;
+ -webkit-box-shadow: 0 0 0 0;
+ box-shadow: 0 0 0 0;
+ }
+ .ant-badge-multiple-words {
+ padding: 0 0px;
+ }
+
+ .ant-menu-horizontal {
+ border-bottom: 0px solid #e8e8e8;
+ }
+
+ button{
+ padding:0 5px;
+ }
+}
+
+button {
+ color: #333333;
+ background: #FAFBFC;
+ border: 1px solid #D0D0D0;
+ border-radius: 4px;
+ height: 32px;
+}
+button:hover {
+ background: #F3F4F6;
+}
+button:active {
+ background: #EBECF0;
+}
+
+.deleteBut{
+ color: #DF0002;
+}
+
+.deleteBut:hover{
+ background: #DF0002;
+ border: 1px solid #DF0002;
+ color:#FFFFFF;
+}
+
+.deleteBut:active{
+ background: #CE0002;
+ border: 1px solid #CE0002;
+ color:#FFFFFF;
+}
+
+.mynotice-content {
+ justify-content: space-between;
+ padding: 15px 0 15px 10px;
+ border-bottom: 1px solid #EEEEEE;
+ color: #333333;
+ &:hover{
+ background: #F3F4F6;
+ }
+
+ & img{
+ cursor: pointer;
+ }
+
+ & b{
+ font-weight: 400;
+ text-shadow: 0.5px 0 #333;
+ }
+
+ & .invisable-read{
+ display: none;
+ }
+
+ &:hover .invisable-read{
+ display: block;
+ color: #466AFF;
+ opacity: 0.6;
+ cursor: pointer;
+
+ &:hover{
+ opacity: 1;
+ }
+ }
+
+ &:hover .timeSpan{
+ display: none;
+ }
+
+ i{
+ font-size: 16px !important;
+ margin-right: 5px;
+ }
+
+ .boldSpan{
+ font-weight: 400;
+ text-shadow: 0.5px 0 0 #333;
+ margin: 0 8px;
+ }
+ & .currentImg{
+ width: 40px;
+ height: 40px;
+ margin-left: 0px;
+ }
+
+ & .private-letter-img + .ant-badge-count{
+ top: 2px;
+ right: 5px;
+ height: 18px;
+ min-width: 18px;
+ line-height: 18px;
+ padding: 0 0;
+ }
+
+ & .highlightSpan:hover{
+ color: #466AFF;
+ cursor: pointer;
+ }
+
+ .mynotice-cont{
+ padding:0;
+ cursor: default;
+ & .visible-checkbox{
+ margin-right: 10px;
+ }
+ & .invisible-checkbox{
+ display: none;
+ }
+ .atme-notice-text{
+ margin-left: 6px;
+
+ & .atme-notice-name{
+ margin: 0 0 ;
+ }
+
+ & .atme-length{
+ max-width: 48rem;
+ word-break: break-all;
+ }
+ }
+ }
+
+ & .ant-badge-count, .ant-badge-dot, .ant-badge .ant-scroll-number-custom-component {
+ -webkit-box-shadow: 0 0 0 0;
+ box-shadow: 0 0 0 0;
+ top: 3px;
+ right: 4px;
+ min-width: 8px;
+ height: 8px;
+ }
+
+ & .system-notice-blank{
+ margin-right: 14px;
+ }
+}
+
+.batchDel{
+ & .currentImg, & .atme-notice-text{
+ pointer-events: none;
+ }
+}
+
+.baselineDiv{
+ align-items: baseline;
+}
+
+.invisible {
+ display: none;
+}
+
+.visible {
+ display: flex;
+ justify-content: space-between;
+ height: 30px;
+ padding: 0 10px;
+ color: #333333;
+ margin-bottom: 5px;
+ button{
+ padding:0px 12px;
+ }
+ .batchDeleteBut{
+ border:1px solid #466AFF;
+ color: #466AFF;
+ }
+}
+
+.private-letter-right {
+ flex: auto;
+ margin: 0px 10px 0 16px;
+ & div{
+ display: flex;
+ justify-content: space-between;
+ }
+}
+
+.letter-length-limit{
+ max-width: 50rem;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+
+.sysNotice-length{
+ max-width: 52rem;
+ word-break: break-all;
+}
+
+
+.numberSpan{
+ color: #466AFF;
+}
+
+.vertical-center-style{
+ display: flex;
+ align-items: center;
+}
+
+.stretch-style{
+ display: flex;
+ align-items: baseline;
+}
+
+.float-left-little{
+ margin-right: 10px;
+}
+
+.float-right-little{
+ margin-left: 12px;
+}
+
+.paging{
+ text-align: center;
+ margin: 12px;
+}
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/notice/privateLetter/Index.jsx b/src/forge/SecuritySetting/notice/privateLetter/Index.jsx
new file mode 100644
index 000000000..517583770
--- /dev/null
+++ b/src/forge/SecuritySetting/notice/privateLetter/Index.jsx
@@ -0,0 +1,200 @@
+import React, { useState, useEffect } from 'react';
+import './Index.scss'
+import '../manager/Index.scss'
+import { Button, Input, Icon, Badge } from 'antd';
+import { Link } from 'react-router-dom';
+
+function PrivateLetter(props){
+
+ const { TextArea,Search } = Input;
+
+ function deleteNotice(){
+ alert("删除消息");
+ }
+
+ return(
+
+
+ {(noticeType==="0" && noticeUnreadCount>0) || (noticeType==="2"&& atUnreadCount>0) ? :""}
+
+
+
+
+
+ {messageList && messageList.length===0 ?
+ {onlyUnread===1 || messageList && messageList.length>0 ? e.target.checked ? setOnlyUnread(1) : setOnlyUnread()}>仅看未读{noticeType === "1" ? `私信（12）` : noticeType === "0" ? `消息（${noticeUnreadCount}）` : `消息（${atUnreadCount}）`} :""}
+
+ {noticeType === "2" && messageList && messageList.length > 0 ? : ""}
+
+
}
+
+ {messageList && messageList.map(item => {
+ // 系统消息
+ if (noticeType === "0") {
+ // 消息类别
+ return (
+
+ 全选
+ 已选择 {selectedNum} 项
+
+
+
+
+
+
+
+ )
+ } else if (noticeType === "2") {
+ //@我
+ return (
+
+ {item.status === 1 ?
+
+ {item.time_ago}
+ {item.status === 1 && readNotice([item.id])}>标记为已读}
+
+
+
+ )
+ } else{
+ //私信
+ {/*
+ 
{window.open(`/${item.sender && item.sender.login}`);}}/>}
+
+ {turnToMess(item)}}>
+ {item.status === 1 ?
+
+ {item.time_ago}
+ {!isBatchDelete && item.status === 1 && readNotice([item.id])}>标记为已读}
+ {!isBatchDelete && deleteNotice([item.id])}>删除}
+
+
+ 
*/}
+ }
+ })}
+
+ {/* 分页 */}
+ {!isBatchDelete &&
+
+
+ props.history.push('/settings/notice/privateLetter')}>
+ 最好的OpenStack控制台，对标OpenStack社区Horizon项目,最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。
+
+
+ {setCurrentPage(page)}}
+ total = {messTotalCount}
+ hideOnSinglePage
+ >
+
}
+
+
+ )
+}
+export default PrivateLetter;
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/notice/privateLetter/Index.scss b/src/forge/SecuritySetting/notice/privateLetter/Index.scss
new file mode 100644
index 000000000..6276b7a21
--- /dev/null
+++ b/src/forge/SecuritySetting/notice/privateLetter/Index.scss
@@ -0,0 +1,192 @@
+.private-letter{
+ border-radius: 4px 4px 0px 0px;
+ border: 1px solid rgba(151, 151, 151, 0.24);
+ display: flex;
+
+ .currentImg{
+ width: 40px;
+ height: 40px;
+ margin-left: 0px;
+ }
+ & .private-letter-img + .ant-badge-count{
+ top: 2px;
+ right: 5px;
+ }
+}
+
+.pl-content{
+ flex: auto;
+ .pl-name{
+ height: 3rem;
+ border-bottom: 1px solid #EEEEEE;
+
+ &>a{
+ position: relative;
+ left: 26px;
+ color:#999999;
+ }
+ span{
+ font-size: 16px;
+ font-weight: 600;
+ color: #333333;
+ flex: auto;
+ text-align: center;
+ }
+ }
+ .plcontent-list{
+ height: 24rem;
+ padding:20px;
+ overflow-y: scroll;
+
+ .plclo{
+ margin-bottom: 30px;
+ }
+
+ .notice-my{
+ flex-direction: row-reverse;
+
+ & .pld01{
+ left: 0;
+ }
+ }
+
+ & .notice-content{
+ padding:8px 10px;
+ background: #F4F4F4;
+ border-radius:5px;
+ position: relative;
+ max-width: 20rem;
+
+ .pld01{
+ display: none;
+
+ }
+ &:hover .pld01{
+ display: block;
+ position: absolute;
+ right: 0;
+ bottom: -2em;
+ color: #999999;
+ font-size: 12px;
+ &:hover{
+ color: #666666;
+ }
+ }
+ }
+
+ & .message-bubble{
+ position:relative;
+ width:0;
+ height:0;
+ font-size:0;
+ border:solid 8px;
+ border-color:#FFFFFF #FFFFFF #FFFFFF #F4F4F4;
+ }
+
+ & .mb-other{
+ border-color:#FFFFFF #F4F4F4 #FFFFFF #FFFFFF;
+ }
+
+ & span{
+ margin: 0 10px;
+ font-size: 12px;
+ color: #999999;
+ line-height: 17px;
+ }
+ }
+ .private-letter-present{
+ padding:20px 20px;
+ & div{
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ flex: auto;
+ }
+ .private-letter-cont-mt25{
+ margin-top: 8px;
+ padding:0 22px;
+ }
+
+ .private-letter-cont, .private-letter-cont .ant-input-suffix{
+ background-color: #fafafa !important;
+ margin-left: 17px;
+ }
+
+ .private-letter-cont{
+ resize:none;
+ &:hover,&:focus{
+ background-color: #fafafa !important;
+ }
+ }
+ }
+}
+
+.pl-list{
+ width: 30%;
+ border-left: 1px solid #EEEEEE;
+ .list-sort{
+ justify-content: center;
+ height: 3rem;
+ border-bottom: 1px solid #EEEEEE;
+ & .ant-btn-primary{
+ width: 2.3rem;
+ color: #466AFF;
+ background: #eff2ff;
+ border: 1px solid rgba(151, 151, 151, 0.24);
+ }
+
+ & .ant-btn{
+ padding: 0;
+ }
+
+ // & .ant-input:hover{
+ // border: 1px solid red !important;
+ // }
+ }
+
+ .list-scroll{
+ height: 32.4rem;
+ overflow-y: scroll;
+ }
+
+ .list-scroll-content{
+ padding: 10px 10px 15px 15px;
+ border-bottom: 1px solid #EEEEEE;
+ // &:last-child{
+ // border-bottom: 0px;
+ // }
+ &:hover{
+ background: #F3F4F6;
+ }
+ & a{
+ display: none;
+ }
+ &:hover a{
+ display: block;
+ color: #466AFF;
+ }
+ }
+
+ .ls-cont{
+ width: 13rem;
+ // flex: auto;
+ margin-left: 15px;
+ justify-content: space-between;
+ & .ls-content-span{
+ max-width: 11rem;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+}
+
+.vertical-center-style{
+ display: flex;
+ align-items: center;
+}
+
+img{
+ width: 45x;
+ height: 45px;
+}
diff --git a/src/forge/SecuritySetting/sub/New.jsx b/src/forge/SecuritySetting/sub/New.jsx
index 68a65db37..409098e0b 100644
--- a/src/forge/SecuritySetting/sub/New.jsx
+++ b/src/forge/SecuritySetting/sub/New.jsx
@@ -34,7 +34,7 @@ function New({ form , showNotification , history }) {
return(
+
+
+
+ 蒋宇航
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ onSearch={value => console.log(value)}
+ style={{ width: 265 }}
+ />
+
+
+
+
+
+
+
+
+ 蒋宇航
+ 4分钟前
+
+
+ 最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。
+ 删除
+
+
+
+
+
+
+ 蒋宇航
+ 4分钟前
+
+
+ 最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。
+ 删除
+
+
+
+
+
+
+ 蒋宇航
+ 4分钟前
+
+
+ 最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。
+ 删除
+
+
+
+
+
+
+ 蒋宇航
+ 4分钟前
+
+
+ 最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。
+ 删除
+
+
+
+
+
+
+ 蒋宇航
+ 4分钟前
+
+
+ 最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。
+ 删除
+
+
+
+
+
+
+ 蒋宇航
+ 4分钟前
+
+
+ 最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。
+ 删除
+
+
+
+
+
+
+ 蒋宇航
+ 4分钟前
+
+
+ 最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。
+ 删除
+
+
+
+
+
+
+ 蒋宇航
+ 4分钟前
+
+
+ 最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。
+ 删除
+
+
+
+
+
+
+ 蒋宇航
+ 4分钟前
+
+
+ 最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。
+ 删除
+
+
+
+
+
+
+ 蒋宇航
+ 4分钟前
+
+
+ 最好的OpenStack控制台，对标OpenStack社区Horizon项目，在易用性、页面性能等方面进行深度优化，提供简单控制台。
+ 删除
+
+
- SSH密钥添加SSH密钥
+ SSH密钥添加SSH密钥
- SSH密钥
-
+ SSH密钥
+
{
list && list.length > 0 &&
@@ -64,7 +64,7 @@ function SSH(props) {
{
list.map((i,k)=>{
return(
- {setContent(i);setVisibleDesc(true)}}>{i.name}
diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js index 3ebb5b49a..fe546cdf4 100644 --- a/src/forge/Settings/Index.js +++ b/src/forge/Settings/Index.js @@ -102,8 +102,8 @@ class Index extends Component { >- - 项目标签 + + 项目标记
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index c3150323f..b1af2f998 100644 --- a/src/forge/Settings/Setting.js +++ b/src/forge/Settings/Setting.js @@ -295,23 +295,23 @@ class Setting extends Component {合并请求事件
diff --git a/src/forge/Settings/new_tags.js b/src/forge/Settings/new_tags.js index bc763f9c8..ed9269cbb 100644 --- a/src/forge/Settings/new_tags.js +++ b/src/forge/Settings/new_tags.js @@ -348,7 +348,7 @@ class NewTags extends Component {
- 共{data && data.issue_tags_count}个标签
+ 共{data && data.issue_tags_count}个标记
-
- 标签 + 标记 @@ -423,11 +423,11 @@ class NewTags extends Component { className="flex-a-center baseForm bbr" style={{ "justify-content": "space-between" }} > - 项目标签 + 项目标记 {data && data.user_admin_or_member ? ( ) : ( "" @@ -442,7 +442,7 @@ class NewTags extends Component { rules: [ { required: true, - message: "请填写标签名字", + message: "请填写标记名字", }, ], })()} @@ -481,7 +481,7 @@ class NewTags extends Component { onClick={this.createtagpost} className="fr" > - 创建标签 + 创建标记 {/* 创建标签 */} @@ -497,7 +497,7 @@ class NewTags extends Component {
- {OIdentifier}
+ {detail && detail.organization && detail.organization.nickname}
{detail ? detail.name : "新建团队"}
diff --git a/src/forge/comments/comments.js b/src/forge/comments/comments.js
index 7de4bdbd2..c27bb12af 100644
--- a/src/forge/comments/comments.js
+++ b/src/forge/comments/comments.js
@@ -198,7 +198,7 @@ class comments extends Component {
{item.value && item.value.length > 0 ? (
- item.detail === "标签" ? (
+ item.detail === "标记"? (
-1) {
+ actionUrl = developUrl;
+ } else if(window.location.href.indexOf('testforgeplus')>-1){
+ actionUrl = testUrl;
+ axios.defaults.withCredentials = true;
+ }else if (window.location.href.indexOf('forgeplus') > -1) {
+ actionUrl = productUrl;
+ axios.defaults.withCredentials = true;
+ }
+
+ // 创建axios实例
+ const service = axios.create({
+ baseURL: actionUrl,
+ timeout: 10000, // 请求超时时间
+ });
+
+ // request拦截器
+ service.interceptors.request.use(config => {
+ if (cookie.load(TokenKey)) {
+ console.log(cookie.load(TokenKey));
+ config.headers['Authorization'] = cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改
+ }
+ if (window.location.port === "3007") {
+ // 模拟token为登录用户
+ const token = sessionStorage.token;
+ if (config.url.indexOf('?') === -1) {
+ config.url = `${config.url}?token=${token}`;
+ } else {
+ config.url = `${config.url}&token=${token}`;
+ }
+ }
+ return config;
+ }, error => {
+ console.log(error); // for debug
+ // Promise.reject(error);
+ });
+ // respone拦截器
+ service.interceptors.response.use(
+ response => {
+ const res = response||{};
+ if (res.status === 400) {
+ message.error(res.data.message || '操作失败');
+ return Promise.reject('error');
+ }
+ if (res.status === 401) {
+ message.error(res.data.message || '登录信息已过期');
+ return Promise.reject('error');
+ }
+ if (res.status === 403) {
+ message.error(res.data.message || '无权限！');
+ return Promise.reject('error');
+ }
+ if (res.status === 40001) {
+ notification.open({
+ message: "提示",
+ description: '账户或密码错误！',
+ });
+ return Promise.reject('error');
+ }
+ if (response.status !== 200 && res.status !== 200) {
+ notification.open({
+ message: "提示",
+ description: res.message,
+ });
+ } else {
+ return response.data;
+ }
+ },
+ error => {
+ console.log(error);
+ let res = error.response||{};
+ if (res.status === 400) {
+ message.error(res.data.message || '操作失败');
+ return Promise.reject('error');
+ }
+ if (res.status === 401) {
+ message.error(res.data.message || '登录信息已过期');
+ Login();
+ return Promise.reject('error');
+ }
+ if (res.status === 403) {
+ message.error(res.data.message || '无权限！');
+ return Promise.reject('error');
+ }
+ notification.open({
+ message: "提示",
+ description: error.message,
+ });
+ return Promise.reject(error);
+ }
+ );
+
+ console.log(service);
+ console.log(typeof service);
+
+ return {service,actionUrl};
+}
\ No newline at end of file
diff --git a/src/forge/users/Material/Base.jsx b/src/forge/users/Material/Base.jsx
index 5f776f8db..f9707ab0d 100644
--- a/src/forge/users/Material/Base.jsx
+++ b/src/forge/users/Material/Base.jsx
@@ -125,7 +125,7 @@ export default Form.create()(
-
+
+
+
+
{
key === "0" ?
diff --git a/src/forge/users/Material/Index.scss b/src/forge/users/Material/Index.scss
index b24d3eb19..f4e79a52b 100644
--- a/src/forge/users/Material/Index.scss
+++ b/src/forge/users/Material/Index.scss
@@ -19,6 +19,12 @@
.ant-menu-item{
a{
font-size: 16px;
+ color: #333333;
+ position: relative;
+ bottom: -10px;
+ }
+ a:hover{
+ color: #333333;
}
}
}
\ No newline at end of file
diff --git a/src/forge/users/Material/Password.jsx b/src/forge/users/Material/Password.jsx
index 12b31ac53..d7a2abc6a 100644
--- a/src/forge/users/Material/Password.jsx
+++ b/src/forge/users/Material/Password.jsx
@@ -89,7 +89,7 @@ export default Form.create()(
-
+
diff --git a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
index 4f1e6d813..d6df12c4e 100644
--- a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
+++ b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
@@ -53,8 +53,6 @@ class CompetitionContentspdfpeopledata extends Component {
let url = `/users/accounts/${id}.json`;
axios.get(url).then((result) => {
if (result.data) {
- console.log("GetuseridApi");
- console.log(result.data);
this.setState({
userdata:result.data
})