Skip to content

Commit d6609b0

Browse files
committed
Update router and naming
1 parent 7928ef0 commit d6609b0

13 files changed

Lines changed: 26 additions & 82 deletions

File tree

config/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export default {
7474
.split('/')
7575
.map(a => a.replace(/([A-Z])/g, '-$1'))
7676
.map(a => a.toLowerCase());
77-
return `web${arr.join('-')}-${localName}`.replace(/--/g, '-');
77+
return `gin-admin${arr.join('-')}-${localName}`.replace(/--/g, '-');
7878
}
7979
return localName;
8080
},

src/layouts/AdminLayout.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React from 'react';
22
import { Layout, Menu, Icon, Avatar, Dropdown, Spin } from 'antd';
33
import DocumentTitle from 'react-document-title';
44
import { connect } from 'dva';
5+
// eslint-disable-next-line import/no-extraneous-dependencies
56
import Link from 'umi/link';
67
import { ContainerQuery } from 'react-container-query';
78
import classNames from 'classnames';
@@ -158,10 +159,11 @@ class AdminLayout extends React.PureComponent {
158159
}
159160

160161
return menusData.map(item => {
161-
if (!item.name) {
162+
if (!item.name || item.hidden !== 0) {
162163
return null;
163164
}
164-
if (item.children && item.children.some(child => child.name)) {
165+
166+
if (item.children && item.children.some(child => child.name && child.hidden === 0)) {
165167
return (
166168
<SubMenu
167169
title={

src/models/demo.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ export default {
1818
},
1919
effects: {
2020
*fetch({ search, pagination }, { call, put, select }) {
21-
let params = {
22-
q: 'page',
23-
};
21+
let params = {};
2422

2523
if (search) {
2624
params = { ...params, ...search };

src/models/menu.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ export default {
2121
},
2222
effects: {
2323
*fetch({ search, pagination }, { call, put, select }) {
24-
let params = {
25-
q: 'page',
26-
};
24+
let params = {};
2725

2826
if (search) {
2927
params = { ...params, ...search };
@@ -158,13 +156,11 @@ export default {
158156
}
159157
},
160158
*fetchTree({ payload }, { call, put }) {
161-
let params = {
162-
q: 'tree',
163-
};
159+
let params = {};
164160
if (payload) {
165161
params = { ...params, ...payload };
166162
}
167-
const response = yield call(menuService.query, params);
163+
const response = yield call(menuService.queryTree, params);
168164
yield put({
169165
type: 'saveTreeData',
170166
payload: response.list || [],

src/models/role.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ export default {
1919
},
2020
effects: {
2121
*fetch({ search, pagination }, { call, put, select }) {
22-
let params = {
23-
q: 'page',
24-
};
22+
let params = {};
2523

2624
if (search) {
2725
params = { ...params, ...search };
@@ -147,10 +145,7 @@ export default {
147145
}
148146
},
149147
*fetchSelect(_, { call, put }) {
150-
const params = {
151-
q: 'select',
152-
};
153-
const response = yield call(roleService.query, params);
148+
const response = yield call(roleService.querySelect);
154149
yield put({
155150
type: 'saveSelectData',
156151
payload: response.list || [],

src/models/user.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ export default {
1717
},
1818
effects: {
1919
*fetch({ search, pagination }, { call, put, select }) {
20-
let params = {
21-
q: 'page',
22-
};
20+
let params = {};
2321

2422
if (search) {
2523
params = { ...params, ...search };

src/pages/Login/Index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@ class Login extends PureComponent {
111111
],
112112
})(
113113
<Input
114-
style={{ width: '70%', marginRight: 10 }}
114+
style={{ width: '60%', marginRight: 10 }}
115115
size="large"
116116
prefix={<Icon type="code" className={styles.prefixIcon} />}
117117
placeholder="请输入验证码"
118118
/>
119119
)}
120120
<div
121121
style={{
122-
width: 100,
122+
width: 120,
123123
height: 40,
124124
}}
125125
>

src/pages/Login/Index.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
.submit {
2626
width: 100%;
27-
margin-top: 24px;
27+
margin-top: 12px;
2828
}
2929

3030
:global {

src/pages/Menu/MenuList.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,11 @@ class MenuList extends PureComponent {
303303
} = this.props;
304304

305305
const item = {
306-
parent_id: '',
306+
parentID: '',
307307
};
308308

309309
if (keys.length > 0) {
310-
[item.parent_id] = keys;
310+
[item.parentID] = keys;
311311
}
312312

313313
this.dispatch({

src/pages/Menu/MenuTree.js

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)