From 446645b0cce542f750167b05e2cf6487b897f984 Mon Sep 17 00:00:00 2001 From: Rylan Date: Wed, 22 Oct 2025 22:50:11 +0800 Subject: [PATCH 1/5] feat(MessagePlugin): first parameter supports `TNode` --- packages/components/message/message.en-US.md | 14 ++--- packages/components/message/message.md | 59 ++++++++++---------- packages/components/message/plugin.tsx | 33 ++++++----- packages/components/message/type.ts | 18 +++--- 4 files changed, 64 insertions(+), 60 deletions(-) diff --git a/packages/components/message/message.en-US.md b/packages/components/message/message.en-US.md index 3d7ee64b84..75881b163c 100644 --- a/packages/components/message/message.en-US.md +++ b/packages/components/message/message.en-US.md @@ -42,7 +42,7 @@ zIndex | Number | 5000 | \- | N name | params | default | description -- | -- | -- | -- theme | String | - | required。Typescript：`MessageThemeList` -message | String / Object | - | required。Typescript：`string \| MessageOptions` +message | Object | - | required。Typescript：`TNode \| MessageOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -52,7 +52,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`string \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) +message | Object | - | required。Typescript：`TNode \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts)。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -62,7 +62,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`string \| MessageInfoOptions` +message | Object | - | required。Typescript：`TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -72,7 +72,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`string \| MessageInfoOptions` +message | Object | - | required。Typescript：`TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -82,7 +82,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`string \| MessageInfoOptions` +message | Object | - | required。Typescript：`TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -92,7 +92,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`string \| MessageInfoOptions` +message | Object | - | required。Typescript：`TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -102,7 +102,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`string \| MessageInfoOptions` +message | Object | - | required。Typescript：`TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) diff --git a/packages/components/message/message.md b/packages/components/message/message.md index d7a08d2c38..d754bd2957 100644 --- a/packages/components/message/message.md +++ b/packages/components/message/message.md @@ -31,13 +31,14 @@ {{ plugin }} ## API + ### Message Props -名称 | 类型 | 默认值 | 说明 | 必传 +名称 | 类型 | 默认值 | 描述 | 必传 -- | -- | -- | -- | -- closeBtn | String / Boolean / Slot / Function | undefined | 关闭按钮，可以自定义。值为 true 显示默认关闭按钮，值为 false 不显示关闭按钮。值类型为 string 则直接显示值，如：“关闭”。也可以完全自定义按钮。TS 类型：`string \| boolean \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N content | String / Slot / Function | - | 用于自定义消息弹出内容。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N -duration | Number | 3000 | 消息内置计时器，计时到达时会触发 duration-end 事件。单位：毫秒。值为 0 则表示没有计时器。 | N +duration | Number | 3000 | 消息内置计时器，计时到达时会触发 duration-end 事件。单位：毫秒。值为 0 则表示没有计时器 | N icon | Boolean / Slot / Function | true | 用于自定义消息前面的图标，优先级大于 theme 设定的图标。值为 false 则不显示图标，值为 true 显示 theme 设定图标。TS 类型：`boolean \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N theme | String | info | 消息组件风格。可选项：info/success/warning/error/question/loading。TS 类型：`MessageThemeList` `type MessageThemeList = 'info' \| 'success' \| 'warning' \| 'error' \| 'question' \| 'loading'`。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) | N onClose | Function | | TS 类型：`(context: { trigger: 'close-click' \| 'duration-end', e?: MouseEvent }) => void`
关闭消息时触发 | N @@ -54,7 +55,7 @@ duration-end | \- | 计时结束后触发 ### MessageOptions -名称 | 类型 | 默认值 | 说明 | 必传 +名称 | 类型 | 默认值 | 描述 | 必传 -- | -- | -- | -- | -- attach | String / Function | 'body' | 指定弹框挂载的父节点。数据类型为 String 时，会被当作选择器处理，进行节点查询。示例：'body' 或 () => document.body。TS 类型：`AttachNode`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N className | String | - | 类名 | N @@ -62,86 +63,84 @@ offset | Array | - | 相对于 placement 的偏移量，示例：[-10, 20] 或 [ placement | String | top | 弹出消息位置。可选项：center/top/left/right/bottom/top-left/top-right/bottom-left/bottom-right。TS 类型：`MessagePlacementList` `type MessagePlacementList = 'center' \| 'top' \| 'left' \| 'right' \| 'bottom' \| 'top-left' \| 'top-right' \| 'bottom-left' \| 'bottom-right'`。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) | N style | Object | - | 内敛样式。TS 类型：`CSSProperties` | N zIndex | Number | 5000 | 消息层级 | N -`MessageProps` | \- | - | 继承 `MessageProps` 中的全部 API | N +`MessageProps` | \- | - | 继承 `MessageProps` 中的全部属性 | N ### MessagePlugin 同时也支持 `this.$message`。 -参数名称 | 参数类型 | 参数默认值 | 参数说明 +参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- theme | String | - | 必需。消息类型。TS 类型：`MessageThemeList` -message | String / Object | - | 必需。消息内容。TS 类型：`string \| MessageOptions` +message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 -context | \- | - | 要继承的应用的上下文。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) ### MessagePlugin.info 同时也支持 `this.$message.info`。 -参数名称 | 参数类型 | 参数默认值 | 参数说明 +参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息内容。TS 类型：`string \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) +message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts)。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 -context | \- | - | 要继承的应用的上下文。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) - +context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) ### MessagePlugin.error 同时也支持 `this.$message.error`。 -参数名称 | 参数类型 | 参数默认值 | 参数说明 +参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息内容。TS 类型：`string \| MessageInfoOptions` +message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 -context | \- | - | 要继承的应用的上下文。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) ### MessagePlugin.warning 同时也支持 `this.$message.warning`。 -参数名称 | 参数类型 | 参数默认值 | 参数说明 +参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息内容。TS 类型：`string \| MessageInfoOptions` +message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 -context | \- | - | 要继承的应用的上下文。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) ### MessagePlugin.success 同时也支持 `this.$message.success`。 -参数名称 | 参数类型 | 参数默认值 | 参数说明 +参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息内容。TS 类型：`string \| MessageInfoOptions` +message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 -context | \- | - | 要继承的应用的上下文。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) ### MessagePlugin.loading 同时也支持 `this.$message.loading`。 -参数名称 | 参数类型 | 参数默认值 | 参数说明 +参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息提醒内容。TS 类型：`string \| MessageInfoOptions` +message | Object | - | 必需。消息提醒内容。TS 类型：`TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 -context | \- | - | 要继承的应用的上下文。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) ### MessagePlugin.question 同时也支持 `this.$message.question`。 -参数名称 | 参数类型 | 参数默认值 | 参数说明 +参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息内容。TS 类型：`string \| MessageInfoOptions` +message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 -context | \- | - | 要继承的应用的上下文。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) - +context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) ### MessagePlugin.close 同时也支持 `this.$message.close`。 -参数名称 | 参数类型 | 参数默认值 | 参数说明 +参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- options | Object | - | 必需。该插件参数为 $Message.info() 等插件执行后的返回值。示例：`const msg = $Message.info({}); $Message.close(msg)`。TS 类型：`Promise` @@ -149,7 +148,7 @@ options | Object | - | 必需。该插件参数为 $Message.info() 等插件执 同时也支持 `this.$message.closeAll`。 -参数名称 | 参数类型 | 参数默认值 | 参数说明 +参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- \- | \- | - | \- @@ -157,6 +156,6 @@ options | Object | - | 必需。该插件参数为 $Message.info() 等插件执 同时也支持 `this.$message.config`。 -参数名称 | 参数类型 | 参数默认值 | 参数说明 +参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- message | Object | - | 必需。全局提醒插件全局配置。TS 类型：`MessageOptions` diff --git a/packages/components/message/plugin.tsx b/packages/components/message/plugin.tsx index 39e8d14849..7015d533fe 100644 --- a/packages/components/message/plugin.tsx +++ b/packages/components/message/plugin.tsx @@ -23,24 +23,25 @@ * msg.then(instance => instance.close()) * */ -import { App, nextTick, Plugin, AppContext, createVNode, render, VNode } from 'vue'; -import MessageList, { DEFAULT_Z_INDEX } from './message-list'; +import { App, AppContext, createVNode, isVNode, nextTick, Plugin, render, VNode } from 'vue'; +import { isObject, isString } from 'lodash-es'; import { getAttach } from '@tdesign/shared-utils'; -import { - MessageOptions, - MessageMethod, - MessageInstance, - MessageInfoMethod, +import MessageList, { DEFAULT_Z_INDEX } from './message-list'; + +import type { AttachNodeReturnValue } from '../common'; +import type { + MessageCloseAllMethod, + MessageCloseMethod, MessageErrorMethod, - MessageWarningMethod, - MessageSuccessMethod, + MessageInfoMethod, + MessageInstance, MessageLoadingMethod, + MessageMethod, + MessageOptions, MessageQuestionMethod, - MessageCloseMethod, - MessageCloseAllMethod, + MessageSuccessMethod, + MessageWarningMethod, } from './type'; -import { AttachNodeReturnValue } from '../common'; -import { isObject, isString } from 'lodash-es'; // 存储不同 attach 和 不同 placement 消息列表实例 const instanceMap: Map> = new Map(); @@ -100,11 +101,15 @@ const MessageFunction = (props: MessageOptions, context?: AppContext): Promise { let options: MessageOptions = { theme }; - if (isString(params)) { + + if (isVNode(params)) { + options.content = () => params; + } else if (isString(params)) { options.content = params; } else if (isObject(params) && !(params instanceof Array)) { options = { ...options, ...params }; } + (duration || duration === 0) && (options.duration = duration); return MessageFunction(options, context); }; diff --git a/packages/components/message/type.ts b/packages/components/message/type.ts index 90ddc34510..a665b8abb2 100644 --- a/packages/components/message/type.ts +++ b/packages/components/message/type.ts @@ -3,7 +3,7 @@ /** * 该文件为脚本自动生成文件，请勿随意修改。如需修改请联系 PMC * */ -import { ComponentPublicInstance } from 'vue'; + import { TNode, AttachNode, AppContext } from '../common'; export interface TdMessageProps { @@ -88,13 +88,13 @@ export type MessagePlacementList = | 'bottom-left' | 'bottom-right'; -export interface MessageInstance extends ComponentPublicInstance { +export interface MessageInstance { close: () => void; } export type MessageMethod = ( theme: MessageThemeList, - message: string | MessageOptions, + message: TNode | MessageOptions, duration?: number, context?: AppContext, ) => Promise; @@ -102,37 +102,37 @@ export type MessageMethod = ( export type MessageInfoOptions = Omit; export type MessageInfoMethod = ( - message: string | MessageInfoOptions, + message: TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageErrorMethod = ( - message: string | MessageInfoOptions, + message: TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageWarningMethod = ( - message: string | MessageInfoOptions, + message: TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageSuccessMethod = ( - message: string | MessageInfoOptions, + message: TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageLoadingMethod = ( - message: string | MessageInfoOptions, + message: TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageQuestionMethod = ( - message: string | MessageInfoOptions, + message: TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; From 3739ef20d6dd27ef2e72ca293df5bbcf2335327d Mon Sep 17 00:00:00 2001 From: Rylan Date: Wed, 22 Oct 2025 23:01:11 +0800 Subject: [PATCH 2/5] docs: update type --- packages/components/message/message.en-US.md | 14 +++++++------- packages/components/message/message.md | 14 +++++++------- packages/components/message/type.ts | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/components/message/message.en-US.md b/packages/components/message/message.en-US.md index 75881b163c..1f103648c7 100644 --- a/packages/components/message/message.en-US.md +++ b/packages/components/message/message.en-US.md @@ -42,7 +42,7 @@ zIndex | Number | 5000 | \- | N name | params | default | description -- | -- | -- | -- theme | String | - | required。Typescript：`MessageThemeList` -message | Object | - | required。Typescript：`TNode \| MessageOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`String \| TNode \| MessageOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -52,7 +52,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | Object | - | required。Typescript：`TNode \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts)。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) +message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts)。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -62,7 +62,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | Object | - | required。Typescript：`TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -72,7 +72,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | Object | - | required。Typescript：`TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -82,7 +82,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | Object | - | required。Typescript：`TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -92,7 +92,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | Object | - | required。Typescript：`TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -102,7 +102,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | Object | - | required。Typescript：`TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) diff --git a/packages/components/message/message.md b/packages/components/message/message.md index d754bd2957..0b9cc664ac 100644 --- a/packages/components/message/message.md +++ b/packages/components/message/message.md @@ -72,7 +72,7 @@ zIndex | Number | 5000 | 消息层级 | N 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- theme | String | - | 必需。消息类型。TS 类型：`MessageThemeList` -message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -82,7 +82,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts)。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts)。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -92,7 +92,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -102,7 +102,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -112,7 +112,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -122,7 +122,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | Object | - | 必需。消息提醒内容。TS 类型：`TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息提醒内容。TS 类型：`String \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -132,7 +132,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | Object | - | 必需。消息内容。TS 类型：`TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) diff --git a/packages/components/message/type.ts b/packages/components/message/type.ts index a665b8abb2..2274c62420 100644 --- a/packages/components/message/type.ts +++ b/packages/components/message/type.ts @@ -94,7 +94,7 @@ export interface MessageInstance { export type MessageMethod = ( theme: MessageThemeList, - message: TNode | MessageOptions, + message: String | TNode | MessageOptions, duration?: number, context?: AppContext, ) => Promise; @@ -102,37 +102,37 @@ export type MessageMethod = ( export type MessageInfoOptions = Omit; export type MessageInfoMethod = ( - message: TNode | MessageInfoOptions, + message: String | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageErrorMethod = ( - message: TNode | MessageInfoOptions, + message: String | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageWarningMethod = ( - message: TNode | MessageInfoOptions, + message: String | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageSuccessMethod = ( - message: TNode | MessageInfoOptions, + message: String | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageLoadingMethod = ( - message: TNode | MessageInfoOptions, + message: String | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageQuestionMethod = ( - message: TNode | MessageInfoOptions, + message: String | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; From 53f1669a922f9c1599112fbaf5e8e1354c2ea44f Mon Sep 17 00:00:00 2001 From: Rylan Date: Thu, 23 Oct 2025 14:55:00 +0800 Subject: [PATCH 3/5] chore: update common and import path --- packages/common | 2 +- packages/components/message/consts/index.ts | 62 ----------- packages/components/message/message-list.tsx | 6 +- packages/components/message/message.tsx | 15 +-- .../components/message/utils/animation.ts | 103 ------------------ packages/components/message/utils/index.ts | 1 - 6 files changed, 10 insertions(+), 179 deletions(-) delete mode 100644 packages/components/message/consts/index.ts delete mode 100644 packages/components/message/utils/animation.ts delete mode 100644 packages/components/message/utils/index.ts diff --git a/packages/common b/packages/common index 639bad74bd..667d0ecedc 160000 --- a/packages/common +++ b/packages/common @@ -1 +1 @@ -Subproject commit 639bad74bddb81b0f3bb084bea790359684bfb84 +Subproject commit 667d0ecedcd09e99c0b85e8dc29f0298fb3e8d9c diff --git a/packages/components/message/consts/index.ts b/packages/components/message/consts/index.ts deleted file mode 100644 index 3f655477fb..0000000000 --- a/packages/components/message/consts/index.ts +++ /dev/null @@ -1,62 +0,0 @@ -export const THEME_LIST: string[] = ['info', 'success', 'warning', 'error', 'question', 'loading']; - -const DISTANCE = '32px'; - -export const PLACEMENT_OFFSET = { - top: { - top: DISTANCE, - left: '50%', - transform: 'translateX(-50%)', - }, - center: { - left: '50%', - top: '50%', - transform: 'translateX(-50%) translateY(-50%)', - }, - left: { - left: DISTANCE, - top: '50%', - transform: 'translateY(-50%)', - }, - bottom: { - bottom: DISTANCE, - left: '50%', - transform: 'translateX(-50%)', - }, - right: { - right: DISTANCE, - top: '50%', - transform: 'translateY(-50%)', - display: 'flex', - flexDirection: 'column', - alignItems: 'flex-end', - }, - 'top-left': { - left: DISTANCE, - top: DISTANCE, - }, - 'top-right': { - right: DISTANCE, - top: DISTANCE, - display: 'flex', - flexDirection: 'column', - alignItems: 'flex-end', - }, - 'bottom-right': { - right: DISTANCE, - bottom: DISTANCE, - display: 'flex', - flexDirection: 'column', - alignItems: 'flex-end', - }, - 'bottom-left': { - left: DISTANCE, - bottom: DISTANCE, - }, -}; - -export const PLACEMENT_LIST = Object.keys(PLACEMENT_OFFSET); - -export default { - THEME_LIST, -}; diff --git a/packages/components/message/message-list.tsx b/packages/components/message/message-list.tsx index 519bb93e5f..c1f6e897d1 100644 --- a/packages/components/message/message-list.tsx +++ b/packages/components/message/message-list.tsx @@ -1,9 +1,9 @@ import { computed, defineComponent, ref } from 'vue'; import type { CSSProperties } from 'vue'; -import { PLACEMENT_OFFSET } from './consts'; -import TMessage from './message'; -import { MessageOptions } from './type'; +import { PLACEMENT_OFFSET } from '@tdesign/common-js/message/index'; import { usePrefixClass } from '@tdesign/shared-hooks'; +import TMessage from './message'; +import type { MessageOptions } from './type'; export const DEFAULT_Z_INDEX = 6000; diff --git a/packages/components/message/message.tsx b/packages/components/message/message.tsx index 75a9200a14..83e7cb6d6f 100644 --- a/packages/components/message/message.tsx +++ b/packages/components/message/message.tsx @@ -1,20 +1,17 @@ -import { defineComponent, h, onBeforeMount, onMounted, computed, ref } from 'vue'; +import { computed, defineComponent, h, onBeforeMount, onMounted, ref } from 'vue'; import { - InfoCircleFilledIcon as TdInfoCircleFilledIcon, CheckCircleFilledIcon as TdCheckCircleFilledIcon, + CloseIcon as TdCloseIcon, ErrorCircleFilledIcon as TdErrorCircleFilledIcon, HelpCircleFilledIcon as TdHelpCircleFilledIcon, - CloseIcon as TdCloseIcon, + InfoCircleFilledIcon as TdInfoCircleFilledIcon, } from 'tdesign-icons-vue-next'; +import { isFunction } from 'lodash-es'; +import { THEME_LIST, fadeIn, fadeOut } from '@tdesign/common-js/message/index'; +import { useContent, useGlobalIcon, usePrefixClass, useTNodeJSX } from '@tdesign/shared-hooks'; import TLoading from '../loading'; -import { THEME_LIST } from './consts'; import props from './props'; -import { useContent, useTNodeJSX, useGlobalIcon, usePrefixClass } from '@tdesign/shared-hooks'; - -import { fadeIn, fadeOut } from './utils'; - -import { isFunction } from 'lodash-es'; export default defineComponent({ name: 'TMessage', diff --git a/packages/components/message/utils/animation.ts b/packages/components/message/utils/animation.ts deleted file mode 100644 index 3e299f06d2..0000000000 --- a/packages/components/message/utils/animation.ts +++ /dev/null @@ -1,103 +0,0 @@ -import { PLACEMENT_LIST } from '../consts'; - -interface Keyframe { - composite?: CompositeOperationOrAuto; - easing?: string; - offset?: number | null; - [property: string]: string | number | null | undefined; -} -type CompositeOperationOrAuto = 'accumulate' | 'add' | 'auto' | 'replace'; - -const ANIMATION_OPTION = { - duration: 200, - easing: 'linear', -}; - -function fadeIn(dom: HTMLElement, placement: string) { - if (!dom) return; - const offsetWidth = dom?.offsetWidth || 0; - const offsetHeight = dom?.offsetHeight || 0; - const fadeInKeyframes: Array | null = getFadeInKeyframes(placement, offsetWidth, offsetHeight); - if (!fadeInKeyframes) return; - const styleAfterFadeIn = fadeInKeyframes[fadeInKeyframes.length - 1]; - setDomStyleAfterAnimation(dom, styleAfterFadeIn); - dom.animate && dom.animate(fadeInKeyframes, ANIMATION_OPTION); -} - -function fadeOut(dom: HTMLElement, placement: string, onFinish: Function) { - if (!dom) return; - const offsetHeight = dom?.offsetHeight || 0; - const fadeOutKeyframes: Array | null = getFadeOutKeyframes(placement, offsetHeight); - if (!fadeOutKeyframes) return onFinish(); - const styleAfterFadeOut = fadeOutKeyframes[fadeOutKeyframes.length - 1]; - setDomStyleAfterAnimation(dom, styleAfterFadeOut); - - const animation = dom.animate && dom.animate(fadeOutKeyframes, ANIMATION_OPTION); - if (animation) { - animation.onfinish = () => { - // eslint-disable-next-line no-param-reassign - dom.style.display = 'none'; - onFinish(); - }; - } else { - // eslint-disable-next-line no-param-reassign - dom.style.display = 'none'; - onFinish(); - } -} - -function setDomStyleAfterAnimation(dom: HTMLElement, styleAfterAnimation: Keyframe) { - const keys = Object.keys(styleAfterAnimation); - for (let i = 0; i < keys.length; i += 1) { - const key = keys[i]; - // @ts-ignore - // TODO: CSSStyleDeclaration - dom.style[key] = styleAfterAnimation[key]; - } -} - -function getFadeInKeyframes(placement: string, offsetWidth: Number, offsetHeight: Number): Array | null { - if (!PLACEMENT_LIST.includes(placement)) return null; - if (['top-left', 'left', 'bottom-left'].includes(placement)) { - return [ - { opacity: 0, marginLeft: `-${offsetWidth}px` }, - { opacity: 1, marginLeft: '0' }, - ]; - } - if (['top-right', 'right', 'bottom-right'].includes(placement)) { - return [ - { opacity: 0, marginRight: `-${offsetWidth}px` }, - { opacity: 1, marginRight: '0' }, - ]; - } - if (['top', 'center'].includes(placement)) { - return [ - { opacity: 0, marginTop: `-${offsetHeight}px` }, - { opacity: 1, marginTop: '0' }, - ]; - } - if (['bottom'].includes(placement)) { - return [ - { opacity: 0, transform: `translate3d(0, ${offsetHeight}px, 0)` }, - { opacity: 1, transform: 'translate3d(0, 0, 0)' }, - ]; - } -} - -function getFadeOutKeyframes(placement: string, offsetHeight: Number): Array | null { - if (!PLACEMENT_LIST.includes(placement)) return null; - if (['bottom-left', 'bottom', 'bottom-right'].includes(placement)) { - const marginOffset = `${offsetHeight}px`; - return [ - { opacity: 1, marginTop: '0px' }, - { opacity: 0, marginTop: marginOffset }, - ]; - } - const marginOffset = `-${offsetHeight}px`; - return [ - { opacity: 1, marginTop: '0px' }, - { opacity: 0, marginTop: marginOffset }, - ]; -} - -export { fadeIn, fadeOut }; diff --git a/packages/components/message/utils/index.ts b/packages/components/message/utils/index.ts deleted file mode 100644 index c5e96bf5b2..0000000000 --- a/packages/components/message/utils/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './animation'; From cd04c20b6c78add98a4bdfa2a821380859b36248 Mon Sep 17 00:00:00 2001 From: Rylan Date: Thu, 23 Oct 2025 15:01:37 +0800 Subject: [PATCH 4/5] docs: update `String` to `string` --- packages/components/message/message.en-US.md | 14 +++++++------- packages/components/message/message.md | 14 +++++++------- packages/components/message/type.ts | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/components/message/message.en-US.md b/packages/components/message/message.en-US.md index 1f103648c7..ca2b560d86 100644 --- a/packages/components/message/message.en-US.md +++ b/packages/components/message/message.en-US.md @@ -42,7 +42,7 @@ zIndex | Number | 5000 | \- | N name | params | default | description -- | -- | -- | -- theme | String | - | required。Typescript：`MessageThemeList` -message | String / Object | - | required。Typescript：`String \| TNode \| MessageOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`string \| TNode \| MessageOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -52,7 +52,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts)。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) +message | String / Object | - | required。Typescript：`string \| TNode \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts)。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -62,7 +62,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`string \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -72,7 +72,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`string \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -82,7 +82,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`string \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -92,7 +92,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`string \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -102,7 +102,7 @@ context | \- | - | Typescript：`AppContext`。[see more ts definition](https:// name | params | default | description -- | -- | -- | -- -message | String / Object | - | required。Typescript：`String \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | required。Typescript：`string \| TNode \| MessageInfoOptions`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | \- context | \- | - | Typescript：`AppContext`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) diff --git a/packages/components/message/message.md b/packages/components/message/message.md index 0b9cc664ac..f98c99d121 100644 --- a/packages/components/message/message.md +++ b/packages/components/message/message.md @@ -72,7 +72,7 @@ zIndex | Number | 5000 | 消息层级 | N 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- theme | String | - | 必需。消息类型。TS 类型：`MessageThemeList` -message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`string \| TNode \| MessageOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -82,7 +82,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts)。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`string \| TNode \| MessageInfoOptions` `type MessageInfoOptions = Omit`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts)。[详细类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/message/type.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -92,7 +92,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`string \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -102,7 +102,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`string \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -112,7 +112,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`string \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -122,7 +122,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息提醒内容。TS 类型：`String \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息提醒内容。TS 类型：`string \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) @@ -132,7 +132,7 @@ context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext` 参数名称 | 参数类型 | 参数默认值 | 参数描述 -- | -- | -- | -- -message | String / Object | - | 必需。消息内容。TS 类型：`String \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) +message | String / Object | - | 必需。消息内容。TS 类型：`string \| TNode \| MessageInfoOptions`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) duration | Number | 3000 | 消息显示时长，单位：毫秒。值为 0 表示永久显示 context | \- | - | 要继承的应用的上下文。。TS 类型：`AppContext`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) diff --git a/packages/components/message/type.ts b/packages/components/message/type.ts index 2274c62420..335539d223 100644 --- a/packages/components/message/type.ts +++ b/packages/components/message/type.ts @@ -94,7 +94,7 @@ export interface MessageInstance { export type MessageMethod = ( theme: MessageThemeList, - message: String | TNode | MessageOptions, + message: string | TNode | MessageOptions, duration?: number, context?: AppContext, ) => Promise; @@ -102,37 +102,37 @@ export type MessageMethod = ( export type MessageInfoOptions = Omit; export type MessageInfoMethod = ( - message: String | TNode | MessageInfoOptions, + message: string | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageErrorMethod = ( - message: String | TNode | MessageInfoOptions, + message: string | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageWarningMethod = ( - message: String | TNode | MessageInfoOptions, + message: string | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageSuccessMethod = ( - message: String | TNode | MessageInfoOptions, + message: string | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageLoadingMethod = ( - message: String | TNode | MessageInfoOptions, + message: string | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; export type MessageQuestionMethod = ( - message: String | TNode | MessageInfoOptions, + message: string | TNode | MessageInfoOptions, duration?: number, context?: AppContext, ) => Promise; From 613cdc0a0b5f6ad8439796ffcf15fb0080cf5ca6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 23 Oct 2025 16:05:46 +0000 Subject: [PATCH 5/5] chore: update common --- packages/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common b/packages/common index 667d0ecedc..30800118e4 160000 --- a/packages/common +++ b/packages/common @@ -1 +1 @@ -Subproject commit 667d0ecedcd09e99c0b85e8dc29f0298fb3e8d9c +Subproject commit 30800118e41c7e37fcb710febd3ff3ae58e06a1b