repair breadcrumb and routers

This commit is contained in:
zuiidea
2016-09-19 23:09:41 +08:00
parent 62f37008d3
commit ad92f03f2d
17 changed files with 194 additions and 200 deletions
+40 -60
View File
@@ -1,81 +1,61 @@
import React from 'react';
import {Breadcrumb, Icon} from 'antd';
import items from 'menu.js';
import Logger from '../../utils/logger';
import React from 'react'
import items from 'menu.js'
import {Breadcrumb, Icon} from 'antd'
import {Logger} from '../../utils/lib.js'
const Item = Breadcrumb.Item;
const logger = Logger.getLogger('Breadcrumb');
const logger = Logger.getLogger('Breadcrumb')
/**
* 定义面包屑导航, 由于和已有的组件重名, 所以改个类名
*/
class Bread extends React.Component {
static inited = false; // 表示下面两个map是否初始化
static iconMap = new Map(); // 暂存menu.js中key->icon的对应关系
static nameMap = new Map(); // 暂存menu.js中key->name的对应关系
// 初始化iconMap和nameMap
static init() {
// 箭头函数还是很好用的
const Bread = React.createClass({
getInitialState() {
let iconMap = new Map()
let nameMap = new Map()
items.forEach((level1) => {
Bread.nameMap.set(level1.key, level1.name);
logger.debug('nameMap add entry: key=%s, value=%s', level1.key, level1.name);
Bread.iconMap.set(level1.key, level1.icon);
logger.debug('iconMap add entry: key=%s, value=%s', level1.key, level1.icon);
nameMap.set(level1.key, level1.name)
iconMap.set(level1.key, level1.icon)
if (level1.child) {
level1.child.forEach((level2) => {
Bread.nameMap.set(level2.key, level2.name);
logger.debug('nameMap add entry: key=%s, value=%s', level2.key, level2.name);
nameMap.set(level2.key, level2.name)
if (level2.child) {
level2.child.forEach((level3)=> {
Bread.nameMap.set(level3.key, level3.name);
logger.debug('nameMap add entry: key=%s, value=%s', level3.key, level3.name);
});
level2.child.forEach((level3) => {
nameMap.set(level3.key, level3.name)
})
}
});
})
}
});
}
})
iconMap.set("error", "frown")
nameMap.set("error", "页面未找到")
return {iconMap, nameMap}
},
render() {
// render之前判断是否要初始化
if (!Bread.inited) {
logger.debug('not inited, calling init method');
Bread.init();
Bread.inited = true;
}
const itemArray = [];
// 面包屑导航的最开始都是一个home图标, 并且这个图标时可以点击的
itemArray.push(<Item key="systemHome" href="#"><Icon type="home"/></Item>);
let itemArray = []
const _this = this
itemArray.push(
<Breadcrumb.Item key="systemHome" href="javascript:;"><Icon type="home"/></Breadcrumb.Item>
)
for (const route of this.props.routes) {
logger.debug('path=%s, route=%o', route.path, route);
const name = Bread.nameMap.get(route.path);
const name = _this.state.nameMap.get(route.path)
if (name) {
const icon = Bread.iconMap.get(route.path);
const icon = _this.state.iconMap.get(route.path)
if (icon) {
itemArray.push(<Item key={name}><Icon type={icon}/> {name}</Item>); // 有图标的话带上图标
itemArray.push(
<Breadcrumb.Item key={name}><Icon type={icon}/> {name}</Breadcrumb.Item>
)
} else {
// 这个key属性不是antd需要的, 只是react要求同一个array中各个元素要是不同的, 否则有warning
itemArray.push(<Item key={name}>{name}</Item>);
itemArray.push(
<Breadcrumb.Item key={name}>{name}</Breadcrumb.Item>
)
}
}
}
// 这个面包屑是不可点击的(除了第一级的home图标), 只是给用户一个提示
return (
<div className="ant-layout-breadcrumb">
<Breadcrumb>{itemArray}</Breadcrumb>
<Breadcrumb>
{itemArray}
</Breadcrumb>
</div>
);
)
}
})
}
export default Bread;
export default Bread
-22
View File
@@ -1,22 +0,0 @@
import React from 'react';
import {Icon} from 'antd';
import './index.less';
/**
* 显示错误信息
* 可以当404页来用
*/
class Error extends React.Component {
render() {
return (
<div className="not-found">
<div style={{ fontSize:32 }}><Icon type="frown"/></div>
<h1>{this.props.errorMsg || '404 Not Found'}</h1>
</div>
);
}
}
export default Error;
-8
View File
@@ -1,8 +0,0 @@
.not-found {
color: black;
text-align: center;
}
.not-found h1 {
font-family: "PingFang SC",
}
+9 -29
View File
@@ -1,37 +1,17 @@
import React from 'react';
import {BackTop} from 'antd';
import globalConfig from 'config.js';
/**
* 定义Footer组件
*/
class Footer extends React.Component {
import {config} from '../../utils/lib.js'
const Footer = React.createClass({
render() {
// FIXME: gross hack
// footer组件第一次render的时候, 不能返回BackTop, 因为main-content-div还没render
if (this.inited) {
return (
<div>
<BackTop target={() => document.getElementById('main-content-div')}/>
<div className="ant-layout-footer">
{globalConfig.footer || 'footer被弄丢啦!'}
</div>
return (
<div>
<div className="ant-layout-footer">
{config.footer}
</div>
);
} else {
this.inited = true;
return (
<div>
<div className="ant-layout-footer">
{globalConfig.footer || 'footer被弄丢啦!'}
</div>
</div>
);
}
</div>
)
}
}
})
export default Footer;
+1 -1
View File
@@ -5,7 +5,7 @@ import './index.less';
const SubMenu = Menu.SubMenu;
let Header = React.createClass({
const Header = React.createClass({
signOut(){
ajax({
url:config.user.signOut
-15
View File
@@ -1,15 +0,0 @@
import React from 'react';
import './index.less';
/**
* 测试用
*/
class Hello extends React.Component {
render() {
return <div><h1 className="testStyle">Hello, React!</h1></div>;
}
}
export default Hello;
-3
View File
@@ -1,3 +0,0 @@
.testStyle {
color: red;
}
+41 -44
View File
@@ -12,49 +12,12 @@ const Sider = React.createClass({
getInitialState() {
let fixed=false;
let fixedText="固定";
const paths = []
const defaultOpenKeys = []
if(window.localStorage.getItem("mgFixedSider")&&window.localStorage.getItem("mgFixedSider")=="true"){
fixed=true;
fixedText="取消";
}
return {
fixed:fixed,
collapse: true,
fixedText:fixedText
}
},
onCollapseChange() {
this.setState({
collapse: !this.state.collapse,
})
},
switchFixed(){
window.localStorage.setItem("mgFixedSider",!this.state.fixed);
this.setState({
fixed: !this.state.fixed
});
if(this.state.fixedText=="固定"){
this.setState({
fixed: !this.state.fixed,
fixedText:"取消"
});
} else {
this.setState({
fixed: !this.state.fixed,
fixedText:"固定"
});
}
},
transFormMenuItem(obj, paths) {
const parentPath = paths.join('/')
return (
<MenuItem key={obj.key}>
{obj.child ? obj.name : <Link to={`/${parentPath}`}>{obj.name}</Link> }
</MenuItem>
)
},
componentWillMount() {
const paths = []
const defaultOpenKeys = []
const menu = items.map((level1) => {
paths.push(level1.key)
if (defaultOpenKeys.length === 0) {
@@ -84,7 +47,7 @@ const Sider = React.createClass({
})
paths.pop()
return (
<SubMenu key={level1.key} title={<span><Icon type={level1.icon} />{level1.name}</span>}>
<SubMenu key={level1.key} title={<span> <Icon type={level1.icon} />{level1.name}</span>}>
{level2menu}
</SubMenu>
)
@@ -95,8 +58,42 @@ const Sider = React.createClass({
return tmp
}
})
this.menu = menu
this.defaultOpenKeys = defaultOpenKeys
return {
fixed:fixed,
collapse: true,
fixedText:fixedText,
menu,
}
},
onCollapseChange() {
this.setState({
collapse: !this.state.collapse,
})
},
switchFixed(){
window.localStorage.setItem("mgFixedSider",!this.state.fixed);
this.setState({
fixed: !this.state.fixed
});
if(this.state.fixedText=="固定"){
this.setState({
fixed: !this.state.fixed,
fixedText:"取消"
});
} else {
this.setState({
fixed: !this.state.fixed,
fixedText:"固定"
});
}
},
transFormMenuItem(obj, paths) {
const parentPath = paths.join('/')
return (
<MenuItem key={obj.key}>
{obj.child ? obj.name : <Link to={`/${parentPath}`}> {obj.icon ? <Icon type={obj.icon} /> : ''} {obj.name}</Link> }
</MenuItem>
)
},
render() {
const collapse = this.state.collapse
@@ -106,8 +103,8 @@ const Sider = React.createClass({
<img src="https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg" />
<span>Ant Design</span>
</div>
<Menu mode="inline" theme="dark" defaultSelectedKeys={['user']}>
{this.menu}
<Menu mode="inline" theme="dark" defaultSelectedKeys={['dashboard']}>
{this.state.menu}
</Menu>
<div className="ant-aside-action" onClick={this.onCollapseChange}>
{collapse ? <Icon type="right" /> : <Icon type="left" />}