Skip to content

feat(Watermark): add innerStyle #818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wesley-0808 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(Watermark): add innerStyle #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified db/TDesign.db
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion packages/products/tdesign-mobile-react/src/watermark/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 该文件为脚本自动生成文件，请勿随意修改。如需修改请联系 PMC
* */

import { TNode } from '../common';
import { TNode, Styles } from '../common';

export interface TdWatermarkProps {
/**
Expand All @@ -24,6 +24,10 @@ export interface TdWatermarkProps {
* 水印高度
*/
height?: number;
/**
* 水印层的样式
*/
innerStyle?: Styles;
/**
* 水印是否重复出现
* @default true
Expand Down
11 changes: 6 additions & 5 deletions packages/products/tdesign-mobile-react/src/watermark/watermark.en-US.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,21 @@
name | type | default | description | required
-- | -- | -- | -- | --
className | String | - | className of component | N
style | Object | - | CSS(Cascading Style Sheets)，Typescript：`React.CSSProperties` | N
style | Object | - | CSS(Cascading Style Sheets)，Typescript: `React.CSSProperties` | N
alpha | Number | 1 | \- | N
children | TNode | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
content | TNode | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
children | TNode | - | Typescript: `string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
content | TNode | - | Typescript: `string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
height | Number | - | \- | N
innerStyle | Object | - | Typescript: `Styles`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
isRepeat | Boolean | true | \- | N
layout | String | rectangular | options: rectangular/hexagonal | N
lineSpace | Number | 16 | \- | N
movable | Boolean | false | \- | N
moveInterval | Number | 3000 | \- | N
offset | Array | - | Typescript：`Array<number>` | N
offset | Array | - | Typescript: `Array<number>` | N
removable | Boolean | true | \- | N
rotate | Number | -22 | \- | N
watermarkContent | Object / Array | - | Typescript：`WatermarkText\|WatermarkImage\|Array<WatermarkText\|WatermarkImage>` | N
watermarkContent | Object / Array | - | Typescript: `WatermarkText\|WatermarkImage\|Array<WatermarkText\|WatermarkImage>` | N
width | Number | - | \- | N
x | Number | - | \- | N
y | Number | - | \- | N
Expand Down
1 change: 1 addition & 0 deletions packages/products/tdesign-mobile-react/src/watermark/watermark.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ alpha | Number | 1 | 水印整体透明度，取值范围 [0-1] | N
children | TNode | - | 水印所覆盖的内容节点，同 `content`。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
content | TNode | - | 水印所覆盖的内容节点。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
height | Number | - | 水印高度 | N
innerStyle | Object | - | 水印层的样式。TS 类型：`Styles`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
isRepeat | Boolean | true | 水印是否重复出现 | N
layout | String | rectangular | 水印的布局方式，rectangular：矩形，即横平竖直的水印；hexagonal：六边形，即错位的水印。可选项：rectangular/hexagonal | N
lineSpace | Number | 16 | 行间距，只作用在多行（`content` 配置为数组）情况下 | N
Expand Down
4 changes: 4 additions & 0 deletions packages/products/tdesign-mobile-vue/src/watermark/props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ export default {
height: {
type: Number,
},
/** 水印层的样式 */
innerStyle: {
type: Object as PropType<TdWatermarkProps['innerStyle']>,
},
/** 水印是否重复出现 */
isRepeat: {
type: Boolean,
Expand Down
6 changes: 5 additions & 1 deletion packages/products/tdesign-mobile-vue/src/watermark/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 该文件为脚本自动生成文件，请勿随意修改。如需修改请联系 PMC
* */

import { TNode } from '../common';
import { TNode, Styles } from '../common';

export interface TdWatermarkProps {
/**
Expand All @@ -24,6 +24,10 @@ export interface TdWatermarkProps {
* 水印高度
*/
height?: number;
/**
* 水印层的样式
*/
innerStyle?: Styles;
/**
* 水印是否重复出现
* @default true
Expand Down
9 changes: 5 additions & 4 deletions packages/products/tdesign-mobile-vue/src/watermark/watermark.en-US.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@
name | type | default | description | required
-- | -- | -- | -- | --
alpha | Number | 1 | \- | N
content | String / Slot / Function | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
default | String / Slot / Function | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
content | String / Slot / Function | - | Typescript: `string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
default | String / Slot / Function | - | Typescript: `string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
height | Number | - | \- | N
innerStyle | Object | - | Typescript: `Styles`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
isRepeat | Boolean | true | \- | N
layout | String | rectangular | options: rectangular/hexagonal | N
lineSpace | Number | 16 | \- | N
movable | Boolean | false | \- | N
moveInterval | Number | 3000 | \- | N
offset | Array | - | Typescript：`Array<number>` | N
offset | Array | - | Typescript: `Array<number>` | N
removable | Boolean | true | \- | N
rotate | Number | -22 | \- | N
watermarkContent | Object / Array | - | Typescript：`WatermarkText\|WatermarkImage\|Array<WatermarkText\|WatermarkImage>` | N
watermarkContent | Object / Array | - | Typescript: `WatermarkText\|WatermarkImage\|Array<WatermarkText\|WatermarkImage>` | N
width | Number | - | \- | N
x | Number | - | \- | N
y | Number | - | \- | N
Expand Down
1 change: 1 addition & 0 deletions packages/products/tdesign-mobile-vue/src/watermark/watermark.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ alpha | Number | 1 | 水印整体透明度，取值范围 [0-1] | N
content | String / Slot / Function | - | 水印所覆盖的内容节点。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
default | String / Slot / Function | - | 水印所覆盖的内容节点，同 `content`。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
height | Number | - | 水印高度 | N
innerStyle | Object | - | 水印层的样式。TS 类型：`Styles`。[通用类型定义](https://github.com/Tencent/tdesign-mobile-vue/blob/develop/src/common.ts) | N
isRepeat | Boolean | true | 水印是否重复出现 | N
layout | String | rectangular | 水印的布局方式，rectangular：矩形，即横平竖直的水印；hexagonal：六边形，即错位的水印。可选项：rectangular/hexagonal | N
lineSpace | Number | 16 | 行间距，只作用在多行（`content` 配置为数组）情况下 | N
Expand Down
6 changes: 5 additions & 1 deletion packages/products/tdesign-react/packages/components/watermark/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 该文件为脚本自动生成文件，请勿随意修改。如需修改请联系 PMC
* */

import { TNode } from '../common';
import { TNode, Styles } from '../common';

export interface TdWatermarkProps {
/**
Expand All @@ -24,6 +24,10 @@ export interface TdWatermarkProps {
* 水印高度
*/
height?: number;
/**
* 水印层的样式
*/
innerStyle?: Styles;
/**
* 水印是否重复出现
* @default true
Expand Down
11 changes: 6 additions & 5 deletions packages/products/tdesign-react/packages/components/watermark/watermark.en-US.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,21 @@
name | type | default | description | required
-- | -- | -- | -- | --
className | String | - | className of component | N
style | Object | - | CSS(Cascading Style Sheets)，Typescript：`React.CSSProperties` | N
style | Object | - | CSS(Cascading Style Sheets)，Typescript: `React.CSSProperties` | N
alpha | Number | 1 | \- | N
children | TNode | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/common.ts) | N
content | TNode | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/common.ts) | N
children | TNode | - | Typescript: `string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/common.ts) | N
content | TNode | - | Typescript: `string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/common.ts) | N
height | Number | - | \- | N
innerStyle | Object | - | Typescript: `Styles`。[see more ts definition](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/common.ts) | N
isRepeat | Boolean | true | \- | N
layout | String | rectangular | options: rectangular/hexagonal | N
lineSpace | Number | 16 | \- | N
movable | Boolean | false | \- | N
moveInterval | Number | 3000 | \- | N
offset | Array | - | Typescript：`Array<number>` | N
offset | Array | - | Typescript: `Array<number>` | N
removable | Boolean | true | \- | N
rotate | Number | -22 | \- | N
watermarkContent | Object / Array | - | Typescript：`WatermarkText\|WatermarkImage\|Array<WatermarkText\|WatermarkImage>` | N
watermarkContent | Object / Array | - | Typescript: `WatermarkText\|WatermarkImage\|Array<WatermarkText\|WatermarkImage>` | N
width | Number | - | \- | N
x | Number | - | \- | N
y | Number | - | \- | N
Expand Down
1 change: 1 addition & 0 deletions packages/products/tdesign-react/packages/components/watermark/watermark.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ alpha | Number | 1 | 水印整体透明度，取值范围 [0-1] | N
children | TNode | - | 水印所覆盖的内容节点，同 `content`。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/common.ts) | N
content | TNode | - | 水印所覆盖的内容节点。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/common.ts) | N
height | Number | - | 水印高度 | N
innerStyle | Object | - | 水印层的样式。TS 类型：`Styles`。[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/packages/components/common.ts) | N
isRepeat | Boolean | true | 水印是否重复出现 | N
layout | String | rectangular | 水印的布局方式，rectangular：矩形，即横平竖直的水印；hexagonal：六边形，即错位的水印。可选项：rectangular/hexagonal | N
lineSpace | Number | 16 | 行间距，只作用在多行（`content` 配置为数组）情况下 | N
Expand Down
4 changes: 4 additions & 0 deletions packages/products/tdesign-vue-next/packages/components/watermark/props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ export default {
height: {
type: Number,
},
/** 水印层的样式 */
innerStyle: {
type: Object as PropType<TdWatermarkProps['innerStyle']>,
},
/** 水印是否重复出现 */
isRepeat: {
type: Boolean,
Expand Down
6 changes: 5 additions & 1 deletion packages/products/tdesign-vue-next/packages/components/watermark/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 该文件为脚本自动生成文件，请勿随意修改。如需修改请联系 PMC
* */

import { TNode } from '../common';
import { TNode, Styles } from '../common';

export interface TdWatermarkProps {
/**
Expand All @@ -24,6 +24,10 @@ export interface TdWatermarkProps {
* 水印高度
*/
height?: number;
/**
* 水印层的样式
*/
innerStyle?: Styles;
/**
* 水印是否重复出现
* @default true
Expand Down
9 changes: 5 additions & 4 deletions ...ages/products/tdesign-vue-next/packages/components/watermark/watermark.en-US.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@
name | type | default | description | required
-- | -- | -- | -- | --
alpha | Number | 1 | \- | N
content | String / Slot / Function | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N
default | String / Slot / Function | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N
content | String / Slot / Function | - | Typescript: `string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N
default | String / Slot / Function | - | Typescript: `string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N
height | Number | - | \- | N
innerStyle | Object | - | Typescript: `Styles`。[see more ts definition](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N
isRepeat | Boolean | true | \- | N
layout | String | rectangular | options: rectangular/hexagonal | N
lineSpace | Number | 16 | \- | N
movable | Boolean | false | \- | N
moveInterval | Number | 3000 | \- | N
offset | Array | - | Typescript：`Array<number>` | N
offset | Array | - | Typescript: `Array<number>` | N
removable | Boolean | true | \- | N
rotate | Number | -22 | \- | N
watermarkContent | Object / Array | - | Typescript：`WatermarkText\|WatermarkImage\|Array<WatermarkText\|WatermarkImage>` | N
watermarkContent | Object / Array | - | Typescript: `WatermarkText\|WatermarkImage\|Array<WatermarkText\|WatermarkImage>` | N
width | Number | - | \- | N
x | Number | - | \- | N
y | Number | - | \- | N
Expand Down
1 change: 1 addition & 0 deletions packages/products/tdesign-vue-next/packages/components/watermark/watermark.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ alpha | Number | 1 | 水印整体透明度，取值范围 [0-1] | N
content | String / Slot / Function | - | 水印所覆盖的内容节点。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N
default | String / Slot / Function | - | 水印所覆盖的内容节点，同 `content`。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N
height | Number | - | 水印高度 | N
innerStyle | Object | - | 水印层的样式。TS 类型：`Styles`。[通用类型定义](https://github.com/Tencent/tdesign-vue-next/blob/develop/packages/components/common.ts) | N
isRepeat | Boolean | true | 水印是否重复出现 | N
layout | String | rectangular | 水印的布局方式，rectangular：矩形，即横平竖直的水印；hexagonal：六边形，即错位的水印。可选项：rectangular/hexagonal | N
lineSpace | Number | 16 | 行间距，只作用在多行（`content` 配置为数组）情况下 | N
Expand Down
4 changes: 4 additions & 0 deletions packages/products/tdesign-vue/src/watermark/props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ export default {
height: {
type: Number,
},
/** 水印层的样式 */
innerStyle: {
type: Object as PropType<TdWatermarkProps['innerStyle']>,
},
/** 水印是否重复出现 */
isRepeat: {
type: Boolean,
Expand Down
6 changes: 5 additions & 1 deletion packages/products/tdesign-vue/src/watermark/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* 该文件为脚本自动生成文件，请勿随意修改。如需修改请联系 PMC
* */

import { TNode } from '../common';
import { TNode, Styles } from '../common';

export interface TdWatermarkProps {
/**
Expand All @@ -24,6 +24,10 @@ export interface TdWatermarkProps {
* 水印高度
*/
height?: number;
/**
* 水印层的样式
*/
innerStyle?: Styles;
/**
* 水印是否重复出现
* @default true
Expand Down
9 changes: 5 additions & 4 deletions packages/products/tdesign-vue/src/watermark/watermark.en-US.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@
name | type | default | description | required
-- | -- | -- | -- | --
alpha | Number | 1 | \- | N
content | String / Slot / Function | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-vue/blob/develop/src/common.ts) | N
default | String / Slot / Function | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-vue/blob/develop/src/common.ts) | N
content | String / Slot / Function | - | Typescript: `string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-vue/blob/develop/src/common.ts) | N
default | String / Slot / Function | - | Typescript: `string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-vue/blob/develop/src/common.ts) | N
height | Number | - | \- | N
innerStyle | Object | - | Typescript: `Styles`。[see more ts definition](https://github.com/Tencent/tdesign-vue/blob/develop/src/common.ts) | N
isRepeat | Boolean | true | \- | N
layout | String | rectangular | options: rectangular/hexagonal | N
lineSpace | Number | 16 | \- | N
movable | Boolean | false | \- | N
moveInterval | Number | 3000 | \- | N
offset | Array | - | Typescript：`Array<number>` | N
offset | Array | - | Typescript: `Array<number>` | N
removable | Boolean | true | \- | N
rotate | Number | -22 | \- | N
watermarkContent | Object / Array | - | Typescript：`WatermarkText\|WatermarkImage\|Array<WatermarkText\|WatermarkImage>` | N
watermarkContent | Object / Array | - | Typescript: `WatermarkText\|WatermarkImage\|Array<WatermarkText\|WatermarkImage>` | N
width | Number | - | \- | N
x | Number | - | \- | N
y | Number | - | \- | N
Expand Down
1 change: 1 addition & 0 deletions packages/products/tdesign-vue/src/watermark/watermark.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ alpha | Number | 1 | 水印整体透明度，取值范围 [0-1] | N
content | String / Slot / Function | - | 水印所覆盖的内容节点。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-vue/blob/develop/src/common.ts) | N
default | String / Slot / Function | - | 水印所覆盖的内容节点，同 `content`。TS 类型：`string \| TNode`。[通用类型定义](https://github.com/Tencent/tdesign-vue/blob/develop/src/common.ts) | N
height | Number | - | 水印高度 | N
innerStyle | Object | - | 水印层的样式。TS 类型：`Styles`。[通用类型定义](https://github.com/Tencent/tdesign-vue/blob/develop/src/common.ts) | N
isRepeat | Boolean | true | 水印是否重复出现 | N
layout | String | rectangular | 水印的布局方式，rectangular：矩形，即横平竖直的水印；hexagonal：六边形，即错位的水印。可选项：rectangular/hexagonal | N
lineSpace | Number | 16 | 行间距，只作用在多行（`content` 配置为数组）情况下 | N
Expand Down
43 changes: 43 additions & 0 deletions packages/scripts/api.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149320,6 +149320,49 @@
"Number"
]
},
{
"id": 1771338316,
"platform_framework": [
"1",
"2",
"8",
"16"
],
"component": "Watermark",
"field_category": 1,
"field_name": "innerStyle",
"field_type": [
"8"
],
"field_default_value": "",
"field_enum": "",
"field_desc_zh": "水印层的样式",
"field_desc_en": null,
"field_required": 0,
"event_input": "",
"create_time": "2026-02-17 14:25:16",
"update_time": "2026-02-17 14:25:16",
"event_output": null,
"custom_field_type": "Styles",
"syntactic_sugar": null,
"readonly": 1,
"html_attribute": 0,
"trigger_elements": "",
"deprecated": 0,
"version": "",
"test_description": null,
"support_default_value": 0,
"field_category_text": "Props",
"platform_framework_text": [
"Vue(PC)",
"React(PC)",
"Vue(Mobile)",
"React(Mobile)"
],
"field_type_text": [
"Object"
]
},
{
"id": 2582,
"platform_framework": [
Expand Down