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

fix(components): fix the attribute conflict #13504

Merged
merged 5 commits into from
Aug 15, 2023

Conversation

kamesan012
Copy link
Contributor

@kamesan012 kamesan012 commented Jul 7, 2023

When value is input by shortcut, it's value will not be changed by defaultTime anymore

closed #13483

Please make sure these boxes are checked before submitting your PR, thank you!

  • Make sure you follow contributing guide English | (中文 | Español | Français).
  • Make sure you are merging your commits to dev branch.
  • Add some descriptions and refer to relative issues for your PR.

Description

🤖 Generated by Copilot at 146b1df

This change improves the date picker component by allowing shortcut options to emit date values without default time values. It introduces a new parameter isShortcut to the formatEmit and emit functions in panel-date-pick.vue.

Related Issue

Fixes #13483.

Explanation of Changes

🤖 Generated by Copilot at 146b1df

  • Add isShortcut parameter to formatEmit and emit functions to indicate shortcut date selection (link, link, link)

When value is input by shortcut, it's value will not be changed by defaultTime anymore

closed element-plus#13483
@pull-request-triage
Copy link

👋 @kamesan012, seems like this is your first time contribution to element-plus.

  • Please make sure that you have read our guidelines and code of conduct before making a contribution.
  • You can comment with /label Components:[component_name] to add a label for which component you are working on.
  • You may join our Discord for staying tuned.

@pull-request-triage pull-request-triage bot added 1st contribution Their very first contribution Needs Review labels Jul 7, 2023
@github-actions
Copy link

github-actions bot commented Jul 7, 2023

@github-actions
Copy link

github-actions bot commented Jul 7, 2023

Hello @kamesan012, thank you for contributing to element-plus, please see our guideline to see how to make contribution

@github-actions github-actions bot added the CommitMessage::Qualified Qualified commit message label Jul 8, 2023
@github-actions
Copy link

github-actions bot commented Jul 8, 2023

🧪 Playground Preview: https://element-plus.run/?pr=13504
Please comment the example via this playground if needed.

Copy link
Collaborator

@btea btea left a comment

Choose a reason for hiding this comment

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

Can you add a test case?

@kamesan012
Copy link
Contributor Author

Can you add a test case?

Added.

@kamesan012
Copy link
Contributor Author

@btea Does this prrequire two people to review before merging?

@btea
Copy link
Collaborator

btea commented Aug 9, 2023

@btea Does this prrequire two people to review before merging?

Yes, please be patient.

Copy link
Member

@tolking tolking left a comment

Choose a reason for hiding this comment

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

LGTM, Thank for your contribution

@tolking tolking merged commit b8e4740 into element-plus:dev Aug 15, 2023
10 checks passed
@element-bot element-bot mentioned this pull request Aug 25, 2023
3 tasks
laizuan pushed a commit to laizuan/element-plus that referenced this pull request Sep 5, 2023
* fix(components): fix the attribute conflict

When value is input by shortcut, it's value will not be changed by defaultTime anymore

closed element-plus#13483

* fix(components): change param to pass the test

* fix(components): delete unnecessary changes

* fix(components): use let to replace ref variable

* fix(components): add test cases
consultation-applio pushed a commit to consultation-applio/element-plus that referenced this pull request Nov 10, 2023
* fix(components): fix the attribute conflict

When value is input by shortcut, it's value will not be changed by defaultTime anymore

closed element-plus#13483

* fix(components): change param to pass the test

* fix(components): delete unnecessary changes

* fix(components): use let to replace ref variable

* fix(components): add test cases
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Component] [date-picker] DatePicker's prop "defaultTime" is in collision with prop "shortcuts"
3 participants