Merge branch '4.2-dev'

src/components/FilterItem/FilterItem.js

@@ -0,0 +1,29 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import styles from './FilterItem.less'
+
+const FilterItem = ({
+  label = '',
+  children,
+}) => {
+  const labelArray = label.split('')
+  return (
+    <div className={styles.filterItem}>
+      {labelArray.length > 0
+        ? <div className={styles.labelWrap}>
+            {labelArray.map((item, index) => <span className="labelText" key={index}>{item}</span>)}
+          </div>
+        : ''}
+      <div className={styles.item}>
+        {children}
+      </div>
+    </div>
+  )
+}
+
+FilterItem.propTypes = {
+  label: PropTypes.string,
+  children: PropTypes.element.isRequired,
+}
+
+export default FilterItem

src/components/FilterItem/FilterItem.less

@@ -0,0 +1,17 @@
+.filterItem {
+  display: flex;
+  justify-content: space-between;
+
+  .labelWrap {
+    width: 64px;
+    line-height: 28px;
+    margin-right: 12px;
+    justify-content: space-between;
+    display: flex;
+    overflow: hidden;
+  }
+
+  .item {
+    flex: 1;
+  }
+}

src/components/FilterItem/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "FilterItem",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./FilterItem.js"
+}

src/components/Layout/Bread.js

@@ -6,7 +6,7 @@ import styles from './Bread.less'
 import pathToRegexp from 'path-to-regexp'
 import { queryArray } from '../../utils'
 
-const Bread = ({ location, menu }) => {
+const Bread = ({ menu }) => {
   // 匹配当前路由
   let pathArray = []
   let current
@@ -17,19 +17,24 @@ const Bread = ({ location, menu }) => {
     }
   }
 
-  if (!current) {
-    return (<div className={styles.bread}>首页</div>)
-  }
-
-  // 递归查找父级
   const getPathArray = (item) => {
     pathArray.unshift(item)
     if (item.bpid) {
       getPathArray(queryArray(menu, item.bpid, 'id'))
     }
   }
-  getPathArray(current)
 
+  if (!current) {
+    pathArray.push(menu[0])
+    pathArray.push({
+      id: 404,
+      name: 'Not Found',
+    })
+  } else {
+    getPathArray(current)
+  }
+
+  // 递归查找父级
   const breads = pathArray.map((item, key) => {
     const content = (
       <span>{item.icon
@@ -58,7 +63,6 @@ const Bread = ({ location, menu }) => {
 
 Bread.propTypes = {
   menu: PropTypes.array,
-  location: PropTypes.object,
 }
 
 export default Bread

src/components/Layout/Header.js

@@ -40,7 +40,7 @@ function Header ({ user, logout, switchSider, siderFold, isNavbar, menuPopoverVi
             {user.username} < /span>}
           >
             <Menu.Item key="logout">
-              <a>注销</a>
+              Sign out
             </Menu.Item>
           </SubMenu>
         </Menu>

src/components/Layout/Menu.js

@@ -90,7 +90,7 @@ const Menus = ({ siderFold, darkTheme, location, handleClickNavMenu, navOpenKeys
   const getPathArray = (array, current, pid, id) => {
     let result = [String(current[id])]
     const getPath = (item) => {
-      if (item[pid]) {
+      if (item && item[pid]) {
         result.unshift(String(item[pid]))
         getPath(queryArray(array, item[pid], id))
       }

src/components/Layout/Sider.js

@@ -22,8 +22,8 @@ function Sider ({ siderFold, darkTheme, location, changeTheme, navOpenKeys, chan
       </div>
       <Menus {...menusProps} />
       {!siderFold ? <div className={styles.switchtheme}>
-        <span><Icon type="bulb" />切换主题</span>
-        <Switch onChange={changeTheme} defaultChecked={darkTheme} checkedChildren="黑" unCheckedChildren="白" />
+        <span><Icon type="bulb" />Switch Theme</span>
+        <Switch onChange={changeTheme} defaultChecked={darkTheme} checkedChildren="Dark" unCheckedChildren="Light" />
       </div> : ''}
     </div>
   )

src/components/index.js

@@ -3,6 +3,7 @@ import DropOption from './DropOption'
 import Iconfont from './Iconfont'
 import Search from './Search'
 import Editor from './Editor'
+import FilterItem from './FilterItem'
 import * as Layout from './Layout/index.js'
 
 import layer from './layer'
@@ -14,5 +15,6 @@ export {
   Iconfont,
   Search,
   Editor,
+  FilterItem,
   layer,
  }