+ {
const [isSpin, setIsSpin] = useState(true);
const { sha , projectsId, owner } = match.params;
+ const [ dropLoading, setDropLoading] = useState(false); //加载loading
+ const limit = 100;
+ const fRef = useRef();
+
+ useEffect(()=>{
+ window.addEventListener("scroll",scrollListener);
+ return ()=>{window.removeEventListener("scroll",scrollListener);}
+ },[])
+
+ const scrollListener=()=>{
+ let scrollHeight = document.documentElement.scrollHeight;
+ let clientHeight = document.documentElement.clientHeight;
+ let scrollTop = document.documentElement.scrollTop;
+ if(Math.ceil(scrollTop+clientHeight) >= scrollHeight-5){
+ InitDiffData();
+ }
+ }
+
useEffect(()=>{
if(projectDetail){
const { author, name} = projectDetail;
@@ -66,17 +84,18 @@ export default (props) => {
useEffect(() => {
if (projectsId && owner && sha) {
+ InitDiffData();
+
const url = `/${owner}/${projectsId}/commits/${sha}.json`;
axios
.get(url)
.then(result => {
if (result) {
- setData(result.data);
+ // setData(result.data);
setCommit(result.data.commit);
setParents(result.data.parents);
setCommitter(result.data.committer || (result.data.commit && result.data.commit.committer));
setIsSpin(false);
-
}
})
.catch(error => {
@@ -84,6 +103,28 @@ export default (props) => {
});
}
}, [projectsId , owner, sha]);
+
+ async function InitDiffData (){
+ let f = fRef.current ? fRef.current.files : [];
+ let p = fRef.current ? fRef.current.page : 1;
+ let hm = fRef.current ? fRef.current.hasMore : true;
+ if (!hm || dropLoading || !isSpin) {
+ return;
+ }
+ setDropLoading(true);
+ const url = `/v1/${owner}/${projectsId}/commits/${sha}/files.json`;
+ await axios.get(url,{
+ params:{page:p,limit}
+ }).then(res=>{
+ if(res && res.status === 200){
+ let arr = p === 1 ? res.data.files : [...f,...res.data.files];
+ setData(res.data);
+ fRef.current = {files:arr,page:p+1,hasMore:arr.length === limit};
+ setDropLoading(false);
+ }
+ })
+ }
+
return (
@@ -132,10 +173,13 @@ export default (props) => {
0 && parents[0].sha}
+ mergeId={`commits/${sha}`}
/>
+ { dropLoading &&
);
diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index 9f83a55f4..f1ebc1094 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -513,6 +513,7 @@ class CreateMerge extends Component {
changeCommitFunc={this.changeCommitFunc}
comparesData={comparesData}
pullOwnerLogin={pullOwnerLogin}
+ branchParams = {getBranchParams(this.props.location.pathname)}
>
)}
diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 4610a1b77..88108bf90 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -1,20 +1,19 @@
import React ,{useEffect,useState } from 'react';
-import { truncateCommitId } from '../common/util';
import { AlignCenter , FlexAJ } from '../Component/layout';
-import { Tooltip,Progress } from 'antd';
+import { Tooltip , Progress } from 'antd';
import './merge.css';
import './Index.scss';
+import FileDrop from './components/fileDrop';
-function Files({ data,history,owner,projectsId , parentsSha }){
- const [ files , setFiles ] = useState(data && data.files);
- const [ copyfileTipTitle, setCopyfileTipTitle] = useState("复制文件路径");
+function Files({ data , filesData , history,owner,projectsId , parentsSha , mergeId }){
+ const [ files , setFiles ] = useState(filesData);
const [ isOpen, setIsOpen] = useState(false);
useEffect(()=>{
- if(data){
- setFiles(data.files);
+ if(filesData){
+ setFiles(filesData);
}
- },[data]);
+ },[filesData]);
useEffect(()=>{
document.addEventListener('click',()=>{setIsOpen(false)})
@@ -29,33 +28,22 @@ function Files({ data,history,owner,projectsId , parentsSha }){
}
}
- function copyFileName(fileName){
- var copyCont = document.createElement('input');
- copyCont.defaultValue = fileName;
- document.body.appendChild(copyCont);
- copyCont.select(); // 选择对象
- document.execCommand("Copy"); // 执行浏览器复制命令
- copyCont.className = 'copyCont';
- copyCont.style.display='none';
- setCopyfileTipTitle("复制成功");
- }
-
const folderOpen = (
+ {getFieldDecorator('psdComfirm', {
+ rules: [
+ {
+ required: true,
+ message: "请确认登录密码"
+ },
+ {
+ validator: (rule, value, callback) => { comfirmPassWord(rule, value, callback, 2) }
+ }
+ ],
+ validateTrigger: "onBlur",
+ validateFirst: true,
+ })( } />)}
+
+
+ {/*
+ {getFieldDecorator('agreement', {
+ valuePropName: 'checked',
+ initialValue: false,
+ rules: [
+ {
+ validator: (rule, value, callback) => { comfirmRead(rule, value, callback) }
+ }
+ ],
+ })(我已阅读并接受《软件发展新技术服务协议条款》 )}
+ */}
+
+
+
+ )
+}
+export default Form.create({ name: 'register' })(Register);
\ No newline at end of file
diff --git a/src/modules/loginRegister/ResetPasswordNew.jsx b/src/modules/loginRegister/ResetPasswordNew.jsx
new file mode 100644
index 000000000..5556883b2
--- /dev/null
+++ b/src/modules/loginRegister/ResetPasswordNew.jsx
@@ -0,0 +1,270 @@
+import React, { useEffect, useRef, useState } from "react";
+import { Form, Input, Button, message } from "antd";
+import { Link } from "react-router-dom";
+import axios from 'axios';
+import { setmiyah } from 'educoder';
+import './LoginRegisterPageNew.scss';
+import { Encrypt } from "../../common/Env";
+
+function ResetPassword(props) {
+ const {form, mygetHelmetapi } = props;
+ const {getFieldDecorator } = form;
+ const [emailStr, setEmailStr] = useState(undefined);
+ const [secondsStr, setSecondsStr] = useState(60);
+ const [countDown, setCountDown] = useState(false);
+ const [getCaptchaBut, setGetCaptchaBut] = useState(false);
+ const [mess, setMess] = useState(undefined);
+ const [tipVisable, setTipVisable] = useState(false);
+ //用于限制表单提交时会再次调用check.json接口校验数据
+ const [emailGo, setEmailGo] = useState(true);
+ const seconds = useRef();
+ let interval = undefined;
+
+ // 配置网页标题
+ useEffect(()=>{
+ if(mygetHelmetapi){
+ const {name} = mygetHelmetapi;
+ document.title = name;
+ }
+ }, [mygetHelmetapi])
+
+ //重置密码表单提交
+ function handleSubmit() {
+ form.validateFieldsAndScroll((err, values) => {
+ if (!err) {
+ axios.post(`/accounts/reset_password.json`, {
+ login: values.email,
+ password: Encrypt(values.psd),
+ password_confirmation: Encrypt(values.psdComfirm),
+ code: values.captcha,
+ }).then((response) => {
+ if (response.data.status === 0) {
+ //重置密码成功，调用登录接口
+ axios.post(`/accounts/login.json`, {
+ login: values.email,
+ password: Encrypt(values.psd)
+ }).then((login_response) => {
+ if (!login_response.data.login) {
+ setMess(login_response.data.message);
+ } else {
+ window.location.href = "/" + login_response.data.login;
+ }
+ }).catch((error) => {
+ console.log('error',error);
+ })
+ } else {
+ //设置邮箱内容-》不设置会被恢复成undefined,从而点击验证码失败
+ setEmailStr(values.email);
+ const message = response.data.message;
+ message === "验证码不正确" ? form.setFields({captcha: {value:values.captcha,errors:[new Error('验证码错误，请重新输入')]}}) : setMess(message);
+ }
+ })
+ }
+ });
+ }
+
+ //判断邮箱/手机号是否符合规范、是否注册
+ function emailConfirm(rule, value, callback) {
+ if(/^([1][3456789])\d{9}$/.test(value) || /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(value)){
+ setEmailGo(true);
+ if(value && (emailGo || value !== emailStr)){
+ axios.get(`/accounts/valid_email_and_phone.json`, {
+ params: {
+ login: value,
+ type: 2
+ }
+ }).then(response => {
+ if (response.data && !response.data.status) {
+ setEmailStr(value);
+ setGetCaptchaBut(true);
+ setEmailGo(false);
+ callback();
+ } else {
+ setGetCaptchaBut(false);
+ callback('此手机号/邮箱未注册');
+ }
+ })
+ }else{
+ callback()
+ }
+ // setEmailStr(undefined);
+ }else{
+ callback("请输入正确的手机号/邮箱")
+ }
+ }
+
+ //确认密码
+ function comfirmPassWord(rule, value, callback, index) {
+ if ((index === 2 && value && form.getFieldValue('psd') && value !== form.getFieldValue('psd')) || (index === 1 && value && form.getFieldValue('psdComfirm') && value !== form.getFieldValue('psdComfirm'))) {
+ if(index===1){
+ form.setFields({psdComfirm: {value:form.getFieldValue('psdComfirm'),errors:[new Error('密码不一致，请重新输入')]}});
+ callback();
+ }else{
+ callback('密码不一致，请重新输入');
+ }
+ } else {
+ callback();
+ }
+ }
+
+ //检查密码是否符合格式
+ function checkPassWord(rule, value, callback){
+ if(!value){
+ setTipVisable(true);
+ callback('请输入新密码');
+ }else if(/(?!.*\s)(?!^[\u4e00-\u9fa5]+$)^.{8,16}$/.test(value)){
+ callback()
+ }else{
+ setTipVisable(true);
+ if(value.length<8 || value.length>16){
+ callback('密码长度为8-16个字符');
+ }else{
+ callback('密码不能使用空格');
+ }
+ }
+ }
+
+ //获取验证码
+ function getCaptcha() {
+ setMess(undefined);
+ if (emailStr) {
+ // 倒计时开始
+ setCountDown(true);
+ setGetCaptchaBut(false);
+ seconds.current = 60;
+ setSecondsStr(60);
+ !interval && clearInterval(interval);
+ interval = setInterval(() => {
+ if (seconds.current > 1) {
+ let oldSeconds = seconds.current;
+ seconds.current = oldSeconds - 1;
+ setSecondsStr(oldSeconds - 1);
+ } else {
+ //倒计时结束->可以获取验证码
+ setGetCaptchaBut(true);
+ setCountDown(false);
+ clearInterval(interval);
+ }
+ }, 1000)
+
+ //请求获取验证码接口
+ axios.get(`/accounts/get_verification_code.json`, {
+ params: {
+ login: emailStr,
+ type: 2,
+ smscode: setmiyah(emailStr),
+ }
+ }).then(response => {
+ if (response.data && response.data.status === 0) {
+ //验证码发送成功
+ let email = emailStr.substring(emailStr.indexOf("@")+1);
+ message.success({content:验证码已发送，请注意查收。{emailStr.indexOf("@") === -1 ? '' : 前往邮箱}});
+ } else {
+ //验证码发送失败,获取验证码按钮变灰并且文案变回【获取验证码】
+ setGetCaptchaBut(false);
+ setCountDown(false);
+ clearInterval(interval);
+ setMess(response.data.message);
+ }
+ })
+ }
+ }
+
+ //清除密码框的value属性->DOM看不见密码值
+ function clear(){
+ const password = document.getElementById("resetPassword_psd");
+ const passwordComfirm = document.getElementById("resetPassword_psdComfirm");
+ if(password && password.type==="password"){
+ setTimeout(()=>{
+ password.removeAttribute('value');
+ },0)
+ }
+ if(passwordComfirm && passwordComfirm.type==="password"){
+ setTimeout(()=>{
+ passwordComfirm.removeAttribute('value');
+ },0)
+ }
+ }
+
+ return (
+
+ 
+ 支持持续成长演化的软件平台
+ 群智开发
+
{isRender === true ?
文件加载中...
}
{files && files.map((item, key) => {
return (
- {item.flag && showDown(item.flag, key, item.isBin);setIsOpen(false);}}>
+ {item.flag && showDown(item.flag, key, item.is_bin);setIsOpen(false);}}>
- {item.name}
+ {item.filename}
@@ -66,22 +54,17 @@ function Files({ data,history,owner,projectsId , parentsSha }){
)
- function subStrContent(content){
- return content ? content.slice(1) :"";
- }
return(
- 0 ? "：":""}${item.addition>0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${item.deletion>0?item.deletion+"处删除":""}`}>
-
{e.nativeEvent.stopImmediatePropagation()}}>
-
- {setIsOpen(!isOpen)}}>
+
{
@@ -92,57 +75,7 @@ function Files({ data,history,owner,projectsId , parentsSha }){
return(
@@ -193,12 +222,17 @@ class MergeFooter extends Component {
}
key="3"
>
-
-
- {data.pull_request && data.pull_request.fork_project_user}: {data.pull_request && data.pull_request.head}
-
+ {
+ (data.pull_request.fork_project_user || data.issue.author_name!=="已注销") ?
+
+ {data.pull_request && (data.pull_request.is_original ? data.pull_request.fork_project_user:data.issue.author_name)}: {data.pull_request && data.pull_request.head}
+
+ :
+
+ {data.pull_request && (data.pull_request.is_original ? data.pull_request.fork_project_user:data.issue.author_name)}: {data.pull_request && data.pull_request.head}
+
+
+ }
) : (
diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index c846fddd2..0d90ee541 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -281,7 +281,6 @@ class NewMerge extends Component {
id,
comparesData
} = this.state;
-
const renderBrances = (list, type) => {
if (list && list.length > 0) {
return list.map((item, key) => {
@@ -313,7 +312,9 @@ class NewMerge extends Component {
return ;
};
let { project } = this.props;
-
+ // 源仓库所有者login
+ const pullOwnerLogin = projects_names && projects_names.filter(item=>{return item.id === id})[0].project_user_login;
+ console.log("-------------",pullOwnerLogin,projects_names);
return (
+ // 
+ //
+ //
+ // )
+ // })
+ // }
+ //
+ //
+ {getFieldDecorator('email',{
+ rules:[
+ {
+ validator: (rule, value, callback) => { emailConfirm(rule, value, callback) }
+ }
+ ],
+ validateTrigger:"onBlur",
+ validateFirst: true,
+ })( } />)}
+
+
+ {/*
+ */}
+
+
+ {getFieldDecorator('register_psd',{
+ rules:[
+ {
+ validator: (rule, value, callback) => { comfirmPassWord(rule, value, callback, 1) }
+ },
+ {
+ validator: (rule, value, callback) => { checkPassWord(rule, value, callback) }
+ }
+ ],
+ validateTrigger:"onBlur",
+ validateFirst: true,
+ })(
} />)}
+
+ {/* 请输入8-16位密码，区分大小写、不能使用空格 */}
+
+ {setIsOpen(!isOpen)}}>
-
-
- 共有 {data && data.files_count} 个文件 被更改
- { data && data.total_addition ? ，包括 {data && data.total_addition} 次插入:"" }
- { data && data.total_addition && data.total_deletion ? " 和 ":""}
- { data && data.total_deletion ? {data && data.total_deletion} 次删除:""}
-
-
+
+
+ 共有 {data && data.file_nums} 个文件 被更改
+ { data && data.total_addition ? ，包括 {data && data.total_addition} 次插入:"" }
+ { data && data.total_addition && data.total_deletion ? " 和 ":""}
+ { data && data.total_deletion ? {data && data.total_deletion} 次删除:""}
+
{isOpen && folderOpen}
-
-
- {!item.isBin ? showDown(item.flag,key,item.isBin)}>:""}
- showDown(item.flag,key,item.isBin)}>
- { item.isRenamed && item.old_name}
- { item.isRenamed && }
- {item.name}
-
- setCopyfileTipTitle("复制文件路径")}
- >
- copyFileName(item.name)}>
-
-
-
- {
- item.sections && item.sections.length >= 1 && !item.flag &&
-
)
})
diff --git a/src/forge/Merge/Index.scss b/src/forge/Merge/Index.scss
index 211b181f3..40b8b839e 100644
--- a/src/forge/Merge/Index.scss
+++ b/src/forge/Merge/Index.scss
@@ -118,4 +118,11 @@
width:30px;
text-align: center;
display: inline-block;
+}
+.diffDesc{
+ padding:30px 0px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
}
\ No newline at end of file
diff --git a/src/forge/Merge/MergeLinkFooter.jsx b/src/forge/Merge/MergeLinkFooter.jsx
index ed25ca2e4..8a8271d88 100644
--- a/src/forge/Merge/MergeLinkFooter.jsx
+++ b/src/forge/Merge/MergeLinkFooter.jsx
@@ -22,14 +22,21 @@ class MergeFooter extends Component {
activeKey: '1',
commitCount: 0,
filesCount: 0,
+ unitData:undefined,
// 总评论数量，包含回复
commentsTotalCount: 0,
+ page:1,
+ hasMore:true,
+ dropLoading:false,
+ limit:100
};
}
componentDidMount() {
this.Init();
// 为父组件绑定当前，以方便调用方法
this.props.bindFootRef && this.props.bindFootRef(this);
+ window.addEventListener("scroll",this.scrollListener);
+ return ()=>{window.removeEventListener("scroll",this.scrollListener);}
}
componentDidUpdate(prevProps) {
@@ -41,6 +48,18 @@ class MergeFooter extends Component {
}
}
+
+ scrollListener=()=>{
+ let scrollHeight = document.documentElement.scrollHeight;
+ let clientHeight = document.documentElement.clientHeight;
+ let scrollTop = document.documentElement.scrollTop;
+ if(Math.ceil(scrollTop+clientHeight) >= scrollHeight-5){
+ const { match } = this.props;
+ const { projectsId, owner, mergeId } = match.params;
+ this.getFile(owner, projectsId, mergeId);
+ }
+ }
+
Init = (isTabChange) => {
const { data, location, match } = this.props;
const { pathname } = location;
@@ -60,7 +79,7 @@ class MergeFooter extends Component {
this.setState({
activeKey: activeKey,
commitCount: data && data.commits_count,
- filesCount: data && data.files_count,
+ filesCount:data && data.files_count
});
};
@@ -81,7 +100,7 @@ class MergeFooter extends Component {
if (result) {
this.setState({
commitsData: result.data.commits,
- commitCount: result.data.commits_count,
+ commitCount: result.data.commits_count
});
}
this.setState({ isSpin: false });
@@ -91,29 +110,38 @@ class MergeFooter extends Component {
});
};
- getFile = (owner, projectsId, mergeId) => {
- this.setState({ isSpin: true });
- const url = `/${owner}/${projectsId}/pulls/${mergeId}/files.json`;
- axios
- .get(url)
- .then((result) => {
- if (result) {
- this.setState({
- filesData: result.data,
- filesCount: result.data.files_count,
- });
- }
- this.setState({ isSpin: false });
- })
- .catch((error) => {
- this.setState({ isSpin: false });
- });
+ getFile = async(owner, projectsId, mergeId) => {
+ const { page,limit , hasMore , dropLoading , filesData } = this.state;
+ if(!hasMore || dropLoading){
+ return;
+ }
+ this.setState({ isSpin: page === 1 , dropLoading:page > 1 });
+ const url = `/v1/${owner}/${projectsId}/pulls/${mergeId}/files.json`;
+ await axios.get(url,{
+ params:{page,limit}
+ }).then((result) => {
+ if (result) {
+ let datas = result.data;
+ let files = page === 1 ? datas.files : filesData.concat(datas.files);
+ this.setState({
+ unitData:datas,
+ filesData: files,
+ hasMore:datas.files && datas.files.length === limit,
+ page:page+1
+ });
+ }
+ this.setState({ dropLoading:false,isSpin: false });
+ })
+ .catch((error) => {
+ this.setState({ isSpin: false });
+ });
};
render() {
const { projectsId, owner, mergeId } = this.props.match.params;
- const { order_id, data = {} } = this.props;
+ const { order_id, data = {} , pullOwnerLogin } = this.props;
+
const {
isSpin,
activeKey,
@@ -121,6 +149,8 @@ class MergeFooter extends Component {
commitCount,
filesData,
commitsData = [],
+ unitData,
+ dropLoading
} = this.state;
// 评论数量优先取Comment组件中列表接口返回的，其次取合并请求详情接口中的，都没有取默认值0
@@ -128,7 +158,6 @@ class MergeFooter extends Component {
this.state.commentsTotalCount || data.comments_total_count || 0,
10
);
-
return (
- 0 ? "：":""} ${item.addition > 0 ? item.addition + "处添加" : ""}${item.addition > 0 && item.deletion > 0 ? "和" : ""}${item.deletion > 0 ? item.deletion + "处删除" : ""}`}>
-
- {
- !item.isSubmodule &&
- {history.push(`/${owner}/${projectsId}${item.isDeleted ? `/commits/${truncateCommitId(parentsSha)}`:`/tree/${truncateCommitId(item.sha)}/${item.name}`}`)}}>查看文件
- }
-
-
- {
- item.sections.map((i,k)=>{
- return(
- i.lines && i.lines.length>0 && i.lines.map((item,key)=>{
- return(
-
- }
+
-
- {item.leftIdx && item.leftIdx !=="0" ? item.leftIdx :"" }
- {item.rightIdx && item.rightIdx !=="0" ? item.rightIdx :"" }
-
-
- )
- })
- )
- })
- }
- - {item.type===2 ? "+" : item.type===3 ? "-" :""} - { (item.type===3 || item.type===2) ? subStrContent(item.content) : item.content} -
-
+
)}
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index b12e73aae..61b9c07ea 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -404,12 +404,20 @@ class MessageCount extends Component {
{
文件加载中...
} +
diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js
index d9167fa2a..8117f3877 100644
--- a/src/forge/Merge/UpdateMerge.js
+++ b/src/forge/Merge/UpdateMerge.js
@@ -4,7 +4,6 @@ import axios from "axios";
import "../Order/order.scss";
import "./merge.css";
import MergeForm from "./merge_form";
-import MergeFooter from "./merge_footer";
const Option = Select.Option;
class UpdateMerge extends Component {
constructor(props) {
diff --git a/src/forge/Merge/components/fileDrop.jsx b/src/forge/Merge/components/fileDrop.jsx
new file mode 100644
index 000000000..193cb8d63
--- /dev/null
+++ b/src/forge/Merge/components/fileDrop.jsx
@@ -0,0 +1,117 @@
+import React ,{useEffect,useState } from 'react';
+import { truncateCommitId } from '../../common/util';
+import { AlignCenter , FlexAJ } from '../../Component/layout';
+import { Tooltip , Progress , Spin } from 'antd';
+import "../Index.scss";
+import axios from 'axios';
+
+
+function FileDrop({prekey,item,projectsId,owner , history , mergeId,parentsSha}){
+ const [ copyfileTipTitle, setCopyfileTipTitle] = useState("复制文件路径");
+ const [ sections, setSections ] = useState(undefined);
+ const [ show, setShow ] = useState(true);
+ const [ isSpin, setIsSpin ] = useState(false);
+
+ useEffect(()=>{
+ if(prekey < 3 && item && item.filename){
+ showDown(item.filename);
+ }
+ },[prekey,item])
+
+ function copyFileName(fileName){
+ var copyCont = document.createElement('input');
+ copyCont.defaultValue = fileName;
+ document.body.appendChild(copyCont);
+ copyCont.select(); // 选择对象
+ document.execCommand("Copy"); // 执行浏览器复制命令
+ copyCont.className = 'copyCont';
+ copyCont.style.display='none';
+ setCopyfileTipTitle("复制成功");
+ }
+ function subStrContent(content){
+ return content ? " " + content.slice(1) :"";
+ }
+
+ function showDown(filename){
+ if(!sections){
+ setIsSpin(true);
+ const url = `/v1/${owner}/${projectsId}/${mergeId}/files.json`;
+ axios.get(url,{
+ params:{filepath:filename}
+ }).then(res=>{
+ if(res){
+ let files = res.data && res.data.files && res.data.files.length>0 && res.data.files[0];
+ setSections(files.sections);
+ setShow(true);
+ setIsSpin(false);
+ }
+ })
+ }else{
+ setShow(!show);
+ }
+ }
+ return(
+
+ {getFieldDecorator('password', {
+ rules: [
+ {
+ required:true,
+ message:"请输入登录密码"
+ }
+ ],
+ validateTrigger:"onBlur",
+ })(
+
} />,
+ )}
+
+
+
+
+
+ setShow(!show)} style={{cursor:!item.is_bin && item.changes !== 0?"pointer":"default"}}>
+ {(!item.is_bin && item.changes !== 0) ? setCopyfileTipTitle("复制文件路径")}
+ >
+ {e.stopPropagation();copyFileName(item.filename);}}>
+
+
+
+ {
+ (!item.is_bin && item.changes !== 0) && show &&
+
+
+ )
+}
+export default FileDrop;
\ No newline at end of file
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index a338c2909..20337d22f 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -197,6 +197,12 @@ form .ant-cascader-picker, form .ant-select {
.linesContent .lines > span:first-child{
margin-right: 0px;
}
+.linesContent .lines,.linesContent .linetype,.no-select,.filesInfo{
+ -webkit-user-select: none; /* Safari */
+ -moz-user-select: none; /* Firefox */
+ -ms-user-select: none; /* IE/Edge */
+ user-select: none; /* 标准语法 */
+}
.linesContent .lines > span{
width: 50%;
text-align: right;
diff --git a/src/forge/Merge/merge_footer.js b/src/forge/Merge/merge_footer.js
index 340d47b26..cd346a4de 100644
--- a/src/forge/Merge/merge_footer.js
+++ b/src/forge/Merge/merge_footer.js
@@ -1,10 +1,13 @@
import React, { Component } from 'react';
-import { Tabs } from 'antd';
+import { Tabs , Spin } from 'antd';
import Commits from './Commits';
import Files from './Files';
+import { returnbar , turnbar } from 'educoder';
+import { Base64 } from 'js-base64';
import '../Order/order.scss';
import './merge.css';
+import axios from 'axios';
const { TabPane } = Tabs;
@@ -13,9 +16,30 @@ class MergeFooter extends Component {
super(props);
this.state = {
activeKey: '1',
+ diff:undefined,
+ filesData: undefined,
+ page:1,
+ hasMore:true,
+ dropLoading:false,
+ limit:100
};
}
+ componentDidMount(){
+ this.getFilesInfo();
+ window.addEventListener("scroll",this.scrollListener);
+ return ()=>{window.removeEventListener("scroll",this.scrollListener);}
+ }
+
+ scrollListener=()=>{
+ let scrollHeight = document.documentElement.scrollHeight;
+ let clientHeight = document.documentElement.clientHeight;
+ let scrollTop = document.documentElement.scrollTop;
+ if(Math.ceil(scrollTop+clientHeight) >= scrollHeight-5){
+ this.getFilesInfo();
+ }
+ }
+
changeTab = (index) => {
this.setState({
activeKey: index,
@@ -27,11 +51,58 @@ class MergeFooter extends Component {
changeCommitFunc&& changeCommitFunc(page);
}
+ componentDidUpdate(prevProps) {
+ // 解决切换tab后浏览器回退不刷新的问题、点击tab后url变化但tab未切换的问题
+ const newPathname = this.props.location.pathname;
+ const prevPathname = prevProps.location.pathname;
+ if (newPathname !== prevPathname) {
+ this.getFilesInfo();
+ }
+ }
+
+ getFilesInfo=()=>{
+ const { hasMore , dropLoading , filesData , page , limit } = this.state;
+ if(!hasMore || dropLoading){
+ return;
+ }
+ this.setState({dropLoading:page>1})
+ const { branchParams = {} } = this.props;
+ const { mergeOwner, projectId } = branchParams;
+ let url = `/v1/${mergeOwner}/${projectId}/${this.getUrl()}/files.json`;
+ axios.get(url,{
+ params:{page,limit}
+ }).then(res=>{
+ if(res){
+ let datas = res.data;
+ let files = page === 1 ? datas.files : filesData.concat(datas.files);
+ this.setState({
+ diff:res.data ,
+ filesData: files,
+ hasMore:datas.files && datas.files.length === limit,
+ dropLoading:false,page:page+1
+ })
+ }
+ })
+ }
+
+ getUrl = ()=>{
+ const { branchParams = {} } = this.props;
+ const { pullOwner, pullBranch, mergeOwner, mergeBranch, projectId , pullIdentity } = branchParams;
+ let url = `compare`;
+ if (mergeOwner === pullOwner) {
+ url += `/${Base64.encode(returnbar(pullBranch))}...${Base64.encode(returnbar(mergeBranch))}`;
+ } else {
+ url += `/${Base64.encode(returnbar(mergeBranch))}...${pullOwner}/${pullIdentity || projectId}:${Base64.encode(returnbar(pullBranch))}`;
+ }
+ return url;
+ }
+
+
render() {
const { projectsId, owner } = this.props.match.params;
- const { comparesData = {} ,limit } = this.props;
- const { commits, diff, commits_count } = comparesData;
- const { activeKey } = this.state;
+ const { comparesData = {} ,limit ,branchParams } = this.props;
+ const { commits,commits_count } = comparesData;
+ const { activeKey , diff , filesData , dropLoading } = this.state;
return (commits && commits.length === 0) || !diff ? (
''
@@ -71,19 +142,24 @@ class MergeFooter extends Component {
tab={
文件
- {diff.files_count > 0 && (
- {diff.files_count}
+ {diff.file_nums > 0 && (
+ {diff.file_nums}
)}
}
key="3"
>
- :""}
+
+ { item.is_renamed && item.old_name}
+ { item.is_renamed && }
+ {item.filename}
+
+
+ 0 ? "：":""} ${item.additions > 0 ? item.additions + "处添加" : ""}${item.additions > 0 && item.deletions > 0 ? "和" : ""}${item.deletions > 0 ? item.deletions + "处删除" : ""}`}>
+
+ {
+ !item.is_submodule &&
+ {history.push(`/${owner}/${projectsId}${item.is_deleted ? `/commits/${truncateCommitId(parentsSha)}`:`/tree/${truncateCommitId(item.sha)}/${item.filename}`}`)}}>查看文件
+ }
+
+
+ {
+ (sections && sections.length > 0) ? sections.map((i,k)=>{
+ return(
+ i.lines && i.lines.length>0 && i.lines.map((item,keys)=>{
+ return(
+
+ }
+
+
+ {item.left_index && item.left_index !=="0" ? item.left_index :"" }
+ {item.right_index && item.right_index !=="0" ? item.right_index :"" }
+
+
+ )
+ })
+ )
+ })
+ :
+
+ }
+
+ {item.type===2 ? "+" : item.type===3 ? "-" :""}
+
+
+ {(item.type===3 || item.type===2) ? subStrContent(item.content) : item.content}
+
+
+
)}
diff --git a/src/images/headerBg.png b/src/images/headerBg.png
new file mode 100644
index 000000000..1af456a2a
Binary files /dev/null and b/src/images/headerBg.png differ
diff --git a/src/modules/loginRegister/LoginNew.jsx b/src/modules/loginRegister/LoginNew.jsx
new file mode 100644
index 000000000..1cc5ee36e
--- /dev/null
+++ b/src/modules/loginRegister/LoginNew.jsx
@@ -0,0 +1,146 @@
+import React, { useEffect, useState } from "react";
+import { Form, Input, Button, Checkbox , Tooltip } from "antd";
+import { Link } from "react-router-dom";
+import axios from 'axios';
+// import educoderLogo from '../login/educoder.png';
+// import qqlogo from '../login/qq@2x.png';
+// import WeChatlogo from '../login/WeChat@2x.png';
+// import giteelogo from '../login/gitee.png';
+// import githublogo from '../login/github.png';
+import cookie from 'react-cookies';
+import './LoginRegisterPageNew.scss';
+import { Encrypt } from "../../common/Env";
+
+function Login(props){
+ const [message,setMessage] = useState();
+ // const [setting, setSetting] = useState(undefined);
+ const {form, location, mygetHelmetapi} = props;
+ const {getFieldDecorator } = form;
+ const {search} = location;
+
+
+ useEffect(()=>{
+ //控制密码输入框在DOM不可见value
+ clear();
+ //获取第三方登录平台信息
+ // setSetting(JSON.parse(localStorage.getItem("chromesetting")));
+ },[])
+
+ // 配置网页标题
+ useEffect(()=>{
+ if(mygetHelmetapi){
+ const {name} = mygetHelmetapi;
+ document.title = name;
+ }
+ }, [mygetHelmetapi])
+
+ // 登录表单提交
+ function handleSubmit(){
+ setMessage(undefined);
+ form.validateFields((err, values) => {
+ if (!err) {
+ axios.post(`/accounts/login.json`, {
+ login: values.username,
+ password: Encrypt(values.password),
+ autologin: values.remember?1:0,
+ }).then((response) => {
+ if (!response.data.login) {
+ response.data.status === -2 ? setMessage(response.data.message) : setMessage("错误的账号或密码");
+ } else {
+ //判断用户是否选择【下次自动登录】
+ cookie.save('autologin',values.remember);
+ cookie.save('supplyphone',true);
+ cookie.save("login",response.data.login);
+
+ const searchParams = new URLSearchParams(search.substring(1));
+ const goPage = searchParams.get("go_page");
+ //意见反馈
+ window.location.href = goPage ? goPage : `/${response.data.login}`
+ }
+ }).catch((error) => {
+ console.log('error',error);
+ })
+ }
+ });
+ }
+
+ //清除密码框的value属性->DOM看不见密码值
+ function clear(){
+ const password = document.getElementById("login_password");
+ if(password && password.type==="password"){
+ setTimeout(()=>{
+ password.removeAttribute('value');
+ },0)
+ }
+ }
+
+
+ return(
+ 文件加载中...
} +
+
} />)}
+
+
+
+
+ 欢迎登录 群智开发
+{message}
+
+
+ {getFieldDecorator('remember', {
+ valuePropName: 'checked',
+ initialValue: cookie.load('autologin'),
+ })(下次自动登录 )}
+
+ {/* 忘记密码？ */}
+
+
+
+ 没有账号？去注册
+
+ {
+ // setting && setting.third_party_new && setting.third_party_new.length > 0 ?
+ // + //
+ // 快速登录 + // {setting.third_party_new.map((item,key)=>{ + // return( + // + //
+
+ )
+}
+export default LoginRegisterPage;
\ No newline at end of file
diff --git a/src/modules/loginRegister/LoginRegisterPageNew.scss b/src/modules/loginRegister/LoginRegisterPageNew.scss
new file mode 100644
index 000000000..b81a2fc98
--- /dev/null
+++ b/src/modules/loginRegister/LoginRegisterPageNew.scss
@@ -0,0 +1,161 @@
+@import url(./font/font.css);
+
+.loginRegister{
+ height: 100vh;
+ width: 100vw;
+ background-image: url(./img/bg1.png);
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-family: alibaba;
+}
+.clear{
+ clear: both;
+}
+.login_register_right {
+ width: 1200px;
+ height: 705px;
+ background:#ffffff;
+ box-shadow:0px 0px 20px rgba(37, 106, 206, 0.14);
+ background-image: url(./img/bglogin.png);
+ background-repeat: no-repeat;
+ background-size: 50% 100%;
+ .Register_content {
+ padding: 70px 75px 70px 75px;
+ .registerNav {
+ margin-bottom: 28px;
+ a {
+ color: #445a7a;
+ display: inline-block;
+ height: 26px;
+ line-height: 26px;
+ }
+ .activeRegisterNav {
+ font-family: alibaba-medium;
+ color: #0d5ef8;
+ border-bottom: 2px solid #0d5ef8;
+ }
+ }
+ .ant-form-item {
+ margin-bottom: 34px;
+ }
+ }
+ .login_content {
+ padding: 105px 75px 113px 75px;
+ .ant-form-item {
+ margin-bottom: 40px;
+ }
+ }
+ .right_cont {
+ height: 100%;
+ width: 50%;
+ margin-left: auto;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ .login_register_head {
+ font-family: alibaba-medium;
+ color: #283444;
+ font-size: 28px;
+ line-height: 28px;
+ .head_blue {
+ font-size: 26px;
+ color: #0d5ef8;
+ }
+ }
+ .account {
+ .input_icon::before {
+ background-image: url(./img/icon1.png);
+ }
+ &:hover {
+ .input_icon::before {
+ background-image: url(./img/icon2.png);
+ }
+ }
+ }
+ .psd, .psdComfirm, .register_psd {
+ .input_icon::before {
+ background-image: url(./img/icon3.png);
+ }
+ &:hover {
+ .input_icon::before {
+ background-image: url(./img/icon4.png);
+ }
+ }
+ }
+ .email {
+ .input_icon::before {
+ background-image: url(./img/icon7.png);
+ }
+ &:hover {
+ .input_icon::before {
+ background-image: url(./img/icon8.png);
+ }
+ }
+ }
+ .phone {
+ .input_icon::before {
+ background-image: url(./img/icon5.png);
+ }
+ &:hover {
+ .input_icon::before {
+ background-image: url(./img/icon6.png);
+ }
+ }
+ }
+ .input_icon {
+ margin-left: 50px;
+ width: 0px;
+ height: 30px;
+ border: 1px solid;
+ border-color: rgba(20, 49, 179, 0.12);
+ &::before {
+ transform: translate( 50%, -50%);
+ position: absolute;
+ content: "";
+ left: 0;
+ top: 50%;
+ width: 22px;
+ height: 22px;
+ background-image: url(./img/icon1.png);
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ }
+ }
+ .ant-input{
+ width: 450px;
+ height: 48px;
+ border: 1px solid;
+ border-color: #9eaacb;
+ border-radius: 4px;
+ background: #FFFFFF !important;
+ color: #283444;
+ padding-left: 80px;
+ &:hover{
+ background: rgba(0, 88, 255, 0.03);
+ border-color: #0d5ef8;
+ }
+ }
+ .login_register_cofBut {
+ width: 450px;
+ height: 56px;
+ background: #0d5ef8;
+ border-radius: 10px;
+ color: #ffffff;
+ font-size: 16px;
+ }
+ .link_span {
+ font-size:14px;
+ line-height: 20px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 20px;
+ a {
+ color: #0d5ef8;
+ }
+ }
+ }
+}
diff --git a/src/modules/loginRegister/RegisterNew.jsx b/src/modules/loginRegister/RegisterNew.jsx
new file mode 100644
index 000000000..c7967c8e0
--- /dev/null
+++ b/src/modules/loginRegister/RegisterNew.jsx
@@ -0,0 +1,350 @@
+import React, { useEffect, useRef, useState } from "react";
+import { Form, Input, Button, Checkbox, message } from "antd";
+import { Link } from "react-router-dom";
+import axios from 'axios';
+import { setmiyah } from 'educoder';
+import './LoginRegisterPageNew.scss';
+import { Encrypt } from "../../common/Env";
+
+function Register(props){
+ const {form, mygetHelmetapi} = props;
+ const {getFieldDecorator, setFieldsValue } = form;
+ //用户输入的符合规则的邮箱（用于获取验证码）
+ const [emailStr, setEmailStr] = useState(undefined);
+ //用户输入的符合规则的用户名，用于当用户输入符合规则的用户名之后再更改又去触发check.json接口
+ const [loginStr, setLoginStr] = useState(undefined);
+ const [secondsStr, setSecondsStr] = useState(60);
+ const [countDown, setCountDown] = useState(false);
+ const [getCaptchaBut, setGetCaptchaBut] = useState(false);
+ const [mess, setMess] = useState(undefined);
+ const [tipVisable, setTipVisable] = useState(false);
+ //用于表单提交时会再次校验数据
+ const [userNameGo, setUserNameGo] = useState(true);
+ const [emailGo, setEmailGo] = useState(true);
+ // 注册类型(手机号/邮箱)
+ const [registerType, setRegisterType] = useState(0);
+ const [setting, setSetting] = useState(undefined);
+ const seconds = useRef();
+ let interval = undefined;
+
+ useEffect(()=>{
+ //获取第三方登录平台信息
+ setSetting(JSON.parse(localStorage.getItem("chromesetting")));
+ },[])
+
+ // 配置网页标题
+ useEffect(()=>{
+ if(mygetHelmetapi){
+ const {name} = mygetHelmetapi;
+ document.title = name;
+ }
+ }, [mygetHelmetapi])
+
+ //注册表单提交
+ function handleSubmit(){
+ form.validateFields((err, values) => {
+ if (!err) {
+ axios.post(`/accounts/register.json`, {
+ login: values.email,
+ namespace: values.register_username.trim(),
+ password: Encrypt(values.register_psd),
+ password_confirmation: Encrypt(values.psdComfirm),
+ code: "123123"
+ }).then((response)=>{
+ debugger;
+ if(response.data && response.data.status === -6){
+ //验证码不正确
+ form.setFields({captcha: {value:values.captcha,errors:[new Error('验证码错误，请重新输入')]}});
+ //设置邮箱内容-》不设置会被恢复成undefined,从而点击验证码失败
+ setEmailStr(values.email);
+ }else if(response.data && response.data.status === 0){
+ //注册成功，页面跳转即可，注册后登录流程forge处理了
+ window.location.href = "/"+values.register_username.trim();
+ } else {
+ setEmailStr(values.email);
+ setMess(response.data.message);
+ }
+ })
+ }
+ });
+ }
+
+ //判断用户名（username）是否注册
+ function usernameConfirm(rule, value, callback){
+ setUserNameGo(true);
+ value && (userNameGo || value !== loginStr) ? axios.post(`/accounts/check.json`, {
+ value: value.trim(),
+ type: 1
+ }).then(response => {
+ if (response.data.status === -1) {
+ callback(response.data.message);
+ } else {
+ setLoginStr(value);
+ setUserNameGo(false);
+ callback();
+ }
+ }):callback();setLoginStr(undefined);
+ }
+
+ //判断邮箱/手机号是否符合规范、是否注册
+ function emailConfirm(rule, value, callback) {
+ if(value){
+ if((/^([1][3456789])\d{9}$/.test(value) && !registerType) || (/^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(value) && registerType)){
+ setEmailGo(true);
+ (emailGo || value !== emailStr) ? axios.get(`/accounts/valid_email_and_phone.json`, {
+ params: {
+ login: value,
+ type: 1
+ }
+ }).then(response => {
+ if(!response.data.status){
+ setEmailStr(value);
+ setGetCaptchaBut(true);
+ setEmailGo(false);
+ callback();
+ }else{
+ setGetCaptchaBut(false);
+ // callback(response.data.status === -2 ? `该${registerType ? '邮箱' : '手机号'}已被注册` : response.data.message);
+ callback(response.data.message);
+ }
+ }):callback();// setEmailStr(undefined);
+ }else{
+ callback(`请输入正确的${registerType ? '邮箱地址' : '手机号'}`);
+ }
+ }else{
+ callback(`请输入${registerType ? '邮箱地址' : '手机号'}`);
+ }
+ }
+
+ //确认密码
+ function comfirmPassWord(rule, value, callback, index) {
+ if ((index === 2 && value && form.getFieldValue('register_psd') && value !== form.getFieldValue('register_psd')) || (index === 1 && value && form.getFieldValue('psdComfirm') && value !== form.getFieldValue('psdComfirm'))) {
+ if(index===1){
+ form.setFields({psdComfirm: {value:form.getFieldValue('psdComfirm'),errors:[new Error('密码不一致，请重新输入')]}});
+ callback();
+ }else{
+ callback('密码不一致，请重新输入');
+ }
+ } else {
+ callback();
+ }
+ }
+
+ //检查密码是否符合格式
+ function checkPassWord(rule, value, callback){
+ if(!value){
+ setTipVisable(true);
+ callback('请输入登录密码');
+ }else if(/(?!.*\s)(?!^[\u4e00-\u9fa5]+$)^.{8,16}$/.test(value)){
+ callback()
+ }else{
+ setTipVisable(true);
+ if(value.length<8 || value.length>16){
+ callback('密码长度为8-16个字符');
+ }else{
+ callback('密码不能使用空格');
+ }
+ }
+ }
+
+ //确认勾选服务
+ function comfirmRead(rule, value, callback){
+ if(value){
+ callback();
+ }else{
+ callback("请阅读并接受我们的服务条款");
+ }
+ }
+
+ //获取验证码
+ function getCaptcha() {
+ setMess(undefined);
+ if (emailStr) {
+ // 倒计时开始
+ setCountDown(true);
+ setGetCaptchaBut(false);
+ seconds.current = 60;
+ setSecondsStr(60);
+ !interval && clearInterval(interval);
+ interval = setInterval(() => {
+ if (seconds.current > 1) {
+ let oldSeconds = seconds.current;
+ seconds.current = oldSeconds - 1;
+ setSecondsStr(oldSeconds - 1);
+ } else {
+ clearInterval(interval);
+ //倒计时结束->可以获取验证码
+ setGetCaptchaBut(true);
+ setCountDown(false);
+ }
+ }, 1000)
+
+ //请求获取验证码接口
+ axios.get(`/accounts/get_verification_code.json`, {
+ params: {
+ login: emailStr,
+ type: 1,
+ smscode: setmiyah(emailStr),
+ }
+ }).then(response => {
+ if (response.data && response.data.status === 0) {
+ //验证码发送成功
+ let email = emailStr.substring(emailStr.indexOf("@")+1);
+ message.success({content:验证码已发送，请注意查收。{registerType ? 前往邮箱 : ''}});
+ } else {
+ //验证码发送失败,获取验证码按钮变灰并且文案变回【获取验证码】
+ setGetCaptchaBut(false);
+ setCountDown(false);
+ clearInterval(interval);
+ setMess(response.data.message);
+ }
+ })
+ }
+ }
+
+ //清除密码框的value属性->DOM看不见密码值
+ function clear(){
+ const password = document.getElementById("register_register_psd");
+ const passwordComfirm = document.getElementById("register_psdComfirm");
+ if(password && password.type==="password"){
+ setTimeout(()=>{
+ password.removeAttribute('value');
+ },0)
+ }
+ if(passwordComfirm && passwordComfirm.type==="password"){
+ setTimeout(()=>{
+ passwordComfirm.removeAttribute('value');
+ },0)
+ }
+ }
+
+ function changeRegisterType(type){
+ setGetCaptchaBut(false);
+ setRegisterType(type);
+ setFieldsValue({'email': undefined})
+ }
+
+ return(
+ } />)}
+
+
+ {props.location.pathname === "/login" ?
+
+ :
+
+ }
+
+
+
+ {getFieldDecorator('captcha', {
+ rules: [{
+ required: true,
+ message: "请输入验证码"
+ }],
+ validateTrigger: "onBlur",
+ })(
+
+ )}
+
+
+ 已有账号，立即登录
+ {/*
+
+ )
+
+}
+export default Form.create({ name: 'resetPassword' })(ResetPassword);
\ No newline at end of file
diff --git a/src/modules/loginRegister/font/AlibabaPuHuiTi-Medium.woff2 b/src/modules/loginRegister/font/AlibabaPuHuiTi-Medium.woff2
new file mode 100644
index 000000000..bf238010a
Binary files /dev/null and b/src/modules/loginRegister/font/AlibabaPuHuiTi-Medium.woff2 differ
diff --git a/src/modules/loginRegister/font/AlibabaPuHuiTi-Regular.woff2 b/src/modules/loginRegister/font/AlibabaPuHuiTi-Regular.woff2
new file mode 100644
index 000000000..c837782b7
Binary files /dev/null and b/src/modules/loginRegister/font/AlibabaPuHuiTi-Regular.woff2 differ
diff --git a/src/modules/loginRegister/font/font.css b/src/modules/loginRegister/font/font.css
new file mode 100644
index 000000000..60d5f4e69
--- /dev/null
+++ b/src/modules/loginRegister/font/font.css
@@ -0,0 +1,11 @@
+/* 登录临时用 */
+
+@font-face {
+ font-family: "alibaba";
+ src: url('./AlibabaPuHuiTi-Regular.woff2');
+}
+@font-face {
+ font-family: "alibaba-medium";
+ src: url('./AlibabaPuHuiTi-Medium.woff2') format('woff');
+ font-display: swap;
+}
diff --git a/src/modules/loginRegister/img/bg1.png b/src/modules/loginRegister/img/bg1.png
new file mode 100644
index 000000000..4efda2855
Binary files /dev/null and b/src/modules/loginRegister/img/bg1.png differ
diff --git a/src/modules/loginRegister/img/bglogin.png b/src/modules/loginRegister/img/bglogin.png
new file mode 100644
index 000000000..7f839fdf7
Binary files /dev/null and b/src/modules/loginRegister/img/bglogin.png differ
diff --git a/src/modules/loginRegister/img/icon1.png b/src/modules/loginRegister/img/icon1.png
new file mode 100644
index 000000000..ad2ef3782
Binary files /dev/null and b/src/modules/loginRegister/img/icon1.png differ
diff --git a/src/modules/loginRegister/img/icon2.png b/src/modules/loginRegister/img/icon2.png
new file mode 100644
index 000000000..be5ff3ce4
Binary files /dev/null and b/src/modules/loginRegister/img/icon2.png differ
diff --git a/src/modules/loginRegister/img/icon3.png b/src/modules/loginRegister/img/icon3.png
new file mode 100644
index 000000000..b38fec81f
Binary files /dev/null and b/src/modules/loginRegister/img/icon3.png differ
diff --git a/src/modules/loginRegister/img/icon4.png b/src/modules/loginRegister/img/icon4.png
new file mode 100644
index 000000000..5a3254deb
Binary files /dev/null and b/src/modules/loginRegister/img/icon4.png differ
diff --git a/src/modules/loginRegister/img/icon5.png b/src/modules/loginRegister/img/icon5.png
new file mode 100644
index 000000000..5de8b08c4
Binary files /dev/null and b/src/modules/loginRegister/img/icon5.png differ
diff --git a/src/modules/loginRegister/img/icon6.png b/src/modules/loginRegister/img/icon6.png
new file mode 100644
index 000000000..b75941e54
Binary files /dev/null and b/src/modules/loginRegister/img/icon6.png differ
diff --git a/src/modules/loginRegister/img/icon7.png b/src/modules/loginRegister/img/icon7.png
new file mode 100644
index 000000000..610dbb5c6
Binary files /dev/null and b/src/modules/loginRegister/img/icon7.png differ
diff --git a/src/modules/loginRegister/img/icon8.png b/src/modules/loginRegister/img/icon8.png
new file mode 100644
index 000000000..461fcfa42
Binary files /dev/null and b/src/modules/loginRegister/img/icon8.png differ
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index 0606d00db..0c1f51d0c 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -23,13 +23,11 @@ body>.-task-title {
overflow: hidden;
}
.newHeaders{
- max-width: unset;
- width: 100%;
- height:7vh;
- min-width: 1200px;
- z-index: 1001;
- position: fixed;
- background: #234175;
+ height: 62px;
+ padding: 0 30px;
+ min-height: 50px;
+ background: url('../../images/headerBg.png') no-repeat;
+ background-size: 100% 100%;
color: #fff;
}
.newHeaders.publicNav{
@@ -38,11 +36,21 @@ body>.-task-title {
}
.headerContent{
margin:0px auto;
- padding:0px 30px;
display: flex;
align-items: center;
height: 100%;
- justify-content: flex-end;
+ justify-content: space-between;
+ .title {
+ display: flex;
+ align-items: center;
+ font-family: YouSheBiaoTiHei;
+ }
+ .font32 {
+ font-size: 32px;
+ }
+ .font24 {
+ font-size: 24px;
+ }
}
.globalSpin {
max-height: 700px !important;
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index 4010dd96d..d3209bcdc 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -398,7 +398,7 @@ export function TPMIndexHOC(WrappedComponent) {
/> : ""}
{npsModalVisible &&
+
+
+ 找回密码
+ 已有账号，立即登录
+
+ {mess}
+ +
{/* { !(this.hideNavPath(path)) &&