fix(upload): fix options method #3155
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
|
|
uyarn
approved these changes
Apr 27, 2024
|
sorry 昨天没看到PR 发布版本的时候更新了common 需要再处理下冲突了 |
我刚刚好像把 common 回退到上个 commit 了，可能还是应该 develop 更新到 common 最新的 commit？ |
我直接在你的PR上改 |
因为我们在拉分支之后都更新了common 后来我的改动先合入了主干 所以你需要rebase主干（处理冲突）之后，确保common带上了option的改动就可以 |
Merged
16 tasks
uyarn
added a commit
that referenced
this pull request
May 16, 2024
* chore: update common * fix(upload): fix options method * chore: update common --------- Co-authored-by: Uyarn <uyarnchen@gmail.com>
uyarn
added a commit
that referenced
this pull request
May 16, 2024
* fix(upload): fix options method (#3155) * chore: update common * fix(upload): fix options method * chore: update common --------- Co-authored-by: Uyarn <uyarnchen@gmail.com> * chore: fix docs (#3161) * chore: fix docs * chore: fix lint * fix(color-picker): 修复切换预览颜色时，通道按钮位置不变的问题 (#3163) * feat(input): add borderless mode (#3162) * feat: add label prop API for date pickers and range input (#3169) --------- Signed-off-by: Siubeng <fython@163.com> Co-authored-by: Uyarn <uyarnchen@gmail.com> * fix(range-input): 修复 prefix/suffix 内容未应用居中样式的问题 (#3175) * fix(range-input): add missing classes to fix unexpected align of prefix/suffix in component * test(range-input): update snapshots for range-input and related components * fix(select): fix default value missing (#3177) * fix(select): fix default value missing * chore: update snapshot * chore: update common to synchronize style and docs fix (#3178) * chore: release 1.9.4-naruto --------- Signed-off-by: Siubeng <fython@163.com> Co-authored-by: Yunfei Shen <shenyf0608@163.com> Co-authored-by: fennghuang <89014758+fennghuang@users.noreply.github.com> Co-authored-by: Siubeng <fython@163.com>
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.
🤔 这个 PR 的性质是？
🔗 相关 Issue
Tencent/tdesign-react#2852
💡 需求背景和解决方案
📝 更新日志
fix(upload): fix options method
本条 PR 不需要纳入 Changelog
☑️ 请求合并前的自查清单