@@ -19,7 +19,7 @@ const Loader = ({ spinning, fullScreen }) => {
Loader.propTypes = {
spinning: PropTypes.bool,
- fullScreen: PropTypes.bool,
+ fullScreen: PropTypes.bool
}
export default Loader
diff --git a/src/components/index.js b/src/components/index.js
index 6a453b5..30715b9 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -3,5 +3,5 @@ import * as Layout from './Layout/index.js'
export {
Loader,
- Layout,
+ Layout
}
diff --git a/src/layouts/app.js b/src/layouts/app.js
index 11dc23c..0ad8a91 100644
--- a/src/layouts/app.js
+++ b/src/layouts/app.js
@@ -24,7 +24,7 @@ const App = ({ children, dispatch, app, loading, location }) => {
const { iconFontJS, iconFontCSS, logo } = config
const current = menu.filter(item => pathToRegexp(item.url || '').exec(pathname));
let hasPermission = false;
- if (current.length == 0 || pathname.indexOf('?') > 0) {//菜单中没有，但是pathName上带有查询参数的连接，默认为子页面，不验证权限.
+ if (current.length === 0 || pathname.indexOf('?') > 0) {//菜单中没有，但是pathName上带有查询参数的连接，默认为子页面，不验证权限.
hasPermission = true;
} else {
hasPermission = permission.check(current[0].permissionName)
@@ -47,18 +47,18 @@ const App = ({ children, dispatch, app, loading, location }) => {
isNavbar,
menuPopoverVisible,
navOpenKeys,
- switchMenuPopover () {
+ switchMenuPopover() {
dispatch({ type: 'app/switchMenuPopver' })
},
- logout () {
+ logout() {
dispatch({ type: 'app/logout' })
},
- switchSider () {
+ switchSider() {
dispatch({ type: 'app/switchSider' })
},
- changeOpenKeys (openKeys) {
+ changeOpenKeys(openKeys) {
dispatch({ type: 'app/handleNavOpenKeys', payload: { navOpenKeys: openKeys } })
- },
+ }
}
const siderProps = {
@@ -67,18 +67,18 @@ const App = ({ children, dispatch, app, loading, location }) => {
siderFold,
darkTheme,
navOpenKeys,
- changeTheme () {
+ changeTheme() {
dispatch({ type: 'app/switchTheme' })
},
- changeOpenKeys (openKeys) {
+ changeOpenKeys(openKeys) {
window.localStorage.setItem(`${prefix}navOpenKeys`, JSON.stringify(openKeys))
dispatch({ type: 'app/handleNavOpenKeys', payload: { navOpenKeys: openKeys } })
- },
+ }
}
const breadProps = {
menu,
- location,
+ location
}
if (openPages && openPages.includes(pathname)) {
return (
@@ -105,7 +105,7 @@ const App = ({ children, dispatch, app, loading, location }) => {
- {hasPermission ? children : }
+ {hasPermission ? children : }
@@ -120,7 +120,7 @@ App.propTypes = {
location: PropTypes.object,
dispatch: PropTypes.func,
app: PropTypes.object,
- loading: PropTypes.object,
+ loading: PropTypes.object
}
export default withRouter(connect(({ app, loading }) => ({ app, loading }))(App))
diff --git a/src/models/app.js b/src/models/app.js
index 48f0f86..214532a 100644
--- a/src/models/app.js
+++ b/src/models/app.js
@@ -21,8 +21,8 @@ export default {
id: 1,
icon: 'laptop',
name: 'Dashboard',
- url: '/dashboard',
- },
+ url: '/dashboard'
+ }
],
menuPopoverVisible: false,
siderFold: window.localStorage.getItem(`${prefix}siderFold`) === 'true',
@@ -30,7 +30,7 @@ export default {
isNavbar: document.body.clientWidth < 769,
navOpenKeys: JSON.parse(window.localStorage.getItem(`${prefix}navOpenKeys`)) || [],
locationPathname: '',
- locationQuery: {},
+ locationQuery: {}
},
subscriptions: {
@@ -40,8 +40,8 @@ export default {
type: 'updateState',
payload: {
locationPathname: location.pathname,
- locationQuery: location.query,
- },
+ locationQuery: location.query
+ }
})
})
},
@@ -55,13 +55,12 @@ export default {
dispatch({ type: 'changeNavbar' })
}, 300)
}
- },
-
+ }
},
effects: {
* query({
- payload,
+ payload
}, { call, put, select }) {
const { success, user } = yield call(query, payload)
const { locationPathname } = yield select(_ => _.app)
@@ -77,26 +76,26 @@ export default {
type: 'updateState',
payload: {
user,
- menu,
- },
+ menu
+ }
})
- if (location.pathname === '/login') {
+ if (window.location.pathname === '/login') {
yield put(routerRedux.push({
- pathname: '/dashboard',
+ pathname: '/dashboard'
}))
}
} else if (config.openPages && config.openPages.indexOf(locationPathname) < 0) {
yield put(routerRedux.push({
pathname: '/login',
search: queryString.stringify({
- from: locationPathname,
- }),
+ from: locationPathname
+ })
}))
}
},
* logout({
- payload,
+ payload
}, { call, put }) {
const data = yield call(logout, parse(payload))
if (data.success) {
@@ -109,8 +108,8 @@ export default {
icon: 'laptop',
name: 'Dashboard',
url: '/dashboard'
- },
- ],
+ }
+ ]
}
})
yield put({ type: 'query' })
@@ -125,14 +124,13 @@ export default {
if (isNavbar !== app.isNavbar) {
yield put({ type: 'handleNavbar', payload: isNavbar })
}
- },
-
+ }
},
reducers: {
- updateState (state, { payload }) {
+ updateState(state, { payload }) {
return {
...state,
- ...payload,
+ ...payload
}
},
@@ -140,7 +138,7 @@ export default {
window.localStorage.setItem(`${prefix}siderFold`, !state.siderFold)
return {
...state,
- siderFold: !state.siderFold,
+ siderFold: !state.siderFold
}
},
@@ -148,29 +146,29 @@ export default {
window.localStorage.setItem(`${prefix}darkTheme`, !state.darkTheme)
return {
...state,
- darkTheme: !state.darkTheme,
+ darkTheme: !state.darkTheme
}
},
switchMenuPopver(state) {
return {
...state,
- menuPopoverVisible: !state.menuPopoverVisible,
+ menuPopoverVisible: !state.menuPopoverVisible
}
},
handleNavbar(state, { payload }) {
return {
...state,
- isNavbar: payload,
+ isNavbar: payload
}
},
handleNavOpenKeys(state, { payload: navOpenKeys }) {
return {
...state,
- ...navOpenKeys,
+ ...navOpenKeys
}
- },
- },
+ }
+ }
}
diff --git a/src/pages/dashboard/index.js b/src/pages/dashboard/index.js
index 4ca2cb1..400faec 100644
--- a/src/pages/dashboard/index.js
+++ b/src/pages/dashboard/index.js
@@ -20,10 +20,10 @@ class DashBoardPage extends React.Component {
checkable:true,
actions: [{
name: '外部按钮',
- onClick: function (ids, datas) { }
+ onClick: function () { }
}],
columns: [
- { title: "编号", data: "id", type: "number", },
+ { title: "编号", data: "id", type: "number"},
{ title: "文本", data: "field-text", type: "text", editor: {}, query: true },
{ title: "整数", data: "field-number", type: "number", editor: {}, query: true },
{ title: "小数", data: "field-float", type: "number", editor: { step: 0.1, precision: 2 }, query: true },
diff --git a/src/pages/demo/bird-button.js b/src/pages/demo/bird-button.js
index d759d5f..329033f 100644
--- a/src/pages/demo/bird-button.js
+++ b/src/pages/demo/bird-button.js
@@ -1,5 +1,4 @@
import React from 'react';
-import { request } from 'utils';
import {Card} from 'antd';
import {BirdButton} from 'components/Form';
diff --git a/src/pages/demo/bird-cascader.js b/src/pages/demo/bird-cascader.js
index c279caa..3fe664f 100644
--- a/src/pages/demo/bird-cascader.js
+++ b/src/pages/demo/bird-cascader.js
@@ -1,5 +1,4 @@
import React from 'react';
-import { request } from 'utils';
import {Card} from 'antd';
import {BirdCascader} from 'components/Form';
diff --git a/src/pages/demo/bird-form.js b/src/pages/demo/bird-form.js
index 9f0f264..ff0bdc6 100644
--- a/src/pages/demo/bird-form.js
+++ b/src/pages/demo/bird-form.js
@@ -1,5 +1,4 @@
import React from 'react';
-import { request } from 'utils';
import {Card} from 'antd';
import {BirdForm} from 'components/Form';
diff --git a/src/pages/demo/bird-grid.js b/src/pages/demo/bird-grid.js
index 47851dc..9074a7d 100644
--- a/src/pages/demo/bird-grid.js
+++ b/src/pages/demo/bird-grid.js
@@ -21,10 +21,10 @@ class BirdGridDemoPage extends React.Component {
checkable:true,
actions: [{
name: '外部按钮',
- onClick: function (ids, datas) { }
+ onClick: function () { }
}],
columns: [
- { title: "编号", data: "id", type: "number", },
+ { title: "编号", data: "id", type: "number" },
{ title: "文本", data: "field-text", type: "text", editor: {}, query: true },
{ title: "整数", data: "field-number", type: "number", editor: {}, query: true },
{ title: "小数", data: "field-float", type: "number", editor: { step: 0.1, precision: 2 }, query: true },
diff --git a/src/pages/demo/bird-multi.js b/src/pages/demo/bird-multi.js
index f9c94dc..3a86317 100644
--- a/src/pages/demo/bird-multi.js
+++ b/src/pages/demo/bird-multi.js
@@ -1,5 +1,4 @@
import React from 'react';
-import { request } from 'utils';
import {BirdMulti} from "../../components/Form";
import {Card} from 'antd';
diff --git a/src/pages/demo/bird-selector.js b/src/pages/demo/bird-selector.js
index 7ec44dd..63bd12a 100644
--- a/src/pages/demo/bird-selector.js
+++ b/src/pages/demo/bird-selector.js
@@ -1,5 +1,4 @@
import React from 'react';
-import { request } from 'utils';
import {BirdSelector} from "../../components/Form";
import {Card} from 'antd';
diff --git a/src/pages/demo/bird-tree.js b/src/pages/demo/bird-tree.js
index 1c7dd50..2257ca2 100644
--- a/src/pages/demo/bird-tree.js
+++ b/src/pages/demo/bird-tree.js
@@ -1,5 +1,4 @@
import React from 'react';
-import { request } from 'utils';
import {Card} from 'antd';
import {BirdTree} from 'components/Grid';
diff --git a/src/pages/login/index.js b/src/pages/login/index.js
index 5b9d0ca..1bb69df 100644
--- a/src/pages/login/index.js
+++ b/src/pages/login/index.js
@@ -12,10 +12,10 @@ const Login = ({
dispatch,
form: {
getFieldDecorator,
- validateFieldsAndScroll,
- },
+ validateFieldsAndScroll
+ }
}) => {
- function handleOk () {
+ function handleOk() {
validateFieldsAndScroll((errors, values) => {
if (errors) {
return
@@ -35,18 +35,18 @@ const Login = ({
{getFieldDecorator('username', {
rules: [
{
- required: true,
- },
- ],
+ required: true
+ }
+ ]
})(
)}
{getFieldDecorator('password', {
rules: [
{
- required: true,
- },
- ],
+ required: true
+ }
+ ]
})()}
@@ -67,7 +67,7 @@ const Login = ({
Login.propTypes = {
form: PropTypes.object,
dispatch: PropTypes.func,
- loading: PropTypes.object,
+ loading: PropTypes.object
}
export default connect(({ loading }) => ({ loading }))(Form.create()(Login))
diff --git a/src/pages/login/model.js b/src/pages/login/model.js
index 4e0ce9e..5a51424 100644
--- a/src/pages/login/model.js
+++ b/src/pages/login/model.js
@@ -7,8 +7,8 @@ export default {
state: {},
effects: {
- * login ({
- payload,
+ * login({
+ payload
}, { put, call, select }) {
const data = yield call(login, payload)
const { locationQuery } = yield select(_ => _.app)
@@ -23,7 +23,6 @@ export default {
} else {
throw data
}
- },
- },
-
+ }
+ }
}
diff --git a/src/pages/login/service.js b/src/pages/login/service.js
index cd33692..14dd102 100644
--- a/src/pages/login/service.js
+++ b/src/pages/login/service.js
@@ -3,7 +3,7 @@ import { request, config } from 'utils'
const { api } = config
const { userLogin } = api
-export function login (data) {
+export function login(data) {
return request({
url: userLogin,
method: 'post',
diff --git a/src/pages/sys/authorize/user.js b/src/pages/sys/authorize/user.js
index cc603f1..9b0e256 100644
--- a/src/pages/sys/authorize/user.js
+++ b/src/pages/sys/authorize/user.js
@@ -20,10 +20,10 @@ class SysUserPage extends React.Component {
checkable:true,
actions: [{
name: '外部按钮',
- onClick: function (ids, datas) { }
+ onClick: function () { }
}],
columns: [
- { title: "编号", data: "id", type: "number", },
+ { title: "编号", data: "id", type: "number" },
{ title: "文本", data: "field-text", type: "text", editor: {}, query: true },
{ title: "整数", data: "field-number", type: "number", editor: {}, query: true },
{ title: "小数", data: "field-float", type: "number", editor: { step: 0.1, precision: 2 }, query: true },
diff --git a/src/services/app.js b/src/services/app.js
index f21bada..d0a756d 100644
--- a/src/services/app.js
+++ b/src/services/app.js
@@ -3,7 +3,7 @@ import { request, config } from 'utils'
const { api } = config
const { user, userLogout, userLogin } = api
-export async function login (params) {
+export async function login(params) {
return request({
url: userLogin,
method: 'post',
@@ -11,7 +11,7 @@ export async function login (params) {
})
}
-export async function logout (params) {
+export async function logout(params) {
return request({
url: userLogout,
method: 'get',
@@ -19,7 +19,7 @@ export async function logout (params) {
})
}
-export async function query (params) {
+export async function query(params) {
return request({
url: user.replace('/:id', ''),
method: 'get',
diff --git a/src/services/menus.js b/src/services/menus.js
index d9b40fe..f97f5ef 100644
--- a/src/services/menus.js
+++ b/src/services/menus.js
@@ -1,9 +1,9 @@
-import { request,config } from 'utils'
+import { request, config } from 'utils'
-export async function query (params) {
+export async function query(params) {
return request({
url: config.api.menus,
method: 'get',
- data: params,
+ data: params
})
}
diff --git a/src/services/permissions.js b/src/services/permissions.js
index 7d5ca6d..73b90fa 100644
--- a/src/services/permissions.js
+++ b/src/services/permissions.js
@@ -1,9 +1,9 @@
-import { request,config } from 'utils'
+import { request, config } from 'utils'
-export async function query (params) {
+export async function query(params) {
return request({
url: config.api.permissions,
method: 'get',
- data: params,
+ data: params
})
}
diff --git a/src/utils/config.js b/src/utils/config.js
index 2c036bc..6057242 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -22,5 +22,5 @@ module.exports = {
getDic:`${APIV1}/getdic?key=`,
upload:`/file/upload`,
permissions:`${APIV1}/permissions`
- },
+ }
}
diff --git a/src/utils/index.js b/src/utils/index.js
index 3671c05..fd284b4 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -87,20 +87,20 @@ const arrayToHash=(array,key='value')=> {
* @returns {*}
*/
const deepClone = (p,c) => {
- var c = c ? c : p.constructor === Array ? [] : {};
+ var nc = c ? c : p.constructor === Array ? [] : {};
for (var i in p) {
if (typeof p[i] === 'object') {
if (p[i] == null) {
- c[i] = null;
+ nc[i] = null;
continue;
}
- c[i] = (p[i].constructor === Array) ? [] : {};
- deepClone(p[i], c[i]);
+ nc[i] = (p[i].constructor === Array) ? [] : {};
+ deepClone(p[i], nc[i]);
} else {
- c[i] = p[i];
+ nc[i] = p[i];
}
}
- return c;
+ return nc;
}
export {
diff --git a/src/utils/permission.js b/src/utils/permission.js
index b0d28a4..8db25a9 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -7,7 +7,7 @@ const permission = {
if (util.string.isEmpty(permissionName)) return true;
let permissions = permission.getPermissions();
- return permissions.findIndex(p => p == permissionName) >= 0;
+ return permissions.findIndex(p => p === permissionName) >= 0;
},
getPermissions() {
return util.store.get(permissionKey);
diff --git a/src/utils/request.js b/src/utils/request.js
index 0294a3e..3434760 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,7 +13,7 @@ const fetch = (options) => {
method = 'post',
data,
fetchType,
- url,
+ url
} = options
const cloneData = lodash.cloneDeep(data)
@@ -41,7 +41,7 @@ const fetch = (options) => {
jsonp(url, {
param: `${qs.stringify(data)}&callback`,
name: `jsonp_${new Date().getTime()}`,
- timeout: 4000,
+ timeout: 4000
}, (error, result) => {
if (error) {
reject(error)
@@ -86,9 +86,9 @@ const fetch = (options) => {
}
}
-export default function request (options) {
+export default function request(options) {
//TODO:后台访问地址前缀移入配置文件
- if (options.url && options.url.indexOf('//') == -1 && options.url.indexOf('api/v') < 0) {
+ if (options.url && options.url.indexOf('//') === -1 && options.url.indexOf('api/v') < 0) {
options.url = config.apiPrefix + options.url;
}
if (options.url && options.url.indexOf('//') > -1) {
@@ -108,19 +108,19 @@ export default function request (options) {
return fetch(options).then((response) => {
let data = options.fetchType === 'YQL' ? response.data.query.results.json : response.data
- if(data['httpCode']==="200") {
+ if (data['httpCode'] === "200") {
return Promise.resolve(data['result'])
} else if (data['code'] + '' === '500') {
- return Promise.reject({response});
- }else {
+ return Promise.reject({ response });
+ } else {
return Promise.resolve(data);
}
}).catch((error) => {
- const {response} = error
+ const { response } = error
let msg
let statusCode
if (response && response instanceof Object) {
- const {data, statusText} = response
+ const { data, statusText } = response
statusCode = response.status
msg = data.message || statusText
} else {
@@ -128,6 +128,6 @@ export default function request (options) {
msg = error.message || 'Network Error'
}
message.error(msg);
- return Promise.reject({success: false, statusCode, message: msg})
+ return Promise.reject({ success: false, statusCode, message: msg })
})
}
diff --git a/src/utils/theme.js b/src/utils/theme.js
index c25585c..85ed8b4 100644
--- a/src/utils/theme.js
+++ b/src/utils/theme.js
@@ -9,6 +9,6 @@ module.exports = {
borderBase: '#e5e5e5',
borderSplit: '#f4f4f4',
grass: '#d6fbb5',
- sky: '#c1e0fc',
- },
+ sky: '#c1e0fc'
+ }
}
diff --git a/src/utils/util.js b/src/utils/util.js
index a8b8068..698c130 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -5,30 +5,30 @@ const tokenKey = "sso.token";
let util = {
object: {
deepClone: function (p, c) {
- var c = c ? c : p.constructor === Array ? [] : {};
+ var nc = c ? c : p.constructor === Array ? [] : {};
for (var i in p) {
if (typeof p[i] === 'object') {
if (p[i] == null) {
- c[i] = null;
+ nc[i] = null;
continue;
}
- c[i] = (p[i].constructor === Array) ? [] : {};
- util.object.deepClone(p[i], c[i]);
+ nc[i] = (p[i].constructor === Array) ? [] : {};
+ util.object.deepClone(p[i], nc[i]);
} else {
- c[i] = p[i];
+ nc[i] = p[i];
}
}
- return c;
+ return nc;
},
equal: function (a, b) {
- return JSON.stringify(a) == JSON.stringify(b);
+ return JSON.stringify(a) === JSON.stringify(b);
}
},
number: {
getDiscount: function (price, originPrice) {
if (price <= 0 || originPrice <= 0 || price >= originPrice) return "";
var d = (price / originPrice * 10).toFixed(2);
- while (d[d.length - 1] === "0" || d[d.length - 1] == ".") {
+ while (d[d.length - 1] === "0" || d[d.length - 1] === ".") {
d = d.substring(0, d.length - 1);
}
return d;
@@ -112,7 +112,7 @@ let util = {
if (typeof (str) === "undefined") return true;
return (str.replace(/(^\s*)|(\s*$)/g, "").length === 0);
},
- generateRandom (len) {
+ generateRandom(len) {
len = len || 32;
var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
var maxPos = $chars.length;
@@ -172,10 +172,10 @@ let util = {
return null;
},
set: function (key, value, span) {
- var span = span || 120;//默认缓存两小时
+ var sp = span || 120;//默认缓存两小时
var now = new Date();
- var expire = new Date((now / 1000 + span * 60) * 1000);
+ var expire = new Date((now / 1000 + sp * 60) * 1000);
var cacheObj = {
expire: expire,
value: value