diff --git a/apps/web-antd/src/api/mp/material/index.ts b/apps/web-antd/src/api/mp/material/index.ts index 73ca899ee..a6387332b 100644 --- a/apps/web-antd/src/api/mp/material/index.ts +++ b/apps/web-antd/src/api/mp/material/index.ts @@ -3,6 +3,7 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; /** 素材类型枚举 */ +// TODO @xingyu:芋艿,可能要整理下枚举; export enum MaterialType { IMAGE = 1, // 图片 THUMB = 4, // 缩略图 diff --git a/apps/web-antd/src/api/mp/menu/index.ts b/apps/web-antd/src/api/mp/menu/index.ts index a8ae0833b..b4cf88941 100644 --- a/apps/web-antd/src/api/mp/menu/index.ts +++ b/apps/web-antd/src/api/mp/menu/index.ts @@ -1,6 +1,7 @@ import { requestClient } from '#/api/request'; /** 菜单类型枚举 */ +// TODO @xingyu:芋艿,可能要整理下枚举; export enum MenuType { CLICK = 'click', // 点击推事件 LOCATION_SELECT = 'location_select', // 发送位置 @@ -11,7 +12,7 @@ export enum MenuType { PIC_WEIXIN = 'pic_weixin', // 微信相册发图 SCANCODE_PUSH = 'scancode_push', // 扫码推事件 SCANCODE_WAITMSG = 'scancode_waitmsg', // 扫码带提示 - VIEW = 'view', // 跳转URL + VIEW = 'view', // 跳转 URL VIEW_LIMITED = 'view_limited', // 跳转图文消息URL } diff --git a/apps/web-antd/src/api/mp/message/index.ts b/apps/web-antd/src/api/mp/message/index.ts index cfb2dbacc..0a547651f 100644 --- a/apps/web-antd/src/api/mp/message/index.ts +++ b/apps/web-antd/src/api/mp/message/index.ts @@ -3,6 +3,7 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; /** 消息类型枚举 */ +// TODO @xingyu:芋艿,可能要整理下枚举; export enum MessageType { IMAGE = 'image', // 图片消息 MPNEWS = 'mpnews', // 公众号图文消息 @@ -29,7 +30,7 @@ export namespace MpMessageApi { } /** 发送消息请求 */ - export interface SendMessageRequest { + export interface MessageSendRequestVO { accountId: number; openid: string; type: MessageType; @@ -49,6 +50,6 @@ export function getMessagePage(params: PageParam) { } /** 发送消息 */ -export function sendMessage(data: MpMessageApi.SendMessageRequest) { +export function sendMessage(data: MpMessageApi.MessageSendRequestVO) { return requestClient.post('/mp/message/send', data); } diff --git a/apps/web-antd/src/api/mp/statistics/index.ts b/apps/web-antd/src/api/mp/statistics/index.ts index 47200ff2b..7c053abd5 100644 --- a/apps/web-antd/src/api/mp/statistics/index.ts +++ b/apps/web-antd/src/api/mp/statistics/index.ts @@ -2,13 +2,13 @@ import { requestClient } from '#/api/request'; export namespace MpStatisticsApi { /** 统计查询参数 */ - export interface StatisticsQuery { + export interface StatisticsGetReqVO { accountId: number; date: Date[]; } /** 消息发送概况数据 */ - export interface UpstreamMessage { + export interface StatisticsUpstreamMessageRespVO { refDate: string; msgType: string; msgUser: number; @@ -16,7 +16,7 @@ export namespace MpStatisticsApi { } /** 用户增减数据 */ - export interface UserSummary { + export interface StatisticsUserSummaryRespVO { refDate: string; userSource: number; newUser: number; @@ -25,13 +25,13 @@ export namespace MpStatisticsApi { } /** 用户累计数据 */ - export interface UserCumulate { + export interface StatisticsUserCumulateRespVO { refDate: string; cumulateUser: number; } /** 接口分析数据 */ - export interface InterfaceSummary { + export interface StatisticsInterfaceSummaryRespVO { refDate: string; callbackCount: number; failCount: number; @@ -41,8 +41,8 @@ export namespace MpStatisticsApi { } /** 获取消息发送概况数据 */ -export function getUpstreamMessage(params: MpStatisticsApi.StatisticsQuery) { - return requestClient.get( +export function getUpstreamMessage(params: MpStatisticsApi.StatisticsGetReqVO) { + return requestClient.get( '/mp/statistics/upstream-message', { params, @@ -51,8 +51,8 @@ export function getUpstreamMessage(params: MpStatisticsApi.StatisticsQuery) { } /** 获取用户增减数据 */ -export function getUserSummary(params: MpStatisticsApi.StatisticsQuery) { - return requestClient.get( +export function getUserSummary(params: MpStatisticsApi.StatisticsGetReqVO) { + return requestClient.get( '/mp/statistics/user-summary', { params, @@ -61,8 +61,8 @@ export function getUserSummary(params: MpStatisticsApi.StatisticsQuery) { } /** 获取用户累计数据 */ -export function getUserCumulate(params: MpStatisticsApi.StatisticsQuery) { - return requestClient.get( +export function getUserCumulate(params: MpStatisticsApi.StatisticsGetReqVO) { + return requestClient.get( '/mp/statistics/user-cumulate', { params, @@ -71,8 +71,10 @@ export function getUserCumulate(params: MpStatisticsApi.StatisticsQuery) { } /** 获取接口分析数据 */ -export function getInterfaceSummary(params: MpStatisticsApi.StatisticsQuery) { - return requestClient.get( +export function getInterfaceSummary( + params: MpStatisticsApi.StatisticsGetReqVO, +) { + return requestClient.get( '/mp/statistics/interface-summary', { params, diff --git a/apps/web-antd/src/api/mp/tag/index.ts b/apps/web-antd/src/api/mp/tag/index.ts index b1acd0130..df8fd3423 100644 --- a/apps/web-antd/src/api/mp/tag/index.ts +++ b/apps/web-antd/src/api/mp/tag/index.ts @@ -11,12 +11,6 @@ export namespace MpTagApi { count?: number; createTime?: Date; } - - /** 标签分页查询参数 */ - export interface TagPageQuery extends PageParam { - accountId?: number; - name?: string; - } } /** 创建公众号标签 */ @@ -44,7 +38,7 @@ export function getTag(id: number) { } /** 获取公众号标签分页 */ -export function getTagPage(params: MpTagApi.TagPageQuery) { +export function getTagPage(params: PageParam) { return requestClient.get>('/mp/tag/page', { params, }); diff --git a/apps/web-antd/src/api/mp/user/index.ts b/apps/web-antd/src/api/mp/user/index.ts index e34573a1a..d79e6c6f4 100644 --- a/apps/web-antd/src/api/mp/user/index.ts +++ b/apps/web-antd/src/api/mp/user/index.ts @@ -21,13 +21,6 @@ export namespace MpUserApi { tagIds?: number[]; createTime?: Date; } - - /** 用户分页查询参数 */ - export interface UserPageQuery extends PageParam { - accountId?: number; - nickname?: string; - tagId?: number; - } } /** 更新公众号粉丝 */ @@ -43,7 +36,7 @@ export function getUser(id: number) { } /** 获取公众号粉丝分页 */ -export function getUserPage(params: MpUserApi.UserPageQuery) { +export function getUserPage(params: PageParam) { return requestClient.get>('/mp/user/page', { params, }); diff --git a/apps/web-antd/src/views/bpm/model/form/modules/custom-print-template.vue b/apps/web-antd/src/views/bpm/model/form/modules/custom-print-template.vue index d4b26c391..ca18c1216 100644 --- a/apps/web-antd/src/views/bpm/model/form/modules/custom-print-template.vue +++ b/apps/web-antd/src/views/bpm/model/form/modules/custom-print-template.vue @@ -5,8 +5,8 @@ import { computed, onBeforeUnmount, ref, shallowRef } from 'vue'; import { useVbenModal } from '@vben/common-ui'; -// @ts-ignore - tinymce vue 声明文件按项目依赖提供 import Editor from '@tinymce/tinymce-vue'; +import { Alert, Button } from 'ant-design-vue'; import { setupTinyPlugins } from './tinymce-plugin'; @@ -23,9 +23,7 @@ const props = withDefaults( const tinymceScriptSrc = `${import.meta.env.VITE_BASE}tinymce/tinymce.min.js`; const [Modal, modalApi] = useVbenModal({ - closable: true, footer: false, - title: '自定义模板', async onOpenChange(isOpen: boolean) { if (!isOpen) { return; @@ -51,7 +49,6 @@ const handleConfirm = () => { modalApi.close(); }; -// 提供给 @ 自动补全的字段(默认 + 表单字段) const mentionList = computed(() => { const base: MentionItem[] = [ { id: 'startUser', name: '发起人' }, @@ -70,11 +67,10 @@ const mentionList = computed(() => { name: `[表单]${it.title}`, })); return [...base, ...extras]; -}); +}); // 提供给 @ 自动补全的字段(默认 + 表单字段) -// 编辑器 const valueHtml = ref(''); -const editorRef = shallowRef(); +const editorRef = shallowRef(); // 编辑器 const tinyInit = { height: 400, @@ -103,9 +99,10 @@ onBeforeUnmount(() => {