feat(input): 增加左侧、右侧文本 #88
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mokywu
force-pushed
the
feature/fix/input
branch
2 times, most recently
from
4979223 to
b5a81ee
Compare
chaishi
reviewed
Dec 24, 2021
src/input/input.tsx
Outdated
| @@ -85,6 +86,9 @@ export default (Vue as VueConstructor<InputInstance>).extend({ | |||
| const prefixIcon = this.renderIcon(h, this.prefixIcon, 'prefix-icon'); | |||
| let suffixIcon = this.renderIcon(h, this.suffixIcon, 'suffix-icon'); | |||
|
|
|||
| const labelContent = this.label ? <span class={`${name}__prefix`}>{renderTNodeJSX(this, 'label')}</span> : null; | |||
| const suffixContent = this.suffix ? <span class={`${name}__suffix`}>{renderTNodeJSX(this, 'suffix')}</span> : null; | |||
There was a problem hiding this comment.
业务侧使用的时候：props this.label 和插槽 <div slot="label"> 二选一。
逻辑不对，不是 this.label 存在，才能执行 renderTNodeJSX(this, 'label')。这样子，无法正常渲染插槽 label。
renderTNodeJSX(this, 'label') 包含了插槽渲染，和渲染函数 this.label 两种。
建议代码：
const label = renderTNodeJSX(this, 'label');
// 使用 __label 而非 __prefix；使用 div 而非 span，这些自定义元素很可能会是 block 元素
const labelContent = label ? <div class={`${name}__label`}>{label}</div>
src/input/input.tsx
Outdated
| [`${name}--suffix`]: suffixIcon, | ||
| [`${name}--prefix`]: prefixIcon || labelContent, | ||
| [`${name}--suffix`]: suffixIcon || suffixContent, | ||
| [`${name}__inner-is-focused`]: this.focused, |
There was a problem hiding this comment.
__inner-is-focused 更为 __inner--focused
mokywu
force-pushed
the
feature/fix/input
branch
4 times, most recently
from
1ebad64 to
9038e14
Compare
mokywu
force-pushed
the
feature/fix/input
branch
7 times, most recently
from
2b03fb7 to
4fb0336
Compare
|
|
|
input__inner移动的影响太大了 |
mokywu
force-pushed
the
feature/fix/input
branch
2 times, most recently
from
8329903 to
c1f0795
Compare
增加左侧、右侧文本 Tencent#81
mokywu
force-pushed
the
feature/fix/input
branch
from
c1f0795 to
a2c34e8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
增加左侧、右侧文本。子仓库变更：Tencent/tdesign-common#52
issue #81