Fix/bugs

[M-Adoo]

Purpose of this Pull Request

Please briefly describe what this Pull Request is aiming to achieve.

Checklist Before Merging

Please ensure the following are completed before merging:

• If this is linked to an issue, include the link in your description.
• If you've made changes to the code or documentation, make sure these are updated in the CHANGELOG.md file.
• If you've introduced any break changes, briefly describe them in the Breaking section of the CHANGELOG.md file.

Additional Information

The bot will replace #pr in CHANGELOG.md with your pull request number. If your branch is out of sync, use git pull --rebase to update it.

If you're unsure about which branch to submit your Pull Request to, or when it will be released after being merged, please refer to our Release Guide.

If you're working on a widget and need help writing test cases, we have some macros that can assist you. Please refer to the Ribir Dev Helper documentation.