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

feat: add showCancel prop for dialog component #4302

Merged

Conversation

ruibaby
Copy link
Member

@ruibaby ruibaby commented Jul 26, 2023

What type of PR is this?

/area console
/kind improvement
/milestone 2.8.x

What this PR does / why we need it:

为 Dialog 组件添加 showCancel 属性用于控制是否显示取消按钮,某些场景下 Dialog 只是用于提示切必须点击确定。

此外,还对以下位置做了对应修改:

  1. 进入文章编辑时检查编辑器是否存在的弹框,只允许点击确定并返回。
  2. 备份恢复完成之后点击确定关闭 Halo。

Does this PR introduce a user-facing change?

Console 端的 Dialog 组件添加 showCancel 属性用于控制是否显示取消按钮。

Signed-off-by: Ryan Wang <i@ryanc.cc>
@f2c-ci-robot f2c-ci-robot bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jul 26, 2023
@f2c-ci-robot f2c-ci-robot bot added this to the 2.8.x milestone Jul 26, 2023
@f2c-ci-robot f2c-ci-robot bot added the area/console Issues or PRs related to the Halo Console label Jul 26, 2023
@f2c-ci-robot f2c-ci-robot bot requested review from guqing and LIlGG July 26, 2023 03:44
@f2c-ci-robot f2c-ci-robot bot added the kind/improvement Categorizes issue or PR as related to a improvement. label Jul 26, 2023
@codecov
Copy link

codecov bot commented Jul 26, 2023

Codecov Report

Merging #4302 (5299886) into main (cfe77c5) will decrease coverage by 0.14%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #4302      +/-   ##
============================================
- Coverage     60.76%   60.62%   -0.14%     
+ Complexity     2503     2498       -5     
============================================
  Files           370      370              
  Lines         13047    13047              
  Branches        935      935              
============================================
- Hits           7928     7910      -18     
- Misses         4659     4678      +19     
+ Partials        460      459       -1     

see 5 files with indirect coverage changes

Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

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

/approve

@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Jul 26, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 26, 2023
Copy link
Member

@guqing guqing left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Jul 26, 2023
@f2c-ci-robot f2c-ci-robot bot merged commit 25725e5 into halo-dev:main Jul 26, 2023
4 checks passed
@ruibaby ruibaby modified the milestones: 2.8.x, 2.8.0 Jul 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/console Issues or PRs related to the Halo Console kind/improvement Categorizes issue or PR as related to a improvement. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants