diff --git a/src/forge/Utils/locData.js b/src/forge/Utils/locData.js
index f1d38dbf3..5ebba6ccb 100644
--- a/src/forge/Utils/locData.js
+++ b/src/forge/Utils/locData.js
@@ -5338,10 +5338,10 @@ export const locData = Array.from(province.keys()).map(p=>({
label:p,
children:Array.from(province.get(p).keys()).map((c,key)=>({
value:c,
- label:c,
- children:Array.from(area.keys())[key].map(a=>({
- value:a,
- label:a,
- }))
+ label:c,
+ // children:Array.from(area.keys())[key].map(a=>({
+ // value:a,
+ // label:a,
+ // }))
}))
}));
\ No newline at end of file
diff --git a/src/forge/users/Echart/Calendar.jsx b/src/forge/users/Echart/Calendar.jsx
new file mode 100644
index 000000000..743a0a551
--- /dev/null
+++ b/src/forge/users/Echart/Calendar.jsx
@@ -0,0 +1,145 @@
+import React ,{ useEffect, useState } from 'react';
+import * as echarts from 'echarts';
+import moment from 'moment';
+import Axios from 'axios';
+
+function Calendar({ userLogin , time , chooseTime }) {
+ const [ endT, setEndT ] = useState("");
+ const [ baginT, setBaginT ] = useState("");
+
+ useEffect(()=>{
+ if(time){
+ let e,b = "";
+ if(parseInt(time,0) === parseInt(moment().get('year'),0)){
+ let y = moment().get('year');
+ let m = moment().get('month');
+ let d = moment().get('date');
+ e = `${y}-${m+1}-${d}`;
+ b = `${y-1}-${m+1}-${d}`;
+ }else{
+ e = `${time}-12-31`;
+ b = `${time}-01-01`;
+ }
+ setEndT(e);
+ setBaginT(b);
+ }
+ },[time])
+
+ useEffect(()=>{
+ if(baginT && endT){
+ getData();
+ }
+ },[baginT,endT])
+
+ function getData() {
+ const url = `/users/${userLogin}/headmaps.json`;
+ Axios.get(url).then(result=>{
+ if(result && result.data){
+ let m = result.data.headmaps;
+ m.sort(compare('contributions'));
+ let max = m[m.length -1].contributions;
+ Init(m,max);
+ }
+ }).catch(error=>{})
+ }
+
+ function compare(property){
+ return function(a,b){
+ var value1 = a[property];
+ var value2 = b[property];
+ return value1 - value2;
+ }
+ }
+
+ function getVirtulData(data) {
+ var date = +echarts.number.parseDate(baginT);
+ var end = +echarts.number.parseDate(endT);
+ var dayTime = 3600 * 24 * 1000;
+ var array = [];
+ for (var time = date; time <= end; time += dayTime) {
+ let stamp = timestampToTime(time);
+ let stampFilter = data.filter(i=>i.date === stamp);
+ if(stampFilter && stampFilter.length > 0){
+ array.push([stampFilter[0].date,stampFilter[0].contributions]);
+ }else{
+ array.push([stamp,0]);
+ }
+ }
+ return array;
+ }
+
+ function timestampToTime(timestamp) {
+ var date = new Date(timestamp);
+ var Y = date.getFullYear() + '-';
+ var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
+ var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+ return Y+M+D;
+ }
+
+ function Init(data,max) {
+ var huan_val = document.getElementById("Calendar");
+ var myEcharts = echarts.init(huan_val);
+ let option = {
+ title: {
+ show:false
+ },
+ tooltip: {
+ formatter:function(params){
+ return params.data[0] + ': ' + params.data[1] + '个贡献';
+ }
+ },
+ visualMap: {
+ min: 0,
+ max: max,
+ type: 'piecewise',
+ orient: 'horizontal',
+ left: 'center',
+ bottom: 40,
+ inRange:{
+ color:['#fafafa', '#216e39']
+ }
+ },
+ calendar: {
+ top: 50,
+ left: 40,
+ right: 30,
+ cellSize: ['auto', 13],
+ range: [baginT, endT],
+ splitLine:{
+ show:false,
+ lineStyle:{
+ color:"#fff",
+ width:1,
+ type:"solid"
+ }
+ },
+ itemStyle: {
+ borderWidth: 0.5
+ },
+ yearLabel: {show: false},
+ monthLabel:{
+ nameMap:"cn"
+ },
+ dayLabel:{
+ nameMap:"cn",
+ firstDay:1
+ }
+ },
+ series: {
+ type: 'heatmap',
+ coordinateSystem: 'calendar',
+ data: getVirtulData(data)
+ }
+ };
+ myEcharts.setOption(option);
+ myEcharts.on('click', function (params) {
+ chooseTime(params.data);
+ });
+ }
+
+
+ return(
+
+ )
+}
+export default Calendar;
\ No newline at end of file
diff --git a/src/forge/users/Echart/Cloud.jsx b/src/forge/users/Echart/Cloud.jsx
index cbe182a26..778b30e74 100644
--- a/src/forge/users/Echart/Cloud.jsx
+++ b/src/forge/users/Echart/Cloud.jsx
@@ -4,41 +4,48 @@ import Js2WordCloud from 'js2wordcloud/dist/js2wordcloud.js'
function Cloud({data}) {
useEffect(()=>{
- optionChart1();
- },[])
+ if(data){
+ optionChart1(data);
+ }
+ },[data])
- function optionChart1(){
+ function optionChart1(d){
var div = new Js2WordCloud(document.getElementById('cloud'))
- let textList=[
- ['服务'], ['细致'], ['意识'], ['踏实'],['开发'], ['反馈'], ['协助'],['使用'],['谈判']
- ]
+ let textList= d.categories;
let cyList=[]
- for(let i=0;i<60;i++){
- cyList.push([textList[parseInt(Math.random()*textList.length)],Math.round(Math.random()*10)+1])
+ for(let i=0;i
=12 && fontSize<=20) {
- return 'rgb(29,227,250,0.3)';
- } else if(fontSize>20 && fontSize<=30){
- return 'rgb(29,227,250,0.6)';
- }else if(fontSize>30 && fontSize<=40){
- return 'rgb(29,227,250)';
+ switch(fontSize){
+ case 21:
+ return "#f8e367"
+ case 20:
+ return "#99dfff"
+ case 19:
+ return "#ff9e48"
+ case 18:
+ return "#5ea6ff"
+ case 17:
+ return "#58c0f0"
+ default:
+ return "#bcbcbc"
}
},
})
}
return(
-
+
)
}
export default Cloud;
\ No newline at end of file
diff --git a/src/forge/users/Echart/Line.jsx b/src/forge/users/Echart/Line.jsx
index 2092b87c1..e8c9ac644 100644
--- a/src/forge/users/Echart/Line.jsx
+++ b/src/forge/users/Echart/Line.jsx
@@ -2,88 +2,75 @@ import React ,{ useEffect } from 'react';
import * as echarts from 'echarts';
function Line({data}) {
- useEffect(()=>{
- Init();
- },[])
useEffect(()=>{
if(data){
- Init();
+ Init(data);
}
},[data])
- function Init() {
+ function Init(d) {
var huan_val = document.getElementById("Line");
var myEcharts = echarts.init(huan_val);
let option = {
- color: ["#f8e367", "#99dfff", "#58c0f0", "#5ea6ff", "#ff9e48", "#bcbcbc"],
+ color: ["#f8e367", "#58c0f0", "#ff9e48"],
title: {
- text: '近期活动统计',
- left: '3%'
+ show:false
},
tooltip: {
trigger: 'axis'
},
legend: {
- data: ['邮件营销', '联盟广告', '视频广告', '直接访问', '搜索引擎'],
- right: '3%'
+ data: ['提交数', '易修数', '合并请求数'],
+ right: 'center',
+ bottom: '4%',
},
grid: {
- left: '3%',
- right: '4%',
- bottom: '3%',
+ left: '4%',
+ right: '5%',
+ bottom: '16%',
containLabel: true
},
toolbox: {
- feature: {
- // saveAsImage: {}
- }
+ feature: {
+ // saveAsImage: {}
+ }
},
xAxis: {
- type: 'category',
- boundaryGap: false,
- data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
+ type: 'category',
+ boundaryGap: false,
+ data: d.dates,
+ axisTick:{
+ show:false
+ }
},
yAxis: {
- type: 'value',
- axisLine:{
- show:false
- },
- axisTick:{
- show:false
- }
+ type: 'value',
+ axisLine:{
+ show:false
+ },
+ axisTick:{
+ show:false
+ },
+ minInterval:1,
+ splitNumber: 5,
},
series: [
- {
- name: '邮件营销',
- type: 'line',
- stack: '总量',
- data: [120, 132, 101, 134, 90, 230, 210]
- },
- {
- name: '联盟广告',
- type: 'line',
- stack: '总量',
- data: [220, 182, 191, 234, 290, 330, 310]
- },
- {
- name: '视频广告',
- type: 'line',
- stack: '总量',
- data: [150, 232, 201, 154, 190, 330, 410]
- },
- {
- name: '直接访问',
- type: 'line',
- stack: '总量',
- data: [320, 332, 301, 334, 390, 330, 320]
- },
- {
- name: '搜索引擎',
- type: 'line',
- stack: '总量',
- data: [820, 932, 901, 934, 1290, 1330, 1320]
- }
+ {
+ name: '提交数',
+ type: 'line',
+ data: d.commits_count
+ },
+ {
+ name: '易修数',
+ type: 'line',
+ data: d.issues_count
+ },
+ {
+ name: '合并请求数',
+ type: 'line',
+ data: d.pull_requests_count
+ }
]
};
myEcharts.setOption(option);
diff --git a/src/forge/users/Echart/Pie.jsx b/src/forge/users/Echart/Pie.jsx
index 460d7f001..d5489b981 100644
--- a/src/forge/users/Echart/Pie.jsx
+++ b/src/forge/users/Echart/Pie.jsx
@@ -3,32 +3,27 @@ import echarts from 'echarts/lib/echarts';
import 'echarts/lib/chart/pie';
function Pie({data}) {
- useEffect(()=>{
- Init();
- },[])
useEffect(()=>{
if(data){
- Init();
+ Init(data);
}
},[data])
- function Init() {
+ function Init(d) {
var huan_val = document.getElementById("Pie");
var chart = echarts.init(huan_val);
let option = {
- color: ["#f8e367", "#99dfff", "#58c0f0", "#5ea6ff", "#ff9e48", "#bcbcbc"],
+ color: ["#f8e367", "#5ea6ff", "#ff9e48", "#99dfff"],
title: {
- text: '角色定位',
- top:"5%",
- left:"3%"
+ show:false
},
tooltip: {
trigger: 'item'
},
legend: {
top: '5%',
- right: '3%'
+ right: 'center'
},
series: [
{
@@ -56,11 +51,10 @@ function Pie({data}) {
show: false
},
data: [
- {value: 1048, name: '搜索引擎'},
- {value: 735, name: '直接访问'},
- {value: 580, name: '邮件营销'},
- {value: 484, name: '联盟广告'},
- {value: 300, name: '视频广告'}
+ {value: d.developer && d.developer.count, name: '开发者'},
+ {value: d.manager && d.manager.count, name: '管理员'},
+ {value: d.owner && d.owner.count, name: '创建者'},
+ {value: d.reporter && d.reporter.count, name: '报告者'}
]
}
]
diff --git a/src/forge/users/Echart/Radar.jsx b/src/forge/users/Echart/Radar.jsx
index f427442ed..5a75f2c8a 100644
--- a/src/forge/users/Echart/Radar.jsx
+++ b/src/forge/users/Echart/Radar.jsx
@@ -3,58 +3,55 @@ import echarts from 'echarts/lib/echarts'
import 'echarts/lib/chart/radar';
function Radar({data}) {
- useEffect(()=>{
- Init();
- },[])
useEffect(()=>{
if(data){
- Init();
+ Init(data);
}
},[data])
- function Init() {
+ function Init(d) {
var huan_val = document.getElementById("radar");
var myEcharts = echarts.init(huan_val);
let option = {
color: ["#f8e367", "#99dfff", "#58c0f0", "#5ea6ff", "#ff9e48", "#bcbcbc"],
title: {
- text: '开发能力',
- top:"0",
- left:"3%"
+ show:false
},
legend: {
- data: ['预算分配', '实际开销'],
- top:"0",
+ data: ['个人能力(personal)', '社区平均(average)'],
+ top:"3%",
right:"center"
},
+ tooltip: {
+ trigger: 'item'
+ },
radar: {
// shape: 'circle',
indicator: [
- { name: '销售', max: 6500},
- { name: '管理', max: 16000},
- { name: '信息技术', max: 30000},
- { name: '客服', max: 38000},
- { name: '研发', max: 52000},
- { name: '市场', max: 25000}
+ { name: '影响力', max: 100},
+ { name: '贡献度', max: 100},
+ { name: '活跃度', max: 100},
+ { name: '项目经验', max: 100},
+ { name: '语言能力', max: 100},
],
center:["50%","55%"]
},
series: [{
- name: '预算 vs 开销',
+ name: '',
type: 'radar',
data: [
{
- value: [4200, 3000, 20000, 35000, 50000, 18000],
- name: '预算分配'
+ value: d.user && [d.user.influence, d.user.contribution, d.user.activity, d.user.experience, d.user.language],
+ name: '个人能力(personal)'
},
{
- value: [5000, 14000, 28000, 26000, 42000, 21000],
- name: '实际开销'
+ value: d.platform && [d.platform.influence, d.platform.contribution, d.platform.activity, d.platform.experience, d.platform.language],
+ name: '社区平均(average)'
}
]
}]
- };
+ };
myEcharts.setOption(option);
}
diff --git a/src/forge/users/Echart/Round.jsx b/src/forge/users/Echart/Round.jsx
new file mode 100644
index 000000000..ebcb13671
--- /dev/null
+++ b/src/forge/users/Echart/Round.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import './style.scss';
+
+
+function Round({num,color,name}) {
+ return(
+
+
+ {num}分
+ {name}
+
+
+ {num > 50 ?
+
+ :
+
+ }
+ {num < 50 ?
+
+ :
+
+ }
+
+ {
+ list.map((i,k)=>{
+ return(
+ -
+
})
+
+
+ {i.user_name}
+ {i.action_time}
+ {i.priority && TagInfo(`${i.priority}`,"")}
+ {i.issue_status && {i.issue_status} }
+
+
{i.action_type}：{i.name}
+
+ )
+ })
+ }
+
+ )
+}
+export default Activity;
\ No newline at end of file
diff --git a/src/forge/users/GeneralView/ConcentrateBox.jsx b/src/forge/users/GeneralView/ConcentrateBox.jsx
new file mode 100644
index 000000000..3ee941947
--- /dev/null
+++ b/src/forge/users/GeneralView/ConcentrateBox.jsx
@@ -0,0 +1,172 @@
+import React, { useEffect, useState } from 'react';
+import { Modal , Checkbox , Spin , Input } from 'antd';
+import Axios from 'axios';
+import { Link } from 'react-router-dom';
+
+const { Search } = Input;
+const limit = 20;
+function ConcentrateBox({ visible , onCancel , onSure , username , choosed }) {
+ const [ page , setPage ]= useState(1);
+ const [ total , setTotal ]= useState(0);
+ const [ pageSize , setPageSize ] = useState(false);
+ const [ search , setSearch ] = useState(undefined);
+
+ const [ list , setList ]= useState([]);
+ const [ value , setValue ]= useState([]);
+ const [ isSpin , setIsSpin ]= useState(true);
+ const [ disable , setDisable ] = useState(false);
+
+ const [ copyList , setCopyList ] = useState([]);
+ const [ copyAllList , setCopyAllList ] = useState([]);
+
+ useEffect(()=>{
+ if(visible){
+ setIsSpin(true);
+ getProjectList();
+ }else{
+ setSearch(undefined);
+ setCopyAllList([]);
+ setCopyList([]);
+ setList([]);
+ }
+ },[visible])
+
+ useEffect(()=>{
+ if(page>1){
+ setIsSpin(true);
+ getProjectList(page,undefined);
+ }
+ },[page])
+
+
+ useEffect(()=>{
+ if(visible && choosed && choosed.length >0 ){
+ setValue(choosed);
+ }
+ },[visible,choosed])
+
+ useEffect(()=>{
+ if(value && value.length === 6){
+ setDisable(true);
+ }else{
+ setDisable(false);
+ }
+ },[value])
+
+ function getProjectList(p,s) {
+ const url = `/users/${username}/projects.json`;
+ Axios.get(url,{
+ params:{
+ page:p,limit,is_public: "public",search:s,choosed
+ }
+ }).then(result=>{
+ if(result && result.data){
+ let e = !search ? mergeArrayMerge(list,result.data.projects) : result.data.projects;
+ setCopyAllList(!search ? e : copyAllList);
+ setTotal(result.data.count);
+ setList(e);
+ setIsSpin(false);
+ // 查看更多需要页数
+ let s = parseInt(result.data.count/limit,0);
+ let y = result.data.count%limit;
+ setPageSize(y>0?s+1:s);
+ }
+ }).catch(error=>{})
+ }
+
+ function mergeArrayMerge (array1, array2) {
+ array1.map((v, index) => {
+ if (v !== '') {
+ let idx = array2.indexOf(v);
+ if (idx > -1) {
+ array2.splice(idx, 1)
+ }
+ }
+ });
+ array1 = array1.concat(array2);
+ return array1
+ }
+
+ function saveList(c) {
+ // 将选中的复制下来保存到copyList数组里
+ if(c && c.length > 0){
+ let l = []
+ for(var i=0;ij.id === c[i]);
+ if(filter && filter.length>0){
+ l.push(filter[0]);
+ }
+ }
+ setCopyList(l);
+ }
+ }
+
+ function onOk() {
+ onSure && onSure(value);
+ setValue([]);
+ }
+
+ function chooseProject(e) {
+ setValue(e);
+ }
+
+ // 搜索
+ function onSearch(params) {
+ setCopyAllList(list);
+ value && value.length > 0 ? saveList(value) : setCopyList([]);
+ setPage(1);
+ setSearch(params);
+ getProjectList(1,params);
+ }
+
+
+ return(
+
+
+
+
最多可选取6个公开仓库
+
setSearch(e.target.value)}
+ />
+
+
+ {
+ copyList && copyList.length >0 && copyList.map((i,k)=>{
+ return(
+ j === i.id).length===0)}>{i.author && i.author.name}/{i.name}
+ )
+ })
+ }
+ {
+ list && list.length > 0 && list.map((i,k)=>{
+ let c = copyList && copyList.length >0 && copyList.filter(j=>j.id === i.id).length !== 0;
+ return(
+ !c && j === i.id).length===0)}>{i.author && i.author.name}/{i.name}
+ )
+ })
+ }
+
+
+ { total > limit && page < pageSize && setPage(page+1)}>查看更多
}
+ { (list && list.length === 0) && (copyList && copyList.length === 0) && 您还没有公开的{search && `“${search}”`}项目，先去新建项目
}
+
+
+ )
+}
+export default ConcentrateBox;
\ No newline at end of file
diff --git a/src/forge/users/GeneralView/ConcentrateProject.jsx b/src/forge/users/GeneralView/ConcentrateProject.jsx
new file mode 100644
index 000000000..bfcf290d5
--- /dev/null
+++ b/src/forge/users/GeneralView/ConcentrateProject.jsx
@@ -0,0 +1,83 @@
+import React, { useEffect, useState } from 'react';
+import { FlexAJ , AlignCenter } from '../../Component/layout';
+import { Link } from 'react-router-dom';
+import axios from 'axios';
+import Box from './ConcentrateBox';
+
+function ConcentrateProject({userLogin,current}) {
+ const [ list , setList ] = useState(undefined);
+ const [ visible , setVisible ] = useState(false);
+ const [ value , setValue ] = useState([]);
+
+ useEffect(()=>{
+ getList();
+ },[])
+
+ function getList() {
+ const url = `/users/${userLogin}/is_pinned_projects.json`;
+ axios.get(url).then(result=>{
+ if(result && result.data){
+ let p = result.data.projects;
+ setList(p);
+ if(p && p.length > 0){
+ let array = p.map(i=>{
+ return i.project_id
+ })
+ setValue(array);
+ }
+ }
+ }).catch(erroer=>{})
+ }
+
+ function onSure(is_pinned_project_ids) {
+ if(is_pinned_project_ids && is_pinned_project_ids.length===0){
+ setValue([]);
+ }
+ const url = `/users/${userLogin}/is_pinned_projects/pin.json`;
+ axios.post(url,{
+ is_pinned_project_ids
+ }).then(result=>{
+ if(result && result.data){
+ setVisible(false);
+ getList();
+ }
+ }).catch(error=>{})
+ }
+ return(
+
+ setVisible(false)} onSure={onSure} username={userLogin} choosed={value}/>
+ {
+ list && list.length>0 &&
+
+
+ 精选项目
+ { current && setVisible(true)}>自定义精选项目 }
+
+
+
+ {
+ list.map((i,k)=>{
+ return(
+ -
+ {i.name}
+
{i.description}
+
+ { i.category && {i.category.name} }
+ {i.watchers_count}
+ {i.forked_count}
+
+
+ )
+ })
+ }
+
+
+
-
-
-
-
+
+
+
+
+
+
+ 贡献度
+
+
+
+
+
+
+
+
动态
+ { projectTrends && projectTrends.length > 0 &&
}
+ { projectTrends && projectTrends.length === 0 && }
+ { total > aLimit && }
+
-
-
- {user && user.user_identity && (
-
- {user && user.user_identity}
-
- )}
-
+
+
+ 
+
+ {
+ user && user.gender===1?
+
+ :
+
+ }
+
+
+
+
{user && user.username}
-
+
+ {user && user.description}
+
{user && current_user && user.login === current_user.login && (
)}
-
+
{user && user.watched_count}
-
-
- {current_user && user && user.login === current_user.login ? (
-
-
-
- this.undo_link()}>
-
-
- 待办事项
-
-
- {undo_events}
-
-
-
-
-
- ):""}
-
-
-
- - this.change_project_type(undefined)}>
-
- 项目类型
-
-
- - this.change_project_type("common")}>
-
- 开源托管项目
-
- {user && user.common_projects_count}
-
-
-
- - this.change_project_type("mirror")}>
-
- 开源镜像项目
-
- {user && user.mirror_projects_count}
-
-
-
- - this.change_project_type("sync_mirror")}>
-
- 镜像托管项目
-
- {user && user.sync_mirror_projects_count}
-
-
-
-
-
- {
- current_user && current_user.login && current_user.login === username &&
-
- }
-
-
-
- this.organize_link()} >
-
-
- 组织
-
-
- {user && user.user_org_count}
-
-
-
+ {
+ user && (user.province || user.custom_department || user.email) ?
+
+ { user.province &&
{user.province}{user.city}
}
+ { user.custom_department &&
{user.custom_department}
}
+ { user.email &&
{user.email}
}
+
+ :""
+ }
+ { !route_type && menuKey &&
+
+ }
{user && (
-
-
+
+ {
+ return ;
+ }}
+ >
{
- return ;
- }}
- >
- {
- return ;
- }}
- >
- {
- return ;
- }}
- >
- {
- return ;
- }}
- >
- {
- return ;
- }}
- >
- {
- return ;
- }}
- >
- {
- return ;
- }}
- >
- {
- return ;
- }}
- >
- {
- return ;
- }}
- >
-
-
+ path="/users/:username/notice"
+ render={() => {
+ return
;
+ }}
+ >
+ {
+ return ;
+ }}
+ >
+ {
+ return ;
+ }}
+ >
+ {
+ return ;
+ }}
+ >
+ {
+ return ;
+ }}
+ >
+ {
+ return ;
+ }}
+ >
+ {
+ return ;
+ }}
+ >
+ {
+ return ;
+ }}
+ >
+
+ {
+ return ;
+ }}
+ >
+ {
+ return ;
+ }}
+ >
+ {
+ return ;
+ }}
+ >
+
)}
-
+
);
diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js
index 3a185a786..e79e1021e 100644
--- a/src/forge/users/InfosUser.js
+++ b/src/forge/users/InfosUser.js
@@ -100,9 +100,6 @@ class InfosUser extends Component {
const {is_public} = this.state
const new_is_public = is_public === check_is_public ? undefined : check_is_public
- // this.setState({
- // is_public: new_is_public
- // })
this.state.is_public = new_is_public
this.get_projects(new_is_public);
}
@@ -176,7 +173,7 @@ class InfosUser extends Component {
return (
-
+
{
+ const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form;
+ const { username } = props && props.match && props.match.params;
+ const { user , resetUser , current_user } = props;
+
+ useEffect(()=>{
+ if(current_user && current_user.login){
+ setFieldsValue({
+ ...current_user,
+ location:current_user.province && [current_user.province,current_user.city]
+ })
+ }
+ },[current_user])
+
+ function submit() {
+ validateFields((error,values)=>{
+ if(!error){
+ submitFunc(values);
+ }
+ })
+ }
+
+ function submitFunc(values) {
+ const url = `/users/${username}.json`;
+ const params={
+ user: {
+ nickname: values.real_name,
+ user_extension_attributes: {
+ province: values.location && values.location[0],
+ city: values.location && values.location[1],
+ ...values
+ }
+ }
+ }
+ Axios.put(url,params).then(result=>{
+ if(result && result.data){
+ props.showNotification("资料修改成功！")
+ resetUser && resetUser(result.data);
+ }
+ }).catch(error=>{})
+ }
+
+ return(
+