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: resolve incorrect display of options in formkit selector with async data #6629

Merged
merged 2 commits into from
Sep 10, 2024

Conversation

LIlGG
Copy link
Member

@LIlGG LIlGG commented Sep 10, 2024

What type of PR is this?

/kind bug
/area ui
/milestone 2.20.x

What this PR does / why we need it:

为 formkit select 组件优化逻辑,目前将可以监听到 options 的变化,用于在变化时设置值。用于解决当 options 是异步获取,而 value 是初始设置时,无法显示正常的 label。

How to test it?

测试 options 比设置 value 晚时,数据能否正常显示 label。

Does this PR introduce a user-facing change?

解决当 FormKit Select 组件中的 options 延迟设置时无法正常回显的问题。

@f2c-ci-robot f2c-ci-robot bot added kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Sep 10, 2024
@f2c-ci-robot f2c-ci-robot bot added this to the 2.20.x milestone Sep 10, 2024
@f2c-ci-robot f2c-ci-robot bot added the area/ui Issues or PRs related to the Halo UI label Sep 10, 2024
@f2c-ci-robot f2c-ci-robot bot requested review from guqing and ruibaby September 10, 2024 07:41
@LIlGG
Copy link
Member Author

LIlGG commented Sep 10, 2024

/cherrypick release-2.19

@halo-dev-bot
Copy link
Collaborator

@LIlGG: once the present PR merges, I will cherry-pick it on top of release-2.19 in a new PR and assign it to you.

In response to this:

/cherrypick release-2.19

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link

codecov bot commented Sep 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.05%. Comparing base (6cd8dc8) to head (071a17a).
Report is 59 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6629      +/-   ##
============================================
- Coverage     58.18%   58.05%   -0.13%     
- Complexity     3774     3916     +142     
============================================
  Files           651      670      +19     
  Lines         22125    22970     +845     
  Branches       1538     1575      +37     
============================================
+ Hits          12873    13335     +462     
- Misses         8641     9019     +378     
- Partials        611      616       +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@ruibaby ruibaby 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 Sep 10, 2024
Copy link

f2c-ci-robot bot commented Sep 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ruibaby

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 Sep 10, 2024
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 removed the lgtm Indicates that a PR is ready to be merged. label Sep 10, 2024
Copy link

@guqing
Copy link
Member

guqing commented Sep 10, 2024

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Sep 10, 2024
@f2c-ci-robot f2c-ci-robot bot merged commit b02ab8d into halo-dev:main Sep 10, 2024
8 checks passed
@halo-dev-bot
Copy link
Collaborator

@LIlGG: #6629 failed to apply on top of branch "release-2.19":

Applying: fix: resolve incorrect display of options in formkit selector with async data
Using index info to reconstruct a base tree...
M	ui/src/formkit/inputs/select/SelectMain.vue
Falling back to patching base and 3-way merge...
Auto-merging ui/src/formkit/inputs/select/SelectMain.vue
CONFLICT (content): Merge conflict in ui/src/formkit/inputs/select/SelectMain.vue
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: resolve incorrect display of options in formkit selector with async data
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-2.19

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

LIlGG added a commit to LIlGG/halo that referenced this pull request Sep 10, 2024
…ync data (halo-dev#6629)

#### What type of PR is this?

/kind bug
/area ui
/milestone 2.20.x

#### What this PR does / why we need it:

为 formkit select 组件优化逻辑,目前将可以监听到 options 的变化,用于在变化时设置值。用于解决当 options 是异步获取,而 value 是初始设置时,无法显示正常的 label。

#### How to test it?

测试 options 比设置 value 晚时,数据能否正常显示 label。

#### Does this PR introduce a user-facing change?
```release-note
解决当 formkit select 组件中的 options 延迟设置时无法正常回显的问题。
```
f2c-ci-robot bot pushed a commit that referenced this pull request Sep 10, 2024
…elector with async data (#6631)

This is an automated cherry-pick of #6629

/assign LIlGG

```release-note
解决当 formkit select 组件中的 options 延迟设置时无法正常回显的问题。
```
@ruibaby ruibaby modified the milestones: 2.20.x, 2.20.0 LTS Sep 14, 2024
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/ui Issues or PRs related to the Halo UI kind/bug Categorizes issue or PR as related to a bug. 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.

4 participants