Skip to content
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.

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

chore: feature merge master #6323

Closed
wants to merge 32 commits into from
Closed

chore: feature merge master #6323

wants to merge 32 commits into from

Conversation

miracles1919
Copy link
Contributor

No description provided.

1587315093 and others added 30 commits July 4, 2023 19:23
…itch (#6232)

* doc: update SwupeAction doc

* doc: update ProgressBar  ProgressCircle doc

* doc: update Popover doc

* doc: update Switch doc
* doc: update docs

* doc: update doc
* fix: fix placeholder show when value is number 0 on virtual-input

* test: add value `0`

---------

Co-authored-by: wuguangsen.wgs <[email protected]>
Co-authored-by: miracles1919 <[email protected]>
…its parent (#6239)

fix: hidden textarea element is not positioned relative to its parent
chore: master merge feature
* enhance: useWheel dir change

* enhance: 代码风格调整

* refactor: 数组解构方式优化

* style: delete note code
* fix(TextArea): rows should be the smallest of default and autoSize

* refactor: adjust rows logic
* refactor: to simplify the judge

* refactor: simplify the judge

* fix: add null judge

* fix: add judage case
* refactor(Calendar): change locale from method to string

* test(ConfigProvider): remove spaces in Japanese translation in calendar

---------

Co-authored-by: litaoq <[email protected]>
* enhance: passive and preventDefault coexist repair

* refactor: code simplify

* test: add useLockScroll test case
fix(toast): compatible with rtl mode

Co-authored-by: Fog3211 <[email protected]>
enhance: fix passive and preventDefault in components
* chore: code simplify

* chore: code simplify
)

* fix: useLockScroll whether the element scroll is in the end #6253

* test: useLockScroll test case #6253

* fix: useLockScroll whether the element scroll is in the end #6253

* test: useLockScroll whether the element scroll is in the end #6253

* test: useLockScroll with strict params #6253

* test: useLockScroll with strict params #6253

* fix: del px and remove {} #6253
* fix: error-block Normal display 0

* test: add test case
1587315093 and others added 2 commits August 15, 2023 10:18
chore: pickview dom use classPrefix
* enhance: replace missing colors with css variables. fix #6319

* enhance: replace black color with css variable

* chore: update tag snapshots for css var
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😅 This branch has conflicts that must be resolved!

@github-actions github-actions bot closed this Aug 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants