+
@@ -94,10 +90,10 @@ function Users({ location, dispatch, users }) {
Users.propTypes = {
users: PropTypes.object,
location: PropTypes.object,
- dispatch: PropTypes.func,
+ dispatch: PropTypes.func
}
-function mapStateToProps({ users }) {
+function mapStateToProps ({ users }) {
return { users }
}
diff --git a/src/services/app.js b/src/services/app.js
index 71b562e..e062075 100644
--- a/src/services/app.js
+++ b/src/services/app.js
@@ -1,23 +1,22 @@
import { request } from '../utils'
-import qs from 'qs'
-export async function login(params) {
+export async function login (params) {
return request('/api/login', {
method: 'post',
- data:params,
+ data: params
})
}
-export async function logout(params) {
+export async function logout (params) {
return request('/api/logout', {
method: 'post',
- data:params,
+ data: params
})
}
-export async function userInfo(params) {
+export async function userInfo (params) {
return request('/api/userInfo', {
method: 'get',
- data:params,
+ data: params
})
}
diff --git a/src/services/dashboard.js b/src/services/dashboard.js
index ccec99d..ac549be 100644
--- a/src/services/dashboard.js
+++ b/src/services/dashboard.js
@@ -1,25 +1,24 @@
import { request } from '../utils'
-import qs from 'qs'
-export async function myCity(params) {
+export async function myCity (params) {
return request('http://www.zuimeitianqi.com/zuimei/myCity', {
method: 'get',
- cross:true,
- data:params,
+ cross: true,
+ data: params
})
}
-export async function queryWeather(params) {
+export async function queryWeather (params) {
return request('http://www.zuimeitianqi.com/zuimei/queryWeather', {
method: 'get',
- cross:true,
- data:params,
+ cross: true,
+ data: params
})
}
-export async function query(params) {
+export async function query (params) {
return request('/api/dashboard', {
method: 'get',
- data:params,
+ data: params
})
}
diff --git a/src/services/users.js b/src/services/users.js
index 0710ed4..e10e1ba 100644
--- a/src/services/users.js
+++ b/src/services/users.js
@@ -1,30 +1,29 @@
import { request } from '../utils'
-import qs from 'qs'
-export async function query(params) {
+export async function query (params) {
return request('/api/users', {
method: 'get',
- data:params,
+ data: params
})
}
-export async function create(params) {
+export async function create (params) {
return request('/api/users', {
method: 'post',
- data:params,
+ data: params
})
}
-export async function remove(params) {
+export async function remove (params) {
return request('/api/users', {
method: 'delete',
- data:params,
+ data: params
})
}
-export async function update(params) {
+export async function update (params) {
return request('/api/users', {
method: 'put',
- data: params,
+ data: params
})
}
diff --git a/src/tests/models/example-test.js b/src/tests/models/example-test.js
index 3b8bd44..8b13789 100644
--- a/src/tests/models/example-test.js
+++ b/src/tests/models/example-test.js
@@ -1,11 +1 @@
-import expect from 'expect';
-import example from '../../models/example';
-describe('example', () => {
-
- describe('reducer', () => {
- it('it should save', () => {
- expect(example.reducers['example/save']({}, { payload: { a: 1 }})).toEqual({ a: 1 });
- });
- })
-});
diff --git a/src/theme.js b/src/theme.js
index db598f0..d0666d7 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -4,8 +4,8 @@ module.exports = () => {
'@border-radius-sm': '2px',
'@shadow-color': 'rgba(0,0,0,0.05)',
'@shadow-1-down': '4px 4px 40px @shadow-color',
- '@border-color-split':'#f4f4f4',
- '@border-color-base':'#e5e5e5',
- '@font-family':'monospace,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif'
- };
-};
+ '@border-color-split': '#f4f4f4',
+ '@border-color-base': '#e5e5e5',
+ '@font-family': 'monospace,-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif'
+ }
+}
diff --git a/src/utils/config.js b/src/utils/config.js
index 9e4ae52..6a71518 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -1,8 +1,8 @@
module.exports = {
name: 'Ant Design Admin',
- prefix:'antdAdmin',
+ prefix: 'antdAdmin',
footerText: 'Ant Design Admin 版权所有 © 2016 由 zuiidea 支持',
- logoSrc:'https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg',
- logoText:'Antd Admin',
- needLogin:true,
-};
+ logoSrc: 'https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg',
+ logoText: 'Antd Admin',
+ needLogin: true
+}
diff --git a/src/utils/index.js b/src/utils/index.js
index a1713a4..ef1ec8c 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -15,28 +15,29 @@ String.prototype.hyphenToHump = function () {
// 驼峰转连字符
String.prototype.humpToHyphen = function () {
- return this.replace(/([A-Z])/g, "-$1").toLowerCase()
+ return this.replace(/([A-Z])/g, '-$1').toLowerCase()
}
// 日期格式化
Date.prototype.format = function (format) {
var o = {
- "M+": this.getMonth() + 1,
- "d+": this.getDate(),
- "h+": this.getHours(),
+ 'M+': this.getMonth() + 1,
+ 'd+': this.getDate(),
+ 'h+': this.getHours(),
'H+': this.getHours(),
- "m+": this.getMinutes(),
- "s+": this.getSeconds(),
- "q+": Math.floor((this.getMonth() + 3) / 3),
- "S": this.getMilliseconds()
+ 'm+': this.getMinutes(),
+ 's+': this.getSeconds(),
+ 'q+': Math.floor((this.getMonth() + 3) / 3),
+ 'S': this.getMilliseconds()
}
- if (/(y+)/.test(format))
- format = format.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length))
- for (var k in o)
- if (new RegExp("(" + k + ")").test(format))
- format = format.replace(RegExp.$1, RegExp.$1.length == 1
+ if (/(y+)/.test(format)) { format = format.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length)) }
+ for (var k in o) {
+ if (new RegExp('(' + k + ')').test(format)) {
+ format = format.replace(RegExp.$1, RegExp.$1.length === 1
? o[k]
- : ("00" + o[k]).substr(("" + o[k]).length))
+ : ('00' + o[k]).substr(('' + o[k]).length))
+ }
+ }
return format
}
diff --git a/src/utils/menu.js b/src/utils/menu.js
index b15fef5..28b5787 100644
--- a/src/utils/menu.js
+++ b/src/utils/menu.js
@@ -7,18 +7,18 @@ module.exports = [
{
key: 'users',
name: '用户管理',
- icon: 'user',
+ icon: 'user'
},
{
key: 'ui',
name: 'UI组件',
icon: 'camera-o',
- clickable:false,
- child:[
+ clickable: false,
+ child: [
{
key: 'ico',
- name: '业务图标',
- },
+ name: '业务图标'
+ }
]
},
{
@@ -28,7 +28,7 @@ module.exports = [
child: [
{
key: 'navigation1',
- name: '二级导航1',
+ name: '二级导航1'
},
{
key: 'navigation2',
@@ -36,14 +36,14 @@ module.exports = [
child: [
{
key: 'navigation21',
- name: '三级导航1',
+ name: '三级导航1'
},
{
key: 'navigation22',
- name: '三级导航2',
- },
- ],
- },
- ],
- },
-];
+ name: '三级导航2'
+ }
+ ]
+ }
+ ]
+ }
+]
diff --git a/src/utils/mock.js b/src/utils/mock.js
index abfddd1..621ce71 100644
--- a/src/utils/mock.js
+++ b/src/utils/mock.js
@@ -1,22 +1,22 @@
const Mock = require('mockjs')
-const mockData = [require("../../mock/users"), require("../../mock/app"), require("../../mock/dashboard")]
+const mockData = [require('../../mock/users'), require('../../mock/app'), require('../../mock/dashboard')]
-function serialize(str) {
- let paramArray = str.split("&")
+function serialize (str) {
+ let paramArray = str.split('&')
let query = {}
for (let i in paramArray) {
- query[paramArray[i].split("=")[0]] = paramArray[i].split("=")[1]
+ query[paramArray[i].split('=')[0]] = paramArray[i].split('=')[1]
}
return query
}
for (let i in mockData) {
for (let key in mockData[i]) {
- Mock.mock(eval("/" + key.split(" ")[1].replace(/\//g, "\\\/") + "/"), key.split(" ")[0].toLowerCase(), function (options) {
- if (key.split(" ")[0].toLowerCase() == 'get') {
- options.query = !!options.url.split("?")[1]
- ? serialize(options.url.split("?")[1])
- : (!!options.body
+ Mock.mock(eval('/' + key.split(' ')[1].replace(/\//g, '\\\/') + '/'), key.split(' ')[0].toLowerCase(), function (options) {
+ if (key.split(' ')[0].toLowerCase() == 'get') {
+ options.query = options.url.split('?')[1]
+ ? serialize(options.url.split('?')[1])
+ : (options.body
? serialize(options.body)
: {})
}
diff --git a/src/utils/mockStorge.js b/src/utils/mockStorge.js
index edd7d5a..c4a8487 100644
--- a/src/utils/mockStorge.js
+++ b/src/utils/mockStorge.js
@@ -1,8 +1,7 @@
-const Mock = require('mockjs')
-const Watch = require("watchjs")
+const Watch = require('watchjs')
import config from './config'
-export default function mockStorge(name, defaultValue) {
+export default function mockStorge (name, defaultValue) {
let key = config.prefix + name
global[key] = localStorage.getItem(key)
? JSON.parse(localStorage.getItem(key))
diff --git a/src/utils/request.js b/src/utils/request.js
index b44dec9..279b9f7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,4 +1,4 @@
-const Ajax = require("robe-ajax")
+const Ajax = require('robe-ajax')
/**
* Requests a URL, returning a promise.
@@ -7,20 +7,18 @@ const Ajax = require("robe-ajax")
* @param {object} [options] The options we want to pass to "fetch"
* @return {object} An object containing either "data" or "err"
*/
-export default function request(url, options) {
+export default function request (url, options) {
if (options.cross) {
- return Ajax.getJSON("http://query.yahooapis.com/v1/public/yql", {
- q: "select * from json where url=\'"+url+"?"+Ajax.param(options.data)+"\'",
- format: "json"
+ return Ajax.getJSON('http://query.yahooapis.com/v1/public/yql', {
+ q: "select * from json where url='" + url + '?' + Ajax.param(options.data) + "'",
+ format: 'json'
})
} else {
return Ajax.ajax({
url: url,
method: options.method || 'get',
data: options.data || {},
- processData: options.method == 'get'
- ? true
- : false,
+ processData: options.method === 'get',
dataType: 'JSON'
}).done((data) => {
return data
diff --git a/src/utils/theme.js b/src/utils/theme.js
index 06d2035..85ed8b4 100644
--- a/src/utils/theme.js
+++ b/src/utils/theme.js
@@ -1,14 +1,14 @@
module.exports = {
- color:{
- green:'#64ea91',
- blue:'#8fc9fb',
- purple:'#d897eb',
- red:'#f69899',
- yellow:'#f8c82e',
- peach:'#f797d6',
- borderBase:'#e5e5e5',
- borderSplit:'#f4f4f4',
- grass:"#d6fbb5",
- sky:'#c1e0fc'
+ color: {
+ green: '#64ea91',
+ blue: '#8fc9fb',
+ purple: '#d897eb',
+ red: '#f69899',
+ yellow: '#f8c82e',
+ peach: '#f797d6',
+ borderBase: '#e5e5e5',
+ borderSplit: '#f4f4f4',
+ grass: '#d6fbb5',
+ sky: '#c1e0fc'
}
-};
+}
diff --git a/webpack.config.js b/webpack.config.js
index 9c6031b..8538f38 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,12 +1,10 @@
-const fs = require('fs')
-const path = require('path')
const webpack = require('atool-build/lib/webpack')
-module.exports = function(webpackConfig, env) {
+module.exports = function (webpackConfig, env) {
webpackConfig.babel.plugins.push('transform-runtime')
webpackConfig.babel.plugins.push(['import', {
libraryName: 'antd',
- style: true,
+ style: true
}])
// Support hmr
@@ -14,21 +12,21 @@ module.exports = function(webpackConfig, env) {
webpackConfig.devtool = '#eval'
webpackConfig.babel.plugins.push(['dva-hmr', {
entries: [
- './src/index.js',
- ],
+ './src/index.js'
+ ]
}])
} else {
webpackConfig.babel.plugins.push('dev-expression')
}
// Don't extract common.js and common.css
- webpackConfig.plugins = webpackConfig.plugins.filter(function(plugin) {
- return !(plugin instanceof webpack.optimize.CommonsChunkPlugin);
+ webpackConfig.plugins = webpackConfig.plugins.filter(function (plugin) {
+ return !(plugin instanceof webpack.optimize.CommonsChunkPlugin)
})
// Support CSS Modules
// Parse all less files as css module.
- webpackConfig.module.loaders.forEach(function(loader, index) {
+ webpackConfig.module.loaders.forEach(function (loader, index) {
if (typeof loader.test === 'function' && loader.test.toString().indexOf('\\.less$') > -1) {
loader.include = /node_modules/
loader.test = /\.less$/