fix: page 接口返回类型使用 PageResult,null 类型属性改为可选

pull/64/head
puhui999 2025-04-03 21:31:03 +08:00
parent 09a22a3113
commit 113813ec94
6 changed files with 40 additions and 42 deletions

View File

@ -1,4 +1,4 @@
import type { PageParam } from '@vben/request'; import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
@ -20,10 +20,9 @@ export namespace SystemMailAccountApi {
// 查询邮箱账号列表 // 查询邮箱账号列表
export const getMailAccountPage = async (params: PageParam) => { export const getMailAccountPage = async (params: PageParam) => {
return await requestClient.get<{ return await requestClient.get<
list: SystemMailAccountApi.MailAccountVO[]; PageResult<SystemMailAccountApi.MailAccountVO>
total: number; >('/system/mail-account/page', { params });
}>('/system/mail-account/page', { params });
}; };
// 查询邮箱账号详情 // 查询邮箱账号详情

View File

@ -1,4 +1,4 @@
import type { PageParam } from '@vben/request'; import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
@ -26,10 +26,10 @@ export namespace SystemMailLogApi {
// 查询邮件日志列表 // 查询邮件日志列表
export const getMailLogPage = async (params: PageParam) => { export const getMailLogPage = async (params: PageParam) => {
return await requestClient.get<{ return await requestClient.get<PageResult<SystemMailLogApi.MailLogVO>>(
list: SystemMailLogApi.MailLogVO[]; '/system/mail-log/page',
total: number; { params },
}>('/system/mail-log/page', { params }); );
}; };
// 查询邮件日志详情 // 查询邮件日志详情

View File

@ -1,4 +1,4 @@
import type { PageParam } from '@vben/request'; import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
@ -26,10 +26,9 @@ export namespace SystemMailTemplateApi {
// 查询邮件模版列表 // 查询邮件模版列表
export const getMailTemplatePage = async (params: PageParam) => { export const getMailTemplatePage = async (params: PageParam) => {
return await requestClient.get<{ return await requestClient.get<
list: SystemMailTemplateApi.MailTemplateVO[]; PageResult<SystemMailTemplateApi.MailTemplateVO>
total: number; >('/system/mail-template/page', { params });
}>('/system/mail-template/page', { params });
}; };
// 查询邮件模版详情 // 查询邮件模版详情

View File

@ -1,4 +1,4 @@
import type { PageParam } from '@vben/request'; import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
@ -19,10 +19,10 @@ export namespace SystemSmsChannelApi {
/** 查询短信渠道列表 */ /** 查询短信渠道列表 */
export function getSmsChannelPage(params: PageParam) { export function getSmsChannelPage(params: PageParam) {
return requestClient.get<{ return requestClient.get<PageResult<SystemSmsChannelApi.SmsChannelVO>>(
list: SystemSmsChannelApi.SmsChannelVO[]; '/system/sms-channel/page',
total: number; { params },
}>('/system/sms-channel/page', { params }); );
} }
/** 获得短信渠道精简列表 */ /** 获得短信渠道精简列表 */

View File

@ -1,42 +1,42 @@
import type { PageParam } from '@vben/request'; import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace SystemSmsLogApi { export namespace SystemSmsLogApi {
/** 短信日志信息 */ /** 短信日志信息 */
export interface SmsLogVO { export interface SmsLogVO {
id: null | number; id?: number;
channelId: null | number; channelId?: number;
channelCode: string; channelCode: string;
templateId: null | number; templateId?: number;
templateCode: string; templateCode: string;
templateType: null | number; templateType?: number;
templateContent: string; templateContent: string;
templateParams: null | Record<string, any>; templateParams?: Record<string, any>;
apiTemplateId: string; apiTemplateId: string;
mobile: string; mobile: string;
userId: null | number; userId?: number;
userType: null | number; userType?: number;
sendStatus: null | number; sendStatus?: number;
sendTime: Date | null; sendTime?: Date;
apiSendCode: string; apiSendCode: string;
apiSendMsg: string; apiSendMsg: string;
apiRequestId: string; apiRequestId: string;
apiSerialNo: string; apiSerialNo: string;
receiveStatus: null | number; receiveStatus?: number;
receiveTime: Date | null; receiveTime?: Date;
apiReceiveCode: string; apiReceiveCode: string;
apiReceiveMsg: string; apiReceiveMsg: string;
createTime: Date | null; createTime?: Date;
} }
} }
/** 查询短信日志列表 */ /** 查询短信日志列表 */
export function getSmsLogPage(params: PageParam) { export function getSmsLogPage(params: PageParam) {
return requestClient.get<{ return requestClient.get<PageResult<SystemSmsLogApi.SmsLogVO>>(
list: SystemSmsLogApi.SmsLogVO[]; '/system/sms-log/page',
total: number; { params },
}>('/system/sms-log/page', { params }); );
} }
/** 导出短信日志 */ /** 导出短信日志 */

View File

@ -1,4 +1,4 @@
import type { PageParam } from '@vben/request'; import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
@ -29,10 +29,10 @@ export namespace SystemSmsTemplateApi {
/** 查询短信模板列表 */ /** 查询短信模板列表 */
export function getSmsTemplatePage(params: PageParam) { export function getSmsTemplatePage(params: PageParam) {
return requestClient.get<{ return requestClient.get<PageResult<SystemSmsTemplateApi.SmsTemplateVO>>(
list: SystemSmsTemplateApi.SmsTemplateVO[]; '/system/sms-template/page',
total: number; { params },
}>('/system/sms-template/page', { params }); );
} }
/** 查询短信模板详情 */ /** 查询短信模板详情 */