Skip to content

Commit cea04bd

Browse files
committed
feat: 将分页参数从pageNum更改为pageIndex,以统一命名规范
1 parent 7cb9d4d commit cea04bd

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

src/components/CURD/PageContent.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ const pagination = reactive(
532532
);
533533
// 分页相关的请求参数
534534
const request = props.contentConfig.request ?? {
535-
pageName: "pageNum",
535+
pageName: "pageIndex",
536536
limitName: "pageSize",
537537
};
538538

src/components/NoticeDropdown/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ watch(
129129
* 获取我的通知公告
130130
*/
131131
function featchMyNotice() {
132-
NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 5, isRead: 0 }).then((data) => {
132+
NoticeAPI.getMyNoticePage({ pageIndex: 1, pageSize: 5, isRead: 0 }).then((data) => {
133133
noticeList.value = data.list;
134134
});
135135
}

src/components/TableSelect/index.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<pagination
126126
v-if="total > 0"
127127
v-model:total="total"
128-
v-model:page="queryParams.pageNum"
128+
v-model:page="queryParams.pageIndex"
129129
v-model:limit="queryParams.pageSize"
130130
@pagination="handlePagination"
131131
/>
@@ -221,11 +221,11 @@ const pageData = ref<IObject[]>([]);
221221
const pageSize = 10;
222222
// 搜索参数
223223
const queryParams = reactive<{
224-
pageNum: number;
224+
pageIndex: number;
225225
pageSize: number;
226226
[key: string]: any;
227227
}>({
228-
pageNum: 1,
228+
pageIndex: 1,
229229
pageSize: pageSize,
230230
});
231231
@@ -256,7 +256,7 @@ function handleQuery() {
256256
function fetchPageData(isRestart = false) {
257257
loading.value = true;
258258
if (isRestart) {
259-
queryParams.pageNum = 1;
259+
queryParams.pageIndex = 1;
260260
queryParams.pageSize = pageSize;
261261
}
262262
props.selectConfig

src/views/codegen/index.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<pagination
7979
v-if="total > 0"
8080
v-model:total="total"
81-
v-model:page="queryParams.pageNum"
81+
v-model:page="queryParams.pageIndex"
8282
v-model:limit="queryParams.pageSize"
8383
@pagination="handleQuery"
8484
/>
@@ -439,7 +439,7 @@ const treeData = ref<TreeNode[]>([]);
439439
440440
const queryFormRef = ref();
441441
const queryParams = reactive<TablePageQuery>({
442-
pageNum: 1,
442+
pageIndex: 1,
443443
pageSize: 10,
444444
});
445445
@@ -642,7 +642,7 @@ function handleQuery() {
642642
/** 重置查询 */
643643
function handleResetQuery() {
644644
queryFormRef.value.resetFields();
645-
queryParams.pageNum = 1;
645+
queryParams.pageIndex = 1;
646646
handleQuery();
647647
}
648648
@@ -655,10 +655,10 @@ async function handleOpenDialog(tableName: string) {
655655
656656
currentTableName.value = tableName;
657657
// 获取字典数据
658-
DictAPI.getList().then((data) => {
658+
DictAPI.getOptions("all").then((data) => {
659659
dictOptions.value = data.map((item) => ({
660660
label: item.name,
661-
value: item.dictCode,
661+
value: item.code,
662662
}));
663663
loading.value = true;
664664
GeneratorAPI.getGenConfig(tableName)

src/views/cust/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ function hancleResetPassword(row: CustmerPageVO) {
188188
ElMessage.warning("金额必须大于1,请重新输入");
189189
return false;
190190
}
191-
CustAPI.recharge(row.id, value).then(() => {
191+
CustAPI.recharge(row.id, value as unknown as number).then(() => {
192192
ElMessage.success("充值成功,充值金额是:" + value);
193193
handleResetQuery();
194194
});

src/views/demo/websocket.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@
6969
:class="[
7070
message.type === 'tip' ? 'system-notice' : 'chat-message',
7171
{
72-
'chat-message--sent': message.sender === userStore.userInfo.username,
73-
'chat-message--received': message.sender !== userStore.userInfo.username,
72+
'chat-message--sent': message.sender === userStore.userInfo.account,
73+
'chat-message--received': message.sender !== userStore.userInfo.account,
7474
},
7575
]"
7676
>
7777
<template v-if="message.type != 'tip'">
7878
<div class="chat-message__content">
7979
<div
8080
:class="{
81-
'chat-message__sender': message.sender === userStore.userInfo.username,
82-
'chat-message__receiver': message.sender !== userStore.userInfo.username,
81+
'chat-message__sender': message.sender === userStore.userInfo.account,
82+
'chat-message__receiver': message.sender !== userStore.userInfo.account,
8383
}"
8484
>
8585
{{ message.sender }}
@@ -113,7 +113,7 @@ const messages = ref<MessageType[]>([]);
113113
// 广播消息内容
114114
const topicMessage = ref("亲爱的朋友们,系统已恢复最新状态。");
115115
// 点对点消息内容(默认示例)
116-
const queneMessage = ref("Hi, " + userStore.userInfo.username + " 这里是点对点消息示例!");
116+
const queneMessage = ref("Hi, " + userStore.userInfo.account + " 这里是点对点消息示例!");
117117
const receiver = ref("root");
118118
119119
// 调用 useStomp hook,默认使用 socketEndpoint 和 token(此处用 getAccessToken())
@@ -172,7 +172,7 @@ function sendToAll() {
172172
body: topicMessage.value,
173173
});
174174
messages.value.push({
175-
sender: userStore.userInfo.username,
175+
sender: userStore.userInfo.account,
176176
content: topicMessage.value,
177177
});
178178
}
@@ -186,7 +186,7 @@ function sendToUser() {
186186
body: queneMessage.value,
187187
});
188188
messages.value.push({
189-
sender: userStore.userInfo.username,
189+
sender: userStore.userInfo.account,
190190
content: queneMessage.value,
191191
});
192192
}

src/views/system/notice/components/MyNotice.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<pagination
7070
v-if="total > 0"
7171
v-model:total="total"
72-
v-model:page="queryParams.pageNum"
72+
v-model:page="queryParams.pageIndex"
7373
v-model:limit="queryParams.pageSize"
7474
@pagination="handleQuery()"
7575
/>
@@ -116,7 +116,7 @@ const loading = ref(false);
116116
const total = ref(0);
117117
118118
const queryParams = reactive<NoticePageQuery>({
119-
pageNum: 1,
119+
pageIndex: 1,
120120
pageSize: 10,
121121
});
122122
@@ -139,7 +139,7 @@ function handleQuery() {
139139
// 重置通知公告查询
140140
function handleResetQuery() {
141141
queryFormRef.value!.resetFields();
142-
queryParams.pageNum = 1;
142+
queryParams.pageIndex = 1;
143143
handleQuery();
144144
}
145145

0 commit comments

Comments
 (0)