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.

Sign up for GitHub

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

Jump to bottom

Add support for link group and its sort #2105

Merged
merged 8 commits into from
May 25, 2022
Merged

Add support for link group and its sort #2105

merged 8 commits into from
May 25, 2022

Conversation

Camsyn
Copy link

@Camsyn Camsyn commented May 22, 2022 •
edited by JohnNiang
Loading

What type of PR is this?

/kind feature
/kind api-change

What this PR does / why we need it:

提供对友链分组的排序功能；前端还通过拖拽来提供可视化的对友链及友链分组的排序操作。

Which issue(s) this PR fixes:

Fixes #1905

Special notes for your reviewer:

出于不更改数据库表的考虑，对分组的排序没有增设新的字段如team_priority，而是沿用过去的link的priority字段，每个分组的priority设置为其组内link的最高priority。

前端不提供显式的修改priority的接口，改由前端按排序自动计算所有link的priority，再交由后端统一更新。

前端方面进行友链管理界面的重构，沿用了vuedraggable组件来实现拖拽，由于我对前端不是很熟练，前端方面的具体实现和PR交由 @gungnir479 负责。

总体效果如下

-.Halo.1.mp4

Does this PR introduce a user-facing change?

重构了管理友链的界面，现在可以通过拖拽的形式可视化的管理友链及友链分组的排序

@f2c-ci-robot f2c-ci-robot bot added the kind/feature Categorizes issue or PR as related to a new feature. label May 22, 2022
@f2c-ci-robot f2c-ci-robot bot added kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 22, 2022
@Camsyn Camsyn changed the title Issue1905 Feat: 提供对友链分组的支持 May 22, 2022
@ruibaby
Copy link
Member

ruibaby commented May 22, 2022

/kind feature
/milestone 1.6.x

/cc @halo-dev/sig-halo

很赞 👍

@f2c-ci-robot f2c-ci-robot bot added this to the 1.6.x milestone May 22, 2022
@Camsyn Camsyn changed the title Feat: 提供对友链分组的支持 Feat: 提供对友链分组排序的支持 May 22, 2022
@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 23, 2022
JohnNiang
JohnNiang reviewed May 23, 2022
View reviewed 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.

Hi @Camsyn，非常棒的功能 👍 。

不过我这里留下了一些小建议，请花点儿时间看看，Thx！

src/main/java/run/halo/app/service/impl/LinkServiceImpl.java Outdated Show resolved Hide resolved
src/main/java/run/halo/app/service/impl/LinkServiceImpl.java Outdated Show resolved Hide resolved
src/main/java/run/halo/app/service/impl/LinkServiceImpl.java Outdated Show resolved Hide resolved
src/main/java/run/halo/app/service/impl/LinkServiceImpl.java Outdated Show resolved Hide resolved
src/main/java/run/halo/app/controller/admin/api/LinkController.java Outdated Show resolved Hide resolved
src/main/java/run/halo/app/repository/LinkRepository.java Outdated Show resolved Hide resolved
src/main/java/run/halo/app/controller/admin/api/LinkController.java Show resolved Hide resolved
src/main/java/run/halo/app/controller/admin/api/LinkController.java Outdated Show resolved Hide resolved
JohnNiang
JohnNiang reviewed May 24, 2022
View reviewed 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.

/retitle Add support for link group and its sort
/lgtm

Thanks for your first contribution!

@f2c-ci-robot f2c-ci-robot bot changed the title Feat: 提供对友链分组排序的支持 Add support for link group and its sort May 24, 2022
@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label May 24, 2022
ruibaby
ruibaby reviewed May 24, 2022
View reviewed changes
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

JohnNiang
JohnNiang reviewed May 25, 2022
View reviewed 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 May 25, 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 May 25, 2022
@f2c-ci-robot f2c-ci-robot bot merged commit c2e477f into halo-dev:master May 25, 2022
@ruibaby ruibaby mentioned this pull request Jul 31, 2022
Merged
f2c-ci-robot bot pushed a commit that referenced this pull request Oct 12, 2022
@ruibaby
release: 1.6.0 (#2542)
de684ff 
#### What type of PR is this?


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

发布 1.6.0

#### Special notes for your reviewer:

/cc @halo-dev/sig-halo 

```markdown
## Features

- SMTP 添加 STARTTLS 的设置支持。 #1861 halo-dev/console#552 @ntdgy @wangxiaoerYah
- 为邮件通知模板添加更多的可用参数，`email`、`status`、`createTime`、`authorUrl`。 #2095 @Yhcrown @iRoZhi
- 后台附件设置中添加 `去除图片 EXIF 信息` 的选项。 #2168 halo-dev/console#554 @SladeGranger @eziosudo @52lemon6
- 后台文章标签管理支持清理未使用标签。 halo-dev/console#587 @ruibaby
- 重构后台的友情链接管理页面，现在支持拖动排序以及分组管理。 halo-dev/console#574 #2105 @Camsyn @daifiyum @gungnir479

## Improvements

- 优化文章编辑时间更新的逻辑，目前更改为仅在修改文章标题或者内容时才更新。 #2195 @wxyShine @ListenV
- 修改后台管理页面为直接渲染而不是重定向，以更好地兼容反向代理。 #2259 @viticis
- 后台在构建时提供 gzip 压缩的资源。 halo-dev/console#547 @2211898719
- 后台主题设置界面顶部提供了保存设置的按钮。 halo-dev/console#549 @Aanko
- 修改后台页面的 lang 属性，由 `zh-cmn-Hans` 改为 `cmn-Han`，`zh-cmn-Hans` 已废弃。 halo-dev/console#576 @wordlesswind
- 优化后台附件库列表以及选择附件弹框的布局。 halo-dev/console#580 @ruibaby
- 修改后台底部的 `Power by Halo` 为 `Powered by Halo`。 halo-dev/console#597 @liaocp666
- 优化后台日志管理设置公开/隐藏状态的方式。 halo-dev/console#610 @zjy4fun @manction
- 优化后台在个人资料中设置头像的逻辑，现在无需再提交个人资料表单。 halo-dev/console#619 @wxyShine
- 优化后台图库批量从附件添加时，按照选择顺序倒序排列，即最先选择的图片在最前面。 halo-dev/console#631 @zjy4fun @zyy247796143

## Bug Fixes

- 修复文章详情页 `meta_description` 为空的问题。 #2282 @guqing @ruibaby
- 修复批量删除外部云存储的时候，因为文件不存在导致的删除失败问题。 #2317 @JustinLiang522 @129duckflew
- 修复了七牛云存储附件无法上传非图片文件的问题。 #2331 @AirboZH @hexWars
- 修复未审核评论回复会发送邮件提醒的问题。 #2340 @AirboZH @cetr
- 修复在单个分类所属文章页面页面变量中无法获取子分类中文章的问题。 #2405 @JustinLiang522 @HugeLeaf
- 修复管理员资料表单中邮件地址的字符数限制。 halo-dev/console#571 @Yhcrown
- 修复了无法设置日志、相册、链接页标题和每页显示条数的问题。 halo-dev/console#601 @JustinLiang522 @manction

## Dependencies

- Docker 镜像的基础镜像使用 Eclipse Temurin 镜像替代 AdoptOpenJDK。 #2120 @wordlesswind
```

#### Does this PR introduce a user-facing change?

```release-note
None
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnNiang JohnNiang JohnNiang left review comments

@ruibaby ruibaby ruibaby left review comments

@lan-yonghui lan-yonghui Awaiting requested review from lan-yonghui

@wan92hen wan92hen Awaiting requested review from wan92hen

Assignees

@JohnNiang JohnNiang

@ruibaby ruibaby

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API 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
Milestone
1.6.x
Development

Successfully merging this pull request may close these issues.

希望可以对友链”分组“进行排序
3 participants
@Camsyn @ruibaby @JohnNiang