Skip to content

Commit 87a3482

Browse files
LyricTianLyricTian
committed
Rename record_id to id
1 parent 43ddba1 commit 87a3482

File tree

14 files changed

+78
-82
lines changed

14 files changed

+78
-82
lines changed

‎src/layouts/AdminLayout.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class AdminLayout extends React.PureComponent {
117117
let isParent = false;
118118
for (let i = 0; i < openKeys.length - 1; i += 1) {
119119
const item = menuMap[openKeys[i]] || {};
120-
let path = item.record_id;
120+
let path = item.id;
121121
if (item.parent_path !== '') {
122122
path = `${item.parent_path}/${path}`;
123123
}
@@ -185,7 +185,7 @@ class AdminLayout extends React.PureComponent {
185185
item.name
186186
)
187187
}
188-
key={item.record_id}
188+
key={item.id}
189189
>
190190
{this.renderNavMenuItems(item.children)}
191191
</SubMenu>
@@ -199,7 +199,7 @@ class AdminLayout extends React.PureComponent {
199199
} = this.props;
200200

201201
return (
202-
<Menu.Item key={item.record_id}>
202+
<Menu.Item key={item.id}>
203203
{router.startsWith('http') ? (
204204
<a href={router} target="_blank" rel="noopener noreferrer">
205205
{icon}

‎src/models/demo.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ export default {
8989
}),
9090
put({
9191
type: 'fetchForm',
92-
payload: { record_id: payload.id },
92+
payload: { id: payload.id },
9393
}),
9494
];
9595
}
9696
},
9797
*fetchForm({ payload }, { call, put }) {
98-
const response = yield call(demoService.get, payload.record_id);
98+
const response = yield call(demoService.get, payload.id);
9999
yield [
100100
put({
101101
type: 'saveFormData',
@@ -120,7 +120,7 @@ export default {
120120
}
121121
} else {
122122
const response = yield call(demoService.create, params);
123-
if (response.record_id && response.record_id !== '') {
123+
if (response.id && response.id !== '') {
124124
success = true;
125125
}
126126
}
@@ -142,7 +142,7 @@ export default {
142142
}
143143
},
144144
*del({ payload }, { call, put }) {
145-
const response = yield call(demoService.del, payload.record_id);
145+
const response = yield call(demoService.del, payload.id);
146146
if (response.status === 'OK') {
147147
message.success('删除成功');
148148
yield put({ type: 'fetch' });
@@ -151,9 +151,9 @@ export default {
151151
*changeStatus({ payload }, { call, put, select }) {
152152
let response;
153153
if (payload.status === 1) {
154-
response = yield call(demoService.enable, payload.record_id);
154+
response = yield call(demoService.enable, payload.id);
155155
} else {
156-
response = yield call(demoService.disable, payload.record_id);
156+
response = yield call(demoService.disable, payload.id);
157157
}
158158

159159
if (response.status === 'OK') {
@@ -167,7 +167,7 @@ export default {
167167

168168
for (let i = 0; i < data.list.length; i += 1) {
169169
const item = data.list[i];
170-
if (item.record_id === payload.record_id) {
170+
if (item.id === payload.id) {
171171
item.status = payload.status;
172172
}
173173
newData.list.push(item);

‎src/models/global.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export default {
4242

4343
yield put({
4444
type: 'changeSelectedKeys',
45-
payload: [item.record_id],
45+
payload: [item.id],
4646
});
4747
},
4848
*fetchUser(_, { call, put }) {
@@ -65,7 +65,7 @@ export default {
6565
const menuMap = {};
6666
function fillData(data) {
6767
for (let i = 0; i < data.length; i += 1) {
68-
menuMap[data[i].record_id] = data[i];
68+
menuMap[data[i].id] = data[i];
6969
if (data[i].router !== '') {
7070
menuPaths[data[i].router] = data[i];
7171
}

‎src/models/menu.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export default {
9393
}),
9494
put({
9595
type: 'fetchForm',
96-
payload: { record_id: payload.id },
96+
payload: { id: payload.id },
9797
}),
9898
];
9999
} else {
@@ -105,7 +105,7 @@ export default {
105105
}
106106
},
107107
*fetchForm({ payload }, { call, put }) {
108-
const response = yield call(menuService.get, payload.record_id);
108+
const response = yield call(menuService.get, payload.id);
109109
yield put({
110110
type: 'saveFormData',
111111
payload: response,
@@ -128,7 +128,7 @@ export default {
128128
}
129129
} else {
130130
const response = yield call(menuService.create, params);
131-
if (response.record_id && response.record_id !== '') {
131+
if (response.id && response.id !== '') {
132132
success = true;
133133
}
134134
}
@@ -150,7 +150,7 @@ export default {
150150
}
151151
},
152152
*del({ payload }, { call, put }) {
153-
const response = yield call(menuService.del, payload.record_id);
153+
const response = yield call(menuService.del, payload.id);
154154
if (response.status === 'OK') {
155155
message.success('删除成功');
156156
yield put({ type: 'fetchTree' });
@@ -171,9 +171,9 @@ export default {
171171
*changeStatus({ payload }, { call, put, select }) {
172172
let response;
173173
if (payload.status === 1) {
174-
response = yield call(menuService.enable, payload.record_id);
174+
response = yield call(menuService.enable, payload.id);
175175
} else {
176-
response = yield call(menuService.disable, payload.record_id);
176+
response = yield call(menuService.disable, payload.id);
177177
}
178178

179179
if (response.status === 'OK') {
@@ -187,7 +187,7 @@ export default {
187187

188188
for (let i = 0; i < data.list.length; i += 1) {
189189
const item = data.list[i];
190-
if (item.record_id === payload.record_id) {
190+
if (item.id === payload.id) {
191191
item.status = payload.status;
192192
}
193193
newData.list.push(item);

‎src/models/role.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ export default {
9090
}),
9191
put({
9292
type: 'fetchForm',
93-
payload: { record_id: payload.id },
93+
payload: { id: payload.id },
9494
}),
9595
];
9696
}
9797
},
9898
*fetchForm({ payload }, { call, put }) {
99-
const response = yield call(roleService.get, payload.record_id);
99+
const response = yield call(roleService.get, payload.id);
100100

101101
const { role_menus: roleMenus } = response;
102102
if (roleMenus) {
@@ -140,7 +140,7 @@ export default {
140140
}
141141
} else {
142142
const response = yield call(roleService.create, params);
143-
if (response.record_id && response.record_id !== '') {
143+
if (response.id && response.id !== '') {
144144
success = true;
145145
}
146146
}
@@ -162,7 +162,7 @@ export default {
162162
}
163163
},
164164
*del({ payload }, { call, put }) {
165-
const response = yield call(roleService.del, payload.record_id);
165+
const response = yield call(roleService.del, payload.id);
166166
if (response.status === 'OK') {
167167
message.success('删除成功');
168168
yield put({ type: 'fetch' });
@@ -178,9 +178,9 @@ export default {
178178
*changeStatus({ payload }, { call, put, select }) {
179179
let response;
180180
if (payload.status === 1) {
181-
response = yield call(roleService.enable, payload.record_id);
181+
response = yield call(roleService.enable, payload.id);
182182
} else {
183-
response = yield call(roleService.disable, payload.record_id);
183+
response = yield call(roleService.disable, payload.id);
184184
}
185185

186186
if (response.status === 'OK') {
@@ -194,7 +194,7 @@ export default {
194194

195195
for (let i = 0; i < data.list.length; i += 1) {
196196
const item = data.list[i];
197-
if (item.record_id === payload.record_id) {
197+
if (item.id === payload.id) {
198198
item.status = payload.status;
199199
}
200200
newData.list.push(item);

‎src/models/user.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ export default {
8888
}),
8989
put({
9090
type: 'fetchForm',
91-
payload: { record_id: payload.id },
91+
payload: { id: payload.id },
9292
}),
9393
];
9494
}
9595
},
9696
*fetchForm({ payload }, { call, put }) {
97-
const response = yield call(userService.get, payload.record_id);
97+
const response = yield call(userService.get, payload.id);
9898
yield put({
9999
type: 'saveFormData',
100100
payload: response,
@@ -117,7 +117,7 @@ export default {
117117
}
118118
} else {
119119
const response = yield call(userService.create, params);
120-
if (response.record_id && response.record_id !== '') {
120+
if (response.id && response.id !== '') {
121121
success = true;
122122
}
123123
}
@@ -139,7 +139,7 @@ export default {
139139
}
140140
},
141141
*del({ payload }, { call, put }) {
142-
const response = yield call(userService.del, payload.record_id);
142+
const response = yield call(userService.del, payload.id);
143143
if (response.status === 'OK') {
144144
message.success('删除成功');
145145
yield put({ type: 'fetch' });
@@ -148,9 +148,9 @@ export default {
148148
*changeStatus({ payload }, { call, put, select }) {
149149
let response;
150150
if (payload.status === 1) {
151-
response = yield call(userService.enable, payload.record_id);
151+
response = yield call(userService.enable, payload.id);
152152
} else {
153-
response = yield call(userService.disable, payload.record_id);
153+
response = yield call(userService.disable, payload.id);
154154
}
155155

156156
if (response.status === 'OK') {
@@ -164,7 +164,7 @@ export default {
164164

165165
for (let i = 0; i < data.list.length; i += 1) {
166166
const item = data.list[i];
167-
if (item.record_id === payload.record_id) {
167+
if (item.id === payload.id) {
168168
item.status = payload.status;
169169
}
170170
newData.list.push(item);

‎src/pages/Demo/DemoList.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ class DemoList extends PureComponent {
3232
onItemDisableClick = item => {
3333
this.dispatch({
3434
type: 'demo/changeStatus',
35-
payload: { record_id: item.record_id, status: 2 },
35+
payload: { id: item.id, status: 2 },
3636
});
3737
};
3838

3939
onItemEnableClick = item => {
4040
this.dispatch({
4141
type: 'demo/changeStatus',
42-
payload: { record_id: item.record_id, status: 1 },
42+
payload: { id: item.id, status: 1 },
4343
});
4444
};
4545

@@ -48,7 +48,7 @@ class DemoList extends PureComponent {
4848
type: 'demo/loadForm',
4949
payload: {
5050
type: 'E',
51-
id: item.record_id,
51+
id: item.id,
5252
},
5353
});
5454
};
@@ -65,7 +65,7 @@ class DemoList extends PureComponent {
6565
onDelOKClick(id) {
6666
this.dispatch({
6767
type: 'demo/del',
68-
payload: { record_id: id },
68+
payload: { id },
6969
});
7070
this.clearSelectRows();
7171
}
@@ -84,15 +84,15 @@ class DemoList extends PureComponent {
8484
okText: '确认',
8585
okType: 'danger',
8686
cancelText: '取消',
87-
onOk: this.onDelOKClick.bind(this, item.record_id),
87+
onOk: this.onDelOKClick.bind(this, item.id),
8888
});
8989
};
9090

9191
handleTableSelectRow = (record, selected) => {
9292
const keys = [];
9393
const rows = [];
9494
if (selected) {
95-
keys.push(record.record_id);
95+
keys.push(record.id);
9696
rows.push(record);
9797
}
9898
this.setState({
@@ -293,7 +293,7 @@ class DemoList extends PureComponent {
293293
onSelect: this.handleTableSelectRow,
294294
}}
295295
loading={loading}
296-
rowKey={record => record.record_id}
296+
rowKey={record => record.id}
297297
dataSource={list}
298298
columns={columns}
299299
pagination={paginationProps}

‎src/pages/Menu/MenuCard.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class MenuCard extends PureComponent {
3535
}
3636
const newData = [];
3737
for (let i = 0; i < data.length; i += 1) {
38-
const item = { ...data[i], title: data[i].name, value: data[i].record_id };
38+
const item = { ...data[i], title: data[i].name, value: data[i].id };
3939
if (item.children && item.children.length > 0) {
4040
item.children = this.toTreeSelect(item.children);
4141
}

0 commit comments

Comments
 (0)