{children}
@@ -83,4 +90,4 @@ App.propTypes = {
app: PropTypes.object,
}
-export default connect(({ app }) => ({ app }))(App)
+export default connect(({ app, loading }) => ({ app, loading }))(App)
diff --git a/src/routes/chart/Container.js b/src/routes/chart/Container.js
index 104e4b2..ac36f9b 100644
--- a/src/routes/chart/Container.js
+++ b/src/routes/chart/Container.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import styles from './Container.less'
import { ResponsiveContainer } from 'recharts'
diff --git a/src/routes/chart/barChart/index.js b/src/routes/chart/barChart/index.js
index fd083c1..0fff5fb 100644
--- a/src/routes/chart/barChart/index.js
+++ b/src/routes/chart/barChart/index.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { Row, Col, Card, Button } from 'antd'
import Container from '../Container'
import {
diff --git a/src/routes/chart/lineChart/index.js b/src/routes/chart/lineChart/index.js
index c363fb1..e45f73b 100644
--- a/src/routes/chart/lineChart/index.js
+++ b/src/routes/chart/lineChart/index.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { Row, Col, Card, Button } from 'antd'
import Container from '../Container'
import {
diff --git a/src/routes/dashboard/components/browser.js b/src/routes/dashboard/components/browser.js
index fa5b794..6daeab9 100644
--- a/src/routes/dashboard/components/browser.js
+++ b/src/routes/dashboard/components/browser.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { Table, Tag } from 'antd'
import styles from './browser.less'
import { color } from '../../../utils'
diff --git a/src/routes/dashboard/components/comments.js b/src/routes/dashboard/components/comments.js
index b8c71f8..dea3642 100644
--- a/src/routes/dashboard/components/comments.js
+++ b/src/routes/dashboard/components/comments.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { Table, Tag } from 'antd'
import styles from './comments.less'
import { color } from '../../../utils'
diff --git a/src/routes/dashboard/components/completed.js b/src/routes/dashboard/components/completed.js
index b2ac636..1eef236 100644
--- a/src/routes/dashboard/components/completed.js
+++ b/src/routes/dashboard/components/completed.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import styles from './completed.less'
import classnames from 'classnames'
import { color } from '../../../utils'
diff --git a/src/routes/dashboard/components/cpu.js b/src/routes/dashboard/components/cpu.js
index 860d79c..b6102ea 100644
--- a/src/routes/dashboard/components/cpu.js
+++ b/src/routes/dashboard/components/cpu.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import styles from './cpu.less'
import { color } from '../../../utils'
import CountUp from 'react-countup'
diff --git a/src/routes/dashboard/components/numberCard.js b/src/routes/dashboard/components/numberCard.js
index 26c09f8..8c2491e 100644
--- a/src/routes/dashboard/components/numberCard.js
+++ b/src/routes/dashboard/components/numberCard.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { Icon, Card } from 'antd'
import CountUp from 'react-countup'
import styles from './numberCard.less'
diff --git a/src/routes/dashboard/components/quote.js b/src/routes/dashboard/components/quote.js
index 240d244..709ce9a 100644
--- a/src/routes/dashboard/components/quote.js
+++ b/src/routes/dashboard/components/quote.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import styles from './quote.less'
function Quote ({ name, content, title, avatar }) {
diff --git a/src/routes/dashboard/components/recentSales.js b/src/routes/dashboard/components/recentSales.js
index af1e9c3..cdbe213 100644
--- a/src/routes/dashboard/components/recentSales.js
+++ b/src/routes/dashboard/components/recentSales.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { Table, Tag } from 'antd'
import styles from './recentSales.less'
import { color } from '../../../utils'
diff --git a/src/routes/dashboard/components/sales.js b/src/routes/dashboard/components/sales.js
index 1c73623..b761cc7 100644
--- a/src/routes/dashboard/components/sales.js
+++ b/src/routes/dashboard/components/sales.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import styles from './sales.less'
import classnames from 'classnames'
import { color } from '../../../utils'
diff --git a/src/routes/dashboard/components/user.js b/src/routes/dashboard/components/user.js
index 68cc411..af483b5 100644
--- a/src/routes/dashboard/components/user.js
+++ b/src/routes/dashboard/components/user.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { Button } from 'antd'
import styles from './user.less'
import CountUp from 'react-countup'
diff --git a/src/routes/dashboard/components/weather.js b/src/routes/dashboard/components/weather.js
index b11a060..09a7ec6 100644
--- a/src/routes/dashboard/components/weather.js
+++ b/src/routes/dashboard/components/weather.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import styles from './weather.less'
function Weather ({ city, icon, dateTime, temperature, name }) {
diff --git a/src/routes/dashboard/index.js b/src/routes/dashboard/index.js
index e71958b..eeee8e6 100644
--- a/src/routes/dashboard/index.js
+++ b/src/routes/dashboard/index.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { connect } from 'dva'
import { Row, Col, Card } from 'antd'
import { NumberCard, Quote, Sales, Weather, RecentSales, Comments, Completed, Browser, Cpu, User } from './components'
diff --git a/src/routes/login/index.js b/src/routes/login/index.js
index 8ed54b8..ee5e98f 100644
--- a/src/routes/login/index.js
+++ b/src/routes/login/index.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { connect } from 'dva'
import { Button, Row, Form, Input } from 'antd'
import { config } from '../../utils'
diff --git a/src/routes/users/UserFilter.js b/src/routes/users/UserFilter.js
index 0f9b972..7fea2c7 100644
--- a/src/routes/users/UserFilter.js
+++ b/src/routes/users/UserFilter.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { Form, Button, Row, Col, Switch } from 'antd'
import { Search } from '../../components'
diff --git a/src/routes/users/UserList.js b/src/routes/users/UserList.js
index 2817109..c2913ab 100644
--- a/src/routes/users/UserList.js
+++ b/src/routes/users/UserList.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { Table, Modal } from 'antd'
import styles from './UserList.less'
import classnames from 'classnames'
diff --git a/src/routes/users/UserModal.js b/src/routes/users/UserModal.js
index 6d8eef1..2a67af9 100644
--- a/src/routes/users/UserModal.js
+++ b/src/routes/users/UserModal.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { Form, Input, InputNumber, Radio, Modal } from 'antd'
const FormItem = Form.Item
diff --git a/src/routes/users/index.js b/src/routes/users/index.js
index 494f47d..b8c7530 100644
--- a/src/routes/users/index.js
+++ b/src/routes/users/index.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
+import PropTypes from 'prop-types'
import { routerRedux } from 'dva/router'
import { connect } from 'dva'
import UserList from './UserList'
diff --git a/src/services/app.js b/src/services/app.js
index c4a62d4..c34e173 100644
--- a/src/services/app.js
+++ b/src/services/app.js
@@ -1,10 +1,10 @@
import { request, config } from '../utils'
const { api } = config
-const { userInfo, userLogout } = api
+const { userInfo, userLogout, userLogin } = api
export async function login (params) {
return request({
- url: '/api/login',
+ url: userLogin,
method: 'post',
data: params,
})
diff --git a/src/utils/index.js b/src/utils/index.js
index b124624..e1e812c 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -3,6 +3,7 @@ import menu from './menu'
import request from './request'
import classnames from 'classnames'
import { color } from './theme'
+import lodash from 'lodash'
// 连字符转驼峰
String.prototype.hyphenToHump = function () {
@@ -52,6 +53,52 @@ const queryURL = (name) => {
return null
}
+/**
+ * 数组内查询
+ * @param {array} array
+ * @param {String} id
+ * @param {String} keyAlias
+ * @return {Array}
+ */
+const queryArray = (array, key, keyAlias = 'key') => {
+ if (!(array instanceof Array)) {
+ return null
+ }
+ const item = array.filter(_ => _[keyAlias] === key)
+ if (item.length) {
+ return item[0]
+ }
+ return null
+}
+
+/**
+ * 数组格式转树状结构
+ * @param {array} array
+ * @param {String} id
+ * @param {String} pid
+ * @param {String} children
+ * @return {Array}
+ */
+const arrayToTree = (array, id = 'id', pid = 'pid', chindren = 'chindren') => {
+ let data = lodash.cloneDeep(array)
+ let result = []
+ let hash = {}
+ data.forEach((item, index) => {
+ hash[data[index][id]] = data[index]
+ })
+
+ data.forEach((item) => {
+ let hashVP = hash[item[pid]]
+ if (hashVP) {
+ !hashVP[chindren] && (hashVP[chindren] = [])
+ hashVP[chindren].push(item)
+ } else {
+ result.push(item)
+ }
+ })
+ return result
+}
+
module.exports = {
config,
menu,
@@ -59,4 +106,6 @@ module.exports = {
color,
classnames,
queryURL,
+ queryArray,
+ arrayToTree,
}
diff --git a/src/utils/menu.js b/src/utils/menu.js
index 3f815c7..e25cfac 100644
--- a/src/utils/menu.js
+++ b/src/utils/menu.js
@@ -1,102 +1,140 @@
module.exports = [
{
- key: 'dashboard',
- name: 'Dashboard',
+ id: 1,
icon: 'laptop',
+ name: 'Dashboard',
+ router: '/dashboard',
},
{
- key: 'users',
+ id: 2,
+ bpid: 1,
name: 'User Manage',
icon: 'user',
+ router: '/users',
},
{
- key: 'request',
+ id: 3,
+ bpid: 1,
name: 'Request',
icon: 'api',
+ router: '/request',
},
{
- key: 'UIElement',
+ id: 4,
+ bpid: 1,
name: 'UI Element',
icon: 'camera-o',
- clickable: false,
- child: [
- {
- key: 'iconfont',
- name: 'IconFont',
- icon: 'heart-o',
- },
- {
- key: 'dataTable',
- name: 'DataTable',
- icon: 'database',
- },
- {
- key: 'dropOption',
- name: 'DropOption',
- icon: 'bars',
- },
- {
- key: 'search',
- name: 'Search',
- icon: 'search',
- },
- {
- key: 'editor',
- name: 'Editor',
- icon: 'edit',
- },
- {
- key: 'layer',
- name: 'layer (Function)',
- icon: 'credit-card',
- },
- ],
},
{
- key: 'chart',
+ id: 41,
+ bpid: 4,
+ mpid: 4,
+ name: 'IconFont',
+ icon: 'heart-o',
+ router: '/UIElement/iconfont',
+ },
+ {
+ id: 42,
+ bpid: 4,
+ mpid: 4,
+ name: 'DataTable',
+ icon: 'database',
+ router: '/UIElement/dataTable',
+ },
+ {
+ id: 43,
+ bpid: 4,
+ mpid: 4,
+ name: 'DropOption',
+ icon: 'bars',
+ router: '/UIElement/dropOption',
+ },
+ {
+ id: 44,
+ bpid: 4,
+ mpid: 4,
+ name: 'Search',
+ icon: 'search',
+ router: '/UIElement/search',
+ },
+ {
+ id: 45,
+ bpid: 4,
+ mpid: 4,
+ name: 'Editor',
+ icon: 'edit',
+ router: '/UIElement/editor',
+ },
+ {
+ id: 46,
+ bpid: 4,
+ mpid: 4,
+ name: 'layer (Function)',
+ icon: 'credit-card',
+ router: '/UIElement/layer',
+ },
+ {
+ id: 5,
+ bpid: 1,
name: 'Recharts',
icon: 'code-o',
- child: [
- {
- key: 'lineChart',
- name: 'LineChart',
- icon: 'line-chart',
- },
- {
- key: 'barChart',
- name: 'BarChart',
- icon: 'bar-chart',
- },
- {
- key: 'areaChart',
- name: 'AreaChart',
- icon: 'area-chart',
- },
- ],
},
{
- key: 'navigation',
+ id: 51,
+ bpid: 5,
+ mpid: 5,
+ name: 'LineChart',
+ icon: 'line-chart',
+ router: '/chart/lineChart',
+ },
+ {
+ id: 52,
+ bpid: 5,
+ mpid: 5,
+ name: 'BarChart',
+ icon: 'bar-chart',
+ router: '/chart/lineChart',
+ },
+ {
+ id: 53,
+ bpid: 5,
+ mpid: 5,
+ name: 'AreaChart',
+ icon: 'area-chart',
+ router: '/chart/areaChart',
+ },
+ {
+ id: 6,
+ bpid: 1,
name: 'Test Navigation',
icon: 'setting',
- child: [
- {
- key: 'navigation1',
- name: 'Test Navigation1',
- },
- {
- key: 'navigation2',
- name: 'Test Navigation2',
- child: [
- {
- key: 'navigation21',
- name: 'Test Navigation21',
- },
- {
- key: 'navigation22',
- name: 'Test Navigation22',
- },
- ],
- },
- ],
+ },
+ {
+ id: 61,
+ bpid: 6,
+ mpid: 6,
+ name: 'Test Navigation1',
+ router: '/navigation/navigation1',
+ },
+ {
+ id: 62,
+ bpid: 6,
+ mpid: 6,
+ name: 'Test Navigation2',
+ router: '/navigation/navigation2',
+ },
+ {
+ id: 621,
+ bpid: 62,
+ mpid: 62,
+ name: 'Test Navigation21',
+ router: '/navigation/navigation2/navigation1',
+ },
+ {
+ id: 622,
+ bpid: 62,
+ mpid: 62,
+ name: 'Test Navigation22',
+ router: '/navigation/navigation2/navigation2',
},
]
diff --git a/webpack.configtest.js b/webpack.configtest.js
deleted file mode 100644
index 88576a1..0000000
--- a/webpack.configtest.js
+++ /dev/null
@@ -1,50 +0,0 @@
-const webpack = require('atool-build/lib/webpack')
-
-module.exports = function (webpackConfig, env) {
- webpackConfig.babel.plugins.push('transform-runtime')
- webpackConfig.babel.plugins.push(['import', {
- libraryName: 'antd',
- style: true,
- }])
-
- // Support hmr
- if (env === 'development') {
- webpackConfig.devtool = '#eval'
- webpackConfig.babel.plugins.push(['dva-hmr', {
- entries: [
- './src/index.js',
- ],
- }])
- } else {
- webpackConfig.babel.plugins.push('dev-expression')
- webpackConfig.entry = { index: './src/_index.js' }
- }
-
- // Don't extract common.js and common.css
- webpackConfig.plugins = webpackConfig.plugins.filter((plugin) => {
- return !(plugin instanceof webpack.optimize.CommonsChunkPlugin)
- })
-
- // Support CSS Modules
- // Parse all less files as css module.
- webpackConfig.module.loaders.forEach((loader) => {
- if (typeof loader.test === 'function' && loader.test.toString().indexOf('\\.less$') > -1) {
- loader.include = /node_modules/
- loader.test = /\.less$/
- }
- if (loader.test.toString() === '/\\.module\\.less$/') {
- loader.exclude = /node_modules/
- loader.test = /\.less$/
- }
- if (typeof loader.test === 'function' && loader.test.toString().indexOf('\\.css$') > -1) {
- loader.include = /node_modules/
- loader.test = /\.css$/
- }
- if (loader.test.toString() === '/\\.module\\.css$/') {
- loader.exclude = /node_modules/
- loader.test = /\.css$/
- }
- })
-
- return webpackConfig
-}