From 4ce76faa044028d94990a59b7f40de3f6ad86978 Mon Sep 17 00:00:00 2001 From: anlyyao Date: Tue, 21 Jan 2025 17:29:25 +0800 Subject: [PATCH] feat(Textarea): support placeholderClass props --- src/input/README.en-US.md | 4 ++-- src/input/README.md | 4 ++-- src/input/props.ts | 2 +- src/input/type.ts | 4 ++-- src/textarea/README.en-US.md | 1 + src/textarea/README.md | 3 ++- src/textarea/__test__/__snapshots__/index.test.js.snap | 2 +- src/textarea/props.ts | 5 +++++ src/textarea/textarea.wxml | 2 +- src/textarea/type.ts | 8 ++++++++ 10 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/input/README.en-US.md b/src/input/README.en-US.md index f14875d81..2acbbe83e 100644 --- a/src/input/README.en-US.md +++ b/src/input/README.en-US.md @@ -18,7 +18,7 @@ clearable | Boolean / Object | false | show clear icon, clicked to clear input v confirm-hold | Boolean | false | \- | N confirm-type | String | done | options: send/search/next/go/done | N cursor | Number | - | required | Y -cursor-color | String | - | \- | N +cursor-color | String | #0052d9 | \- | N cursor-spacing | Number | 0 | \- | N disabled | Boolean | undefined | make input to be disabled | N error-message | String | - | `deprecated` | N @@ -107,4 +107,4 @@ Name | Default Value | Description --td-input-suffix-text-color | @text-color-primary | - --td-input-vertical-padding | 32rpx | - --td-input-warning-text-color | @warning-color | - ---td-input-warning-tips-color | @warning-color | - +--td-input-warning-tips-color | @warning-color | - \ No newline at end of file diff --git a/src/input/README.md b/src/input/README.md index 84ff5ec36..8cae36d39 100644 --- a/src/input/README.md +++ b/src/input/README.md @@ -151,7 +151,7 @@ validate | `(detail: { error?: 'exceed-maximum' \| 'below-minimum' })` | 字数 -- | -- t-class | 根节点样式类 t-class-clearable | 清空按钮样式类 -t-class-input | 标题样式类 +t-class-input | 输入框样式类 t-class-label | 标签样式类 t-class-prefix-icon | 前置图标样式类 t-class-suffix | 后置样式类 @@ -186,4 +186,4 @@ t-class-tips | 提示样式类 --td-input-suffix-text-color | @text-color-primary | - --td-input-vertical-padding | 32rpx | - --td-input-warning-text-color | @warning-color | - ---td-input-warning-tips-color | @warning-color | - +--td-input-warning-tips-color | @warning-color | - \ No newline at end of file diff --git a/src/input/props.ts b/src/input/props.ts index 0373b3456..ad0cda35f 100644 --- a/src/input/props.ts +++ b/src/input/props.ts @@ -36,7 +36,7 @@ const props: TdInputProps = { type: String, value: 'always', }, - /** 是否可清空，默认不启动。值为 `true` 表示使用默认清除空按钮，值为 `Object` 表示透传至 `icon` */ + /** 是否可清空，默认不启动。值为 `true` 表示使用默认清空按钮，值为 `Object` 表示透传至 `icon` */ clearable: { type: null, value: false, diff --git a/src/input/type.ts b/src/input/type.ts index c6130f4c6..ac2e2ea87 100644 --- a/src/input/type.ts +++ b/src/input/type.ts @@ -54,7 +54,7 @@ export interface TdInputProps { value?: 'always' | 'focus'; }; /** - * 是否可清空，默认不启动。值为 `true` 表示使用默认清除空按钮，值为 `Object` 表示透传至 `icon` + * 是否可清空，默认不启动。值为 `true` 表示使用默认清空按钮，值为 `Object` 表示透传至 `icon` * @default false */ clearable?: { @@ -87,7 +87,7 @@ export interface TdInputProps { }; /** * 光标颜色。iOS 下的格式为十六进制颜色值 #000000，安卓下的只支持 default 和 green，Skyline 下无限制 - * @default '' + * @default #0052d9 */ cursorColor?: { type: StringConstructor; diff --git a/src/textarea/README.en-US.md b/src/textarea/README.en-US.md index cc2ac38b6..e95f13061 100644 --- a/src/textarea/README.en-US.md +++ b/src/textarea/README.en-US.md @@ -26,6 +26,7 @@ label | String / Slot | - | [see more ts definition](https://github.com/Tencent/ maxcharacter | Number | - | \- | N maxlength | Number | -1 | \- | N placeholder | String | undefined | \- | N +placeholder-class | String | textarea-placeholder | \- | N placeholder-style | String | - | \- | N selection-end | Number | -1 | \- | N selection-start | Number | -1 | \- | N diff --git a/src/textarea/README.md b/src/textarea/README.md index 04c2c7f9a..7de99950b 100644 --- a/src/textarea/README.md +++ b/src/textarea/README.md @@ -89,6 +89,7 @@ label | String / Slot | - | 左侧文本。[通用类型定义](https://github.c maxcharacter | Number | - | 用户最多可以输入的字符个数，一个中文汉字表示两个字符长度 | N maxlength | Number | -1 | 用户最多可以输入的字符个数，值为 -1 的时候不限制最大长度 | N placeholder | String | undefined | 占位符 | N +placeholder-class | String | textarea-placeholder | 指定 placeholder 的样式类，目前仅支持color,font-size和font-weight | N placeholder-style | String | - | 指定 placeholder 的样式，目前仅支持 color ,font-size和font-weight | N selection-end | Number | -1 | 光标结束位置，自动聚集时有效，需与 selection-start 搭配使用 | N selection-start | Number | -1 | 光标起始位置，自动聚集时有效，需与 selection-end 搭配使用 | N @@ -114,7 +115,7 @@ line-change | `(value: TextareaValue)` | 行高发生变化时触发 t-class | 根节点样式类 t-class-indicator | 计数器样式类 t-class-label | 左侧文本样式类 -t-class-textarea | 占位符样式类 +t-class-textarea | 多行文本框样式类 ### CSS Variables diff --git a/src/textarea/__test__/__snapshots__/index.test.js.snap b/src/textarea/__test__/__snapshots__/index.test.js.snap index e441ecc0b..3964b249e 100644 --- a/src/textarea/__test__/__snapshots__/index.test.js.snap +++ b/src/textarea/__test__/__snapshots__/index.test.js.snap @@ -36,7 +36,7 @@ exports[`textarea slots : label 1`] = ` holdKeyboard="{{false}}" maxlength="{{-1}}" placeholder="" - placeholderClass="t-textarea__placeholder" + placeholderClass="t-textarea__placeholder textarea-placeholder" placeholderStyle="" selectionEnd="{{-1}}" selectionStart="{{-1}}" diff --git a/src/textarea/props.ts b/src/textarea/props.ts index 8ae321e34..790228334 100644 --- a/src/textarea/props.ts +++ b/src/textarea/props.ts @@ -94,6 +94,11 @@ const props: TdTextareaProps = { type: String, value: undefined, }, + /** 指定 placeholder 的样式类，目前仅支持color,font-size和font-weight */ + placeholderClass: { + type: String, + value: 'textarea-placeholder', + }, /** 指定 placeholder 的样式，目前仅支持 color ,font-size和font-weight */ placeholderStyle: { type: String, diff --git a/src/textarea/textarea.wxml b/src/textarea/textarea.wxml index 5d2515c93..a7f5cd31b 100644 --- a/src/textarea/textarea.wxml +++ b/src/textarea/textarea.wxml @@ -16,7 +16,7 @@ maxlength="{{maxlength}}" disabled="{{disabled}}" placeholder="{{placeholder}}" - placeholder-class="{{classPrefix}}__placeholder" + placeholder-class="{{classPrefix}}__placeholder {{placeholderClass}}" placeholder-style="{{placeholderStyle}}" value="{{value}}" auto-height="{{!!autosize}}" diff --git a/src/textarea/type.ts b/src/textarea/type.ts index f667de15b..f93947917 100644 --- a/src/textarea/type.ts +++ b/src/textarea/type.ts @@ -145,6 +145,14 @@ export interface TdTextareaProps { type: StringConstructor; value?: string; }; + /** + * 指定 placeholder 的样式类，目前仅支持color,font-size和font-weight + * @default textarea-placeholder + */ + placeholderClass?: { + type: StringConstructor; + value?: string; + }; /** * 指定 placeholder 的样式，目前仅支持 color ,font-size和font-weight * @default ''