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 annotations expression object for thymeleaf #3076

Merged
merged 3 commits into from
Dec 29, 2022

Conversation

guqing
Copy link
Member

@guqing guqing commented Dec 29, 2022

What type of PR is this?

/kind feature
/area core
/milestone 2.1.x

What this PR does / why we need it:

新增操作 annotations 的表达式对象
在 thymeleaf 模板中使用示例:

<p th:text="${#annotations.get(user, 'background')}"></p>
<p th:text="${#annotations.getOrDefault(user, 'background', 'default-value')}"></p>
<p th:text="${#annotations.contains(user, 'background')}"></p>

Which issue(s) this PR fixes:

Fixes #3073

Special notes for your reviewer:

/cc @halo-dev/sig-halo

Does this PR introduce a user-facing change?

新增 Annotations 表达式对象用于在 thymeleaf 中操作自定义模型的 annotations

@f2c-ci-robot f2c-ci-robot bot added kind/feature Categorizes issue or PR as related to a new feature. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Dec 29, 2022
@f2c-ci-robot f2c-ci-robot bot added this to the 2.1.x milestone Dec 29, 2022
@f2c-ci-robot f2c-ci-robot bot added the area/core Issues or PRs related to the Halo Core label Dec 29, 2022
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

非常有用!

<div
-  th:style="|background:${categoryItem.metadata.annotations != null ? (categoryItem.metadata.annotations['bgColor'] ?: '#fff') : ''}|"
+  th:style="|background:${#annotations.getOrDefault(categoryItem, 'bgColor', '#000')}|"
></div>

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Dec 29, 2022
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 Dec 29, 2022

[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 Dec 29, 2022
@f2c-ci-robot f2c-ci-robot bot merged commit cc891d6 into halo-dev:main Dec 29, 2022
@guqing guqing deleted the feature/3073 branch December 29, 2022 13:34
@JohnNiang JohnNiang modified the milestones: 2.1.x, 2.1.0 Dec 29, 2022
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/core Issues or PRs related to the Halo Core kind/feature Categorizes issue or PR as related to a new feature. 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.

主题端调用资源的 Annotations 不方便
3 participants